From gerrit-no-reply at lists.osmocom.org Thu Nov 1 10:53:05 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 1 Nov 2018 10:53:05 +0000 Subject: Change in osmo-msc[master]: vlr: use unused is_ps parameter in vlr_subscr_req_lu() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11563 Change subject: vlr: use unused is_ps parameter in vlr_subscr_req_lu() ...................................................................... vlr: use unused is_ps parameter in vlr_subscr_req_lu() the function vlr_subscr_req_lu() has a parameter is_ps, which is set to vsub->vlr->cfg.is_ps by the only caller in vlr_lu_fsm.c. Inside the function one can see that vsub->vlr->cfg.is_ps is used directly to decide between PS or CS LU, we could also use is_ps there. Presumably the parameter is_ps was intruduced later but changing the function body has been forgotten. Lets update the function body accordingly. Change-Id: Idfc925f2cb254d192e86568958b5ecb68fac09da --- M src/libvlr/vlr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/63/11563/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f7572f2..2409920 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -622,7 +622,7 @@ int rc; gsup_msg.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST; - gsup_msg.cn_domain = vsub->vlr->cfg.is_ps ? OSMO_GSUP_CN_DOMAIN_PS : OSMO_GSUP_CN_DOMAIN_CS; + gsup_msg.cn_domain = is_ps ? OSMO_GSUP_CN_DOMAIN_PS : OSMO_GSUP_CN_DOMAIN_CS; rc = vlr_subscr_tx_gsup_message(vsub, &gsup_msg); return rc; -- To view, visit https://gerrit.osmocom.org/11563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idfc925f2cb254d192e86568958b5ecb68fac09da Gerrit-Change-Number: 11563 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 11:36:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 11:36:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix typos In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11553 ) Change subject: cosmetic: fix typos ...................................................................... Patch Set 1: > FYI, I don't have permissions to submit this change - someone else > have to do it. Make sure you are still logged i. -- To view, visit https://gerrit.osmocom.org/11553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e75af46e134d33f752214988054105aba91366c Gerrit-Change-Number: 11553 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 11:36:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 11:53:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 11:53:03 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra In-Reply-To: References: Message-ID: Hello daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11549 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... contrib/jenkins.sh: Update to current osmocom infra Otherwise builds end failing in osmocom jenkins/gerrit. Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 --- M contrib/jenkins.sh 1 file changed, 38 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/49/11549/2 -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 11:53:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 11:53:03 +0000 Subject: Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11544 to look at the new patch set (#3). Change subject: debian: Clean up to look like other osmocom projects ...................................................................... debian: Clean up to look like other osmocom projects Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0 --- D debian/README M debian/compat A debian/copyright D debian/init.d.ex D debian/osmo-pcap-client.init D debian/osmo-pcap.default.ex M debian/rules 7 files changed, 29 insertions(+), 338 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/44/11544/3 -- To view, visit https://gerrit.osmocom.org/11544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0 Gerrit-Change-Number: 11544 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 11:53:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 11:53:03 +0000 Subject: Change in osmo-pcap[master]: Install cfg files with autotools In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11546 to look at the new patch set (#3). Change subject: Install cfg files with autotools ...................................................................... Install cfg files with autotools Cfg files are moved to doc/examples like in other osmocom projects. All the cfg files get installed into $prefix/share/doc/osmo-pcap/examples/$subdir/, and 1 script per binary is installed into /etc/osmocom. Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 --- M Makefile.am M configure.ac M contrib/Makefile.am M debian/osmo-pcap-client.install M debian/osmo-pcap-server.install M debian/rules A doc/Makefile.am A doc/examples/Makefile.am R doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg R doc/examples/osmo-pcap-client/osmo-pcap-client.cfg R doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg R doc/examples/osmo-pcap-server/osmo-pcap-server.cfg 12 files changed, 40 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/46/11546/3 -- To view, visit https://gerrit.osmocom.org/11546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 Gerrit-Change-Number: 11546 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:19:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:19:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix typos In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11553 to look at the new patch set (#2). Change subject: cosmetic: fix typos ...................................................................... cosmetic: fix typos Change-Id: I6e75af46e134d33f752214988054105aba91366c --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_LCLS.ttcn M bsc/MSC_ConnectionHandler.ttcn 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/11553/2 -- To view, visit https://gerrit.osmocom.org/11553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6e75af46e134d33f752214988054105aba91366c Gerrit-Change-Number: 11553 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:20:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:20:24 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 12:20:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:20:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:20:30 +0000 Subject: Change in osmo-bsc[master]: LCLS: move MGCP MDCX into separate function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11564 ) Change subject: LCLS: move MGCP MDCX into separate function ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5fafa3b12a39c83bdf64e16e192dd2454d069cf4 Gerrit-Change-Number: 11564 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 01 Nov 2018 12:20:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:20:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:20:40 +0000 Subject: Change in osmo-bsc[master]: LCLS: explicitly check for mode before closing the loop In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11565 ) Change subject: LCLS: explicitly check for mode before closing the loop ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Gerrit-Change-Number: 11565 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 01 Nov 2018 12:20:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:20:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:20:43 +0000 Subject: Change in osmo-bsc[master]: LCLS: move mode check into separate function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11551 ) Change subject: LCLS: move mode check into separate function ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 12:20:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:20:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:20:49 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11552 ) Change subject: LCLS: add bts-loop variant ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 01 Nov 2018 12:20:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:21:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:21:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: LCLS: explicitly check for *CX adjustment In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11558 ) Change subject: LCLS: explicitly check for *CX adjustment ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076 Gerrit-Change-Number: 11558 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 01 Nov 2018 12:21:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:30:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 1 Nov 2018 12:30:16 +0000 Subject: Change in osmo-msc[master]: vlr: use unused is_ps parameter in vlr_subscr_req_lu() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11563 ) Change subject: vlr: use unused is_ps parameter in vlr_subscr_req_lu() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idfc925f2cb254d192e86568958b5ecb68fac09da Gerrit-Change-Number: 11563 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 01 Nov 2018 12:30:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:36:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:36:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: add bts-loop tests In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11559 ) Change subject: BSC LCLS: add bts-loop tests ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e786b430591899c722d99d685db26efa868508 Gerrit-Change-Number: 11559 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 01 Nov 2018 12:36:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:37:07 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 12:37:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: LCLS: explicitly check for *CX adjustment In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11558 ) Change subject: LCLS: explicitly check for *CX adjustment ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11558/1/bsc/BSC_Tests_LCLS.ttcn File bsc/BSC_Tests_LCLS.ttcn: https://gerrit.osmocom.org/#/c/11558/1/bsc/BSC_Tests_LCLS.ttcn at 151 PS1, Line 151: = omit) > the general idea of the TestHdlrParams is that it serves as a collection of all the various paramete [?] Sure, I'll move it to pars. That was just a quick solution while getting a hang of TTCN-3. -- To view, visit https://gerrit.osmocom.org/11558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076 Gerrit-Change-Number: 11558 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 01 Nov 2018 12:37:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 12:51:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 12:51:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix typos In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11553 ) Change subject: cosmetic: fix typos ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e75af46e134d33f752214988054105aba91366c Gerrit-Change-Number: 11553 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 12:51:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 13:38:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 13:38:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11562 ) Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 01 Nov 2018 13:38:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 13:45:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 13:45:20 +0000 Subject: Change in osmo-sgsn[master]: Cleanup non-existent files from debian/copyright In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11566 ) Change subject: Cleanup non-existent files from debian/copyright ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36a05b7c729cc1d050c8d07540ed1d867ca2d613 Gerrit-Change-Number: 11566 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 13:45:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 13:49:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 13:49:37 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log RACH requests in GSMTAP Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11567 Change subject: ttcn3-bts-test: Log RACH requests in GSMTAP ...................................................................... ttcn3-bts-test: Log RACH requests in GSMTAP Change-Id: Idae872492a6cf3306fb2e636c54038caa600646b --- M ttcn3-bts-test/osmo-bts.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/11567/1 diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg index 04a9d17..c2ba83f 100644 --- a/ttcn3-bts-test/osmo-bts.cfg +++ b/ttcn3-bts-test/osmo-bts.cfg @@ -64,6 +64,7 @@ paging queue-size 200 paging lifetime 0 uplink-power-target -75 + gsmtap-sapi rach gsmtap-sapi agch gsmtap-sapi bcch gsmtap-sapi pch -- To view, visit https://gerrit.osmocom.org/11567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idae872492a6cf3306fb2e636c54038caa600646b Gerrit-Change-Number: 11567 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 14:14:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 14:14:52 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to test gprs IPv4 data plane In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11462 ) Change subject: Add support to test gprs IPv4 data plane ...................................................................... Patch Set 4: Waiting for patched ofono to be available (deployed) in Prod setup of osmo-gsm-tester before merging this patch, otherwise gprs tests are going to fail due to ifaces not being setup in the network namespaces. -- To view, visit https://gerrit.osmocom.org/11462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c Gerrit-Change-Number: 11462 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 14:14:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 14:52:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 14:52:26 +0000 Subject: Change in osmo-pcu[master]: Move EGPRS WS computation to C code In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/6241 ) Change subject: Move EGPRS WS computation to C code ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/6241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie411ea2bbfca442b33405584f15687a7ffcbb53c Gerrit-Change-Number: 6241 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 01 Nov 2018 14:52:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 1 15:13:58 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 1 Nov 2018 15:13:58 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#294?= In-Reply-To: <2108103370.356.1540998607302.JavaMail.jenkins@jenkins.osmocom.org> References: <2108103370.356.1540998607302.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1588109503.371.1541085238120.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu Nov 1 15:16:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 15:16:08 +0000 Subject: Change in osmo-pcu[master]: Move EGPRS WS computation to C code In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/6241 to look at the new patch set (#3). Change subject: Move EGPRS WS computation to C code ...................................................................... Move EGPRS WS computation to C code Don't access BTS struct when computing EGPRS window size: let the caller obtain necessary parameters and call corresponding function from C code. This makes it easier to unit-test and follow actual WS computation. Change-Id: Ie411ea2bbfca442b33405584f15687a7ffcbb53c Related: OS#1759 --- M src/mslot_class.c M src/mslot_class.h M src/tbf.cpp M src/tbf.h M src/tbf_dl.cpp M src/tbf_ul.cpp 6 files changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/6241/3 -- To view, visit https://gerrit.osmocom.org/6241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie411ea2bbfca442b33405584f15687a7ffcbb53c Gerrit-Change-Number: 6241 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 15:19:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 15:19:07 +0000 Subject: Change in osmo-pcu[master]: Move EGPRS WS computation to C code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/6241 ) Change subject: Move EGPRS WS computation to C code ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/6241/2/src/tbf_dl.cpp File src/tbf_dl.cpp: https://gerrit.osmocom.org/#/c/6241/2/src/tbf_dl.cpp at 1351 PS2, Line 1351: uint16_t ws = egprs_window_size(bts->bts_data()->ws_base, bts->bts_data()->ws_pdch, pcu_bitcount(dl_slots())); Maybe move bts_data() to a local variable since you use it twice, and then simplify this line. https://gerrit.osmocom.org/#/c/6241/2/src/tbf_ul.cpp File src/tbf_ul.cpp: https://gerrit.osmocom.org/#/c/6241/2/src/tbf_ul.cpp at 588 PS2, Line 588: uint16_t ws = egprs_window_size(bts->bts_data()->ws_base, bts->bts_data()->ws_pdch, pcu_bitcount(ul_slots())); Same here. -- To view, visit https://gerrit.osmocom.org/6241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie411ea2bbfca442b33405584f15687a7ffcbb53c Gerrit-Change-Number: 6241 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 15:19:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 15:20:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 15:20:03 +0000 Subject: Change in osmo-pcu[master]: Move EGPRS WS computation to C code In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/6241 ) Change subject: Move EGPRS WS computation to C code ...................................................................... Patch Set 3: See my comment in previous version of the patch. -- To view, visit https://gerrit.osmocom.org/6241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie411ea2bbfca442b33405584f15687a7ffcbb53c Gerrit-Change-Number: 6241 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 15:20:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 15:29:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 15:29:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Introduce mp_ipa_up_timeout parameter Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11568 Change subject: bts: Introduce mp_ipa_up_timeout parameter ...................................................................... bts: Introduce mp_ipa_up_timeout parameter Some test env may take more than 10 seconds to (re-)start a BTS, so let's make it variable through this parameter. For instance it was observed that running osmo-bts-sysmo through ssh inside a sysmobts can sometimes take a good number of seconds (specially because ssh connection can take a while to be established successfully). Change-Id: Ieb046358d8266ac94bd7b9e916e85f84de3ad319 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/11568/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 5b073ef..a333277 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -63,6 +63,8 @@ integer mp_ms_power_level_exp := 7; integer mp_ms_actual_ta_exp := 0; integer mp_timing_offset_256syms_exp := 512; + /* Time to wait for RSL conn from BTS during startup of test */ + float mp_ipa_up_timeout := 10.0; } type record of RslChannelNr ChannelNrs; @@ -296,7 +298,7 @@ /* global init function */ function f_init(charstring id := "BTS-Test") runs on test_CT { - timer T := 10.0; + timer T := mp_ipa_up_timeout; g_AllChannels := { /* TS 1..4: TCH/F */ valueof(ts_RslChanNr_Bm(1)), valueof(ts_RslChanNr_Bm(2)), -- To view, visit https://gerrit.osmocom.org/11568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb046358d8266ac94bd7b9e916e85f84de3ad319 Gerrit-Change-Number: 11568 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 15:40:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 15:40:56 +0000 Subject: Change in osmo-pcu[master]: Move EGPRS WS computation to C code In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/6241 ) Change subject: Move EGPRS WS computation to C code ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/6241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie411ea2bbfca442b33405584f15687a7ffcbb53c Gerrit-Change-Number: 6241 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 15:40:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 16:11:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 1 Nov 2018 16:11:16 +0000 Subject: Change in osmo-pcu[master]: Move EGPRS WS computation to C code In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/6241 ) Change subject: Move EGPRS WS computation to C code ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/6241/4/src/mslot_class.c File src/mslot_class.c: https://gerrit.osmocom.org/#/c/6241/4/src/mslot_class.c at 301 PS4, Line 301: return OSMO_MIN((num_pdch != 1) ? (128 * num_pdch) : 192, OSMO_MAX(64, This code looks unreadable... -- To view, visit https://gerrit.osmocom.org/6241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie411ea2bbfca442b33405584f15687a7ffcbb53c Gerrit-Change-Number: 6241 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 01 Nov 2018 16:11:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 16:44:16 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 1 Nov 2018 16:44:16 +0000 Subject: Change in osmo-msc[master]: Properly parse cause in cipher mode reject In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11569 ) Change subject: Properly parse cause in cipher mode reject ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I26b3eb0deff6dbd217b23d284bbc6e6a9eebc8e6 Gerrit-Change-Number: 11569 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 01 Nov 2018 16:44:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:07:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 1 Nov 2018 17:07:37 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: document handover In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11532 to look at the new patch set (#3). Change subject: bsc: document handover ...................................................................... bsc: document handover Add chapter "Handover", explaining: - intra- and - inter-BSC handover, - HO algorithm 1 and - algorithm 2 - new neighbor configuration Adjust copyright, add revision and add me as author. Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 --- M OsmoBSC/Makefile A OsmoBSC/chapters/handover.adoc A OsmoBSC/chapters/handover_inter_bsc.dot A OsmoBSC/chapters/handover_intra_bsc.dot M OsmoBSC/osmobsc-usermanual-docinfo.xml M OsmoBSC/osmobsc-usermanual.adoc 6 files changed, 642 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/32/11532/3 -- To view, visit https://gerrit.osmocom.org/11532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 Gerrit-Change-Number: 11532 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:07:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 1 Nov 2018 17:07:48 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: handover: mention the need to resend SI for telnet neighbor cfg In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11535 ) Change subject: bsc: handover: mention the need to resend SI for telnet neighbor cfg ...................................................................... bsc: handover: mention the need to resend SI for telnet neighbor cfg Change-Id: I305ef558b75697015e2532aa7c135f7995662e0d --- M OsmoBSC/chapters/handover.adoc 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved diff --git a/OsmoBSC/chapters/handover.adoc b/OsmoBSC/chapters/handover.adoc index b763701..297eafc 100644 --- a/OsmoBSC/chapters/handover.adoc +++ b/OsmoBSC/chapters/handover.adoc @@ -307,6 +307,15 @@ the MSC, the configured cell identifiers must be of the same type. If in doubt, use the full CGI identifier everywhere. +==== Reconfiguring Neighbors in a Running OsmoBSC + +When modifying a cell's neighbor configuration in a telnet VTY session while a cell is already active, +the neighbor configuration will merely be cached in the BSC's local config. To take actual effect, it is +necessary to + +- either, re-connect the cell to the BSC (e.g. via `drop bts connection <0-255> oml`) +- or, re-send the System Information using `bts <0-255> resend-system-information`. + === Configuring Handover Decisions For a long time, OsmoBSC has supported handover based on reception level -- To view, visit https://gerrit.osmocom.org/11535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I305ef558b75697015e2532aa7c135f7995662e0d Gerrit-Change-Number: 11535 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:07:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 1 Nov 2018 17:07:48 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: handover: clarify default of all-cells-are-neighbors In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11534 ) Change subject: bsc: handover: clarify default of all-cells-are-neighbors ...................................................................... bsc: handover: clarify default of all-cells-are-neighbors Change-Id: I61f877c7a60419132bdd27c1b4e64150c0520751 --- M OsmoBSC/chapters/handover.adoc 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved diff --git a/OsmoBSC/chapters/handover.adoc b/OsmoBSC/chapters/handover.adoc index 1120690..b763701 100644 --- a/OsmoBSC/chapters/handover.adoc +++ b/OsmoBSC/chapters/handover.adoc @@ -166,6 +166,22 @@ | ? | ? | neighbor cgi 001 01 200 3 arfcn 123 bsic 1 |==== +==== Default: All Local Cells are Neighbors + +For historical reasons, the default behavior of OsmoBSC is to add all local-BSS cells as neighbors. To +maintain a backwards compatible configuration file format, this is still the case: as soon as no explicit +neighbor cell is configured with a `neighbor` command (either none was configured, or all configured +neighbors have been removed again), a cell automatically lists all of the local-BSS cells as neighbors. +These are implicit mappings in terms of the legacy neighbor configuration scheme, and re-using ARFCN+BSIC +combinations within a BSS will not work well this way. + +As soon as the first explicit neighbor relation is added to a cell, the legacy behavior is switched off, +and only explicit neighbors are in effect. + +NOTE: If a cell is required to not have any neighbors, it is recommended to rather switch off handover +for that cell with `handover 0`. An alternative solution is to set `neighbor-list mode manual` and not +configure any `neighbor-list` entries. + ==== Local-BSS Neighbors Local neighbors can be configured by just the local BTS number, or by LAC+CI, -- To view, visit https://gerrit.osmocom.org/11534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I61f877c7a60419132bdd27c1b4e64150c0520751 Gerrit-Change-Number: 11534 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:07:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 1 Nov 2018 17:07:49 +0000 Subject: Change in osmo-gsm-manuals[master]: bsc: document handover In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11532 ) Change subject: bsc: document handover ...................................................................... bsc: document handover Add chapter "Handover", explaining: - intra- and - inter-BSC handover, - HO algorithm 1 and - algorithm 2 - new neighbor configuration Adjust copyright, add revision and add me as author. Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 --- M OsmoBSC/Makefile A OsmoBSC/chapters/handover.adoc A OsmoBSC/chapters/handover_inter_bsc.dot A OsmoBSC/chapters/handover_intra_bsc.dot M OsmoBSC/osmobsc-usermanual-docinfo.xml M OsmoBSC/osmobsc-usermanual.adoc 6 files changed, 642 insertions(+), 2 deletions(-) diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile index 1533482..b9f50d0 100644 --- a/OsmoBSC/Makefile +++ b/OsmoBSC/Makefile @@ -2,7 +2,7 @@ ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc include $(TOPDIR)/build/Makefile.asciidoc.inc -osmobsc-usermanual.pdf: chapters/*.adoc +osmobsc-usermanual.pdf: chapters/*.adoc chapters/*.dot aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc VTY_REFERENCE = osmobsc-vty-reference.xml diff --git a/OsmoBSC/chapters/handover.adoc b/OsmoBSC/chapters/handover.adoc new file mode 100644 index 0000000..1120690 --- /dev/null +++ b/OsmoBSC/chapters/handover.adoc @@ -0,0 +1,552 @@ +== Handover + +Handover is the process of moving a continuously used channel (lchan) from one +cell to another. Usually, that is an ongoing call, so that phones are able to +move across cell coverage areas without interrupting the voice transmission. + +A handover can + +- stay within one given cell (intra-cell, i.e. simply a new RR Assignment Command); +- occur between two cells that belong to the same BSS (intra-BSC, via RR Handover Command); +- cross BSS boundaries (inter-BSC, via BSSMAP handover procedures); +- move to another MSC (inter-MSC, inter-PLMN); +- move to another RAN type, e.g. from 2G to 3G (inter-RAT, inter-Radio-Access-Technology). + +The physical distance is by definition always very near, but handover +negotiation may range from being invisible to the MSC all the way to +orchestrating completely separate RAN stacks. + +OsmoBSC currently supports handover within one BSS and between separate BSS. +Whether inter-MSC is supported depends on the MSC implementation (to the BSC, +inter-MSC handover looks identical to inter-BSC handover). Inter-RAT handover +is currently not implemented. + +At the time of writing, OsmoMSC's inter-BSC handover support is not complete +yet, so OsmoBSC can perform handover between separate BSS only in conjunction +with a 3rd party MSC implementation. + +.Handover support in Osmocom at the time of writing +[cols="^,^,^,^,^"] +|==== +| | intra-BSC HO (local BSS) | inter-BSC HO (remote BSS) | inter-MSC HO | inter-RAT HO +| OsmoBSC | rxlev, load-based | rxlev | (planned) | - +| OsmoMSC | (not involved, except for codec changes) | (planned) | (planned) | - +|==== + + +=== How Handover Works + +This chapter generally explains handover operations between 2G cells. + +==== Internal / Intra-BSC Handover + +The BSS is configured to know which cell is physically adjacent to which other +cells, its "neighbors". On the MS/BTS/BSS level, individual cells are +identified by ARFCN+BSIC (frequency + 6-bit identification code). + +Each BTS is told by the BSC which cells identified by ARFCN+BSIC are its +adjacent cells. Via System Information, each MS receives a list of these +ARFCN+BSIC, and the MS then return measurements of reception levels. + +The BSC is the point of decision whether to do handover or not. This can be a +hugely complex combination of heuristics, knowledge of cell load and codec +capabilites. The most important indicator for handover though is: does an MS +report a neighbor with a better signal than the current cell? See +<>. + +[[intra_bsc_ho_dot]] +.Intra-BSC Handover stays within the BSS (shows steps only up to activation of the new lchan -- this would be followed by an RR Handover Command, RACH causing Handover Detection, Handover Complete, ...) +[graphviz] +---- +include::handover_intra_bsc.dot[] +---- + +If the BSC sees the need for handover, it will: + +- activate a new lchan (with a handover reference ID), +- send an RR Handover Command to the current lchan, and +- wait for the MS to send a Handover RACH to the new lchan ("Handover Detect"). +- The RTP stream then is switched over to the new lchan, +- an RSL Establish Indication is expected on the new lchan, +- and the old lchan is released. + +Should handover fail at any point, e.g. the new lchan never receives a RACH, or +the MS reports a Handover Failure, then the new lchan is simply released again, +and the old lchan remains in use. If the RTP stream has already been switched +over to the new lchan, it may actually be switched back to the old lchan. + +This is simple enough if the new cell is managed by the same BSC: the OsmoMGW +is simply instructed to relay the BTS-side of the RTP stream to another IP +address and port, and the BSC continues to forward DTAP to the MSC +transparently. The operation happens completely within the BSS. If the voice +codec has remained unchanged, the MSC/MNCC may not even be notified that +anything has happened at all. + +==== External / Inter-BSC Handover + +If the adjacent target cell belongs to a different BSS, the RR procedure for +handover remains the same, but we need to tell the _remote_ BSC to allocate the +new lchan. + +The only way to reach the remote BSC is via the MSC, so the MSC must be able +to: + +- identify which other BSC we want to talk to, +- forward various BSSMAP Handover messages between old and new BSC, +- redirect the core-side RTP stream to the new BSS at the appropriate time, +- and must finally BSSMAP Clear the connection to the old BSS to conclude the + inter-BSC handover. + +[[inter_bsc_ho_dot]] +.Inter-BSC Handover requires the MSC to relay between two BSCs (shows steps only up to the BSSMAP Handover Command -- this would be followed by an RR Handover Command, RACH causing Handover Detection, Handover Complete, ...) +[graphviz] +---- +include::handover_inter_bsc.dot[] +---- + +The first part, identifying the remote BSC, is not as trivial as it sounds: as +mentioned above, on the level of cell information seen by BTS and MS, the +neighbor cells are identified by ARFCN+BSIC. However, on the A-interface and in +the MSC, there is no knowledge of ARFCN+BSIC configurations, and instead each +cell is identified by a LAC and CI (Location Area Code and Cell Identifier). + +NOTE: There are several different cell identification types on the A-interface: +from Cell Global Identifier (MCC+MNC+LAC+CI) down to only LAC. OsmoBSC supports +most of these (see <>). For simplicity, this description +focuses on LAC+CI identification. + +The most obvious reason for using LAC+CI is that identical ARFCN+BSIC are +typically re-used across many cells of the same network operator: an operator +will have only very few ARFCNs available, and the 6bit BSIC opens only a very +limited range of distinction between cells. As long as each cell has no more +than one neighbor per given ARFCN+BSIC, these values can be re-used any number +of times across a network, and even between cells managed by one and the same +BSC. + +The consequence of this is that + +- the BSC needs to know which remote-BSS cells' ARFCN+BSIC correspond to + exactly which global LAC+CI, and +- the MSC needs to know which LAC+CI are managed by which BSC. + +In other words, each BSC requires prior knowledge about the cell configuration +of its remote-BSS neighbor cells, and the MSC requires prior knowledge about +each BSC's cell identifiers; i.e. these config items are spread reduntantly. + +=== Configuring Neighbors + +The most important step to enable handover in OsmoBSC is to configure each cell +with the ARFCN+BSIC identities of its adjacent neighbors -- both local-BSS and +remote-BSS. + +For a long time, OsmoBSC has offered configuration to manually enter the +ARFCN+BSIC sent out as neighbors on various System Information messages (all +`neighbor-list` related commands). This is still possible, however, +particularly for re-using ARFCN+BSIC within one BSS, this method will not work +well. + +With the addition of inter-BSC handover support, the new `neighbor` config item +has been added to the `bts` config, to maintain explicit cell-to-cell neighbor +relations, with the possibility to re-use ARFCN+BSIC in each cell. + +It is recommended to completely replace `neighbor-list` configurations with the +new `neighbor` configuration described below. + +[[neighbor_conf_list]] +.Overview of neighbor configuration on the `bts` config node +[frame="none",grid="none",cols="^10%,^10%,80%"] +|==== +| Local | Remote BSS | +| ? | | neighbor bts 5 +| ? | | neighbor lac 200 +| ? | | neighbor lac-ci 200 3 +| ? | | neighbor cgi 001 01 200 3 +| ? | ? | neighbor lac 200 arfcn 123 bsic 1 +| ? | ? | neighbor lac-ci 200 3 arfcn 123 bsic 1 +| ? | ? | neighbor cgi 001 01 200 3 arfcn 123 bsic 1 +|==== + +==== Local-BSS Neighbors + +Local neighbors can be configured by just the local BTS number, or by LAC+CI, +or any other supported A-interface type cell identification; also including the +ARFCN+BSIC is optional, it will be derived from the local configuration if +omitted. + +OsmoBSC will log errors in case the configuration includes ambiguous ARFCN+BSIC +relations (when one given cell has more than one neighbor for any one +ARFCN+BSIC). + +Neighbor relations must be configured explicitly in both directions, i.e. each +cell has to name all of its neighbors, even if the other cell already has an +identical neighbor relation in the reverse direction. + +.Example: configuring neighbors within the local BSS in osmo-bsc.cfg, identified by local BTS number +---- +network + bts 0 + neighbor bts 1 + bts 1 + neighbor bts 0 +---- + +.Example: configuring neighbors within the local BSS in osmo-bsc.cfg, identified by LAC+CI +---- +network + + bts 0 + # this cell's LAC=23 CI=5 + location_area_code 23 + cell_identity 5 + # reference bts 1 + neighbor lac-ci 23 6 + + bts 1 + # this cell's LAC=23 CI=6 + location_area_code 23 + cell_identity 6 + # reference bts 0 + neighbor lac-ci 23 5 +---- + +It is allowed to include the ARFCN and BSIC of local neighbor cells, even +though that is redundant with the already known local configuration of the +other cell. The idea is to ease generating the neighbor configuration +automatically, since local-BSS and remote-BSS neighbors then share identical +configuration formatting. For human readability and maintainability, it may +instead be desirable to use the `neighbor bts <0-255>` format. + +.Example: configuring neighbors within the local BSS in osmo-bsc.cfg, redundantly identified by LAC+CI as well as ARFCN+BSIC +---- +network + + bts 0 + # this cell's LAC=23 CI=5 + location_area_code 23 + cell_identity 5 + # this cell's ARFCN=1 BSIC=1 + trx 0 + arfcn 1 + base_station_id_code 1 + # reference bts 1 + neighbor lac-ci 23 6 arfcn 2 bsic 2 + + bts 1 + # LAC=23 CI=6 + location_area_code 23 + cell_identity 6 + # this cell's ARFCN=2 BSIC=2 + trx 0 + arfcn 2 + base_station_id_code 2 + # reference bts 0 + neighbor lac-ci 23 5 arfcn 1 bsic 1 +---- + +If the cell identification matches a local cell, OsmoBSC will report errors if +the provided ARFCN+BSIC do not match. + +==== Remote-BSS Neighbors + +Remote-BSS neighbors _always_ need to be configured with full A-interface +identification _and_ ARFCN+BSIC, to allow mapping a cell's neighbor ARFCN+BSIC +to a _BSSMAP Cell Identifier_ (see 3GPP TS 48.008 3.1.5.1 Handover Required +Indication and 3.2.1.9 HANDOVER REQUIRED). + +.Example: configuring remote-BSS neighbors in osmo-bsc.cfg, identified by LAC+CI (showing both BSCs' configurations) +---- +# BSC Alpha's osmo-bsc.cfg +network + bts 0 + # this cell's LAC=23 CI=6 + location_area_code 23 + cell_identity 6 + # this cell's ARFCN=2 BSIC=2 + trx 0 + arfcn 2 + base_station_id_code 2 + # fully describe the remote cell by LAC+CI and ARFCN+BSIC + neighbor lac-ci 42 3 arfcn 1 bsic 3 + +# BSC Beta's osmo-bsc.cfg +network + bts 0 + # this cell's LAC=42 CI=3 + location_area_code 42 + cell_identity 3 + # this cell's ARFCN=1 BSIC=3 + trx 0 + arfcn 1 + base_station_id_code 3 + # fully describe the remote cell by LAC+CI and ARFCN+BSIC + neighbor lac-ci 23 6 arfcn 2 bsic 2 +---- + +NOTE: It is strongly recommended to stick to a single format for remote-BSS +neighbors' cell identifiers all across an OsmoBSC configuration; i.e. decide +once to use `lac`, `lac-ci` or `cgi` and then stick to that within a given +osmo-bsc.cfg. The reason is that the _Cell Identifier List_ sent in the _BSSMAP +Handover Required_ message must have one single cell identifier type for all +list items. Hence, to be able to send several alternative remote neighbors to +the MSC, the configured cell identifiers must be of the same type. If in doubt, +use the full CGI identifier everywhere. + +=== Configuring Handover Decisions + +For a long time, OsmoBSC has supported handover based on reception level +hysteresis (RXLEV) and distance (TA, Timing Advance), known has `algorithm 1`. + +Since 2018, OsmoBSC also supports a load-based handover decision algorithm, +known as `algorithm 2`, which also takes cell load, available codecs and +oscillation into consideration. Algorithm 2 had actually been implemented for +the legacy OsmoNITB program many years before the OsmoMSC split, but remained +on a branch, until it was forward-ported to OsmoBSC in 2018. + +.What handover decision algorithms take into account +[frame="none",grid="none",cols="^10%,^10%,80%"] +|==== +| algorithm 1 | algorithm 2 | +| ? | ?| RXLEV +| ? | ?| RXQUAL +| ? | ?| TA (distance) +| ? | ?| interference (good RXLEV, bad RXQUAL) +| | ?| load (nr of free lchans, minimum RXLEV and RXQUAL) +| | ?| penalty time to avoid oscillation +| | ?| voice rate / codec bias +| ? | | inter-BSC: RXLEV hysteresis +| | ?| inter-BSC: only below minimum RXLEV, RXQUAL +|==== + +==== Common Configuration + +Handover is disabled by default; to disable/enable handover, use `handover +(0|1)`. + +Once enabled, algorithm 1 is used by default; choose a handover algorithm with +`handover algorithm (1|2)`: + +---- +network + # Enable handover + handover 1 + + # Choose algorithm + handover algorithm 2 + + # Tweak parameters for algorithm 2 (optional) + handover2 min-free-slots tch/f 4 + handover2 penalty-time failed-ho 30 + handover2 retries 1 +---- + +All handover algorithms share a common configuration scheme, with an overlay of +three levels: + +* immutable compile-time default values, +* configuration on the `network` level for all cells, +* individual cells' configuration on each `bts` node. + +Configuration settings relevant for algorithm 1 start with `handover1`, for +algorithm 2 with `handover2`. + +The following example overrides the compile-time default for all cells, and +furthermore sets one particular cell on its own individual setting, for the +`min-free-slots tch/f` value: + +---- +network + handover2 min-free-slots tch/f 4 + bts 23 + handover2 min-free-slots tch/f 2 +---- + +The order in which these settings are issued makes no difference for the +overlay; i.e., this configuration is perfectly identical to the above, and the +individual cell's value remains in force: + +---- +network + bts 23 + handover2 min-free-slots tch/f 2 + handover2 min-free-slots tch/f 4 +---- + +Each setting can be reset to a default value with the `default` keyword. When +resetting an individual cell's value, the globally configured value is used. +When resetting the global value, the compile-time default is used (unless +individual cells still have explicit values configured). For example, this +telnet VTY session removes above configuration first from the cell, then from +the global level: + +---- +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 23 +OsmoBSC(config-net-bts)# handover2 min-free-slots tch/f default +% 'handover2 min-free-slots tch/f' setting removed, now is 4 +OsmoBSC(config-net-bts)# exit +OsmoBSC(config-net)# handover2 min-free-slots tch/f default +% 'handover2 min-free-slots tch/f' setting removed, now is 0 +---- + +==== Handover Algorithm 1 + +Algorithm 1 takes action only when RR Measurement Reports are received from a +BTS. As soon as a neighbor's average RXLEV is higher than the current cell's +average RXLEV plus a hysteresis distance, handover is triggered. + +If a handover fails, algorithm 1 will again attempt handover to the same cell +with the next Measurement Report received. + +Configuration settings relevant for algorithm 1 start with `handover1`. For +further details, please refer to the OsmoBSC VTY Reference +(<>) or the telnet VTY online documentation. + +==== Handover Algorithm 2 + +Algorithm 2 is specifically designed to distribute load across cells. A +subscriber will not necessarily remain attached to the cell that has the best +RXLEV average, if that cell is heavily loaded and a less loaded neighbor is +above the minimum allowed RXLEV. + +Algorithm 2 also features penalty timers to avoid oscillation: for each +subscriber, if handover to a specific neighbor failed (for a configurable +number of retries), a holdoff timer prevents repeated attempts to handover to +that same neighbor. Several hold-off timeouts following specific situations are +configurable (see `handover2 penalty-time` configuration items). + +Configuration settings relevant for algorithm 2 start with `handover2`. For +further details, please refer to the OsmoBSC VTY Reference +<> or the telnet VTY online documentation. + +===== Load Distribution + +Load distribution is only supported by algorithm 2. + +Load distribution occurs: + +- explicitly: every N seconds, OsmoBSC considers all local cells and actively + triggers handover operations to reduce congestion, if any. See + `min-free-slots` below, and the `congestion-check` setting. + +- implicitly: when choosing the best neighbor candidate for a handover + triggered otherwise, a congested cell (in terms of `min-free-slots`) is only + used as handover target if there is no alternative that causes less cell + load. + +In either case, load distribution will only occur towards neighbor cells that +adhere to minimum reception levels and distance, see `min rxlev` and `max +distance`. + +Load distribution will take effect only for already established voice channels. +An MS will always first establish a voice call with its current cell choice; in +load situations, it might be moved to another cell shortly after that. +Considering the best neighbor _before_ starting a new voice call might be +desirable, but is currently not implemented. Consider that RXLEV/RXQUAL ratings +are averaged over a given number of measurement reports, so that the neighbor +ratings may not be valid/reliable yet during early call establishment. In +consequence, it is recommended to ensure a sufficient number of unused logical +channels at all times, though there is no single correct configuration for all +situations. + +Most important for load distribution are the `min-free-slots tch/f` and +`min-free-slots tch/h` settings. The default is zero, meaning _no_ load +distribution. To enable, set `min-free-slots` >= 1 for `tch/f` and/or `tch/h` +as appropriate. This setting refers to the minimum number of voice channels +that should ideally remain unused in each individual BTS at all times. + +NOTE: it is not harmful to configure `min-free-slots` for a TCH kind that is +not actually present. Such settings will simply be ignored. + +NOTE: the number of TCH/F timeslots corresponds 1:1 to the number indicated by +`min-free-slots tch/f`, because each TCH/F physical channel has exactly one +logical channel. In contrast, for each TCH/H timeslot, there are two logical +channels, hence `min-free-slots tch/h` corresponds to twice the number of TCH/H +timeslots configured per cell. In fact, a more accurate naming would have been +"min-free-lchans". + +Think of the `min-free-slots` setting as the threshold at which load +distribution is considered. If as many logical channels as required by this +setting are available in a given cell, only changes in RXLEV/RXQUAL/TA trigger +handover away from that cell. As soon as less logical channels remain free, the +periodical congestion check attempts to distribute MS to less loaded neighbor +cells. Every time, the one MS that will suffer the least RXLEV loss while still +reducing congestion will be instructed to move first. + +If a cell and its neighbors are all loaded past their `min-free-slots` +settings, the algorithmic aim is equal load: a load-based handover will never +cause the target cell to be more congested than the source cell. + +The min-free-slots setting is a tradeoff between immediate voice service +availability and optimal reception levels. A sane choice could be: + +- Start off with `min-free-slots` set to half the available logical channels. +- Increase `min-free-slots` if you see MS being rejected too often even though + close neighbors had unused logical channels. +- Decrease `min-free-slots` if you see too many handovers happening for no + apparent reason. + +Choosing the optimal setting is not trivial, consider these examples: + +- Configure `min-free-slots` = 1: load distribution to other cells will occur + exactly when the last available logical channel has become occupied. The next + time the congestion check runs, at most one handover will occur, so that one + channel is available again. In the intermediate time, all channels will be + occupied, and some MS might be denied immediate voice service because of + that, even though, possibly, other neighbor cells would have provided + excellent reception levels and were completely unloaded. For those MS that + are already in an ongoing voice call and are not physically moving, though, + this almost guarantees service by the closest/best cell. + +- Set `min-free-slots` = 2: up to two MS can successfully request voice service + simultaneously (e.g. one MS is establishing a new voice call while another MS + is travelling into this cell). Ideally, two slots have been kept open and are + immediately available. But if a third MS is also traveling into this cell at + the same time, it will not be able to handover into this cell until load + distribution has again taken action to make logical channels available. The + same scenario applies to any arbitrary number of MS asking for voice channels + simultaneously. The operator needs to choose where to draw the line. + +- Set `min-free-slots` >= the number of available channels: as soon as any + neighbor is less loaded than a given cell, handover will be attempted. But + imagine there are only two active voice calls on this cell with plenty of + logical channels still unused, and the closest neighbor rates only just above + `min rxlev`; then moving one of the MS _for no good reason_ causes all of: + increased power consumption, reduced reception stability and channel + management overhead. + +NOTE: In the presence of dynamic timeslots to provide GPRS service, the number +of voice timeslots left unused also determines the amount of bandwidth +available for GPRS. + +==== External / Inter-BSC Handover Considerations + +There currently is a profound difference for inter-BSC handover between +algorithm 1 and 2: + +For algorithm 1, inter-BSC handover is triggered as soon as the Measurement +Reports and hysteresis indicate a better neighbor than the current cell, +period. + +For algorithm 2, a subscriber is "sticky" to the current BSS, and inter-BSC +handover is only even considered when RXLEV/TA drop below minimum requirements. + +- If your network topology is such that each OsmoBSC instance manages a single + BTS, and you would like to encourage handover between these, choose handover + algorithm 1. Load balancing will not be available, but RXLEV hysteresis will. + +- If your network topology has many cells per BSS, and/or if your BSS + boundaries in tendency correspond to physical/semantic boundaries that favor + handover to remain within a BSS, then choose handover algorithm 2. + +The reason for the difference between algorithm 1 and 2 for remote-BSS +handovers is, in summary, the young age of the inter-BSC handover feature in +OsmoBSC: + +- So far the mechanisms to communicate cell load to remote-BSS available in the + BSSMAP Handover messages are not implemented, so, a handover due to cell load + across BSS boundaries would be likely to cause handover oscillation between + the two BSS (continuous handover of the same MS back and forth between the + same two cells). +- Algorithm 1 has no `min rxlev` setting. +- Algorithm 1 does not actually use any information besides the Measurement + Reports, and hence can trivially treat all neighbor cells identically. diff --git a/OsmoBSC/chapters/handover_inter_bsc.dot b/OsmoBSC/chapters/handover_inter_bsc.dot new file mode 100644 index 0000000..0cc6554 --- /dev/null +++ b/OsmoBSC/chapters/handover_inter_bsc.dot @@ -0,0 +1,35 @@ +digraph G { +rankdir=LR + +subgraph cluster_bss_a { + label="BSS Alpha" + BTS_a0 [rank=min,label="bts 0\nARFCN=1 BSIC=1\nLAC=23 CI=5"] + BTS_a1 [rank=min,label="bts 1\nARFCN=2 BSIC=2\nLAC=23 CI=6"] + BSC_a [label="BSC Alpha"]; + {BTS_a0,BTS_a1} -> BSC_a [arrowhead=none,label=Abis] +} + +subgraph cluster_bss_b { + label="BSS Beta" + BTS_b0 [rank=min,label="bts 0\nARFCN=1 BSIC=3\nLAC=42 CI=3"] + BTS_b1 [rank=min,label="bts 1\nARFCN=2 BSIC=4\nLAC=42 CI=1"] + BSC_b [label="BSC Beta"] + {BTS_b0,BTS_b1} -> BSC_b [arrowhead=none,label=Abis] +} + +MS -> BTS_a1 [label="(3) Measurement:\nARFCN=1 BSIC=3 RXLEV"] +BTS_a1 -> MS [label="(1) my neighbors:\nARFCN=1 BSIC=1\nARFCN=1 BSIC=3"] +BTS_b0 -> MS [label="(2) good RXLEV",style=dotted] +MS -> {BTS_a0,BTS_b0,BTS_b1} [style=invisible,arrowhead=none] + +BTS_a1 -> BSC_a [label="(4) Measurement\nReport",style=dashed] +BTS_a1 -> BTS_b0 [label="(5) BSC decides to do\ninter-BSC Handover",style=dashed,constraint=false] + +{BSC_a,BSC_b} -> MSC [arrowhead=none,label=A] + +BSC_a -> MSC [label="(6) --> Handover Required\nto LAC=42 CI=6\n(10) <-- Handover Command",style=dashed,constraint=false,arrowhead=none] +MSC -> BSC_b [label="(7) <-- Handover Request\n(9) --> Handover Request ACK",style=dashed,constraint=false,arrowhead=none] + +BSC_b -> BTS_b0 [label="(8) activate new lchan",style=dashed,constraint=false] + +} diff --git a/OsmoBSC/chapters/handover_intra_bsc.dot b/OsmoBSC/chapters/handover_intra_bsc.dot new file mode 100644 index 0000000..2a4f6cf --- /dev/null +++ b/OsmoBSC/chapters/handover_intra_bsc.dot @@ -0,0 +1,31 @@ +digraph G { +rankdir=LR + +subgraph cluster_bss_a { + label="BSS Alpha" + BTS_a0 [rank=min,label="bts 0\nARFCN=1 BSIC=1\nLAC=23 CI=5"] + BTS_a1 [rank=min,label="bts 1\nARFCN=2 BSIC=2\nLAC=23 CI=6"] + BSC_a [label="BSC Alpha"]; + {BTS_a0,BTS_a1} -> BSC_a [arrowhead=none,label=Abis] +} + +subgraph cluster_bss_b { + label="BSS Beta" + BTS_b0 [rank=min,label="bts 0\nARFCN=1 BSIC=3\nLAC=42 CI=3"] + BTS_b1 [rank=min,label="bts 1\nARFCN=2 BSIC=4\nLAC=42 CI=1"] + BSC_b [label="BSC Beta"] + {BTS_b0,BTS_b1} -> BSC_b [arrowhead=none,label=Abis] +} + +MS -> BTS_a1 [label="(3) Measurement:\nARFCN=1 BSIC=1 RXLEV"] +BTS_a1 -> MS [label="(1) my neighbors:\nARFCN=1 BSIC=1\nARFCN=1 BSIC=3"] +BTS_a0 -> MS [label="(2) good RXLEV",style=dotted] +MS -> {BTS_a0,BTS_b0,BTS_b1} [style=invisible,arrowhead=none] + +BTS_a1 -> BSC_a [label="(4) Measurement\nReport",style=dashed] +BTS_a1 -> BTS_a0 [label="(5) BSC decides to do\nintra-BSC Handover",style=dashed,constraint=false] +BSC_a -> BTS_a0 [label="(6) activate new lchan",style=dashed,constraint=false] + +{BSC_a,BSC_b} -> MSC [arrowhead=none,label=A] + +} diff --git a/OsmoBSC/osmobsc-usermanual-docinfo.xml b/OsmoBSC/osmobsc-usermanual-docinfo.xml index 5ac3742..6de53b2 100644 --- a/OsmoBSC/osmobsc-usermanual-docinfo.xml +++ b/OsmoBSC/osmobsc-usermanual-docinfo.xml @@ -7,6 +7,15 @@ Initial OsmoBSC manual, recycling OsmoNITB sections + + 2 + October 2018 + NH + + Add Handover chapter: document new neighbor configuration, HO algorithm 2 + and inter-BSC handover. + + @@ -32,10 +41,21 @@ Managing Director + + Neels + Hofmeyr + nhofmeyr at sysmocom.de + NH + + sysmocom + sysmocom - s.f.m.c. GmbH + Developer + + - 2012-2016 + 2012-2018 sysmocom - s.f.m.c. GmbH diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index e3eadaf..0ec15e5 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -15,6 +15,8 @@ include::chapters/counters.adoc[] +include::chapters/handover.adoc[] + include::../common/chapters/vty.adoc[] include::../common/chapters/logging.adoc[] -- To view, visit https://gerrit.osmocom.org/11532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7afb3f66c98abda07fc8acc76e00c46091fe55e2 Gerrit-Change-Number: 11532 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:09:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 1 Nov 2018 17:09:46 +0000 Subject: Change in osmo-gsm-manuals[master]: author info: add "former" to Holger's job title In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11533 ) Change subject: author info: add "former" to Holger's job title ...................................................................... author info: add "former" to Holger's job title It doesn't seem to have an effect on the generated PDFs though. Change-Id: I0556a3f8dafc051f20a3854fc9006edf4ec1a0d3 --- M OsmoBSC/osmobsc-usermanual-docinfo.xml M OsmoBSC/osmux-reference-docinfo.xml M OsmoNITB/osmonitb-usermanual-docinfo.xml 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmoBSC/osmobsc-usermanual-docinfo.xml b/OsmoBSC/osmobsc-usermanual-docinfo.xml index 6de53b2..9c0d1c8 100644 --- a/OsmoBSC/osmobsc-usermanual-docinfo.xml +++ b/OsmoBSC/osmobsc-usermanual-docinfo.xml @@ -27,7 +27,7 @@ sysmocom sysmocom - s.f.m.c. GmbH - Managing Director + former Managing Director diff --git a/OsmoBSC/osmux-reference-docinfo.xml b/OsmoBSC/osmux-reference-docinfo.xml index 7e31ec7..a902c5c 100644 --- a/OsmoBSC/osmux-reference-docinfo.xml +++ b/OsmoBSC/osmux-reference-docinfo.xml @@ -47,7 +47,7 @@ sysmocom sysmocom - s.f.m.c. GmbH - Managing Director + former Managing Director diff --git a/OsmoNITB/osmonitb-usermanual-docinfo.xml b/OsmoNITB/osmonitb-usermanual-docinfo.xml index e9c5177..87d72da 100644 --- a/OsmoNITB/osmonitb-usermanual-docinfo.xml +++ b/OsmoNITB/osmonitb-usermanual-docinfo.xml @@ -26,7 +26,7 @@ sysmocom sysmocom - s.f.m.c. GmbH - Managing Director + former Managing Director -- To view, visit https://gerrit.osmocom.org/11533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0556a3f8dafc051f20a3854fc9006edf4ec1a0d3 Gerrit-Change-Number: 11533 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:09:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 1 Nov 2018 17:09:45 +0000 Subject: Change in osmo-gsm-manuals[master]: author info: add "former" to Holger's job title In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11533 to look at the new patch set (#3). Change subject: author info: add "former" to Holger's job title ...................................................................... author info: add "former" to Holger's job title It doesn't seem to have an effect on the generated PDFs though. Change-Id: I0556a3f8dafc051f20a3854fc9006edf4ec1a0d3 --- M OsmoBSC/osmobsc-usermanual-docinfo.xml M OsmoBSC/osmux-reference-docinfo.xml M OsmoNITB/osmonitb-usermanual-docinfo.xml 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/33/11533/3 -- To view, visit https://gerrit.osmocom.org/11533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0556a3f8dafc051f20a3854fc9006edf4ec1a0d3 Gerrit-Change-Number: 11533 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:10:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 1 Nov 2018 17:10:11 +0000 Subject: Change in osmo-msc[master]: lu_fsm: result cb: use proper cause type (warning/coverity) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11531 ) Change subject: lu_fsm: result cb: use proper cause type (warning/coverity) ...................................................................... lu_fsm: result cb: use proper cause type (warning/coverity) enum gsm48_gmm_cause is the wrong enum to pass to lu_fsm_failure(). Use enum gsm48_reject_value instead. Change-Id: If661f72056decb28c0ee82ad2449630a24d4f31c --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index bf23551..717db42 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1188,8 +1188,8 @@ /* continue in MSC ?!? */ } else { /* unsuccessful case */ - enum gsm48_gmm_cause cause = - *(enum gsm48_gmm_cause *)data; + enum gsm48_reject_value cause = + *(enum gsm48_reject_value *)data; /* Ignoring standalone mode for now. */ if (0 /* procedure_error && vlr->cfg.standalone_mode */) { osmo_fsm_inst_state_chg(fi, -- To view, visit https://gerrit.osmocom.org/11531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If661f72056decb28c0ee82ad2449630a24d4f31c Gerrit-Change-Number: 11531 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:17:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 1 Nov 2018 17:17:55 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 2: I completely don't understand this build failure and cannot reproduce with my gcc (Debian 8.2.0-8) 8.2.0 (werror is on). I have a const struct foo, and use it to initialize another const array. The error message says: gsm0808_test.c:1779:10: error: initializer element is not constant { .id = lac_23, .match_id = lac_23, .expect_match = true }, ^~~~~~ Makes absolutely no sense to me. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 01 Nov 2018 17:17:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:40:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 17:40:52 +0000 Subject: Change in osmo-trx[master]: ChannelizerBase: Fix ASan alloc-dealloc-mismatch Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11570 Change subject: ChannelizerBase: Fix ASan alloc-dealloc-mismatch ...................................................................... ChannelizerBase: Fix ASan alloc-dealloc-mismatch Fixes following Adress Sanitizer warning: ================================================================= ==27120==ERROR: AddressSanitizer: alloc-dealloc-mismatch (operator new [] vs operator delete) on 0x60c00003d900 #0 0x7f2f216de421 in operator delete(void*, unsigned long) /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cc:151 #1 0x561641ce18b7 in ChannelizerBase::~ChannelizerBase() (/build/new/out/bin/osmo-trx-uhd+0x4a8b7) #2 0x561641ce1cad in Channelizer::~Channelizer() (/build/new/out/bin/osmo-trx-uhd+0x4acad) #3 0x561641cd5160 in RadioInterfaceMulti::close() (/build/new/out/bin/osmo-trx-uhd+0x3e160) #4 0x561641cd5047 in RadioInterfaceMulti::~RadioInterfaceMulti() (/build/new/out/bin/osmo-trx-uhd+0x3e047) #5 0x561641cd5093 in RadioInterfaceMulti::~RadioInterfaceMulti() (/build/new/out/bin/osmo-trx-uhd+0x3e093) #6 0x561641ca3fdd in trx_stop() (/build/new/out/bin/osmo-trx-uhd+0xcfdd) #7 0x561641ca4b32 in main (/build/new/out/bin/osmo-trx-uhd+0xdb32) #8 0x7f2f1f555222 in __libc_start_main (/usr/lib/libc.so.6+0x24222) #9 0x561641ca195d in _start (/build/new/out/bin/osmo-trx-uhd+0xa95d) 0x60c00003d900 is located 0 bytes inside of 128-byte region [0x60c00003d900,0x60c00003d980) allocated by thread T0 here: #0 0x7f2f216dcf19 in operator new[](unsigned long) /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cc:93 #1 0x561641ce142d in ChannelizerBase::init() (/build/new/out/bin/osmo-trx-uhd+0x4a42d) #2 0x561641cd5865 in RadioInterfaceMulti::init(int) (/build/new/out/bin/osmo-trx-uhd+0x3e865) #3 0x561641ca1cb7 in makeRadioInterface(trx_ctx*, RadioDevice*, int) (/build/new/out/bin/osmo-trx-uhd+0xacb7) #4 0x561641ca44c6 in trx_start(trx_ctx*) (/build/new/out/bin/osmo-trx-uhd+0xd4c6) #5 0x561641ca4b05 in main (/build/new/out/bin/osmo-trx-uhd+0xdb05) #6 0x7f2f1f555222 in __libc_start_main (/usr/lib/libc.so.6+0x24222) SUMMARY: AddressSanitizer: alloc-dealloc-mismatch /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cc:151 in operator delete(void*, unsigned long) ==27120==HINT: if you don't care about these errors you may set ASAN_OPTIONS=alloc_dealloc_mismatch=0 ==27120==ABORTING Change-Id: Ib7c98ae478f319573dd86a0d2cb264f676bb3859 --- M Transceiver52M/ChannelizerBase.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/70/11570/1 diff --git a/Transceiver52M/ChannelizerBase.cpp b/Transceiver52M/ChannelizerBase.cpp index 8223dba..430e260 100644 --- a/Transceiver52M/ChannelizerBase.cpp +++ b/Transceiver52M/ChannelizerBase.cpp @@ -239,7 +239,7 @@ for (size_t i = 0; i < m; i++) { free(subFilters[i]); - delete hist[i]; + delete[] hist[i]; } fft_free(fftInput); -- To view, visit https://gerrit.osmocom.org/11570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7c98ae478f319573dd86a0d2cb264f676bb3859 Gerrit-Change-Number: 11570 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:40:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 17:40:52 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11571 Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... UHDDevice: setRxGain on chan 0 when using multi-arfcn Same check is done in getRxGain, and then we avoid outputing an error immediatelly after. Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/71/11571/1 diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index c30f3a7..7c0fc93 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -486,6 +486,10 @@ double uhd_device::setRxGain(double db, size_t chan) { + + if (iface == MULTI_ARFCN) + chan = 0; + if (chan >= rx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 17:59:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 17:59:36 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11504/2/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/11504/2/tests/gsm0808/gsm0808_test.c at 1721 PS2, Line 1721: struct test_cell_id_matching_data { Shouldn't all these structs be static? Maybe that helps with compiler error. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 17:59:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 18:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 1 Nov 2018 18:02:06 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 2: https://stackoverflow.com/questions/3025050/error-initializer-element-is-not-constant-when-trying-to-initialize-variable-w -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 01 Nov 2018 18:02:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 19:20:56 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 1 Nov 2018 19:20:56 +0000 Subject: Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11544 ) Change subject: debian: Clean up to look like other osmocom projects ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0 Gerrit-Change-Number: 11544 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 01 Nov 2018 19:20:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 19:28:09 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 1 Nov 2018 19:28:09 +0000 Subject: Change in osmo-pcap[master]: Install cfg files with autotools In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11546 ) Change subject: Install cfg files with autotools ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 Gerrit-Change-Number: 11546 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 01 Nov 2018 19:28:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 19:40:22 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 1 Nov 2018 19:40:22 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11549 ) Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 01 Nov 2018 19:40:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 1 20:17:07 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 1 Nov 2018 20:17:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11562 ) Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... Patch Set 2: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Emulation.ttcn File library/RSL_Emulation.ttcn: https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Emulation.ttcn at 192 PS2, Line 192: private function f_cid_by_ra_fn2(OCT1 ra, RSL_IE_FrameNumber fn) Why are you using RSL_IE_FrameNumber here, but f_cid_by_ra_fn is using GsmFrameNumber? Is f_cid_by_ra_fn2 meant to replace the older function in other cases? https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Emulation.ttcn at 194 PS2, Line 194: var RSL_IE_FrameNumber ct_fn; unused variable https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Emulation.ttcn at 427 PS2, Line 427: var GsmFrameNumber fn; Unused? https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Types.ttcn File library/RSL_Types.ttcn: https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Types.ttcn at 408 PS2, Line 408: function f_compute_RSL_IE_FrameNumber(GsmFrameNumber fn) return RSL_IE_FrameNumber { There's a template that does that.... https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Types.ttcn at 462 PS2, Line 462: template (value) RSL_IE_FrameNumber ts_RSL_IE_FrameNumber(GsmFrameNumber fn) := { ...right here. You should be able to use the template in a comparison. -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 01 Nov 2018 20:17:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 07:58:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 07:58:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11562 ) Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Emulation.ttcn File library/RSL_Emulation.ttcn: https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Emulation.ttcn at 192 PS2, Line 192: private function f_cid_by_ra_fn2(OCT1 ra, RSL_IE_FrameNumber fn) > Why are you using RSL_IE_FrameNumber here, but f_cid_by_ra_fn is using GsmFrameNumber? [?] Regarding fn parameter: I'm using RSL_IE_FrameNumber because that's what I was getting during receive of tr_RSL_CHAN_RQD. Other way would have been to transform what I received in tr_RSL_CHAN_RQD into a GsmFrameNumber, but the function doing the opposite cnversion was already available for a similar structure [function f_compute_ReqRef(uint8_t ra, GsmFrameNumber fn) return RequestReference] so it was easir to follow this path. Regarding replacement: It's not a replacement, as the logic to find/match it's not exactly the same as in f_cid_by_ra_fn, since this one is more relaxed. Of course f_cid_by_ra_fn2 could also be used in other places were f_cid_by_ra_fn is used, but in other places f_cid_by_ra_fn is better because we can match for fn in all cases there (BSC tests). https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Emulation.ttcn at 194 PS2, Line 194: var RSL_IE_FrameNumber ct_fn; > unused variable I'll remove it, thanks, that's a leftover from an older version of the patch. https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Emulation.ttcn at 427 PS2, Line 427: var GsmFrameNumber fn; > Unused? I'll remove, leftover from old version of patch. I think both ra and fn can be removed. https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Types.ttcn File library/RSL_Types.ttcn: https://gerrit.osmocom.org/#/c/11562/2/library/RSL_Types.ttcn at 462 PS2, Line 462: template (value) RSL_IE_FrameNumber ts_RSL_IE_FrameNumber(GsmFrameNumber fn) := { > ...right here. [?] Nice thanks for pointing out. A I said I was inspired by: function tr_compute_ReqRef(template uint8_t ra, template GsmFrameNumber fn) -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 02 Nov 2018 07:58:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 08:58:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 08:58:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: Hello daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11562 to look at the new patch set (#3). Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL We cannot notify RSL Emulation layer about expecting a specific FN (during ts_RSLDC_ChanRqd) because we only know the FN after sending the RACH request, and since notification to RSL Emulation happens async, it can happen (verified) that ChanRqd message from BTS arrives and is handled before we register the RACH req into the ConnectionTable. Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 --- M bts/BTS_Tests.ttcn M library/RSL_Emulation.ttcn 2 files changed, 70 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/11562/3 -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 08:59:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 08:59:51 +0000 Subject: Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11549 ) Change subject: contrib/jenkins.sh: Update to current osmocom infra ...................................................................... contrib/jenkins.sh: Update to current osmocom infra Otherwise builds end failing in osmocom jenkins/gerrit. Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 --- M contrib/jenkins.sh 1 file changed, 38 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e099ceb..7ec1463 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,19 +1,45 @@ #!/usr/bin/env bash +# jenkins build helper script for osmo-pcap. This is how we build on jenkins.osmocom.org + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi set -ex -rm -rf deps/install -mkdir deps || true -cd deps -osmo-deps.sh libosmocore -cd libosmocore -autoreconf --install --force -./configure --prefix=$PWD/../install -$MAKE $PARALLEL_MAKE install +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst -cd ../../ +osmo-clean-workspace.sh + +mkdir "$deps" || true + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" +osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls' + +set +x +echo +echo +echo +echo " =============================== osmo-pcap ===============================" +echo +set -x + + +cd "$base" autoreconf --install --force -PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE -DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" PCAP_LIBS="-lpcap" PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck +PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror +$MAKE $PARALLEL_MAKE +$MAKE check || cat-testlogs.sh +DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" \ + PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \ + $MAKE distcheck || cat-testlogs.sh + +osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/11549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14 Gerrit-Change-Number: 11549 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 08:59:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 08:59:52 +0000 Subject: Change in osmo-pcap[master]: Install systemd services with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11545 ) Change subject: Install systemd services with autotools ...................................................................... Install systemd services with autotools Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5 --- M Makefile.am M configure.ac M contrib/Makefile.am A contrib/systemd/Makefile.am A contrib/systemd/osmo-pcap-client.service A contrib/systemd/osmo-pcap-server.service M debian/osmo-pcap-client.install M debian/osmo-pcap-server.install M debian/rules 9 files changed, 63 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 6caa009..0f4a249 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,10 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version +DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + + @RELMAKE@ $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index b5468ee..f885e6d 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,13 @@ AC_PROG_INSTALL AC_PROG_RANLIB +dnl check for pkg-config (explained in detail in libosmocore/configure.ac) +AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) +if test "x$PKG_CONFIG_INSTALLED" = "xno"; then + AC_MSG_WARN([You need to install pkg-config]) +fi +PKG_PROG_PKG_CONFIG([0.20]) + dnl checks for header files AC_HEADER_STDC @@ -52,6 +59,21 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + AC_ARG_ENABLE([external_tests], AC_HELP_STRING([--enable-external-tests], [Include the VTY tests in make check [default=no]]), @@ -122,5 +144,6 @@ include/osmo-pcap/Makefile src/Makefile contrib/Makefile + contrib/systemd/Makefile tests/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3585924..7bd8c23 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,2 +1,3 @@ +SUBDIRS = systemd dist_pkgdata_DATA = osmo_pcap_clean_old EXTRA_DIST = osmo-pcap-server.cfg osmo-pcap-client.cfg diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..5b41c52 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,8 @@ +if HAVE_SYSTEMD +SYSTEMD_SERVICES = \ + osmo-pcap-client.service \ + osmo-pcap-server.service + +EXTRA_DIST = $(SYSTEMD_SERVICES) +systemdsystemunit_DATA = $(SYSTEMD_SERVICES) +endif diff --git a/contrib/systemd/osmo-pcap-client.service b/contrib/systemd/osmo-pcap-client.service new file mode 100644 index 0000000..fd0de75 --- /dev/null +++ b/contrib/systemd/osmo-pcap-client.service @@ -0,0 +1,12 @@ +[Unit] +Description=PCAP Client for the PCAP aggregation + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-pcap-client -c /etc/osmocom/osmo-pcap-client.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target + diff --git a/contrib/systemd/osmo-pcap-server.service b/contrib/systemd/osmo-pcap-server.service new file mode 100644 index 0000000..3094fc4 --- /dev/null +++ b/contrib/systemd/osmo-pcap-server.service @@ -0,0 +1,12 @@ +[Unit] +Description=PCAP Server for the PCAP aggregation + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-pcap-server -c /etc/osmocom/osmo-pcap-server.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target + diff --git a/debian/osmo-pcap-client.install b/debian/osmo-pcap-client.install index f149b14..ac7c65c 100644 --- a/debian/osmo-pcap-client.install +++ b/debian/osmo-pcap-client.install @@ -1 +1,2 @@ +lib/systemd/system/osmo-pcap-client.service usr/bin/osmo-pcap-client diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install index ad58c8e..6ba698e 100644 --- a/debian/osmo-pcap-server.install +++ b/debian/osmo-pcap-server.install @@ -1 +1,2 @@ +lib/systemd/system/osmo-pcap-server.service usr/bin/osmo-pcap-server diff --git a/debian/rules b/debian/rules index 6862888..a9a8b30 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ override_dh_auto_configure: dh_auto_configure -- \ + --with-systemdsystemunitdir=/lib/systemd/system \ --with-pcap-config=/bin/false \ PCAP_CFLAGS=$(PCAP_CFLAGS) \ PCAP_LIBS=$(PCAP_LIBS) -- To view, visit https://gerrit.osmocom.org/11545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id938f3dab4826ac748abb5e0b169d800c2a625a5 Gerrit-Change-Number: 11545 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 08:59:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 08:59:52 +0000 Subject: Change in osmo-pcap[master]: debian: Clean up to look like other osmocom projects In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11544 ) Change subject: debian: Clean up to look like other osmocom projects ...................................................................... debian: Clean up to look like other osmocom projects Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0 --- D debian/README M debian/compat A debian/copyright D debian/init.d.ex D debian/osmo-pcap-client.init D debian/osmo-pcap.default.ex M debian/rules 7 files changed, 29 insertions(+), 338 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/debian/README b/debian/README deleted file mode 100644 index 1719eed..0000000 --- a/debian/README +++ /dev/null @@ -1,6 +0,0 @@ -The Debian Package osmo-pcap ----------------------------- - -Comments regarding the Package - - -- Holger Hans Peter Freyther Wed, 01 Jun 2011 14:51:32 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..9731a49 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,22 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: OsmoPCAP +Source: http://cgit.osmocom.org/osmo-pcap/ + +Files: * +Copyright: 2011 Holger Freyther and On-Waves + 2018 sysmocom s. f. m. c. GmbH +License: AGPL-3+ + +License: AGPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . diff --git a/debian/init.d.ex b/debian/init.d.ex deleted file mode 100644 index 8cabb58..0000000 --- a/debian/init.d.ex +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-pcap -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: -# <...> -# <...> -### END INIT INFO - -# Author: Holger Hans Peter Freyther - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=osmo-pcap # Introduce a short description here -NAME=osmo-pcap # Introduce the short server's name here -DAEMON=/usr/sbin/osmo-pcap # Introduce the server's location here -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/osmo-pcap-client.init b/debian/osmo-pcap-client.init deleted file mode 100755 index 6bfee7a..0000000 --- a/debian/osmo-pcap-client.init +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: osmo-pcap-client -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start the pcap client -# Description: PCAP Client for the PCAP aggregation -### END INIT INFO - -# Author: Holger Hans Peter Freyther - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=osmo-pcap-client # Introduce a short description here -NAME=osmo-pcap-client # Introduce the short server's name here -DAEMON=/usr/bin/osmo-pcap-client # Introduce the server's location here -DAEMON_ARGS="-c /etc/osmo-pcap/osmo-pcap-client.cfg" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon -b -m --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - #start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - #[ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/osmo-pcap.default.ex b/debian/osmo-pcap.default.ex deleted file mode 100644 index 08824c5..0000000 --- a/debian/osmo-pcap.default.ex +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for osmo-pcap initscript -# sourced by /etc/init.d/osmo-pcap -# installed at /etc/default/osmo-pcap by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff --git a/debian/rules b/debian/rules index 872097c..6862888 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,18 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 -# Uncomment this to turn on verbose mode. +DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) +DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) +VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') + #export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # Maybe we require some moreadvanced testing in the future PCAP_CFLAGS="-I/usr/include" PCAP_LIBS="-lpcap" %: - dh --with autoreconf $@ + dh $@ --with autoreconf --fail-missing override_dh_auto_configure: dh_auto_configure -- \ -- To view, visit https://gerrit.osmocom.org/11544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id71699642b799f5b2f8f3b794b9493ddaeb70cc0 Gerrit-Change-Number: 11544 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 08:59:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 08:59:54 +0000 Subject: Change in osmo-pcap[master]: gitignore: Add compile In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11547 ) Change subject: gitignore: Add compile ...................................................................... gitignore: Add compile Change-Id: Ie801d6929068d11fafd24a1370e60e984b0137c2 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 7e4da82..b80db93 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ install-sh missing stamp-h1 +compile osmopcapconfig.h* -- To view, visit https://gerrit.osmocom.org/11547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie801d6929068d11fafd24a1370e60e984b0137c2 Gerrit-Change-Number: 11547 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 08:59:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 08:59:53 +0000 Subject: Change in osmo-pcap[master]: Install cfg files with autotools In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11546 ) Change subject: Install cfg files with autotools ...................................................................... Install cfg files with autotools Cfg files are moved to doc/examples like in other osmocom projects. All the cfg files get installed into $prefix/share/doc/osmo-pcap/examples/$subdir/, and 1 script per binary is installed into /etc/osmocom. Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 --- M Makefile.am M configure.ac M contrib/Makefile.am M debian/osmo-pcap-client.install M debian/osmo-pcap-server.install M debian/rules A doc/Makefile.am A doc/examples/Makefile.am R doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg R doc/examples/osmo-pcap-client/osmo-pcap-client.cfg R doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg R doc/examples/osmo-pcap-server/osmo-pcap-server.cfg 12 files changed, 40 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 0f4a249..1dd1ff4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 -SUBDIRS = include src contrib tests +SUBDIRS = include src contrib doc tests BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version diff --git a/configure.ac b/configure.ac index f885e6d..95c5270 100644 --- a/configure.ac +++ b/configure.ac @@ -145,5 +145,7 @@ src/Makefile contrib/Makefile contrib/systemd/Makefile + doc/Makefile + doc/examples/Makefile tests/Makefile Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 7bd8c23..e1927a7 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,3 +1,2 @@ SUBDIRS = systemd dist_pkgdata_DATA = osmo_pcap_clean_old -EXTRA_DIST = osmo-pcap-server.cfg osmo-pcap-client.cfg diff --git a/debian/osmo-pcap-client.install b/debian/osmo-pcap-client.install index ac7c65c..ef6576e 100644 --- a/debian/osmo-pcap-client.install +++ b/debian/osmo-pcap-client.install @@ -1,2 +1,5 @@ +etc/osmocom/osmo-pcap-client.cfg lib/systemd/system/osmo-pcap-client.service usr/bin/osmo-pcap-client +usr/share/doc/osmo-pcap/examples/osmo-pcap-client/osmo-pcap-client.cfg +usr/share/doc/osmo-pcap/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install index 6ba698e..cedee92 100644 --- a/debian/osmo-pcap-server.install +++ b/debian/osmo-pcap-server.install @@ -1,2 +1,5 @@ +etc/osmocom/osmo-pcap-server.cfg lib/systemd/system/osmo-pcap-server.service usr/bin/osmo-pcap-server +usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server.cfg +usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg diff --git a/debian/rules b/debian/rules index a9a8b30..90bd79e 100755 --- a/debian/rules +++ b/debian/rules @@ -21,17 +21,6 @@ PCAP_CFLAGS=$(PCAP_CFLAGS) \ PCAP_LIBS=$(PCAP_LIBS) -override_dh_auto_install: - dh_auto_install $@ - install -d -m 0755 $(CURDIR)/debian/osmo-pcap-client/etc/osmo-pcap/ - install -m 0644 $(CURDIR)/contrib/osmo-pcap-client.cfg $(CURDIR)/debian/osmo-pcap-client/etc/osmo-pcap - - install -d -m 0755 $(CURDIR)/debian/osmo-pcap-server/etc/osmo-pcap/ - install -m 0644 $(CURDIR)/contrib/osmo-pcap-server.cfg $(CURDIR)/debian/osmo-pcap-server/etc/osmo-pcap - - install -d -m 0755 $(CURDIR)/debian/osmo-pcap-server/etc/cron.daily/ - install -m 0755 $(CURDIR)/contrib/osmo_pcap_clean_old $(CURDIR)/debian/osmo-pcap-server/etc/cron.daily/ - override_dh_strip: dh_strip -posmo-pcap-client --dbg-package=osmo-pcap-client-dbg dh_strip -posmo-pcap-server --dbg-package=osmo-pcap-server-dbg diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..9337c9e --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,30 @@ +OSMOCONF_FILES = \ + osmo-pcap-client/osmo-pcap-client.cfg \ + osmo-pcap-server/osmo-pcap-server.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) +EXTRA_DIST = $(OSMOCONF_FILES) + +CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done diff --git a/contrib/osmo-pcap-client-tls.cfg b/doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg similarity index 100% rename from contrib/osmo-pcap-client-tls.cfg rename to doc/examples/osmo-pcap-client/osmo-pcap-client-tls.cfg diff --git a/contrib/osmo-pcap-client.cfg b/doc/examples/osmo-pcap-client/osmo-pcap-client.cfg similarity index 100% rename from contrib/osmo-pcap-client.cfg rename to doc/examples/osmo-pcap-client/osmo-pcap-client.cfg diff --git a/contrib/osmo-pcap-server-tls.cfg b/doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg similarity index 100% rename from contrib/osmo-pcap-server-tls.cfg rename to doc/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg diff --git a/contrib/osmo-pcap-server.cfg b/doc/examples/osmo-pcap-server/osmo-pcap-server.cfg similarity index 100% rename from contrib/osmo-pcap-server.cfg rename to doc/examples/osmo-pcap-server/osmo-pcap-server.cfg -- To view, visit https://gerrit.osmocom.org/11546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If3f3a7d3867c0d4d2b1fe01f465532d1ce4bda66 Gerrit-Change-Number: 11546 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 08:59:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 08:59:54 +0000 Subject: Change in osmo-pcap[master]: debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11548 ) Change subject: debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg ...................................................................... debian: Install osmo_pcap_clean_old in osmo-pcap-server pkg Change-Id: Ia4b031fdf54cde3d00818df82e89733420a735ba --- M debian/osmo-pcap-server.install 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/debian/osmo-pcap-server.install b/debian/osmo-pcap-server.install index cedee92..0cb99b1 100644 --- a/debian/osmo-pcap-server.install +++ b/debian/osmo-pcap-server.install @@ -3,3 +3,4 @@ usr/bin/osmo-pcap-server usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server.cfg usr/share/doc/osmo-pcap/examples/osmo-pcap-server/osmo-pcap-server-tls.cfg +usr/share/osmo-pcap/osmo_pcap_clean_old -- To view, visit https://gerrit.osmocom.org/11548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia4b031fdf54cde3d00818df82e89733420a735ba Gerrit-Change-Number: 11548 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:25:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:25:34 +0000 Subject: Change in osmo-msc[master]: Properly parse cause in cipher mode reject In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11569 ) Change subject: Properly parse cause in cipher mode reject ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11569/1/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11569/1/src/libmsc/a_iface_bssap.c at 436 PS1, Line 436: cause = (enum gsm0808_cause)TLVP_VAL(tp, GSM0808_IE_CAUSE); Doesn't TLVP_VAL return a pointer to the data? You should take the pointer, then load 1 or 2 bytes from there depending on bit 8 from fist data octet. -- To view, visit https://gerrit.osmocom.org/11569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I26b3eb0deff6dbd217b23d284bbc6e6a9eebc8e6 Gerrit-Change-Number: 11569 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 09:25:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:28:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:28:34 +0000 Subject: Change in osmo-trx[master]: transceiver: RSSI was calculated reverse. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9598 ) Change subject: transceiver: RSSI was calculated reverse. ...................................................................... Patch Set 1: A bit of background backing the statement in the commit description would be welcome, so it can be cross-checked. -- To view, visit https://gerrit.osmocom.org/9598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4eda4660dbe155ac1c782b77316ef504ef00c5 Gerrit-Change-Number: 9598 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 09:28:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:35:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:35:55 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11550/3/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/#/c/11550/3/src/osmo-bsc/abis_rsl.c at 1860 PS3, Line 1860: struct msgb *rsl_make_ipacc_mdcx(const struct gsm_lchan *lchan, uint32_t dest_ip, uint16_t dest_port) why do you keep dest_ip and dest_port as params despite they come from lchan? Because in later patches you require to pass ones not coming from lchan? or for no reason? -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 09:35:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:36:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:36:55 +0000 Subject: Change in osmo-bsc[master]: LCLS: move MGCP MDCX into separate function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11564 ) Change subject: LCLS: move MGCP MDCX into separate function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5fafa3b12a39c83bdf64e16e192dd2454d069cf4 Gerrit-Change-Number: 11564 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 09:36:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:38:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:38:41 +0000 Subject: Change in osmo-bsc[master]: LCLS: explicitly check for mode before closing the loop In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11565 ) Change subject: LCLS: explicitly check for mode before closing the loop ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11565/1/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11565/1/src/osmo-bsc/osmo_bsc_lcls.c at 252 PS1, Line 252: struct mgcp_conn_peer mdcx_info = (struct mgcp_conn_peer){ whitespace missing before { -- To view, visit https://gerrit.osmocom.org/11565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Gerrit-Change-Number: 11565 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 09:38:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:41:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:41:14 +0000 Subject: Change in osmo-bsc[master]: LCLS: move mode check into separate function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11551 ) Change subject: LCLS: move mode check into separate function ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 09:41:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:45:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:45:23 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11552 ) Change subject: LCLS: add bts-loop variant ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 09:45:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:46:52 +0000 Subject: Change in osmo-gsm-tester[master]: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10687 ) Change subject: Add an initial test for the ms_driver ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 6 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 09:46:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:49:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:49:35 +0000 Subject: Change in osmo-gsm-tester[master]: suites: Rename netreg_mass to nitb_netreg_mass In-Reply-To: References: Message-ID: Hello Jenkins Builder, Holger Freyther, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11515 to look at the new patch set (#3). Change subject: suites: Rename netreg_mass to nitb_netreg_mass ...................................................................... suites: Rename netreg_mass to nitb_netreg_mass Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 --- R suites/nitb_netreg_mass/register_default_mass.py R suites/nitb_netreg_mass/suite.conf 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/15/11515/3 -- To view, visit https://gerrit.osmocom.org/11515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 Gerrit-Change-Number: 11515 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:49:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:49:57 +0000 Subject: Change in osmo-gsm-tester[master]: suites: Rename netreg_mass to nitb_netreg_mass In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11515 ) Change subject: suites: Rename netreg_mass to nitb_netreg_mass ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11515/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11515/2//COMMIT_MSG at 7 PS2, Line 7: suite > it seems like this should be "suites" Done -- To view, visit https://gerrit.osmocom.org/11515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 Gerrit-Change-Number: 11515 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: osmith Gerrit-Comment-Date: Fri, 02 Nov 2018 09:49:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 09:50:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 09:50:58 +0000 Subject: Change in docker-playground[master]: bts: jenkins.sh: increase trx-advance in trxcon In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/11453 ) Change subject: bts: jenkins.sh: increase trx-advance in trxcon ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I37836024b20305a3f561ef9971838154a511b978 Gerrit-Change-Number: 11453 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 10:23:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 2 Nov 2018 10:23:34 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Patch Set 3: Yes, we have to be able to set it explicitly regardless of what's in lchan. -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 10:23:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 10:49:58 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 2 Nov 2018 10:49:58 +0000 Subject: Change in libosmocore[master]: gsm48: correct apidoc for gsm48_generate_mid() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11572 Change subject: gsm48: correct apidoc for gsm48_generate_mid() ...................................................................... gsm48: correct apidoc for gsm48_generate_mid() The API documentation lacks the the description for the last parameter, lets add a description for it. Change-Id: Ibcd25d3a7ddd7075eb15daff6dba42236d14d945 --- M src/gsm/gsm48.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/11572/1 diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index fc3b973..ae9a1cf 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -604,6 +604,7 @@ /*! Generate TS 24.008 ?10.5.1.4 Mobile ID * \param[out] buf Caller-provided output buffer * \param[in] id Identity to be encoded + * \param[in] mi_type Type of identity (e.g. GSM_MI_TYPE_TMSI) * \returns number of bytes used in \a buf */ uint8_t gsm48_generate_mid(uint8_t *buf, const char *id, uint8_t mi_type) { -- To view, visit https://gerrit.osmocom.org/11572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcd25d3a7ddd7075eb15daff6dba42236d14d945 Gerrit-Change-Number: 11572 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 10:53:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 10:53:25 +0000 Subject: Change in libosmocore[master]: gsm48: correct apidoc for gsm48_generate_mid() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11572 ) Change subject: gsm48: correct apidoc for gsm48_generate_mid() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibcd25d3a7ddd7075eb15daff6dba42236d14d945 Gerrit-Change-Number: 11572 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 10:53:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 12:21:41 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 2 Nov 2018 12:21:41 +0000 Subject: Change in osmo-gsm-tester[master]: suites: Rename netreg_mass to nitb_netreg_mass In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11515 ) Change subject: suites: Rename netreg_mass to nitb_netreg_mass ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a83f5fd984084e8050edbb4d8224c1ba1d756c8 Gerrit-Change-Number: 11515 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: osmith Gerrit-Comment-Date: Fri, 02 Nov 2018 12:21:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 13:03:33 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 2 Nov 2018 13:03:33 +0000 Subject: Change in osmo-ci[master]: ansible: Future proof for debian releases after debian9.0 Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11573 Change subject: ansible: Future proof for debian releases after debian9.0 ...................................................................... ansible: Future proof for debian releases after debian9.0 buster has a liblua5.3-dev, openjdk-8-jre-headless and the ttcn3 packages should work as well. Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml M ansible/roles/osmocom-jenkins-slave/tasks/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/73/11573/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index ad9f5c2..87a616c 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -32,7 +32,7 @@ default_release: jessie-backports when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' -- name: install java for stretch +- name: install java for stretch or later apt: name: "{{ item }}" cache_valid_time: 3600 @@ -40,4 +40,4 @@ install_recommends: no with_items: - openjdk-8-jre-headless - when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' + when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index 072792d..98cae55 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -27,7 +27,7 @@ - name: install ttcn3 dependencies include_tasks: ttcn3-slave.yml - when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' + when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= 9 - name: copy .gitconfig copy: diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 73623e3..4ccdf9f 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -97,7 +97,7 @@ default_release: jessie-backports when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' -- name: install liblua for stretch +- name: install liblua for stretch or later apt: name: "{{ item }}" cache_valid_time: 3600 @@ -105,4 +105,4 @@ install_recommends: no with_items: - liblua5.3-dev - when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' + when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 -- To view, visit https://gerrit.osmocom.org/11573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f Gerrit-Change-Number: 11573 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 13:03:34 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 2 Nov 2018 13:03:34 +0000 Subject: Change in osmo-ci[master]: liblime: There is no such package on Debian8.0 skip it Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11574 Change subject: liblime: There is no such package on Debian8.0 skip it ...................................................................... liblime: There is no such package on Debian8.0 skip it There is no installable liblimesuite-dev for Debian 8.0 and the playbook execution fails. Install it for Debian 9.0 or later. Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/74/11574/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 4ccdf9f..2200638 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -67,7 +67,6 @@ - libgnutls28-dev - libgps-dev - libgsm1-dev - - liblimesuite-dev - libmnl-dev - libncurses5-dev - libortp-dev @@ -106,3 +105,13 @@ with_items: - liblua5.3-dev when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + +- name: install liblimesuite-dev for stretch or later + apt: + name: "{{ item }}" + cache_valid_time: 3600 + update_cache: yes + install_recommends: no + with_items: + - liblimesuite-dev + when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 -- To view, visit https://gerrit.osmocom.org/11574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda Gerrit-Change-Number: 11574 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 13:04:06 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 2 Nov 2018 13:04:06 +0000 Subject: Change in osmo-ci[master]: ansible: Skip liblimesuite-dev for debian 8.0 In-Reply-To: References: Message-ID: Holger Freyther has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11574 ) Change subject: ansible: Skip liblimesuite-dev for debian 8.0 ...................................................................... ansible: Skip liblimesuite-dev for debian 8.0 There is no installable liblimesuite-dev for Debian 8.0 and the playbook execution fails. Install it for Debian 9.0 or later. Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/74/11574/2 -- To view, visit https://gerrit.osmocom.org/11574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda Gerrit-Change-Number: 11574 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 13:28:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 2 Nov 2018 13:28:08 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11560 to look at the new patch set (#3). Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 369 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/3 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 14:45:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 14:45:03 +0000 Subject: Change in osmo-ci[master]: ansible: Future proof for debian releases after debian9.0 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11573 ) Change subject: ansible: Future proof for debian releases after debian9.0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f Gerrit-Change-Number: 11573 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 02 Nov 2018 14:45:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 14:55:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 14:55:43 +0000 Subject: Change in osmo-ci[master]: ansible: Skip liblimesuite-dev for debian 8.0 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11574 ) Change subject: ansible: Skip liblimesuite-dev for debian 8.0 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda Gerrit-Change-Number: 11574 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 02 Nov 2018 14:55:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 2 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 2 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#295?= Message-ID: <113347284.386.1541171407388.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.08 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Nov 2 15:15:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 2 Nov 2018 15:15:30 +0000 Subject: Change in osmo-msc[master]: Properly parse cause in cipher mode reject In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11569 ) Change subject: Properly parse cause in cipher mode reject ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I26b3eb0deff6dbd217b23d284bbc6e6a9eebc8e6 Gerrit-Change-Number: 11569 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 15:15:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 15:15:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 2 Nov 2018 15:15:36 +0000 Subject: Change in osmo-msc[master]: Add counters for BSSMAP cipher mode messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11575 ) Change subject: Add counters for BSSMAP cipher mode messages ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5822b2b38b64f1a691b26c926a8e2bece21dc624 Gerrit-Change-Number: 11575 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 02 Nov 2018 15:15:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 15:17:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 2 Nov 2018 15:17:22 +0000 Subject: Change in libosmocore[master]: Update cipher reject function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11576 ) Change subject: Update cipher reject function ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc5fc1ae8d5474dbc8d3385a493adf6420a3c98 Gerrit-Change-Number: 11576 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 02 Nov 2018 15:17:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 15:21:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 15:21:41 +0000 Subject: Change in osmo-msc[master]: Add counters for BSSMAP cipher mode messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11575 ) Change subject: Add counters for BSSMAP cipher mode messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5822b2b38b64f1a691b26c926a8e2bece21dc624 Gerrit-Change-Number: 11575 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 15:21:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 15:22:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 2 Nov 2018 15:22:57 +0000 Subject: Change in libosmocore[master]: Update cipher reject function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11576 ) Change subject: Update cipher reject function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cc5fc1ae8d5474dbc8d3385a493adf6420a3c98 Gerrit-Change-Number: 11576 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 15:22:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 16:00:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 2 Nov 2018 16:00:46 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 02 Nov 2018 16:00:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 17:12:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 2 Nov 2018 17:12:42 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 02 Nov 2018 17:12:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 18:53:03 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 2 Nov 2018 18:53:03 +0000 Subject: Change in osmo-ci[master]: ansible: Skip liblimesuite-dev for debian 8.0 In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11574 ) Change subject: ansible: Skip liblimesuite-dev for debian 8.0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda Gerrit-Change-Number: 11574 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 02 Nov 2018 18:53:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 19:34:59 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 2 Nov 2018 19:34:59 +0000 Subject: Change in osmo-ci[master]: ansible: Future proof for debian releases after debian9.0 In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11573 ) Change subject: ansible: Future proof for debian releases after debian9.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f Gerrit-Change-Number: 11573 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 02 Nov 2018 19:34:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:04:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:04:02 +0000 Subject: Change in libosmocore[master]: Update cipher reject function In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11576 ) Change subject: Update cipher reject function ...................................................................... Update cipher reject function * add note about (yet) unsupported standard feature * use enum constant instead of hex value Change-Id: I5cc5fc1ae8d5474dbc8d3385a493adf6420a3c98 Related: OS#3187 --- M src/gsm/gsm0808.c M tests/gsm0808/gsm0808_test.c 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 9ccca4d..e5c3e30 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -275,6 +275,7 @@ return NULL; msgb_v_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT); + /* FIXME: support 2-byte cause value as per 3GPP TS 08.08 ?3.2.2.5 */ msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 0b2794f..7111db9 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -248,7 +248,7 @@ struct msgb *msg; printf("Testing creating Cipher Reject\n"); - msg = gsm0808_create_cipher_reject(0x23); + msg = gsm0808_create_cipher_reject(GSM0808_CAUSE_CCCH_OVERLOAD); VERIFY(msg, res, ARRAY_SIZE(res)); msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/11576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5cc5fc1ae8d5474dbc8d3385a493adf6420a3c98 Gerrit-Change-Number: 11576 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:04:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:04:41 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 02 Nov 2018 22:04:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:05:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:05:09 +0000 Subject: Change in osmo-msc[master]: Add counters for BSSMAP cipher mode messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11575 ) Change subject: Add counters for BSSMAP cipher mode messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5822b2b38b64f1a691b26c926a8e2bece21dc624 Gerrit-Change-Number: 11575 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 22:05:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:05:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:05:52 +0000 Subject: Change in osmo-msc[master]: Properly parse cause in cipher mode reject In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11569 ) Change subject: Properly parse cause in cipher mode reject ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I26b3eb0deff6dbd217b23d284bbc6e6a9eebc8e6 Gerrit-Change-Number: 11569 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 02 Nov 2018 22:05:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:06:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:06:09 +0000 Subject: Change in osmo-msc[master]: Properly parse cause in cipher mode reject In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11569 ) Change subject: Properly parse cause in cipher mode reject ...................................................................... Properly parse cause in cipher mode reject Use appropriate TLV routines to get and log the value of rejection cause. Change-Id: I26b3eb0deff6dbd217b23d284bbc6e6a9eebc8e6 Fixes: OS#3187 --- M src/libmsc/a_iface_bssap.c 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 11d3673..4666ae3 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -420,21 +420,22 @@ return 0; } -/* Endpoint to handle BSSMAP cipher mode reject */ +/* Endpoint to handle BSSMAP cipher mode reject, 3GPP TS 08.08 ?3.2.1.48 */ static int bssmap_rx_ciph_rej(struct gsm_subscriber_connection *conn, struct msgb *msg, struct tlv_parsed *tp) { - uint8_t cause; + enum gsm0808_cause cause; LOGPCONN(conn, LOGL_NOTICE, "RX BSSMAP CIPHER MODE REJECT\n"); - if (!TLVP_PRESENT(tp, BSS_MAP_MSG_CIPHER_MODE_REJECT)) { + if (!TLVP_PRES_LEN(tp, GSM0808_IE_CAUSE, 1)) { LOGPCONN(conn, LOGL_ERROR, "Cause code is missing -- discarding message!\n"); return -EINVAL; } - cause = TLVP_VAL(tp, BSS_MAP_MSG_CIPHER_MODE_REJECT)[0]; - LOGPCONN(conn, LOGL_NOTICE, "Cipher mode rejection cause: %i\n", cause); + /* FIXME: add support for 2-byte Cause values using libosmocore functions */ + cause = *TLVP_VAL(tp, GSM0808_IE_CAUSE); + LOGPCONN(conn, LOGL_NOTICE, "Cipher mode rejection cause: %s\n", gsm0808_cause_name(cause)); /* FIXME: Can we do something meaningful here? e.g. report to the * msc code somehow that the cipher mode command has failed. */ -- To view, visit https://gerrit.osmocom.org/11569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I26b3eb0deff6dbd217b23d284bbc6e6a9eebc8e6 Gerrit-Change-Number: 11569 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:06:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:06:11 +0000 Subject: Change in osmo-msc[master]: Add counters for BSSMAP cipher mode messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11575 ) Change subject: Add counters for BSSMAP cipher mode messages ...................................................................... Add counters for BSSMAP cipher mode messages Count COMPLETE and REJECT messages. Besides general troubleshooting that's also useful for TTCN-3 tests to check that OsmoMSC processed those messages as expected. Change-Id: I5822b2b38b64f1a691b26c926a8e2bece21dc624 Related: OS#3187 --- M include/osmocom/msc/gsm_data.h M src/libmsc/a_iface_bssap.c 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 579697e..085248c 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -216,6 +216,8 @@ MSC_CTR_NC_SS_MO_ESTABLISHED, MSC_CTR_NC_SS_MT_REQUESTS, MSC_CTR_NC_SS_MT_ESTABLISHED, + MSC_CTR_BSSMAP_CIPHER_MODE_REJECT, + MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE, }; static const struct rate_ctr_desc msc_ctr_description[] = { @@ -247,6 +249,8 @@ [MSC_CTR_NC_SS_MO_ESTABLISHED] = {"nc_ss:mo_established", "Established MS-initiated call independent SS/USSD sessions."}, [MSC_CTR_NC_SS_MT_REQUESTS] = {"nc_ss:mt_requests", "Received network-initiated call independent SS/USSD requests."}, [MSC_CTR_NC_SS_MT_ESTABLISHED] = {"nc_ss:mt_established", "Established network-initiated call independent SS/USSD sessions."}, + [MSC_CTR_BSSMAP_CIPHER_MODE_REJECT] = {"bssmap:cipher_mode_reject", "Number of CIPHER MODE REJECT messages processed by BSSMAP layer"}, + [MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE] = {"bssmap:cipher_mode_complete", "Number of CIPHER MODE COMPLETE messages processed by BSSMAP layer"}, }; static const struct rate_ctr_group_desc msc_ctrg_desc = { diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 4666ae3..282fd73 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -400,6 +400,7 @@ * This needs to be discussed further! */ uint8_t alg_id = 1; + struct rate_ctr_group *msc = conn->network->msc_ctrs; LOGPCONN(conn, LOGL_DEBUG, "Rx BSSMAP CIPHER MODE COMPLETE\n"); @@ -414,6 +415,8 @@ msg = NULL; } + rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE]); + /* Hand over cipher mode complete message to the MSC */ msc_cipher_mode_compl(conn, msg, alg_id); @@ -425,6 +428,7 @@ struct msgb *msg, struct tlv_parsed *tp) { enum gsm0808_cause cause; + struct rate_ctr_group *msc = conn->network->msc_ctrs; LOGPCONN(conn, LOGL_NOTICE, "RX BSSMAP CIPHER MODE REJECT\n"); @@ -433,6 +437,8 @@ return -EINVAL; } + rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]); + /* FIXME: add support for 2-byte Cause values using libosmocore functions */ cause = *TLVP_VAL(tp, GSM0808_IE_CAUSE); LOGPCONN(conn, LOGL_NOTICE, "Cipher mode rejection cause: %s\n", gsm0808_cause_name(cause)); -- To view, visit https://gerrit.osmocom.org/11575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5822b2b38b64f1a691b26c926a8e2bece21dc624 Gerrit-Change-Number: 11575 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:06:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:06:35 +0000 Subject: Change in libosmocore[master]: gsm48: correct apidoc for gsm48_generate_mid() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11572 ) Change subject: gsm48: correct apidoc for gsm48_generate_mid() ...................................................................... gsm48: correct apidoc for gsm48_generate_mid() The API documentation lacks the the description for the last parameter, lets add a description for it. Change-Id: Ibcd25d3a7ddd7075eb15daff6dba42236d14d945 --- M src/gsm/gsm48.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index fc3b973..ae9a1cf 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -604,6 +604,7 @@ /*! Generate TS 24.008 ?10.5.1.4 Mobile ID * \param[out] buf Caller-provided output buffer * \param[in] id Identity to be encoded + * \param[in] mi_type Type of identity (e.g. GSM_MI_TYPE_TMSI) * \returns number of bytes used in \a buf */ uint8_t gsm48_generate_mid(uint8_t *buf, const char *id, uint8_t mi_type) { -- To view, visit https://gerrit.osmocom.org/11572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibcd25d3a7ddd7075eb15daff6dba42236d14d945 Gerrit-Change-Number: 11572 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:08:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:08:42 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11552 ) Change subject: LCLS: add bts-loop variant ...................................................................... Patch Set 3: I'm not 100% familiar with all aspects of the code without re-reading it. Just in general: Did you think about the case where an (intra-BAC) hand-over happens during the LCLS session ongoing? AFAIK for the MGW-loop case this is handled, and for sure we also want to handle it correctly for any more BTS-local loop. -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 02 Nov 2018 22:08:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 2 22:16:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 2 Nov 2018 22:16:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11562 ) Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11562/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11562/3//COMMIT_MSG at 11 PS3, Line 11: and since notification to RSL Emulation happens async, it : can happen (verified) that ChanRqd message from BTS arrives and is : handled before we register the RACH req into the ConnectionTable one option that could be investigated is to temporarily pause processing of any RSL events until you have received the fn from L1CTL and installed the expectation in the ConnectionTable. We already have this kind of logic as 'dchan_suspended' in RSL_Emulation.ttcn. You could also have something like a chan_rqd_suspended and set/unset that via procedure port. I'm not saying it must be done that way, I'm just stating this is a proven option to work around such races. -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 02 Nov 2018 22:16:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 2 22:26:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 2 Nov 2018 22:26:31 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-libosmo-sccp_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1719?= Message-ID: <1596668476.387.1541197591421.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 49.09 KB...] CC stat_item.lo CC stats.lo CC prim.lo CC stats_statsd.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC telnet_interface.lo CC utils.lo CC stats_vty.lo CC vector.lo CC logging_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm690.lo CC gsm620.lo CC gsm610.lo CC gsm660.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC comp128.lo CC rsl.lo CC tlv_parser.lo CC comp128v23.lo CC gsm_utils.lo CC rxlev_stat.lo CC gsm48.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC auth_core.lo CC gsm_04_08_gprs.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo CC oap.lo CC gsm23003.lo CC gsm0808_utils.lo CC gsm0503_conv.lo /bin/bash: line 2: 12078 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT oap.lo -MD -MP -MF $depbase.Tpo -c -o oap.lo oap.c Makefile:593: recipe for target 'oap.lo' failed make[3]: *** [oap.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:698: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Nov 3 00:06:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 3 Nov 2018 00:06:34 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-libosmo-sccp_=C2=BB_a1?= =?UTF-8?Q?=3Ddefault,a2=3Ddefault,a3=3Ddefaul?= =?UTF-8?Q?t,osmocom-master-debian9_#1720?= In-Reply-To: <1596668476.387.1541197591421.JavaMail.jenkins@jenkins.osmocom.org> References: <1596668476.387.1541197591421.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <265213601.388.1541203594273.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat Nov 3 00:20:09 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 3 Nov 2018 00:20:09 +0000 Subject: Change in osmo-ci[master]: ansible: Future proof for debian releases after debian9.0 In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11573 ) Change subject: ansible: Future proof for debian releases after debian9.0 ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f Gerrit-Change-Number: 11573 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 03 Nov 2018 00:20:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 3 00:20:12 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 3 Nov 2018 00:20:12 +0000 Subject: Change in osmo-ci[master]: ansible: Skip liblimesuite-dev for debian 8.0 In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11574 ) Change subject: ansible: Skip liblimesuite-dev for debian 8.0 ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda Gerrit-Change-Number: 11574 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 03 Nov 2018 00:20:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 3 00:20:20 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 3 Nov 2018 00:20:20 +0000 Subject: Change in osmo-ci[master]: ansible: Future proof for debian releases after debian9.0 In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11573 ) Change subject: ansible: Future proof for debian releases after debian9.0 ...................................................................... ansible: Future proof for debian releases after debian9.0 buster has a liblua5.3-dev, openjdk-8-jre-headless and the ttcn3 packages should work as well. Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml M ansible/roles/osmocom-jenkins-slave/tasks/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Holger Freyther: Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index ad9f5c2..87a616c 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -32,7 +32,7 @@ default_release: jessie-backports when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' -- name: install java for stretch +- name: install java for stretch or later apt: name: "{{ item }}" cache_valid_time: 3600 @@ -40,4 +40,4 @@ install_recommends: no with_items: - openjdk-8-jre-headless - when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' + when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index 072792d..98cae55 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -27,7 +27,7 @@ - name: install ttcn3 dependencies include_tasks: ttcn3-slave.yml - when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' + when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= 9 - name: copy .gitconfig copy: diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 73623e3..4ccdf9f 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -97,7 +97,7 @@ default_release: jessie-backports when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' -- name: install liblua for stretch +- name: install liblua for stretch or later apt: name: "{{ item }}" cache_valid_time: 3600 @@ -105,4 +105,4 @@ install_recommends: no with_items: - liblua5.3-dev - when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch' + when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 -- To view, visit https://gerrit.osmocom.org/11573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I76f516bbe503d15d9210ab14e7d9dd024e0ce72f Gerrit-Change-Number: 11573 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 3 00:20:20 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 3 Nov 2018 00:20:20 +0000 Subject: Change in osmo-ci[master]: ansible: Skip liblimesuite-dev for debian 8.0 In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11574 ) Change subject: ansible: Skip liblimesuite-dev for debian 8.0 ...................................................................... ansible: Skip liblimesuite-dev for debian 8.0 There is no installable liblimesuite-dev for Debian 8.0 and the playbook execution fails. Install it for Debian 9.0 or later. Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Holger Freyther: Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 4ccdf9f..2200638 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -67,7 +67,6 @@ - libgnutls28-dev - libgps-dev - libgsm1-dev - - liblimesuite-dev - libmnl-dev - libncurses5-dev - libortp-dev @@ -106,3 +105,13 @@ with_items: - liblua5.3-dev when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + +- name: install liblimesuite-dev for stretch or later + apt: + name: "{{ item }}" + cache_valid_time: 3600 + update_cache: yes + install_recommends: no + with_items: + - liblimesuite-dev + when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 -- To view, visit https://gerrit.osmocom.org/11574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0cee652b9d9703dc10b6105711a26f33cc2a3fda Gerrit-Change-Number: 11574 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Nov 3 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 3 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#296?= In-Reply-To: <113347284.386.1541171407388.JavaMail.jenkins@jenkins.osmocom.org> References: <113347284.386.1541171407388.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <437086099.404.1541257807375.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.81 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Nov 3 17:24:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 3 Nov 2018 17:24:19 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11560 to look at the new patch set (#4). Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 373 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/4 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 4 10:37:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 4 Nov 2018 10:37:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11578 Change subject: hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() ...................................................................... hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() There is no need to pass session state from f_main_mo() to a choosen EUSE handler (e.g. f_ss_echo), because a handler itself is capable to extract the session state IE. Change-Id: I1054baf3e7dafd05b797610b586e6202740f07b6 --- M hlr/HLR_EUSE.ttcn 1 file changed, 9 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/11578/1 diff --git a/hlr/HLR_EUSE.ttcn b/hlr/HLR_EUSE.ttcn index 1e7574b..93eb8f4 100644 --- a/hlr/HLR_EUSE.ttcn +++ b/hlr/HLR_EUSE.ttcn @@ -50,14 +50,17 @@ } } -type function f_euse_cb(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU; +type function f_euse_cb(GSUP_PDU rx_pdu) return GSUP_PDU; -function f_ss_echo_continue(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU { +function f_ss_echo_continue(GSUP_PDU rx_pdu) return GSUP_PDU { var GSUP_SessionState ss_next_state; - var GSUP_IeValue ss_ie; + var GSUP_IeValue ss_ie, state_ie; var SS_FacilityInformation dec_fac, rsp_fac; var octetstring ss_rsp; + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, state_ie); + var GSUP_SessionState ss_state := state_ie.session_state; + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie); dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info); log("dec_fac: ", dec_fac); @@ -74,7 +77,7 @@ ss_next_state, ss_rsp)); } -function f_ss_echo(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU { +function f_ss_echo(GSUP_PDU rx_pdu) return GSUP_PDU { var GSUP_IeValue ss_ie; var SS_FacilityInformation dec_fac, rsp_fac; var octetstring ss_rsp; @@ -100,15 +103,8 @@ while (true) { alt { - [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_BEGIN)) -> value rx_pdu { - EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_BEGIN, rx_pdu)); - } - [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_CONTINUE)) -> value rx_pdu { - EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_CONTINUE, rx_pdu)); - } - - [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_END)) -> value rx_pdu { - EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_END, rx_pdu)); + [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, ?)) -> value rx_pdu { + EUSE.send(cb_fn.apply(rx_pdu)); } -- To view, visit https://gerrit.osmocom.org/11578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1054baf3e7dafd05b797610b586e6202740f07b6 Gerrit-Change-Number: 11578 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 4 14:44:23 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 4 Nov 2018 14:44:23 +0000 Subject: Change in osmo-ci[master]: misc: Install patchelf to add/set an rpath if wanted Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11579 Change subject: misc: Install patchelf to add/set an rpath if wanted ...................................................................... misc: Install patchelf to add/set an rpath if wanted Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M docker/Dockerfile.deb8_amd64 M docker/Dockerfile.deb8_i386 M docker/Dockerfile_osmocom_jenkins.amd64 4 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/79/11579/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 2200638..16e72ed 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -47,6 +47,7 @@ - libopencore-amrnb-dev # by LimeSuite - cmake + - patchelf - name: install build dependencies and libraries apt: diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64 index c996396..4f2a60c 100644 --- a/docker/Dockerfile.deb8_amd64 +++ b/docker/Dockerfile.deb8_amd64 @@ -38,3 +38,6 @@ # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc + +# Add rpath's to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386 index 9605106..d8fd257 100644 --- a/docker/Dockerfile.deb8_i386 +++ b/docker/Dockerfile.deb8_i386 @@ -38,3 +38,6 @@ # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc + +# Add rpath's to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index cc68bf4..c58224d 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -42,5 +42,8 @@ # and all RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev libpcsclite-dev make gcc pkgconf libtool autoconf autoconf-archive automake libortp-dev asciidoc mscgen git libsctp-dev libpcap-dev osc libc-ares-dev libgps-dev libsofia-sip-ua-glib-dev libssl-dev libsqlite3-dev libusb-dev libffi-dev libfftw3-dev flex bison libdbi-dev libsnmp-dev libncurses5-dev libgsm1-dev python-minimal python3 libdbd-sqlite3 cppcheck htop libgmp-dev gawk texinfo flex bison bc libsigsegv-dev libffi-dev libusb-1.0-0-dev libreadline-dev debhelper devscripts gcc-arm-none-eabi git-buildpackage dh-systemd dh-autoreconf bc openssh-client stow +# Add rpath's to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf + ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh -- To view, visit https://gerrit.osmocom.org/11579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 Gerrit-Change-Number: 11579 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 4 14:50:06 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 4 Nov 2018 14:50:06 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10687 to look at the new patch set (#7). Change subject: suits: Add an initial test for the ms_driver ...................................................................... suits: Add an initial test for the ms_driver Things to make configurable: * IMSI and matching MSISDN ranges (start + count) * Timeouts and number of MS (which should be related) Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 --- A suites/nitb_netreg_mass/register_default_mass.py A suites/nitb_netreg_mass/suite.conf 2 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/87/10687/7 -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 7 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 4 14:50:07 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 4 Nov 2018 14:50:07 +0000 Subject: Change in osmo-gsm-tester[master]: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11580 Change subject: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH ...................................................................... misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH Instead of each binary launcher having to check if there is a lib/ directory and then setting a LD_LIBRARY_PATH we can use an RPATH and know these binaries pick-up the right libraries. This requires I6e4ad2e3855af7bcefc22d4190cc4e6f58581857. Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 --- M contrib/jenkins-build-common.sh 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/80/11580/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 17ab7df..63058eb 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -175,6 +175,27 @@ done } +add_rpath() { + # Adds an RPATH to executables in bin/ or sbin/ to search for the + # (Osmocom) libraries in `basepath /proc/self/exe`/../lib/. Adds an + # RPATH to a library to search in the same directory as the library. + + # NOTE: Binaries should not have the SUID bit set and should run as the + # user executing the binary. + + # Add an rpath relative to the binary and library if the directory + # exists. + if [ -d bin/ ]; then + find bin -depth -type f -exec patchelf --set-rpath '$ORIGIN/../lib/' {} \; + fi + if [ -d sbin/ ]; then + find sbin -depth -type f -exec patchelf --set-rpath '$ORIGIN/../lib/' {} \; + fi + if [ -d lib/ ]; then + find lib -depth -type f -name "lib*.so.*" -exec patchelf --set-rpath '$ORIGIN/' {} \; + fi +} + create_bin_tgz() { # build the archive that is going to be copied to the tester @@ -190,6 +211,7 @@ prune_files sbin "$wanted_binaries_sbin" cd "$prefix_real" + add_rpath this="$name.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" tar="${this}.tgz" tar czf "$base/$tar" * -- To view, visit https://gerrit.osmocom.org/11580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 Gerrit-Change-Number: 11580 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Nov 4 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 4 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#297?= In-Reply-To: <437086099.404.1541257807375.JavaMail.jenkins@jenkins.osmocom.org> References: <437086099.404.1541257807375.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1946985534.420.1541344207294.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 5 01:29:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 01:29:53 +0000 Subject: Change in osmo-dev[master]: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11537 ) Change subject: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a Gerrit-Change-Number: 11537 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 01:29:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 01:30:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 01:30:02 +0000 Subject: Change in osmo-dev[master]: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11537 ) Change subject: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/11537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a Gerrit-Change-Number: 11537 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 01:30:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 01:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 01:30:03 +0000 Subject: Change in osmo-dev[master]: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11537 ) Change subject: deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client ...................................................................... deps: osmo-sgsn depends on osmo-hlr's liboso-gsup-client Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a --- M 2G.deps M 3G+2G.deps 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/2G.deps b/2G.deps index 213cb3d..cf2723a 100644 --- a/2G.deps +++ b/2G.deps @@ -9,5 +9,5 @@ osmo-mgw libosmo-netif osmo-msc libosmo-sccp osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw -osmo-sgsn libosmo-sccp osmo-ggsn +osmo-sgsn libosmo-sccp osmo-ggsn osmo-hlr osmo-trx libosmocore diff --git a/3G+2G.deps b/3G+2G.deps index 0eea175..b82e7c9 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -11,6 +11,6 @@ osmo-mgw libosmo-netif osmo-msc osmo-iuh osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw -osmo-sgsn osmo-iuh osmo-ggsn +osmo-sgsn osmo-iuh osmo-ggsn osmo-hlr osmo-sip-connector libosmocore osmo-trx libosmocore -- To view, visit https://gerrit.osmocom.org/11537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie47ca98740ca438e04d6ea76421e0f58d9e5715a Gerrit-Change-Number: 11537 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 01:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 01:34:41 +0000 Subject: Change in osmo-ci[master]: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs ...................................................................... Patch Set 4: Code-Review+2 if you're not overwriting the manual jobs, have you tested that this yml file works? As soon as this file generates working jenkins jobs, let's drop the current "manual" jobs completely. In the meantime it is not harmful to add this file to osmo-ci. -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 01:34:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 01:38:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 01:38:22 +0000 Subject: Change in osmo-bsc[master]: don't use rsl_cause_name() in LOGP statements In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11399 ) Change subject: don't use rsl_cause_name() in LOGP statements ...................................................................... Patch Set 1: sorry, I was oblivious of this patch and implemented a separate fix that is already merged: Ibadd06102f162bca9182c39b77b0651568d3e6f8 That one also avoids generating the cause string if logging is off. -- To view, visit https://gerrit.osmocom.org/11399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0ecabcd6435f3f74448d5d3350fe659d7df91a6d Gerrit-Change-Number: 11399 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 01:38:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 01:38:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 01:38:43 +0000 Subject: Change in osmo-bsc[master]: don't use rsl_cause_name() in LOGP statements In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/11399 ) Change subject: don't use rsl_cause_name() in LOGP statements ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I0ecabcd6435f3f74448d5d3350fe659d7df91a6d Gerrit-Change-Number: 11399 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 01:55:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 01:55:19 +0000 Subject: Change in osmo-bsc[master]: vty doc: drop "(HO algo 2 only)" strings Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11581 Change subject: vty doc: drop "(HO algo 2 only)" strings ...................................................................... vty doc: drop "(HO algo 2 only)" strings These indicators are a legacy of early handover_decision_2.c work, where there were no separate handover1 and handover2 config commands. No need to restate the abundantly obvious anymore. Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612 --- M include/osmocom/bsc/handover_cfg.h M src/osmo-bsc/handover_vty.c M tests/handover_cfg.vty 3 files changed, 26 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/11581/1 diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h index 865fab9..92b5cd4 100644 --- a/include/osmocom/bsc/handover_cfg.h +++ b/include/osmocom/bsc/handover_cfg.h @@ -21,11 +21,10 @@ #define HO_CFG_STR_WIN_RXQUAL HO_CFG_STR_WIN "Received-Quality averaging\n" #define HO_CFG_STR_POWER_BUDGET "Neighbor cell power triggering\n" "Neighbor cell power triggering\n" #define HO_CFG_STR_AVG_COUNT "Number of values to average over\n" -#define HO_CFG_STR_2 " (HO algo 2 only)\n" -#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO" HO_CFG_STR_2 -#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs" HO_CFG_STR_2 -#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested" HO_CFG_STR_2 -#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers" HO_CFG_STR_2 +#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO\n" +#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs\n" +#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested\n" +#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers\n" #define as_is(x) (x) @@ -185,14 +184,14 @@ HO_CFG_ONE_MEMBER(bool, hodec2_as_active, 0, \ "handover2 ", "assignment", "0|1", a2bool, "%d", bool2i, \ HO_CFG_STR_HANDOVER2 \ - "Enable or disable in-call channel re-assignment" HO_CFG_STR_2 \ + "Enable or disable in-call channel re-assignment\n" \ "Disable in-call assignment\n" \ "Enable in-call assignment\n") \ \ HO_CFG_ONE_MEMBER(bool, hodec2_full_tdma, subset, \ "handover2 ", "tdma-measurement", "full|subset", a2tdma, "%s", tdma2a, \ HO_CFG_STR_HANDOVER2 \ - "Define measurement set of TDMA frames" HO_CFG_STR_2 \ + "Define measurement set of TDMA frames\n" \ "Full set of 102/104 TDMA frames\n" \ "Sub set of 4 TDMA frames (SACCH)\n") \ \ @@ -241,7 +240,7 @@ HO_CFG_ONE_MEMBER(int, hodec2_ho_max, 9999, \ "handover2 ", "max-handovers", "<1-9999>", atoi, "%d", as_is, \ HO_CFG_STR_HANDOVER2 \ - "Maximum number of concurrent handovers allowed per cell" HO_CFG_STR_2 \ + "Maximum number of concurrent handovers allowed per cell\n" \ "Number\n") \ \ HO_CFG_ONE_MEMBER(int, hodec2_penalty_max_dist, 300, \ @@ -268,7 +267,7 @@ HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \ "handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \ HO_CFG_STR_HANDOVER2 \ - "Immediately retry on handover/assignment failure" HO_CFG_STR_2 \ + "Immediately retry on handover/assignment failure\n" \ "Number of retries\n") \ #define HO_CFG_ALL_MEMBERS \ diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c index 51e448e..7979511 100644 --- a/src/osmo-bsc/handover_vty.c +++ b/src/osmo-bsc/handover_vty.c @@ -106,7 +106,7 @@ DEFUN(cfg_net_ho_congestion_check_interval, cfg_net_ho_congestion_check_interval_cmd, "handover2 congestion-check (disabled|<1-999>|now)", HO_CFG_STR_HANDOVER2 - "Configure congestion check interval" HO_CFG_STR_2 + "Configure congestion check interval\n" "Disable congestion checking, do not handover based on cell overload\n" "Congestion check interval in seconds (default " OSMO_STRINGIFY_VAL(HO_CFG_CONGESTION_CHECK_DEFAULT) ")\n" diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty index 119eaf5..94c20d9 100644 --- a/tests/handover_cfg.vty +++ b/tests/handover_cfg.vty @@ -218,15 +218,15 @@ window Measurement averaging settings power Neighbor cell power triggering maximum Maximum Timing-Advance value (i.e. MS distance) before triggering HO - assignment Enable or disable in-call channel re-assignment (HO algo 2 only) - tdma-measurement Define measurement set of TDMA frames (HO algo 2 only) - min Minimum Level/Quality thresholds before triggering HO (HO algo 2 only) - afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only) - min-free-slots Minimum free TCH timeslots before cell is considered congested (HO algo 2 only) - max-handovers Maximum number of concurrent handovers allowed per cell (HO algo 2 only) - penalty-time Set penalty times to wait between repeated handovers (HO algo 2 only) - retries Immediately retry on handover/assignment failure (HO algo 2 only) - congestion-check Configure congestion check interval (HO algo 2 only) + assignment Enable or disable in-call channel re-assignment + tdma-measurement Define measurement set of TDMA frames + min Minimum Level/Quality thresholds before triggering HO + afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs + min-free-slots Minimum free TCH timeslots before cell is considered congested + max-handovers Maximum number of concurrent handovers allowed per cell + penalty-time Set penalty times to wait between repeated handovers + retries Immediately retry on handover/assignment failure + congestion-check Configure congestion check interval OsmoBSC(config-net)# handover algorithm ? 1 Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only. @@ -437,14 +437,14 @@ window Measurement averaging settings power Neighbor cell power triggering maximum Maximum Timing-Advance value (i.e. MS distance) before triggering HO - assignment Enable or disable in-call channel re-assignment (HO algo 2 only) - tdma-measurement Define measurement set of TDMA frames (HO algo 2 only) - min Minimum Level/Quality thresholds before triggering HO (HO algo 2 only) - afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only) - min-free-slots Minimum free TCH timeslots before cell is considered congested (HO algo 2 only) - max-handovers Maximum number of concurrent handovers allowed per cell (HO algo 2 only) - penalty-time Set penalty times to wait between repeated handovers (HO algo 2 only) - retries Immediately retry on handover/assignment failure (HO algo 2 only) + assignment Enable or disable in-call channel re-assignment + tdma-measurement Define measurement set of TDMA frames + min Minimum Level/Quality thresholds before triggering HO + afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs + min-free-slots Minimum free TCH timeslots before cell is considered congested + max-handovers Maximum number of concurrent handovers allowed per cell + penalty-time Set penalty times to wait between repeated handovers + retries Immediately retry on handover/assignment failure OsmoBSC(config-net-bts)# handover algorithm ? 1 Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only. -- To view, visit https://gerrit.osmocom.org/11581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612 Gerrit-Change-Number: 11581 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 01:58:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 01:58:51 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBSC: update VTY reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11582 Change subject: OsmoBSC: update VTY reference ...................................................................... OsmoBSC: update VTY reference Re-generate bsc_vty_reference.xml from osmo-bsc, including updates to: - handover and neighbor config - SCCP timers - logging Change-Id: Ia9ba8d5eba531b1156de57573ab42517e0c1ca15 --- M OsmoBSC/vty/bsc_vty_reference.xml 1 file changed, 508 insertions(+), 450 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/82/11582/1 diff --git a/OsmoBSC/vty/bsc_vty_reference.xml b/OsmoBSC/vty/bsc_vty_reference.xml index 29a61bc..f56b951 100644 --- a/OsmoBSC/vty/bsc_vty_reference.xml +++ b/OsmoBSC/vty/bsc_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -125,6 +119,12 @@ + + + + + + @@ -138,6 +138,12 @@ + + + + + + @@ -182,22 +188,10 @@ - - - - - - - - - - - - - + @@ -282,7 +276,7 @@ - + @@ -290,6 +284,7 @@ + @@ -299,30 +294,18 @@ - - - - - - - - - - + - - - + - @@ -330,6 +313,10 @@ + + + + @@ -348,7 +335,6 @@ - @@ -356,6 +342,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -406,6 +424,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -537,6 +575,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable @@ -590,12 +679,6 @@ - - - - - - @@ -643,6 +726,12 @@ + + + + + + @@ -656,6 +745,12 @@ + + + + + + @@ -700,6 +795,21 @@ + + + + + + + + + + + + + + + @@ -712,19 +822,16 @@ - + - - - - - - - - - - - + + + + + + + + @@ -800,7 +907,7 @@ - + @@ -808,6 +915,7 @@ + @@ -817,30 +925,18 @@ - - - - - - - - - - + - - - + - @@ -848,6 +944,10 @@ + + + + @@ -866,7 +966,6 @@ - @@ -874,6 +973,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -924,6 +1055,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -1249,6 +1400,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config @@ -1577,7 +1779,7 @@ - + @@ -1585,23 +1787,21 @@ + - + - - - + - @@ -1609,6 +1809,10 @@ + + + + @@ -1627,7 +1831,6 @@ - @@ -1635,6 +1838,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1903,15 +2138,6 @@ - - - - - - - - - @@ -1925,6 +2151,21 @@ + + + + + + + + + + + + + + + config-cs7-as @@ -2214,11 +2455,27 @@ - + - - - + + + + + + + + + + + + + + + + + + + @@ -2228,109 +2485,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2410,8 +2564,8 @@ - - + + @@ -2470,8 +2624,8 @@ - - + + @@ -2487,7 +2641,7 @@ - + @@ -2496,7 +2650,7 @@ - + @@ -2505,7 +2659,7 @@ - + @@ -2514,34 +2668,34 @@ - + - + - + - + - + - + - + @@ -2550,7 +2704,7 @@ - + @@ -2559,7 +2713,7 @@ - + @@ -2567,7 +2721,7 @@ - + @@ -2576,7 +2730,7 @@ - + @@ -2585,7 +2739,7 @@ - + @@ -2594,75 +2748,15 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2739,12 +2833,6 @@ - - - - - - @@ -3780,6 +3868,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3878,8 +4057,8 @@ - - + + @@ -3938,8 +4117,8 @@ - - + + @@ -3955,7 +4134,7 @@ - + @@ -3964,7 +4143,7 @@ - + @@ -3973,7 +4152,7 @@ - + @@ -3982,34 +4161,34 @@ - + - + - + - + - + - + - + @@ -4018,7 +4197,7 @@ - + @@ -4027,7 +4206,7 @@ - + @@ -4035,7 +4214,7 @@ - + @@ -4044,7 +4223,7 @@ - + @@ -4053,7 +4232,7 @@ - + @@ -4062,71 +4241,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-net-bts-trx @@ -4218,12 +4337,6 @@ - - - - - - @@ -4340,54 +4453,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4508,6 +4573,20 @@ + + + + + + + + + + + + + + @@ -4532,6 +4611,14 @@ + + + + + + + + @@ -4575,47 +4662,18 @@ - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + -- To view, visit https://gerrit.osmocom.org/11582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9ba8d5eba531b1156de57573ab42517e0c1ca15 Gerrit-Change-Number: 11582 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:33:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:33:26 +0000 Subject: Change in libosmo-sccp[master]: osmo-stp: add SCCP related VTY commands Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11583 Change subject: osmo-stp: add SCCP related VTY commands ...................................................................... osmo-stp: add SCCP related VTY commands Call osmo_sccp_vty_init(), so far forgotten. This adds the various 'show cs7 instance N sccp *' commands, as well as making the SCCP timers configurable. Change-Id: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 --- M stp/stp_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/83/11583/1 diff --git a/stp/stp_main.c b/stp/stp_main.c index aa2304c..0efe4ed 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -174,6 +174,7 @@ osmo_fsm_log_addr(false); logging_vty_add_cmds(&log_info); osmo_ss7_vty_init_sg(tall_stp_ctx); + osmo_sccp_vty_init(); osmo_fsm_vty_add_cmds(); rc = vty_read_config_file(cmdline_config.config_file, NULL); -- To view, visit https://gerrit.osmocom.org/11583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 Gerrit-Change-Number: 11583 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:35:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:35:43 +0000 Subject: Change in osmo-gsm-manuals[master]: ggsn: update vty reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11584 Change subject: ggsn: update vty reference ...................................................................... ggsn: update vty reference Change-Id: I8a5c37505c0180d5c04c7792d6d0afdb0dffb282 --- M OsmoGGSN/vty/ggsn_vty_reference.xml 1 file changed, 118 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/84/11584/1 diff --git a/OsmoGGSN/vty/ggsn_vty_reference.xml b/OsmoGGSN/vty/ggsn_vty_reference.xml index 7a43263..7460026 100644 --- a/OsmoGGSN/vty/ggsn_vty_reference.xml +++ b/OsmoGGSN/vty/ggsn_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -175,7 +169,7 @@ - + @@ -183,6 +177,7 @@ + @@ -192,20 +187,10 @@ - - - - - - - - - - + - @@ -229,7 +214,6 @@ - @@ -237,6 +221,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -310,6 +326,12 @@ + + + + + + @@ -389,12 +411,6 @@ - - - - - - @@ -492,7 +508,7 @@ - + @@ -500,6 +516,7 @@ + @@ -509,20 +526,10 @@ - - - - - - - - - - + - @@ -546,7 +553,6 @@ - @@ -554,6 +560,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -627,6 +665,12 @@ + + + + + + @@ -777,8 +821,7 @@ - - + @@ -966,7 +1009,7 @@ - + @@ -974,13 +1017,13 @@ + - + - @@ -1004,7 +1047,6 @@ - @@ -1012,6 +1054,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats -- To view, visit https://gerrit.osmocom.org/11584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8a5c37505c0180d5c04c7792d6d0afdb0dffb282 Gerrit-Change-Number: 11584 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:35:44 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: update vty reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11585 Change subject: hlr: update vty reference ...................................................................... hlr: update vty reference Change-Id: I5a2322c0488cb36b089303bbfec5d4db18c41099 --- M OsmoHLR/vty/hlr_vty_reference.xml 1 file changed, 184 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/85/11585/1 diff --git a/OsmoHLR/vty/hlr_vty_reference.xml b/OsmoHLR/vty/hlr_vty_reference.xml index 8d161d4..cc97dc4 100644 --- a/OsmoHLR/vty/hlr_vty_reference.xml +++ b/OsmoHLR/vty/hlr_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -175,7 +169,7 @@ - + @@ -183,6 +177,7 @@ + @@ -192,23 +187,14 @@ - - - - - - - - - - + - + @@ -227,7 +213,6 @@ - @@ -235,6 +220,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -285,6 +302,12 @@ + + + + + + @@ -348,12 +371,6 @@ - - - - - - @@ -451,7 +468,7 @@ - + @@ -459,6 +476,7 @@ + @@ -468,23 +486,14 @@ - - - - - - - - - - + - + @@ -503,7 +512,6 @@ - @@ -511,6 +519,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -561,6 +601,12 @@ + + + + + + @@ -574,9 +620,9 @@ - + - + @@ -837,8 +883,7 @@ - - + @@ -929,7 +974,7 @@ - + @@ -937,16 +982,17 @@ + - + - + @@ -965,7 +1011,6 @@ - @@ -973,6 +1018,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line @@ -1010,6 +1087,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-hlr-gsup @@ -1021,4 +1156,7 @@ + + config-hlr-euse + -- To view, visit https://gerrit.osmocom.org/11585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5a2322c0488cb36b089303bbfec5d4db18c41099 Gerrit-Change-Number: 11585 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:35:44 +0000 Subject: Change in osmo-gsm-manuals[master]: mgw: update vty reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11586 Change subject: mgw: update vty reference ...................................................................... mgw: update vty reference Change-Id: Ib30ea8b02f8a950648b85e7ebc96a40ba5a36b34 --- M OsmoMGW/vty/mgw_vty_reference.xml 1 file changed, 146 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/86/11586/1 diff --git a/OsmoMGW/vty/mgw_vty_reference.xml b/OsmoMGW/vty/mgw_vty_reference.xml index f11f484..834db04 100644 --- a/OsmoMGW/vty/mgw_vty_reference.xml +++ b/OsmoMGW/vty/mgw_vty_reference.xml @@ -169,7 +169,7 @@ - + @@ -177,6 +177,7 @@ + @@ -186,12 +187,12 @@ - + - + @@ -210,7 +211,6 @@ - @@ -218,6 +218,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -304,6 +336,24 @@ + + + + + + + + + + + + + + + + + + enable @@ -454,7 +504,7 @@ - + @@ -462,6 +512,7 @@ + @@ -471,12 +522,12 @@ - + - + @@ -495,7 +546,6 @@ - @@ -503,6 +553,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -589,6 +671,24 @@ + + + + + + + + + + + + + + + + + + @@ -929,7 +1029,7 @@ - + @@ -937,14 +1037,15 @@ + - + - + @@ -963,7 +1064,6 @@ - @@ -971,6 +1071,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats @@ -1360,8 +1492,8 @@ - - + + -- To view, visit https://gerrit.osmocom.org/11586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib30ea8b02f8a950648b85e7ebc96a40ba5a36b34 Gerrit-Change-Number: 11586 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:35:44 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11587 Change subject: msc: update vty reference ...................................................................... msc: update vty reference Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 --- M OsmoMSC/vty/msc_vty_reference.xml 1 file changed, 311 insertions(+), 157 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/87/11587/1 diff --git a/OsmoMSC/vty/msc_vty_reference.xml b/OsmoMSC/vty/msc_vty_reference.xml index 7cf57c0..bb7e958 100644 --- a/OsmoMSC/vty/msc_vty_reference.xml +++ b/OsmoMSC/vty/msc_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -143,6 +137,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -216,7 +261,7 @@ - + @@ -224,6 +269,7 @@ + @@ -233,20 +279,10 @@ - - - - - - - - - - + - @@ -282,7 +318,6 @@ - @@ -290,6 +325,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -363,6 +430,12 @@ + + + + + + @@ -391,11 +464,12 @@ - + - + + @@ -443,17 +517,19 @@ - + - + + - + + @@ -462,17 +538,19 @@ - + - + + - + + @@ -481,10 +559,11 @@ - + - + + @@ -497,10 +576,11 @@ - + - + + @@ -509,10 +589,11 @@ - + - + + @@ -524,10 +605,11 @@ - + - + + @@ -543,10 +625,11 @@ - + - + + @@ -555,15 +638,16 @@ - + - + + - + @@ -646,12 +730,6 @@ - - - - - - @@ -717,6 +795,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -790,7 +919,7 @@ - + @@ -798,6 +927,7 @@ + @@ -807,20 +937,10 @@ - - - - - - - - - - + - @@ -856,7 +976,6 @@ - @@ -864,6 +983,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -937,6 +1088,12 @@ + + + + + + @@ -965,11 +1122,12 @@ - + - + + @@ -1017,17 +1175,19 @@ - + - + + - + + @@ -1036,17 +1196,19 @@ - + - + + - + + @@ -1055,10 +1217,11 @@ - + - + + @@ -1071,10 +1234,11 @@ - + - + + @@ -1083,10 +1247,11 @@ - + - + + @@ -1098,10 +1263,11 @@ - + - + + @@ -1117,10 +1283,11 @@ - + - + + @@ -1129,15 +1296,16 @@ - + - + + - + @@ -1160,10 +1328,11 @@ - + - + + @@ -1171,21 +1340,6 @@ - - - - - - - - - - - - - - - @@ -1212,10 +1366,11 @@ - + - + + @@ -1563,7 +1718,7 @@ - + @@ -1571,13 +1726,13 @@ + - + - @@ -1613,7 +1768,6 @@ - @@ -1621,6 +1775,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1818,15 +2004,6 @@ - - - - - - - - - @@ -1840,6 +2017,21 @@ + + + + + + + + + + + + + + + config-cs7-as @@ -2176,6 +2368,12 @@ + + + + + + @@ -2265,49 +2463,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2413,8 +2568,7 @@ - - + -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:35:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:35:45 +0000 Subject: Change in osmo-gsm-manuals[master]: sgsn: update vty reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11588 Change subject: sgsn: update vty reference ...................................................................... sgsn: update vty reference Change-Id: I64d775efa6791aca025d116905e951e10ffa5d04 --- M OsmoSGSN/vty/sgsn_vty_reference.xml 1 file changed, 252 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/88/11588/1 diff --git a/OsmoSGSN/vty/sgsn_vty_reference.xml b/OsmoSGSN/vty/sgsn_vty_reference.xml index f6e4016..52d4213 100644 --- a/OsmoSGSN/vty/sgsn_vty_reference.xml +++ b/OsmoSGSN/vty/sgsn_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -175,7 +169,7 @@ - + @@ -183,6 +177,7 @@ + @@ -192,20 +187,10 @@ - - - - - - - - - - + - @@ -237,7 +222,6 @@ - @@ -245,6 +229,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -318,6 +334,12 @@ + + + + + + @@ -396,6 +418,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -545,12 +618,6 @@ - - - - - - @@ -648,7 +715,7 @@ - + @@ -656,6 +723,7 @@ + @@ -665,20 +733,10 @@ - - - - - - - - - - + - @@ -710,7 +768,6 @@ - @@ -718,6 +775,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -791,6 +880,12 @@ + + + + + + @@ -933,6 +1028,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1342,8 +1488,7 @@ - - + @@ -1362,7 +1507,7 @@ - + @@ -1370,13 +1515,13 @@ + - + - @@ -1408,7 +1553,6 @@ - @@ -1416,6 +1560,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,15 +1919,6 @@ - - - - - - - - - @@ -1765,6 +1932,21 @@ + + + + + + + + + + + + + + + config-cs7-as @@ -2009,6 +2191,22 @@ + + + + + + + + + + + + + + + + @@ -2127,8 +2325,7 @@ - - + -- To view, visit https://gerrit.osmocom.org/11588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I64d775efa6791aca025d116905e951e10ffa5d04 Gerrit-Change-Number: 11588 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:35:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:35:45 +0000 Subject: Change in osmo-gsm-manuals[master]: sip-connector: update vty reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11589 Change subject: sip-connector: update vty reference ...................................................................... sip-connector: update vty reference Change-Id: I79b91847337b6022f8f750533301b3bf0eb086df --- M OsmoSIPConnector/vty/sipconn_vty_reference.xml 1 file changed, 106 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/89/11589/1 diff --git a/OsmoSIPConnector/vty/sipconn_vty_reference.xml b/OsmoSIPConnector/vty/sipconn_vty_reference.xml index 35aad6b..dee42e6 100644 --- a/OsmoSIPConnector/vty/sipconn_vty_reference.xml +++ b/OsmoSIPConnector/vty/sipconn_vty_reference.xml @@ -188,7 +188,7 @@ - + @@ -196,6 +196,7 @@ + @@ -205,11 +206,10 @@ - + - @@ -232,7 +232,6 @@ - @@ -240,6 +239,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -308,8 +339,7 @@ - - + @@ -451,7 +481,7 @@ - + @@ -459,6 +489,7 @@ + @@ -468,11 +499,10 @@ - + - @@ -495,7 +525,6 @@ - @@ -503,6 +532,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -855,7 +916,7 @@ - + @@ -863,13 +924,13 @@ + - + - @@ -892,7 +953,6 @@ - @@ -900,6 +960,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats -- To view, visit https://gerrit.osmocom.org/11589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I79b91847337b6022f8f750533301b3bf0eb086df Gerrit-Change-Number: 11589 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:35:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:35:45 +0000 Subject: Change in osmo-gsm-manuals[master]: stp: update vty reference Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11590 Change subject: stp: update vty reference ...................................................................... stp: update vty reference Change-Id: Id5f1067760db7a11ec380a541bfe7357a21a3bb3 --- M OsmoSTP/vty/osmo-stp_vty_reference.xml 1 file changed, 130 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/90/11590/1 diff --git a/OsmoSTP/vty/osmo-stp_vty_reference.xml b/OsmoSTP/vty/osmo-stp_vty_reference.xml index 4ab24f5..cbda3fc 100644 --- a/OsmoSTP/vty/osmo-stp_vty_reference.xml +++ b/OsmoSTP/vty/osmo-stp_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -175,7 +169,7 @@ - + @@ -183,6 +177,7 @@ + @@ -192,20 +187,10 @@ - - - - - - - - - - + - @@ -224,7 +209,6 @@ - @@ -232,6 +216,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,6 +302,16 @@ + + + + + + + + + + @@ -376,12 +402,6 @@ - - - - - - @@ -446,7 +466,8 @@ - + + @@ -478,7 +499,7 @@ - + @@ -486,6 +507,7 @@ + @@ -495,20 +517,10 @@ - - - - - - - - - - + - @@ -527,7 +539,6 @@ - @@ -535,6 +546,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -589,6 +632,16 @@ + + + + + + + + + + @@ -891,7 +944,7 @@ - + @@ -899,13 +952,13 @@ + - + - @@ -924,7 +977,6 @@ - @@ -932,6 +984,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line @@ -983,8 +1067,7 @@ - - + @@ -1043,15 +1126,6 @@ - - - - - - - - - @@ -1310,7 +1384,8 @@ - + + -- To view, visit https://gerrit.osmocom.org/11590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id5f1067760db7a11ec380a541bfe7357a21a3bb3 Gerrit-Change-Number: 11590 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:35:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:35:46 +0000 Subject: Change in osmo-gsm-manuals[master]: stp: update vty reference with added SCCP commands Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11591 Change subject: stp: update vty reference with added SCCP commands ...................................................................... stp: update vty reference with added SCCP commands After I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 which adds the missing sccp_vty_init(), update VTY reference with the new SCCP show / config commands. Depends: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 Change-Id: Id941b8e31d3b4cfdb3f912beedc1e7af321a0113 --- M OsmoSTP/vty/osmo-stp_vty_reference.xml 1 file changed, 99 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/91/11591/1 diff --git a/OsmoSTP/vty/osmo-stp_vty_reference.xml b/OsmoSTP/vty/osmo-stp_vty_reference.xml index cbda3fc..308c369 100644 --- a/OsmoSTP/vty/osmo-stp_vty_reference.xml +++ b/OsmoSTP/vty/osmo-stp_vty_reference.xml @@ -321,6 +321,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -651,6 +692,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1067,7 +1149,8 @@ - + + @@ -1164,6 +1247,21 @@ + + + + + + + + + + + + + + + config-cs7-as -- To view, visit https://gerrit.osmocom.org/11591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id941b8e31d3b4cfdb3f912beedc1e7af321a0113 Gerrit-Change-Number: 11591 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:37:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:37:31 +0000 Subject: Change in libosmo-sccp[master]: osmo-stp: add SCCP related VTY commands In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11583 to look at the new patch set (#2). Change subject: osmo-stp: add SCCP related VTY commands ...................................................................... osmo-stp: add SCCP related VTY commands Call osmo_sccp_vty_init(), so far forgotten. This adds the various 'show cs7 instance N sccp *' commands, as well as making the SCCP timers configurable. See Id941b8e31d3b4cfdb3f912beedc1e7af321a0113 for a diff of the VTY reference, showing what commands are enabled by this patch. Change-Id: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 --- M stp/stp_main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/83/11583/2 -- To view, visit https://gerrit.osmocom.org/11583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 Gerrit-Change-Number: 11583 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:39:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:39:29 +0000 Subject: Change in osmo-ci[master]: misc: Install patchelf to add/set an rpath if wanted In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11579 ) Change subject: misc: Install patchelf to add/set an rpath if wanted ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 Gerrit-Change-Number: 11579 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 02:39:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:43:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:43:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11578 ) Change subject: hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1054baf3e7dafd05b797610b586e6202740f07b6 Gerrit-Change-Number: 11578 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 02:43:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:51:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:51:25 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Patch Set 3: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/11550/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11550/3//COMMIT_MSG at 12 PS3, Line 12: * make IP address helper accessible via header file why? I see no-one using it outside of the static context https://gerrit.osmocom.org/#/c/11550/3//COMMIT_MSG at 14 PS3, Line 14: * constify rsl_tx_ipacc_*cx() parameters this lists three changes that seem unrelated and should hence be in separate, smaller patches. https://gerrit.osmocom.org/#/c/11550/3/include/osmocom/bsc/abis_rsl.h File include/osmocom/bsc/abis_rsl.h: https://gerrit.osmocom.org/#/c/11550/3/include/osmocom/bsc/abis_rsl.h at 64 PS3, Line 64: struct msgb *rsl_make_ipacc_mdcx(const struct gsm_lchan *lchan, uint32_t dest_ip, uint16_t dest_port); At least mention in the commit log in which other commit this will be used; but I'd prefer squashing with the actual caller that needs this change. (that would also have answered Pau's question, most likely) https://gerrit.osmocom.org/#/c/11550/3/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/#/c/11550/3/src/osmo-bsc/abis_rsl.c at 1873 PS3, Line 1873: rather omit whitespace change https://gerrit.osmocom.org/#/c/11550/3/src/osmo-bsc/abis_rsl.c at 1876 PS3, Line 1876: rather omit whitespace change -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 02:51:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 02:54:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 02:54:15 +0000 Subject: Change in osmo-bsc[master]: LCLS: move MGCP MDCX into separate function In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11564 ) Change subject: LCLS: move MGCP MDCX into separate function ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11564/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11564/1//COMMIT_MSG at 7 PS1, Line 7: LCLS: move MGCP MDCX into separate function "LCLS: MGCP MDCX: remove code dup" -- To view, visit https://gerrit.osmocom.org/11564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5fafa3b12a39c83bdf64e16e192dd2454d069cf4 Gerrit-Change-Number: 11564 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 02:54:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:02:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:02:37 +0000 Subject: Change in osmo-bsc[master]: LCLS: explicitly check for mode before closing the loop In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11565 ) Change subject: LCLS: explicitly check for mode before closing the loop ...................................................................... Patch Set 1: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/11565/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11565/1//COMMIT_MSG at 10 PS1, Line 10: * explicitly check for MGW mode before closing the loop via MGCP MDCX I don't see how these two changes end up in the same patch. Please separate orthogonal changes, especially when it's logging tweaks vs. functional changes https://gerrit.osmocom.org/#/c/11565/1/include/osmocom/bsc/bsc_msc_data.h File include/osmocom/bsc/bsc_msc_data.h: https://gerrit.osmocom.org/#/c/11565/1/include/osmocom/bsc/bsc_msc_data.h at 62 PS1, Line 62: extern const struct value_string bsc_lcls_mode_names[]; at some point we agreed to always add something like this: static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode val) { return get_value_string(...); } https://gerrit.osmocom.org/#/c/11565/1/src/osmo-bsc/gsm_data.c File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/#/c/11565/1/src/osmo-bsc/gsm_data.c at 53 PS1, Line 53: { 0, NULL } (possible to just write '{}' in the last line) https://gerrit.osmocom.org/#/c/11565/1/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11565/1/src/osmo-bsc/osmo_bsc_lcls.c at 243 PS1, Line 243: get_value_string(bsc_lcls_mode_names, conn->sccp.msc->lcls_mode)); this and the others below get shorter with bsc_lcls_mode_name(). https://gerrit.osmocom.org/#/c/11565/1/src/osmo-bsc/osmo_bsc_lcls.c at 252 PS1, Line 252: struct mgcp_conn_peer mdcx_info = (struct mgcp_conn_peer){ > whitespace missing before { This is a struct initializer, so I'd favor Max's formatting choice: not place a space. Compare: libosmocore/src/gsm/gsm0808_utils.c 990: *dst = (struct gsm0808_cell_id_list2){ 996: *dst = (struct gsm0808_cell_id_list2){ and various others -- To view, visit https://gerrit.osmocom.org/11565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Gerrit-Change-Number: 11565 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 03:02:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:10:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:10:30 +0000 Subject: Change in osmo-bsc[master]: LCLS: move mode check into separate function In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11551 ) Change subject: LCLS: move mode check into separate function ...................................................................... Patch Set 3: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11551/3/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11551/3/src/osmo-bsc/osmo_bsc_lcls.c at 230 PS3, Line 230: static inline bool lcls_check_toggle_ok(const struct gsm_subscriber_connection *conn, bool enable) heh, the function name ... maybe just lcls_toggle_allowed()? https://gerrit.osmocom.org/#/c/11551/3/src/osmo-bsc/osmo_bsc_lcls.c at 233 PS3, Line 233: conn->sccp.msc->lcls_mode != conn->lcls.other->sccp.msc->lcls_mode) { If I want to break a loop, it doesn't make sense to check for a mode mismatch, does it? It seems to me that this first part should not be in the common function, but rather only in lcls_locally_switched_onenter()? ... or maybe skip this if enable == false? -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 03:10:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:24:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:24:57 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11552 ) Change subject: LCLS: add bts-loop variant ...................................................................... Patch Set 3: Code-Review-1 (8 comments) https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_lcls.c at 238 PS3, Line 238: uint16_t port = enable ? conn->lcls.other->lchan->abis_ip.bound_port : lchan->abis_ip.connect_port; (may I suggest comments... if (enable) { /* redirect directly to remote BTS's IP:port */ ... } else { /* redirect back to the MGW's IP:port */ ... } ) https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_lcls.c at 240 PS3, Line 240: if (conn->lcls.other) { (may I suggest early-exit coding style... if (!conn->lcls.other) { err handling return; } normal case ) https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_lcls.c at 243 PS3, Line 243: LOGPFSM(conn->lcls.fi, "LCLS conn other is unavailable for %s!\n", enable ? "enable" : "disable"); hmm, maybe: "%s LCLS: other conn is not available\n" https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_lcls.c at 244 PS3, Line 244: return; is there no error handling? what happens if this fails, the LCLS state thinks the loop is closed but it actually isn't? https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_lcls.c at 247 PS3, Line 247: abis_rsl_sendmsg(msg); evaluate rc and roll back LCLS state on error? Or even tear down conn if we can't send RSL? https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_lcls.c at 295 PS3, Line 295: lcls_rsl(conn, false); I would prefer a full-on switch() statement, making sure we cover all enum values, and catch wrongly initialized values. https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_lcls.c at 648 PS3, Line 648: lcls_rsl(conn, true); switch() https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_vty.c File src/osmo-bsc/osmo_bsc_vty.c: https://gerrit.osmocom.org/#/c/11552/3/src/osmo-bsc/osmo_bsc_vty.c at 653 PS3, Line 653: "Enable LCLS with loopping traffic between BTS\n") "looping". In this case I'd be fine to fix the typo in the previous code at the same time. -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 05 Nov 2018 03:24:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:34:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:34:53 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Patch Set 2: Code-Review-1 (7 comments) https://gerrit.osmocom.org/#/c/11577/2/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/11577/2/include/osmocom/gsm/gsm0808.h at 178 PS2, Line 178: const char *gsm0808_cause_name(enum gsm0808_cause cause); (nice! the lack of enum use has caused me a lot of head scratching when trying to figure out *which* cause a context is talking about. I wish we would replace all these uint8_t args with their proper enums.) https://gerrit.osmocom.org/#/c/11577/2/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/11577/2/include/osmocom/gsm/gsm0808_utils.h at 110 PS2, Line 110: /*! Return 3GPP TS 08.08 ?3.2.2.5 Class of a given Cause */ maybe rather name the newer version -- that would be 48.008, right? -- only problem is consistency with the rest of the file? But no-one should read the outdated specs anymore... https://gerrit.osmocom.org/#/c/11577/2/include/osmocom/gsm/gsm0808_utils.h at 116 PS2, Line 116: /*! Check whether 3GPP TS 08.08 ?3.2.2.5 Class has extended bit set */ strictly speaking, these comments should have a doxygen \returns clause ... but whatever https://gerrit.osmocom.org/#/c/11577/2/include/osmocom/gsm/gsm0808_utils.h at 118 PS2, Line 118: { /* check that cause looks like 1XXX0000 where XXX represent class */ (weird formatting, comment in { line) https://gerrit.osmocom.org/#/c/11577/2/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11577/2/src/gsm/gsm0808.c at 1274 PS2, Line 1274: static const struct value_string gsm0808_cause_class_names[] = { (I would be fine with this, but a while back the decision was that the value string arrays should be accessible as public API -- @laforge, I think that was your opinion, fine to leave this hidden in static .c context?) https://gerrit.osmocom.org/#/c/11577/2/src/gsm/gsm0808.c at 1276 PS2, Line 1276: { GSM0808_CAUSE_CLASS_NORM1, "Normal event" }, shouldn't the name distinguish between 0 and 1? https://gerrit.osmocom.org/#/c/11577/2/src/gsm/gsm0808.c at 1282 PS2, Line 1282: { GSM0808_CAUSE_CLASS_INETW, "Internetworking" }, I think this should be "Interworking" -- whatever that means :) -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 03:34:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:35:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:35:17 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Neels Hofmeyr has removed a vote on this change. Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Removed Code-Review+2 by Harald Welte -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:35:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:35:56 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Patch Set 2: (I took the liberty to remove the +2 vote even though it wasn't mine, on the grounds that at least the typo should be addressed before merging) -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 03:35:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:41:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:41:33 +0000 Subject: Change in osmo-msc[master]: Update VLR test helper In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11458 ) Change subject: Update VLR test helper ...................................................................... Patch Set 1: Code-Review-1 (1 comment) not sure why, but if you merge please fix the commit summary https://gerrit.osmocom.org/#/c/11458/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11458/1//COMMIT_MSG at 7 PS1, Line 7: Update VLR test helper this summary could mean just about anything! Rather say: msc_vlr_tests: tweak conn_exists() -- To view, visit https://gerrit.osmocom.org/11458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 Gerrit-Change-Number: 11458 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 03:41:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:43:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:43:37 +0000 Subject: Change in osmo-msc[master]: Update VLR test helper In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11458 ) Change subject: Update VLR test helper ...................................................................... Patch Set 1: hrm, why is a -1 vote hidden by a +2? I'd at least want to see the author that there is a negative vote in the overview... I don't want to -2, since that would be too sticky... -- To view, visit https://gerrit.osmocom.org/11458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 Gerrit-Change-Number: 11458 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 03:43:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 03:50:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 03:50:57 +0000 Subject: Change in osmo-pcu[master]: Move EGPRS WS computation to C code In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/6241 ) Change subject: Move EGPRS WS computation to C code ...................................................................... Patch Set 4: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/6241/4/src/mslot_class.c File src/mslot_class.c: https://gerrit.osmocom.org/#/c/6241/4/src/mslot_class.c at 301 PS4, Line 301: return OSMO_MIN((num_pdch != 1) ? (128 * num_pdch) : 192, OSMO_MAX(64, > This code looks unreadable... lol, I was gonna say "looks fine to me", until I hit the ": 192," --- this is moving previous code around, so we should leave it unchanged, especially since the original formatting was easier to read than this. https://gerrit.osmocom.org/#/c/6241/4/src/tbf_dl.cpp File src/tbf_dl.cpp: https://gerrit.osmocom.org/#/c/6241/4/src/tbf_dl.cpp at 1362 PS4, Line 1362: uint16_t ws = egprs_window_size(b->ws_base, b->ws_pdch, pcu_bitcount(dl_slots())); wait, what. This patch: * moves egprs_window_size() around. * changes local var use cosmetically. * *and* changes the last parameter from dl_slots() to pcu_bitcount(dl_slots())? Please separate into individual patches, don't mix cosmetics with functional change, or it's really hard to figure out what the patch is changing. -- To view, visit https://gerrit.osmocom.org/6241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie411ea2bbfca442b33405584f15687a7ffcbb53c Gerrit-Change-Number: 6241 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 03:50:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 04:00:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 04:00:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: LCLS: explicitly check for *CX adjustment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11558 ) Change subject: LCLS: explicitly check for *CX adjustment ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11558/2/bsc/MSC_ConnectionHandler.ttcn File bsc/MSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/#/c/11558/2/bsc/MSC_ConnectionHandler.ttcn at 823 PS2, Line 823: Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-CRCX transactions on g_media.mgcp_conn[" & int2str(i) & "]"); cosmetic change mixed with unrelated functional change. When reading a patch this makes me spend time trying to figure out how these things are related... -- To view, visit https://gerrit.osmocom.org/11558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076 Gerrit-Change-Number: 11558 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 04:00:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 04:03:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 04:03:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: add bts-loop tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11559 ) Change subject: BSC LCLS: add bts-loop tests ...................................................................... Patch Set 3: just a general idea ... when I refactored osmo-bsc's FSMs, I managed to completely break the RTP streams, but the ttcn tests never noticed, because they don't verify that the expected IP:port are sent to the {BTS,MGW} nor that RTP packets follow the expected route. Would it be possible to test for this in more detail, without huge effort? -- To view, visit https://gerrit.osmocom.org/11559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e786b430591899c722d99d685db26efa868508 Gerrit-Change-Number: 11559 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 04:03:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 04:05:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 04:05:21 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log RACH requests in GSMTAP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11567 ) Change subject: ttcn3-bts-test: Log RACH requests in GSMTAP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idae872492a6cf3306fb2e636c54038caa600646b Gerrit-Change-Number: 11567 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 04:05:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 04:05:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 04:05:33 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log RACH requests in GSMTAP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11567 ) Change subject: ttcn3-bts-test: Log RACH requests in GSMTAP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idae872492a6cf3306fb2e636c54038caa600646b Gerrit-Change-Number: 11567 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 04:05:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 04:07:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 04:07:47 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce iperf3 testing infrastructure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11476 ) Change subject: Introduce iperf3 testing infrastructure ...................................................................... Patch Set 3: Code-Review+2 I have no idea what this is doing but it looks like you do. -- To view, visit https://gerrit.osmocom.org/11476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e Gerrit-Change-Number: 11476 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 04:07:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 04:09:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 04:09:23 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 4: osmith, if you're reading this -- I'm counting on your review -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 04:09:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 04:15:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 04:15:29 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: add --enable-sanitize Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11592 Change subject: configure.ac: add --enable-sanitize ...................................................................... configure.ac: add --enable-sanitize Add --enable-sanitize to ./configure, as a copy-paste from libosmocore. When building libosmocore with --enable-sanitize, osmo-sip-connector cannot be linked if it doesn't include asan as well. This is particularly annoying to me when using sanitize.opts in osmo-dev. I'd have to turn off *all* asan everywhere just to include the osmo-sip-connector dep that was recently added. Change-Id: I18761802db2f29d9f0c7f269197d5b5e191142c5 --- M configure.ac 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/92/11592/1 diff --git a/configure.ac b/configure.ac index 98fdc94..cdb42a5 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,18 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING( + [--enable-sanitize], + [Compile with address sanitizer enabled], + )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + AC_ARG_ENABLE(werror, [AS_HELP_STRING( [--enable-werror], -- To view, visit https://gerrit.osmocom.org/11592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I18761802db2f29d9f0c7f269197d5b5e191142c5 Gerrit-Change-Number: 11592 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 04:20:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 5 Nov 2018 04:20:49 +0000 Subject: Change in osmo-dev[master]: sanitize.opts: add --enable-sanitize to ALL builds Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11593 Change subject: sanitize.opts: add --enable-sanitize to ALL builds ...................................................................... sanitize.opts: add --enable-sanitize to ALL builds Actually, add it to *all* builds, since they'd anyway not be able to link libosmocore without also including asan in their binaries. Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 --- M sanitize.opts 1 file changed, 1 insertion(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/93/11593/1 diff --git a/sanitize.opts b/sanitize.opts index 40675be..9118a5d 100644 --- a/sanitize.opts +++ b/sanitize.opts @@ -1,14 +1 @@ -libasn1c --enable-sanitize -libosmo-abis --enable-sanitize -libosmocore --enable-sanitize -libosmo-netif --enable-sanitize -libosmo-sccp --enable-sanitize -libsmpp34 --enable-sanitize -osmo-bsc --enable-sanitize -osmo-ggsn --enable-sanitize -osmo-hlr --enable-sanitize -osmo-iuh --enable-sanitize -osmo-mgw --enable-sanitize -osmo-msc --enable-sanitize -osmo-sgsn --enable-sanitize -openbsc --enable-sanitize +ALL --enable-sanitize -- To view, visit https://gerrit.osmocom.org/11593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 Gerrit-Change-Number: 11593 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 05:01:41 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 05:01:41 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: add --enable-sanitize In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11592 ) Change subject: configure.ac: add --enable-sanitize ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11592/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11592/1//COMMIT_MSG at 11 PS1, Line 11: osmo-sip-connector cannot be : linked if it doesn't include asan as well. Hmm, I always thought that it should not be a problem. I think I even linked something (most likely trxcon) against "ASAN-enabled" libosmocore successfully. -- To view, visit https://gerrit.osmocom.org/11592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18761802db2f29d9f0c7f269197d5b5e191142c5 Gerrit-Change-Number: 11592 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 05:01:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 05:10:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 05:10:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11578 ) Change subject: hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() ...................................................................... hlr/HLR_EUSE.ttcn: remove redundant code from f_main_mo() There is no need to pass session state from f_main_mo() to a choosen EUSE handler (e.g. f_ss_echo), because a handler itself is capable to extract the session state IE. Change-Id: I1054baf3e7dafd05b797610b586e6202740f07b6 --- M hlr/HLR_EUSE.ttcn 1 file changed, 9 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/hlr/HLR_EUSE.ttcn b/hlr/HLR_EUSE.ttcn index 1e7574b..93eb8f4 100644 --- a/hlr/HLR_EUSE.ttcn +++ b/hlr/HLR_EUSE.ttcn @@ -50,14 +50,17 @@ } } -type function f_euse_cb(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU; +type function f_euse_cb(GSUP_PDU rx_pdu) return GSUP_PDU; -function f_ss_echo_continue(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU { +function f_ss_echo_continue(GSUP_PDU rx_pdu) return GSUP_PDU { var GSUP_SessionState ss_next_state; - var GSUP_IeValue ss_ie; + var GSUP_IeValue ss_ie, state_ie; var SS_FacilityInformation dec_fac, rsp_fac; var octetstring ss_rsp; + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, state_ie); + var GSUP_SessionState ss_state := state_ie.session_state; + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie); dec_fac := dec_SS_FacilityInformation(ss_ie.ss_info); log("dec_fac: ", dec_fac); @@ -74,7 +77,7 @@ ss_next_state, ss_rsp)); } -function f_ss_echo(GSUP_SessionState ss_state, GSUP_PDU rx_pdu) return GSUP_PDU { +function f_ss_echo(GSUP_PDU rx_pdu) return GSUP_PDU { var GSUP_IeValue ss_ie; var SS_FacilityInformation dec_fac, rsp_fac; var octetstring ss_rsp; @@ -100,15 +103,8 @@ while (true) { alt { - [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_BEGIN)) -> value rx_pdu { - EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_BEGIN, rx_pdu)); - } - [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_CONTINUE)) -> value rx_pdu { - EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_CONTINUE, rx_pdu)); - } - - [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, OSMO_GSUP_SESSION_STATE_END)) -> value rx_pdu { - EUSE.send(cb_fn.apply(OSMO_GSUP_SESSION_STATE_END, rx_pdu)); + [] EUSE.receive(tr_GSUP_PROC_SS_REQ(?, ?, ?)) -> value rx_pdu { + EUSE.send(cb_fn.apply(rx_pdu)); } -- To view, visit https://gerrit.osmocom.org/11578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1054baf3e7dafd05b797610b586e6202740f07b6 Gerrit-Change-Number: 11578 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 05:13:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 05:13:57 +0000 Subject: Change in osmocom-bb[master]: l1ctl_proto.h: use flexible array member for traffic messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11395 ) Change subject: l1ctl_proto.h: use flexible array member for traffic messages ...................................................................... l1ctl_proto.h: use flexible array member for traffic messages Unlike the DATA messages, traffic frames may have different length. Instead of having fixed payload (i.e. TCH frame) length, let's introduce a flexible array member. This would allow one to calculate the frame length using the MSGB API. Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 --- M include/l1ctl_proto.h M src/host/layer23/src/common/l1ctl.c M src/host/virt_phy/src/virt_prim_traffic.c M src/target/firmware/layer1/prim_tch.c 4 files changed, 34 insertions(+), 21 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index f1bff86..c6156f5 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -96,8 +96,6 @@ L1CTL_MCS9, }; -#define TRAFFIC_DATA_LEN 40 - /* * NOTE: struct size. We do add manual padding out of the believe * that it will avoid some unaligned access. @@ -162,7 +160,7 @@ /* traffic from the network */ struct l1ctl_traffic_ind { - uint8_t data[TRAFFIC_DATA_LEN]; + uint8_t data[0]; } __attribute__((packed)); /* @@ -346,7 +344,7 @@ /* traffic data to network */ struct l1ctl_traffic_req { - uint8_t data[TRAFFIC_DATA_LEN]; + uint8_t data[0]; } __attribute__((packed)); struct l1ctl_tbf_cfg_req { diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 96db52f..5d6d9c0 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -762,6 +762,8 @@ { struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; + size_t frame_len; + uint8_t *frame; if (msgb_l1len(msg) < sizeof(*dl)) { LOGP(DL1C, LOGL_ERROR, "TRAFFIC IND MSG too short " @@ -771,10 +773,17 @@ /* Header handling */ dl = (struct l1ctl_info_dl *) msg->l1h; - msg->l2h = dl->payload; - ti = (struct l1ctl_traffic_ind *) msg->l2h; + ti = (struct l1ctl_traffic_ind *) dl->payload; + frame = (uint8_t *) ti->data; - DEBUGP(DL1C, "TRAFFIC IND (%s)\n", osmo_hexdump(ti->data, 33)); + msg->l2h = dl->payload; + msg->l3h = frame; + + /* Calculate the frame length */ + frame_len = msgb_l3len(msg); + + DEBUGP(DL1C, "TRAFFIC IND len=%zu (%s)\n", frame_len, + osmo_hexdump(frame, frame_len)); /* distribute or drop */ if (ms->l1_entity.l1_traffic_ind) @@ -791,28 +800,28 @@ struct l1ctl_hdr *l1h; struct l1ctl_info_ul *l1i_ul; struct l1ctl_traffic_req *tr; + size_t frame_len; + uint8_t *frame; /* Header handling */ tr = (struct l1ctl_traffic_req *) msg->l2h; + frame = (uint8_t *) tr->data; + msg->l3h = frame; - DEBUGP(DL1C, "TRAFFIC REQ (%s)\n", - osmo_hexdump(msg->l2h, msgb_l2len(msg))); + /* Calculate the frame length */ + frame_len = msgb_l3len(msg); - if (msgb_l2len(msg) != 33) { - LOGP(DL1C, LOGL_ERROR, "Traffic Request has incorrect length " - "(%u != 33)\n", msgb_l2len(msg)); - msgb_free(msg); - return -EINVAL; - } + DEBUGP(DL1C, "TRAFFIC REQ len=%zu (%s)\n", frame_len, + osmo_hexdump(frame, frame_len)); - if ((tr->data[0] >> 4) != 0xd) { + if ((frame[0] >> 4) != 0xd) { LOGP(DL1C, LOGL_ERROR, "Traffic Request has incorrect magic " - "(%u != 0xd)\n", tr->data[0] >> 4); + "(%u != 0xd)\n", frame[0] >> 4); msgb_free(msg); return -EINVAL; } -// printf("TX %s\n", osmo_hexdump(tr->data, 33)); +// printf("TX %s\n", osmo_hexdump(frame, frame_len)); /* prepend uplink info header */ l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); diff --git a/src/host/virt_phy/src/virt_prim_traffic.c b/src/host/virt_phy/src/virt_prim_traffic.c index 4e58de6..5f6b273 100644 --- a/src/host/virt_phy/src/virt_prim_traffic.c +++ b/src/host/virt_phy/src/virt_prim_traffic.c @@ -84,6 +84,7 @@ struct msgb *l1ctl_msg = NULL; struct l1ctl_traffic_ind * l1ti; struct l1ctl_info_dl * l1dl; + uint8_t *frame, frame_len; uint8_t rsl_chan_type, subchan, timeslot; l1ctl_msg = l1ctl_msgb_alloc(L1CTL_TRAFFIC_IND); l1dl = (struct l1ctl_info_dl *) msgb_put(l1ctl_msg, sizeof(*l1dl)); @@ -102,7 +103,10 @@ /* TODO: traffic decoding and decryption */ - memcpy(l1ti->data, msgb_data(msg), msgb_length(msg)); + frame_len = msgb_length(msg); + frame = (uint8_t *) msgb_put(l1ctl_msg, frame_len); + memcpy(frame, msgb_data(msg), frame_len); + DEBUGPMS(DL1P, ms, "Tx L1CTL_TRAFFIC_IND (chan_nr=0x%02x, link_id=0x%02x)\n", chan_nr, link_id); l1ctl_sap_tx_to_l23_inst(ms, l1ctl_msg); } diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 2dadaaf..a8036d2 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -338,6 +338,7 @@ struct msgb *msg; struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; + uint8_t *payload; /* Allocate msgb */ /* FIXME: we actually want all allocation out of L1S! */ @@ -349,15 +350,16 @@ dl = (struct l1ctl_info_dl *) msgb_put(msg, sizeof(*dl)); ti = (struct l1ctl_traffic_ind *) msgb_put(msg, sizeof(*ti)); + payload = (uint8_t *) msgb_put(msg, 33); /* Copy actual data, skipping the information block [0,1,2] */ - dsp_memcpy_from_api(ti->data, &traffic_buf[3], 33, 1); + dsp_memcpy_from_api(payload, &traffic_buf[3], 33, 1); /** * Perform some bit conversations * FIXME: what about other (than FR) codecs? */ - tch_fr_bit_magic(ti, 1); + tch_fr_bit_magic(payload, 1); /* Give message to up layer */ l1_queue_for_l2(msg); -- To view, visit https://gerrit.osmocom.org/11395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I119fa36c84e95c3003d57c19e25f8146ed45c3c6 Gerrit-Change-Number: 11395 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 06:51:39 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 5 Nov 2018 06:51:39 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Initialize event_server_sk_tmp_dira in ctor Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11594 Change subject: ms_driver: Initialize event_server_sk_tmp_dira in ctor ...................................................................... ms_driver: Initialize event_server_sk_tmp_dira in ctor Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/94/11594/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 808989e..a4d81c1 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -64,6 +64,7 @@ self._loop = SimpleLoop() self._suite_run.remember_to_stop(self) self._test_case = None + self.event_server_sk_tmp_dir = None if len(self.event_server_path().encode()) > 107: raise log.Error('Path for event_server socket is longer than max allowed len for unix socket path (107):', self.event_server_path()) -- To view, visit https://gerrit.osmocom.org/11594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 Gerrit-Change-Number: 11594 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 06:51:40 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 5 Nov 2018 06:51:40 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Use terminate not kill and initialize in ctor Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11595 Change subject: ms_driver: Use terminate not kill and initialize in ctor ...................................................................... ms_driver: Use terminate not kill and initialize in ctor Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b --- M src/osmo_ms_driver/starter.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/95/11595/1 diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 86ad446..5218a57 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -39,6 +39,7 @@ def __init__(self, name_number, tmp_dir): super().__init__("osmo-ms-virt-phy", name_number, tmp_dir) self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number) + self._vphy_proc = None def phy_filename(self): return self._phy_filename @@ -61,7 +62,7 @@ def kill(self): """Clean up things.""" if self._vphy_proc: - self._vphy_proc.kill() + self._vphy_proc.terminate() class OsmoMobile(Launcher): def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): @@ -72,6 +73,7 @@ self._phy_filename = phy_filename self._ev_server_path = ev_server_path self._imsi, self._ki = next(self._imsi_ki_generator) + self._omob_proc = None def imsi(self): return self._imsi @@ -122,4 +124,4 @@ def kill(self): """Clean up things.""" if self._omob_proc: - self._omob_proc.kill() + self._omob_proc.terminate() -- To view, visit https://gerrit.osmocom.org/11595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b Gerrit-Change-Number: 11595 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 06:51:41 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 5 Nov 2018 06:51:41 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11596 Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... ms_driver: Allow to specify env and binary name/path For the proper trial/suite integration we can't assume that the virtphy/mobile are in the PATH and that they can be executed direcyly (e.g. need a LD_LIBRARY_PATH to be applied). Introduce BinaryOptions to pass the name/path of the two executables and the env to use. Default this to virtphy/mobile and an empty environment. Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 4 files changed, 27 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/96/11596/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index a4d81c1..f46efa3 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -20,7 +20,7 @@ from osmo_ms_driver.cdf import cdfs from osmo_ms_driver.event_server import EventServer from osmo_ms_driver.simple_loop import SimpleLoop -from osmo_ms_driver.location_update_test import MassUpdateLocationTest +from osmo_ms_driver.location_update_test import BinaryOptions, MassUpdateLocationTest import os.path import shutil @@ -83,7 +83,9 @@ self._ev_server = EventServer("ev_server", event_server_path) self._ev_server.listen(self._loop) - self._test_case = MassUpdateLocationTest("mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir) + options = BinaryOptions("virtphy", "mobile", None) + self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, + self._ev_server, self.event_server_sk_tmp_dir) # TODO: We should pass subscribers down to the test and not get it from # there. diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py index 1573084..265ce47 100644 --- a/src/osmo_ms_driver/__main__.py +++ b/src/osmo_ms_driver/__main__.py @@ -20,6 +20,7 @@ from .simple_loop import SimpleLoop from .location_update_test import MassUpdateLocationTest from .cdf import cdfs +from .starter import BinaryOptions from osmo_gsm_tester import log # System modules @@ -82,7 +83,8 @@ ev_server.listen(loop) # Just a single test for now. - test = MassUpdateLocationTest("lu_test", args.num_ms, cdf, ev_server, tmp_dir) + options = BinaryOptions("virtphy", "mobile", None) + test = MassUpdateLocationTest("lu_test", options, args.num_ms, cdf, ev_server, tmp_dir) atexit.register(test.stop_all) # Run until everything has been launched diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index 010c278..87b3e4e 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -56,8 +56,9 @@ TEMPLATE_LUA = "osmo-mobile-lu.lua" TEMPLATE_CFG = "osmo-mobile.cfg" - def __init__(self, name, number_of_ms, cdf_function, event_server, tmp_dir): + def __init__(self, name, options, number_of_ms, cdf_function, event_server, tmp_dir): super().__init__(log.C_RUN, name) + self._binary_options = options self._number_of_ms = number_of_ms self._cdf = cdf_function self._cdf.set_target(number_of_ms) @@ -71,10 +72,12 @@ for i in range(0, number_of_ms): ms_name = "%.5d" % i - phy = OsmoVirtPhy(ms_name, tmp_dir) + phy = OsmoVirtPhy(options.virtphy, options.env, + ms_name, tmp_dir) self._phys.append(phy) - launcher = OsmoMobile(ms_name, tmp_dir, self.TEMPLATE_LUA, + launcher = OsmoMobile(options.mobile, options.env, + ms_name, tmp_dir, self.TEMPLATE_LUA, self.TEMPLATE_CFG, imsi_gen, phy.phy_filename(), event_server.server_path()) diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 5218a57..2ffb33a 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -18,6 +18,7 @@ from osmo_gsm_tester import log, template +import collections import os import os.path import subprocess @@ -26,9 +27,13 @@ _devnull = open(os.devnull, 'w') #_devnull = open('/dev/stdout', 'w') +BinaryOptions = collections.namedtuple("BinaryOptions", ["virtphy", "mobile", "env"]) + class Launcher(log.Origin): - def __init__(self, base_name, name_number, tmp_dir): + def __init__(self, binary, env, base_name, name_number, tmp_dir): super().__init__(log.C_RUN, "{}/{}".format(base_name, name_number)) + self._binary = binary + self._env = env self._name_number = name_number self._tmp_dir = tmp_dir @@ -36,8 +41,8 @@ return self._name_number class OsmoVirtPhy(Launcher): - def __init__(self, name_number, tmp_dir): - super().__init__("osmo-ms-virt-phy", name_number, tmp_dir) + def __init__(self, binary, env, name_number, tmp_dir): + super().__init__(binary, env, "osmo-ms-virt-phy", name_number, tmp_dir) self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number) self._vphy_proc = None @@ -49,9 +54,9 @@ raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename) self.log("Starting virtphy process") - args = ["virtphy", "--l1ctl-sock=" + self._phy_filename] + args = [self._binary, "--l1ctl-sock=" + self._phy_filename] self.log(' '.join(args)) - self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull) + self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env) def verify_ready(self): while True: @@ -65,8 +70,8 @@ self._vphy_proc.terminate() class OsmoMobile(Launcher): - def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): - super().__init__("osmo-ms-mob", name_number, tmp_dir) + def __init__(self, binary, env, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): + super().__init__(binary, env, "osmo-ms-mob", name_number, tmp_dir) self._lua_template = lua_tmpl self._cfg_template = cfg_tmpl self._imsi_ki_generator = imsi_ki_generator @@ -117,9 +122,9 @@ self.log("Starting process") # Let the kernel pick an unused port for the VTY. - args = ["mobile", "-c", mob_filename, "--vty-port=0"] + args = [self._binary, "-c", mob_filename, "--vty-port=0"] self.log(' '.join(args)) - self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull) + self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env) def kill(self): """Clean up things.""" -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 06:51:42 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 5 Nov 2018 06:51:42 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Switch to process.Process from subprocess Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11597 Change subject: ms_driver: Switch to process.Process from subprocess ...................................................................... ms_driver: Switch to process.Process from subprocess Use a single tmp/rundir for all these instances. In the next step we can create separate directories. Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 --- M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/starter.py 2 files changed, 10 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/11597/1 diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py index 265ce47..0e3611b 100644 --- a/src/osmo_ms_driver/__main__.py +++ b/src/osmo_ms_driver/__main__.py @@ -83,7 +83,7 @@ ev_server.listen(loop) # Just a single test for now. - options = BinaryOptions("virtphy", "mobile", None) + options = BinaryOptions("virtphy", "mobile", os.environ) test = MassUpdateLocationTest("lu_test", options, args.num_ms, cdf, ev_server, tmp_dir) atexit.register(test.stop_all) diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 2ffb33a..4611cd6 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -16,17 +16,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from osmo_gsm_tester import log, template +from osmo_gsm_tester import log, process, template import collections import os import os.path -import subprocess import time -_devnull = open(os.devnull, 'w') -#_devnull = open('/dev/stdout', 'w') - BinaryOptions = collections.namedtuple("BinaryOptions", ["virtphy", "mobile", "env"]) class Launcher(log.Origin): @@ -53,10 +49,11 @@ if len(self._phy_filename.encode()) > 107: raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename) - self.log("Starting virtphy process") + self.log("Starting virtphy") args = [self._binary, "--l1ctl-sock=" + self._phy_filename] - self.log(' '.join(args)) - self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env) + self._vphy_proc = process.Process(self.name(), self._tmp_dir, + args, env=self._env) + self._vphy_proc.launch() def verify_ready(self): while True: @@ -120,11 +117,12 @@ lua_filename = self.write_lua_cfg() mob_filename = self.write_mob_cfg(lua_filename, self._phy_filename) - self.log("Starting process") + self.log("Starting mobile") # Let the kernel pick an unused port for the VTY. args = [self._binary, "-c", mob_filename, "--vty-port=0"] - self.log(' '.join(args)) - self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env) + self._omob_proc = process.Process(self.name(), self._tmp_dir, + args, env=self._env) + self._omob_proc.launch() def kill(self): """Clean up things.""" -- To view, visit https://gerrit.osmocom.org/11597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 Gerrit-Change-Number: 11597 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 06:51:42 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 5 Nov 2018 06:51:42 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: use the util.Dir and create one dir per instance Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11598 Change subject: ms_driver: use the util.Dir and create one dir per instance ...................................................................... ms_driver: use the util.Dir and create one dir per instance Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/starter.py 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/98/11598/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index f46efa3..f9ad559 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -16,7 +16,7 @@ # along with this program. If not, see . from datetime import timedelta -from . import log +from . import log, util from osmo_ms_driver.cdf import cdfs from osmo_ms_driver.event_server import EventServer from osmo_ms_driver.simple_loop import SimpleLoop @@ -85,7 +85,8 @@ self._ev_server.listen(self._loop) options = BinaryOptions("virtphy", "mobile", None) self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, - self._ev_server, self.event_server_sk_tmp_dir) + self._ev_server, + util.Dir(self.event_server_sk_tmp_dir)) # TODO: We should pass subscribers down to the test and not get it from # there. diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py index 0e3611b..7e1afa8 100644 --- a/src/osmo_ms_driver/__main__.py +++ b/src/osmo_ms_driver/__main__.py @@ -21,7 +21,7 @@ from .location_update_test import MassUpdateLocationTest from .cdf import cdfs from .starter import BinaryOptions -from osmo_gsm_tester import log +from osmo_gsm_tester import log, util # System modules from datetime import timedelta @@ -64,7 +64,7 @@ loop = SimpleLoop() - tmp_dir = tempfile.mkdtemp(suffix="osmo-ms-driver") + tmp_dir = util.Dir(tempfile.mkdtemp(suffix="osmo-ms-driver")) log.log("Going to store files in ", tmp_dir=tmp_dir) # How long should starting all apps take @@ -73,7 +73,7 @@ time_step=datetime.timedelta(milliseconds=args.launch_interval) # Event server path - event_server_path = os.path.join(tmp_dir, "osmo_ms_driver.unix") + event_server_path = os.path.join(str(tmp_dir), "osmo_ms_driver.unix") # The function that decides when to start something cdf = cdfs[args.cdf_name](time_start, time_step) diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 4611cd6..a24d0c6 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -31,7 +31,7 @@ self._binary = binary self._env = env self._name_number = name_number - self._tmp_dir = tmp_dir + self._tmp_dir = tmp_dir.new_dir(self.name()) def name_number(self): return self._name_number -- To view, visit https://gerrit.osmocom.org/11598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 Gerrit-Change-Number: 11598 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 06:51:43 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 5 Nov 2018 06:51:43 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Consult the suite to get the binaries Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11599 Change subject: ms_driver: Consult the suite to get the binaries ...................................................................... ms_driver: Consult the suite to get the binaries Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/99/11599/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index f9ad559..492c5eb 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -74,6 +74,33 @@ self.event_server_sk_tmp_dir = tempfile.mkdtemp('', 'ogteventserversk') return os.path.join(self.event_server_sk_tmp_dir, 'osmo_ms_driver.unix') + def build_binary_options(self): + """Builds an instance of BinaryOptions. + + Populates the BinaryOptions by searching the virtphy and mobile + application within the trial directory. + """ + + # Get the base directory for the virtphy/mobile application + inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) + + # Assume these are dynamically linked and verify there is a lib dir. + lib = inst.child('lib') + if not os.path.isdir(lib): + raise RuntimeError('No lib/ in %r' % inst) + env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + + def check_and_return_binary(name): + """Checks the binary exists and returns the path.""" + binary = inst.child('bin', name) + if not os.path.isfile(name): + raise RuntimeError('Binary missing: %r' % binary) + return binary + + virtphy = check_and_return_binary('virtphy') + mobile = check_and_return_binary('mobile') + return BinaryOptions(virtphy, mobile, env) + def configure(self): """ Configures the subscribers, tests and registration server. Needs to be @@ -83,10 +110,10 @@ self._ev_server = EventServer("ev_server", event_server_path) self._ev_server.listen(self._loop) - options = BinaryOptions("virtphy", "mobile", None) + options = self.build_binary_options() self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, self._ev_server, - util.Dir(self.event_server_sk_tmp_dir)) + util.Dir(self.suite_run.get_test_run_dir())) # TODO: We should pass subscribers down to the test and not get it from # there. -- To view, visit https://gerrit.osmocom.org/11599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 Gerrit-Change-Number: 11599 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:11:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 09:11:05 +0000 Subject: Change in osmo-ci[master]: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs ...................................................................... Patch Set 4: Code-Review+1 That's exactly the thing I've been looking for - will add corresponding pcu tests once this is merged. -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 09:11:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:25:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:25:14 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log RACH requests in GSMTAP In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11567 ) Change subject: ttcn3-bts-test: Log RACH requests in GSMTAP ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idae872492a6cf3306fb2e636c54038caa600646b Gerrit-Change-Number: 11567 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 09:25:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:25:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:25:16 +0000 Subject: Change in docker-playground[master]: ttcn3-bts-test: Log RACH requests in GSMTAP In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11567 ) Change subject: ttcn3-bts-test: Log RACH requests in GSMTAP ...................................................................... ttcn3-bts-test: Log RACH requests in GSMTAP Change-Id: Idae872492a6cf3306fb2e636c54038caa600646b --- M ttcn3-bts-test/osmo-bts.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg index 04a9d17..c2ba83f 100644 --- a/ttcn3-bts-test/osmo-bts.cfg +++ b/ttcn3-bts-test/osmo-bts.cfg @@ -64,6 +64,7 @@ paging queue-size 200 paging lifetime 0 uplink-power-target -75 + gsmtap-sapi rach gsmtap-sapi agch gsmtap-sapi bcch gsmtap-sapi pch -- To view, visit https://gerrit.osmocom.org/11567 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idae872492a6cf3306fb2e636c54038caa600646b Gerrit-Change-Number: 11567 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:27:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:27:00 +0000 Subject: Change in osmo-dev[master]: sanitize.opts: add --enable-sanitize to ALL builds In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11593 ) Change subject: sanitize.opts: add --enable-sanitize to ALL builds ...................................................................... Patch Set 1: You probably don't want to enable sanitize in osmo-trx. In that case, it's fine enabling it for dependant libosmocore, just remember to load libasan first using LD_PRELOAD when running it. -- To view, visit https://gerrit.osmocom.org/11593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 Gerrit-Change-Number: 11593 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 09:27:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:28:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 5 Nov 2018 09:28:25 +0000 Subject: Change in osmo-ci[master]: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 09:28:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:28:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 5 Nov 2018 09:28:28 +0000 Subject: Change in osmo-ci[master]: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs ...................................................................... jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs New JJB config, that is able to generate all jobs in the TTCN3 tab at Jenkins: The new *-latest jobs test against the latest stable releases. Existing jobs are not overwritten (this is commented out). ttcn3-bsc-test-sccplite-latest is disabled for now, because it hangs forever. Related: OS#3268 Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 --- A jobs/ttcn3-testsuites.yml 1 file changed, 106 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve osmith: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml new file mode 100644 index 0000000..b4c526c --- /dev/null +++ b/jobs/ttcn3-testsuites.yml @@ -0,0 +1,106 @@ +--- +- project: + name: 'ttcn3-testsuites' + concurrent: false + disabled: false + timer: "@midnight" + jobs: + - "{job-name}" + # Folders from docker-playground.git + job-name: + # nightly (overwrites the existing, manually created jobs!) + # - nplab-m3ua-test: + # timer: 00 03 * * * + # - nplab-sua-test: + # timer: 15 03 * * * + # - ttcn3-bsc-test: + # timer: 00 06 * * * + # - ttcn3-bsc-test-sccplite: + # timer: 30 08 * * * + # - ttcn3-bts-test: + # timer: 00 07 * * * + # - ttcn3-ggsn-test: + # timer: 00 04 * * * + # - ttcn3-hlr-test: + # timer: 45 06 * * * + # - ttcn3-mgw-test: + # timer: 30 06 * * * + # - ttcn3-msc-test: + # timer: 30 04 * * * + # - ttcn3-sgsn-test: + # timer: 30 05 * * * + # - ttcn3-sip-test: + # timer: 00 07 * * * + + # latest stable + - nplab-m3ua-test-latest + - nplab-sua-test-latest + - ttcn3-bsc-test-latest + - ttcn3-bsc-test-sccplite-latest: + disabled: true + - ttcn3-bts-test-latest + - ttcn3-ggsn-test-latest + - ttcn3-hlr-test-latest + - ttcn3-mgw-test-latest + - ttcn3-msc-test-latest + - ttcn3-sgsn-test-latest + - ttcn3-sip-test-latest +- job-template: + name: '{job-name}' + project-type: freestyle + disabled: '{obj:disabled}' + defaults: global + description: | + Run the {job-name} testsuite from + docker-playground.git.
+ If this job ends in -latest, the job runs the latest stable versions of the Osmocom stack. + Otherwise the nightly builds.
+ Generated with the jenkins-job-builder config introduced in + OS#3268.
+ See + TTCN3 Testsuite for more information. + node: ttcn3 + parameters: + - string: + name: BRANCH + description: | + Branch of docker-playground.git. + Only modify if you are hacking on the docker-playground scripts. + default: '*/master' + + builders: + - shell: |- + case "{job-name}" in + *-latest) + cd "$(echo "{job-name}" | sed s/\-latest$//)" + IMAGE_SUFFIX="latest" ./jenkins.sh + ;; + *) + cd "{job-name}" + IMAGE_SUFFIX="master" ./jenkins.sh + ;; + esac + scm: + - git: + branches: + - '$BRANCH' + url: git://git.osmocom.org/docker-playground + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins at osmocom.org' + triggers: + - timed: "{obj:timer}" + publishers: + - junit: + results: '**/junit-xml-*.log' + allow-empty-results: false + - email: + notify-every-unstable-build: true + recipients: laforge at gnumonks.org + send-to-individuals: false + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "^{job-name}.*" + +# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:28:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:28:29 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: add --enable-sanitize In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11592 ) Change subject: configure.ac: add --enable-sanitize ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11592/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11592/1//COMMIT_MSG at 11 PS1, Line 11: osmo-sip-connector cannot be : linked if it doesn't include asan as well. > Hmm, I always thought that it should not be a problem. [?] You usually need to preload libasan with LD_PRELOAD in that case. -- To view, visit https://gerrit.osmocom.org/11592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18761802db2f29d9f0c7f269197d5b5e191142c5 Gerrit-Change-Number: 11592 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 09:28:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:28:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:28:32 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: add --enable-sanitize In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11592 ) Change subject: configure.ac: add --enable-sanitize ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18761802db2f29d9f0c7f269197d5b5e191142c5 Gerrit-Change-Number: 11592 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 09:28:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:44:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:44:08 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Initialize event_server_sk_tmp_dira in ctor In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11594 ) Change subject: ms_driver: Initialize event_server_sk_tmp_dira in ctor ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11594/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11594/1//COMMIT_MSG at 7 PS1, Line 7: ms_driver: Initialize event_server_sk_tmp_dira in ctor typo "dira" -- To view, visit https://gerrit.osmocom.org/11594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 Gerrit-Change-Number: 11594 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 09:44:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:44:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:44:16 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Initialize event_server_sk_tmp_dira in ctor In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11594 ) Change subject: ms_driver: Initialize event_server_sk_tmp_dira in ctor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 Gerrit-Change-Number: 11594 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 09:44:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:44:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:44:53 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Use terminate not kill and initialize in ctor In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11595 ) Change subject: ms_driver: Use terminate not kill and initialize in ctor ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b Gerrit-Change-Number: 11595 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 09:44:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:49:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 5 Nov 2018 09:49:30 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: replace manually generated jobs Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11600 Change subject: ttcn3-testsuites: replace manually generated jobs ...................................................................... ttcn3-testsuites: replace manually generated jobs Let all TTCN3 related Jenkins jobs get generated by ttcn3-testsuites.yml, overwriting the old manually generated jobs. Related: OS#3268 Change-Id: Ib4c0949d21fcbc16c61c6ffe9d3eedea198aaf1d --- M jobs/ttcn3-testsuites.yml 1 file changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/00/11600/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index b4c526c..fc4f306 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -8,29 +8,29 @@ - "{job-name}" # Folders from docker-playground.git job-name: - # nightly (overwrites the existing, manually created jobs!) - # - nplab-m3ua-test: - # timer: 00 03 * * * - # - nplab-sua-test: - # timer: 15 03 * * * - # - ttcn3-bsc-test: - # timer: 00 06 * * * - # - ttcn3-bsc-test-sccplite: - # timer: 30 08 * * * - # - ttcn3-bts-test: - # timer: 00 07 * * * - # - ttcn3-ggsn-test: - # timer: 00 04 * * * - # - ttcn3-hlr-test: - # timer: 45 06 * * * - # - ttcn3-mgw-test: - # timer: 30 06 * * * - # - ttcn3-msc-test: - # timer: 30 04 * * * - # - ttcn3-sgsn-test: - # timer: 30 05 * * * - # - ttcn3-sip-test: - # timer: 00 07 * * * + # nightly + - nplab-m3ua-test: + timer: 00 03 * * * + - nplab-sua-test: + timer: 15 03 * * * + - ttcn3-bsc-test: + timer: 00 06 * * * + - ttcn3-bsc-test-sccplite: + timer: 30 08 * * * + - ttcn3-bts-test: + timer: 00 07 * * * + - ttcn3-ggsn-test: + timer: 00 04 * * * + - ttcn3-hlr-test: + timer: 45 06 * * * + - ttcn3-mgw-test: + timer: 30 06 * * * + - ttcn3-msc-test: + timer: 30 04 * * * + - ttcn3-sgsn-test: + timer: 30 05 * * * + - ttcn3-sip-test: + timer: 00 07 * * * # latest stable - nplab-m3ua-test-latest -- To view, visit https://gerrit.osmocom.org/11600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4c0949d21fcbc16c61c6ffe9d3eedea198aaf1d Gerrit-Change-Number: 11600 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:50:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 5 Nov 2018 09:50:41 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: replace manually generated jobs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11600 ) Change subject: ttcn3-testsuites: replace manually generated jobs ...................................................................... Patch Set 1: Verified+1 This is rolled out on Jenkins. Follow up to: https://gerrit.osmocom.org/#/c/osmo-ci/+/11370/ -- To view, visit https://gerrit.osmocom.org/11600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4c0949d21fcbc16c61c6ffe9d3eedea198aaf1d Gerrit-Change-Number: 11600 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 09:50:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:53:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:53:25 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11596 ) Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11596/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11596/1//COMMIT_MSG at 11 PS1, Line 11: direcyly (e.g. need a LD_LIBRARY_PATH to be applied). directly -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 09:53:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:53:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 5 Nov 2018 09:53:34 +0000 Subject: Change in osmo-ci[master]: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11370 ) Change subject: jobs: ttcn3-testsuites.yml for ttcn3/nplab jobs ...................................................................... Patch Set 5: > if you're not overwriting the manual jobs, have you tested that this yml file works? I have tested the "-latest" jobs several times, they were already generated. > As soon as this file generates working jenkins jobs, let's drop the current "manual" jobs completely. Done. I've first checked that "ttcn3-mgw-test" is still working after replacing it. After updating it with jenkins job builder, I ran it once and except for "TC_two_crcx_and_one_mdcx_rtp_ho" which already failed sporadically 7 builds earlier, everything went through like the previous run. Follow-up: https://gerrit.osmocom.org/#/c/osmo-ci/+/11600/ -- To view, visit https://gerrit.osmocom.org/11370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie433925ee81a61c5788b4a6f2bc5b89c2689d251 Gerrit-Change-Number: 11370 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 09:53:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 09:57:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 09:57:58 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Switch to process.Process from subprocess In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11597 ) Change subject: ms_driver: Switch to process.Process from subprocess ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11597/1/src/osmo_ms_driver/starter.py File src/osmo_ms_driver/starter.py: https://gerrit.osmocom.org/#/c/11597/1/src/osmo_ms_driver/starter.py at 56 PS1, Line 56: self._vphy_proc.launch() You are missing before launch: self.suite_run.remember_to_stop(self._vphy_proc) https://gerrit.osmocom.org/#/c/11597/1/src/osmo_ms_driver/starter.py at 125 PS1, Line 125: self._omob_proc.launch() You are missing before launch: self.suite_run.remember_to_stop(self._omob_proc) -- To view, visit https://gerrit.osmocom.org/11597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 Gerrit-Change-Number: 11597 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 09:57:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 10:04:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 10:04:45 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Consult the suite to get the binaries In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11599 ) Change subject: ms_driver: Consult the suite to get the binaries ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 Gerrit-Change-Number: 11599 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 10:04:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 10:06:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 10:06:20 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10687 ) Change subject: suits: Add an initial test for the ms_driver ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 8 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 10:06:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 10:23:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 10:23:40 +0000 Subject: Change in osmo-gsm-tester[master]: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11580 ) Change subject: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11580/2/contrib/jenkins-build-common.sh File contrib/jenkins-build-common.sh: https://gerrit.osmocom.org/#/c/11580/2/contrib/jenkins-build-common.sh at 180 PS2, Line 180: # (Osmocom) libraries in `basepath /proc/self/exe`/../lib/. Adds an Shouldn't this be dirname instead of basepath? It's quoted as a subshell but at least my shell doesn't have basepath cmd. https://gerrit.osmocom.org/#/c/11580/2/contrib/jenkins-build-common.sh at 189 PS2, Line 189: find bin -depth -type f -exec patchelf --set-rpath '$ORIGIN/../lib/' {} \; Please document in the comments above that this $ORIGIN variable is actually not a shell variable, but one replaced by the linker to be the dirname from where the process is run. I was first really confused about this until I looked it up on the search engine. -- To view, visit https://gerrit.osmocom.org/11580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 Gerrit-Change-Number: 11580 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 10:23:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 10:32:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 10:32:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11562 ) Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11562/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11562/3//COMMIT_MSG at 11 PS3, Line 11: and since notification to RSL Emulation happens async, it : can happen (verified) that ChanRqd message from BTS arrives and is : handled before we register the RACH req into the ConnectionTable > one option that could be investigated is to temporarily pause processing of any RSL events until you [?] I think current implementation is fine, since anyway we check for correct FN during RSL.receive() match in f_rach_req_wait_chan_rqd -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 05 Nov 2018 10:32:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 10:50:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 10:50:08 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 10:50:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 10:53:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 10:53:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: add bts-loop tests In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11559 ) Change subject: BSC LCLS: add bts-loop tests ...................................................................... Patch Set 3: Not sure how ATM. So far the plan is to implement MSC side and test with real hw, than adjust tests if necessary. Would be nice to be able to test purely in TTCN as well but that would require implementing proper RTP receiver - not sure how much effort it is. -- To view, visit https://gerrit.osmocom.org/11559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e786b430591899c722d99d685db26efa868508 Gerrit-Change-Number: 11559 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 10:53:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 10:55:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 10:55:14 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: replace manually generated jobs In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11600 ) Change subject: ttcn3-testsuites: replace manually generated jobs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4c0949d21fcbc16c61c6ffe9d3eedea198aaf1d Gerrit-Change-Number: 11600 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 10:55:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 11:00:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 11:00:56 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: replace manually generated jobs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11600 ) Change subject: ttcn3-testsuites: replace manually generated jobs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib4c0949d21fcbc16c61c6ffe9d3eedea198aaf1d Gerrit-Change-Number: 11600 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 11:00:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 11:31:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 5 Nov 2018 11:31:27 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 4: Code-Review-1 (19 comments) https://gerrit.osmocom.org/#/c/11560/4/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11560/4/src/gits at 1 PS4, Line 1: #!/usr/bin/env python3 Add the copyright and SPDX license lines here? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 2 PS4, Line 2: argparse argparse is not used. But I would highly recommend to use it: * the help output would look like in any other python program * right now "./gits -h" runs "git -h" in every directory instead of printing the help output * no wheel-reinventing for checking the arguments, cmd_help(), having aliases https://gerrit.osmocom.org/#/c/11560/4/src/gits at 11 PS4, Line 11: re_status_mods = re.compile('^\t(modified|deleted):.*') This is only used once in the code. There are other regex patterns, that are not global variables in this file. So I'd recommend to follow that pattern and move this to the function where it is needed. https://gerrit.osmocom.org/#/c/11560/4/src/gits at 29 PS4, Line 29: print(' '.join(cmd)) How about differentiating the command from the output it produces? For example with a leading '>' character: > git -C osmo-mgw status On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working dir clean https://gerrit.osmocom.org/#/c/11560/4/src/gits at 37 PS4, Line 37: sys.stderr.flush() why flush the output only when the section_marker is needed? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 45 PS4, Line 45: m how about "branch" as variable name? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 68 PS4, Line 68: up to date With git 2.11.0 I get: unknown status str: "Your branch is up-to-date with 'origin/master'." (There's "git status --porcelain" which is meant to be parsed, but it doesn't print the branch line - maybe there's an appropriate git plumbing command with stable output that can be used instead?) https://gerrit.osmocom.org/#/c/11560/4/src/gits at 79 PS4, Line 79: m How about "status"? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 87 PS4, Line 87: here are two empty lines after the function, mostly this file has one empty line instead. PEP8 would be using two empty lines between each function. https://gerrit.osmocom.org/#/c/11560/4/src/gits at 89 PS4, Line 89: '''return a list of strings: [branchname, info0, info1,...]''' it's not clear what info0, info1 etc. would be. Maybe add examples with actual strings? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 91 PS4, Line 91: interesting_branch_names = [ 'master' ] : : strs = [git_dir,] (inconsistent: [ text ] vs [text,]) How about renaming "strs" to "ret" to indicate that this will be returned? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 122 PS4, Line 122: strs.append(''.join(branch_info)) why make a list first, and then join it? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 194 PS4, Line 194: print('\n===== %s =====' % git_dir) If we print out something like "> cd %s && %s" before the output of the command, it would be consistent with executing git in every folder. https://gerrit.osmocom.org/#/c/11560/4/src/gits at 200 PS4, Line 200: SkipThisRepos How about "SkipThisRepo"? repo is commonly used to abbreviate repository, so when reading "repos" I'm thinking this is a plural form. https://gerrit.osmocom.org/#/c/11560/4/src/gits at 207 PS4, Line 207: repos "repo"? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 223 PS4, Line 223: if v == answer: : return answer : if v == '*': : return answer how about: if v in (answer, "*"): return answer (somehow gerrit puts this comment in a single line without writing something below the code block) https://gerrit.osmocom.org/#/c/11560/4/src/gits at 227 PS4, Line 227: if v == '+' and len(answer) > 0: (the > 0 is not needed) https://gerrit.osmocom.org/#/c/11560/4/src/gits at 359 PS4, Line 359: cmd_do(sys.argv[1:]) I'm not sure if it's a good idea to perform "do" by default - whenever there's a typo in any of the actions, it will be executed in every directory. https://gerrit.osmocom.org/#/c/11560/4/src/gits at 362 PS4, Line 362: # vim: shiftwidth=2 expandtab tabstop=2 Since there are not Python coding guidelines in the wiki yet: https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards How about following PEP8 (Style Guide for Python Code) instead? https://www.python.org/dev/peps/pep-0008/ "Use 4 spaces per indentation level." There are nice tools like "flake8" which automatically check the formatting, and also auto formatting tools like "autopep8". -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 05 Nov 2018 11:31:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 11:45:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 5 Nov 2018 11:45:23 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: replace manually generated jobs In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11600 ) Change subject: ttcn3-testsuites: replace manually generated jobs ...................................................................... ttcn3-testsuites: replace manually generated jobs Let all TTCN3 related Jenkins jobs get generated by ttcn3-testsuites.yml, overwriting the old manually generated jobs. Related: OS#3268 Change-Id: Ib4c0949d21fcbc16c61c6ffe9d3eedea198aaf1d --- M jobs/ttcn3-testsuites.yml 1 file changed, 23 insertions(+), 23 deletions(-) Approvals: osmith: Verified Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index b4c526c..fc4f306 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -8,29 +8,29 @@ - "{job-name}" # Folders from docker-playground.git job-name: - # nightly (overwrites the existing, manually created jobs!) - # - nplab-m3ua-test: - # timer: 00 03 * * * - # - nplab-sua-test: - # timer: 15 03 * * * - # - ttcn3-bsc-test: - # timer: 00 06 * * * - # - ttcn3-bsc-test-sccplite: - # timer: 30 08 * * * - # - ttcn3-bts-test: - # timer: 00 07 * * * - # - ttcn3-ggsn-test: - # timer: 00 04 * * * - # - ttcn3-hlr-test: - # timer: 45 06 * * * - # - ttcn3-mgw-test: - # timer: 30 06 * * * - # - ttcn3-msc-test: - # timer: 30 04 * * * - # - ttcn3-sgsn-test: - # timer: 30 05 * * * - # - ttcn3-sip-test: - # timer: 00 07 * * * + # nightly + - nplab-m3ua-test: + timer: 00 03 * * * + - nplab-sua-test: + timer: 15 03 * * * + - ttcn3-bsc-test: + timer: 00 06 * * * + - ttcn3-bsc-test-sccplite: + timer: 30 08 * * * + - ttcn3-bts-test: + timer: 00 07 * * * + - ttcn3-ggsn-test: + timer: 00 04 * * * + - ttcn3-hlr-test: + timer: 45 06 * * * + - ttcn3-mgw-test: + timer: 30 06 * * * + - ttcn3-msc-test: + timer: 30 04 * * * + - ttcn3-sgsn-test: + timer: 30 05 * * * + - ttcn3-sip-test: + timer: 00 07 * * * # latest stable - nplab-m3ua-test-latest -- To view, visit https://gerrit.osmocom.org/11600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib4c0949d21fcbc16c61c6ffe9d3eedea198aaf1d Gerrit-Change-Number: 11600 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 11:48:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 11:48:15 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11596 ) Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... Patch Set 1: test is failing with following error: --- /home/jenkins/workspace/osmo-gsm-tester_gerrit/osmo-gsm-tester/selftest/trial_test.err +++ got @@ -0,0 +1,10 @@ +Traceback (most recent call last): + File "/home/jenkins/workspace/osmo-gsm-tester_gerrit/osmo-gsm-tester/selftest/trial_test.py", line 7, in + from osmo_gsm_tester.trial import Trial + File "/home/jenkins/workspace/osmo-gsm-tester_gerrit/osmo-gsm-tester/selftest/../src/osmo_gsm_tester/trial.py", line 25, in + from . import log, util, suite, report + File "/home/jenkins/workspace/osmo-gsm-tester_gerrit/osmo-gsm-tester/selftest/../src/osmo_gsm_tester/suite.py", line 26, in + from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon, ms_driver + File "/home/jenkins/workspace/osmo-gsm-tester_gerrit/osmo-gsm-tester/selftest/../src/osmo_gsm_tester/ms_driver.py", line 23, in + from osmo_ms_driver.location_update_test import BinaryOptions, MassUpdateLocationTest +ImportError: cannot import name 'BinaryOptions' output mismatch: 'trial_test.err' Test failed: 'trial_test.py' -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 11:48:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 14:01:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 14:01:20 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 05 Nov 2018 14:01:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 14:01:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 14:01:24 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11601 ) Change subject: Support cipher mode reject with extended cause ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 05 Nov 2018 14:01:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 14:21:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 14:21:52 +0000 Subject: Change in libosmocore[master]: Fix deprecation warning in gsm0808_test In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11602 ) Change subject: Fix deprecation warning in gsm0808_test ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44772666c929dfd94d25953379cf51b371ce202c Gerrit-Change-Number: 11602 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 05 Nov 2018 14:21:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 14:27:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 14:27:45 +0000 Subject: Change in libosmocore[master]: Fix deprecation warning in gsm0808_test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11602 ) Change subject: Fix deprecation warning in gsm0808_test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44772666c929dfd94d25953379cf51b371ce202c Gerrit-Change-Number: 11602 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 14:27:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 14:28:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 14:28:50 +0000 Subject: Change in libosmocore[master]: Fix deprecation warning in gsm0808_test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11602 ) Change subject: Fix deprecation warning in gsm0808_test ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11602/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11602/1//COMMIT_MSG at 7 PS1, Line 7: Fix deprecation warning in gsm0808_test I'd usually welcome a "test: " or "tests: " prefix in this kind of commits, but fine anyway :-) -- To view, visit https://gerrit.osmocom.org/11602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44772666c929dfd94d25953379cf51b371ce202c Gerrit-Change-Number: 11602 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 05 Nov 2018 14:28:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 14:32:27 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 5 Nov 2018 14:32:27 +0000 Subject: Change in osmo-bsc[master]: gsm_data: make cgi_for_msc available for other modules In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11527 to look at the new patch set (#2). Change subject: gsm_data: make cgi_for_msc available for other modules ...................................................................... gsm_data: make cgi_for_msc available for other modules The function cgi_for_msc() provides an easy way to get a cell global id for an msc/bts combination. This function is currently statically defined in gsm_08_08.c. Lets move it to gsm_data.c and make it publicly available. Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d Related: OS#3645 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/gsm_data.c 3 files changed, 18 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/11527/2 -- To view, visit https://gerrit.osmocom.org/11527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d Gerrit-Change-Number: 11527 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 14:53:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 14:53:55 +0000 Subject: Change in osmo-ci[master]: TTCN-3: add PCU tests Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11603 Change subject: TTCN-3: add PCU tests ...................................................................... TTCN-3: add PCU tests Change-Id: Ifee0373cd920e80486cb40cb872f2be1e736ef06 Related: OS#2890 --- M jobs/ttcn3-testsuites.yml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/03/11603/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index fc4f306..294a9d5 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -27,6 +27,8 @@ timer: 30 06 * * * - ttcn3-msc-test: timer: 30 04 * * * + - ttcn3-pcu-test: + timer: 30 01 * * * - ttcn3-sgsn-test: timer: 30 05 * * * - ttcn3-sip-test: @@ -43,6 +45,7 @@ - ttcn3-hlr-test-latest - ttcn3-mgw-test-latest - ttcn3-msc-test-latest + - ttcn3-pcu-test-latest - ttcn3-sgsn-test-latest - ttcn3-sip-test-latest - job-template: -- To view, visit https://gerrit.osmocom.org/11603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifee0373cd920e80486cb40cb872f2be1e736ef06 Gerrit-Change-Number: 11603 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 5 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 5 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#298?= In-Reply-To: <1946985534.420.1541344207294.JavaMail.jenkins@jenkins.osmocom.org> References: <1946985534.420.1541344207294.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1591322793.436.1541430607268.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 5 15:22:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 15:22:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_paging_resp_unsol Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11604 Change subject: bsc: Introduce test TC_paging_resp_unsol ...................................................................... bsc: Introduce test TC_paging_resp_unsol With this test we want to verify that channels are released if BSC fails to complete an L3 request, for instance because no pending Paging CMD is found for a received Paging Response. Related: OS#3680 Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce --- M bsc/BSC_Tests.ttcn 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/11604/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ae855bd..b953b71 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1455,6 +1455,29 @@ f_shutdown_helper(); } +/* Verify how we handle unsolicited Paging Response, for instance because we + receive a Paging Response after T3113 expired (and subscriber information was + dropped). See OS#3680. */ +testcase TC_paging_resp_unsol() runs on test_CT { + + f_init(1); + + var BSSAP_N_CONNECT_ind rx_c_ind; + var DchanTuple dt; + var PDU_ML3_MS_NW l3 := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010008880018'H)))); + + /* Send CHAN RQD and wait for allocation; acknowledge it */ + dt.rsl_chan_nr := f_chreq_act_ack(); + + /* Send unsolicited Paging response (no matching Paging CMD stored in BSC) */ + f_ipa_tx(0, ts_RSL_EST_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)), enc_PDU_ML3_MS_NW(l3))); + + /* expect BSC to disable the channel */ + f_expect_chan_rel(0, dt.rsl_chan_nr); + setverdict(pass); + +} + /* Test RSL link drop causes counter increment */ testcase TC_rsl_drop_counter() runs on test_CT { var integer rsl_fail; @@ -3047,6 +3070,7 @@ execute( TC_paging_imsi_a_reset() ); execute( TC_paging_imsi_load() ); execute( TC_paging_counter() ); + execute( TC_paging_resp_unsol() ); execute( TC_rsl_drop_counter() ); execute( TC_rsl_unknown_unit_id() ); -- To view, visit https://gerrit.osmocom.org/11604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce Gerrit-Change-Number: 11604 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 15:24:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 15:24:06 +0000 Subject: Change in osmo-bsc[master]: bsc: gsm0808: Fix return code in bsc_compl_l3 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11605 Change subject: bsc: gsm0808: Fix return code in bsc_compl_l3 ...................................................................... bsc: gsm0808: Fix return code in bsc_compl_l3 complete_layer3 returns true if everything succeeded, false otherwise. However, its caller bsc_compl_l3 returns unix style (0 sucess, negative error). This commit has no real effect since only caller of bsc_compl_l3 never checks return code, but will check it in the future. Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/11605/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 19c2598..7e5b909 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -382,7 +382,7 @@ return -1; } - return complete_layer3(conn, msg, msc); + return complete_layer3(conn, msg, msc) ? 0 : -1; } static int handle_page_resp(struct gsm_subscriber_connection *conn, struct msgb *msg) -- To view, visit https://gerrit.osmocom.org/11605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 Gerrit-Change-Number: 11605 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 15:24:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 15:24:07 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11606 Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... gsm0408_rcvmsg: Release lchan if L3 fails to complete Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 --- M src/osmo-bsc/gsm_04_08_rr.c M tests/gsm0408/gsm0408_test.c 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/11606/1 diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 4659c1a..0f72ab7 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -927,6 +927,7 @@ int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) { struct gsm_lchan *lchan; + int rc; lchan = msg->lchan; if (!lchan_may_receive_data(lchan)) { @@ -948,7 +949,11 @@ lchan->conn->lchan = lchan; /* fwd via bsc_api to send COMPLETE L3 INFO to MSC */ - bsc_compl_l3(lchan->conn, msg, 0); + rc = bsc_compl_l3(lchan->conn, msg, 0); + if (rc < 0) { + gscon_release_lchans(lchan->conn, false); + return -1; + } /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */ } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index faeca39..8906e5b 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -952,6 +952,10 @@ OSMO_ASSERT(0); } +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact) { + OSMO_ASSERT(0); +} + bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 16:11:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 5 Nov 2018 16:11:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11607 Change subject: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template ...................................................................... BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template The receive template for the BSSMAP HANDOVER PERFORMED MESSAGE is imissing, lets add one. Related OS#3645 Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae --- M library/BSSMAP_Templates.ttcn 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/11607/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 118168e..d00a5ab 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -823,6 +823,26 @@ } } +template PDU_BSSAP tr_BSSMAP_HandoverPerformed +modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverPerformed := { + messageType := '17'O, + cause := ?, + cellIdentifier := ?, + chosenChannel := omit, + chosenEncryptionAlgorithm := omit, + lSAIdentifier := omit, + talkerPriority := omit, + codecList := omit, + speechCodec := omit, + lCLS_BSS_Status := omit + } + } + } +} + template BSSMAP_IE_IMSI ts_BSSMAP_Imsi(hexstring imsi_digits) := { elementIdentifier := '08'O, lengthIndicator := 0, /* overwritten */ -- To view, visit https://gerrit.osmocom.org/11607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae Gerrit-Change-Number: 11607 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 19:23:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 19:23:07 +0000 Subject: Change in osmocom-bb[master]: cosmetic: fix trailing whitespace Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11608 Change subject: cosmetic: fix trailing whitespace ...................................................................... cosmetic: fix trailing whitespace Change-Id: I5c1a6d98079ad846d114584a17ba9d80d95e0595 --- M src/host/layer23/src/common/gps.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/08/11608/1 diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c index e9aaa97..3ec7377 100644 --- a/src/host/layer23/src/common/gps.c +++ b/src/host/layer23/src/common/gps.c @@ -234,7 +234,7 @@ if (line[23] == 'W') longitude = 360.0 - longitude; g.longitude = longitude; - + LOGP(DGPS, LOGL_DEBUG, "%s\n", line); LOGP(DGPS, LOGL_INFO, " time=%02d:%02d:%02d %04d-%02d-%02d, " "diff-to-host=%d, latitude=%do%.4f, longitude=%do%.4f\n", @@ -324,8 +324,8 @@ case 38400: baud = B38400; break; case 57600: - baud = B57600; break; - case 115200: + baud = B57600; break; + case 115200: baud = B115200; break; } @@ -399,4 +399,3 @@ return; } } - -- To view, visit https://gerrit.osmocom.org/11608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5c1a6d98079ad846d114584a17ba9d80d95e0595 Gerrit-Change-Number: 11608 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 19:23:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 19:23:07 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix build against gpsd >= 3.18 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11609 Change subject: layer23: Fix build against gpsd >= 3.18 ...................................................................... layer23: Fix build against gpsd >= 3.18 Change-Id: I0e97d3e8c3688064c959ea60ecef50cfbbc1bcd6 --- M src/host/layer23/src/common/gps.c 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/11609/1 diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c index 3ec7377..35ee416 100644 --- a/src/host/layer23/src/common/gps.c +++ b/src/host/layer23/src/common/gps.c @@ -60,9 +60,20 @@ #if GPSD_API_MAJOR_VERSION >= 5 static struct gps_data_t _gdata; -#define gps_poll gps_read #endif +static inline int compat_gps_read(struct gps_data_t *data) +{ +/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ +#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 + return gps_read(data, NULL, 0); +#elif GPSD_API_MAJOR_VERSION >= 5 + return gps_read(data); +#else + return gps_poll(data); +#endif +} + int osmo_gpsd_cb(struct osmo_fd *bfd, unsigned int what) { struct tm *tm; @@ -85,7 +96,7 @@ #endif /* polling returned an error */ - if (gps_poll(gdata)) + if (compat_gps_read(gdata)) goto gps_not_ready; /* data are valid */ -- To view, visit https://gerrit.osmocom.org/11609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0e97d3e8c3688064c959ea60ecef50cfbbc1bcd6 Gerrit-Change-Number: 11609 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 19:37:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 5 Nov 2018 19:37:52 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid mempcy with NULL src Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11610 Change subject: layer23: Avoid mempcy with NULL src ...................................................................... layer23: Avoid mempcy with NULL src Fixes following ASan warning: git/osmocom-bb/src/host/layer23/src/misc/../common/main.c:146:2: runtime error: null pointer passed as argument 2, which is declared to never be null The warning however is harmless since in that case, app_len = 0 and thus size to copy is 0. Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 --- M src/host/layer23/src/common/main.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/11610/1 diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 693b10e..d19c507 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -143,7 +143,8 @@ *option = talloc_zero_array(l23_ctx, struct option, len + app_len + 1); memcpy(*option, long_options, sizeof(long_options)); - memcpy(*option + len, app_opp, app_len * sizeof(struct option)); + if (app && app->cfg_getopt_opt) + memcpy(*option + len, app_opp, app_len * sizeof(struct option)); } static void handle_options(int argc, char **argv) -- To view, visit https://gerrit.osmocom.org/11610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 Gerrit-Change-Number: 11610 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 21:39:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 21:39:08 +0000 Subject: Change in osmocom-bb[master]: cosmetic: fix trailing whitespace In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11608 ) Change subject: cosmetic: fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c1a6d98079ad846d114584a17ba9d80d95e0595 Gerrit-Change-Number: 11608 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 21:39:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 21:40:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 21:40:32 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix build against gpsd >= 3.18 In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11609 ) Change subject: layer23: Fix build against gpsd >= 3.18 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e97d3e8c3688064c959ea60ecef50cfbbc1bcd6 Gerrit-Change-Number: 11609 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 21:40:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 21:41:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 21:41:04 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid mempcy with NULL src In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11610 ) Change subject: layer23: Avoid mempcy with NULL src ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 Gerrit-Change-Number: 11610 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 21:41:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 22:19:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 22:19:35 +0000 Subject: Change in osmo-bsc[master]: bsc: gsm0808: Fix return code in bsc_compl_l3 In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11605 ) Change subject: bsc: gsm0808: Fix return code in bsc_compl_l3 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 Gerrit-Change-Number: 11605 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 22:19:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 22:22:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 22:22:52 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11606 ) Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11606/1/src/osmo-bsc/gsm_04_08_rr.c File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/#/c/11606/1/src/osmo-bsc/gsm_04_08_rr.c at 955 PS1, Line 955: return -1; I think you could just 'return rc' from here. https://gerrit.osmocom.org/#/c/11606/1/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/11606/1/tests/gsm0408/gsm0408_test.c at 955 PS1, Line 955: gscon_release_lchans Could you please clarify, how is this related to the change? You're introducing a new symbol that is not used anywhere. -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 22:22:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 22:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 22:24:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_paging_resp_unsol In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11604 ) Change subject: bsc: Introduce test TC_paging_resp_unsol ...................................................................... Patch Set 1: Code-Review+1 What about 'bsc/expected-results.xml'? -- To view, visit https://gerrit.osmocom.org/11604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce Gerrit-Change-Number: 11604 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 22:24:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 22:37:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 22:37:36 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11601 ) Change subject: Support cipher mode reject with extended cause ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11601/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11601/1/src/gsm/gsm0808.c at 303 PS1, Line 303: (const uint8_t *)&c Are you sure this is correct? I may be wrong, but symbol 'c' itself should be a pointer to the first element of array, isn't it? -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 22:37:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 22:55:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 5 Nov 2018 22:55:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: add bts-loop tests In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11559 ) Change subject: BSC LCLS: add bts-loop tests ...................................................................... Patch Set 3: (5 comments) https://gerrit.osmocom.org/#/c/11559/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11559/3/bsc/BSC_Tests.ttcn at a292 PS3, Line 292: Why not to expose this function in a separate change? https://gerrit.osmocom.org/#/c/11559/3/bsc/BSC_Tests_LCLS.ttcn File bsc/BSC_Tests_LCLS.ttcn: https://gerrit.osmocom.org/#/c/11559/3/bsc/BSC_Tests_LCLS.ttcn at 239 PS3, Line 239: f_init_vty(); cosmetic: this could be placed outside the 'if' statement. https://gerrit.osmocom.org/#/c/11559/3/bsc/BSC_Tests_LCLS.ttcn at 295 PS3, Line 295: chan_nr := ie.chan_nr Hmm, missing semicolon? I think the build verification would fail... Probably, it works when a { ... } block contains only a single line, but adding a new line would require one to add the missing semicolon. Let's avoid this. https://gerrit.osmocom.org/#/c/11559/3/bsc/BSC_Tests_LCLS.ttcn at 297 PS3, Line 297: log("Unable to find chan# in ", rsl_msg) Same here. And moreover, should we just ignore this? Wouldn't this cause dynamic testcase error? https://gerrit.osmocom.org/#/c/11559/3/bsc/BSC_Tests_LCLS.ttcn at 334 PS3, Line 334: CONN_A.receive(RSL_Message:?) -> value rsl_msg Why this part is commented out? Makes sense to add some FIXME/TODO note. -- To view, visit https://gerrit.osmocom.org/11559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e786b430591899c722d99d685db26efa868508 Gerrit-Change-Number: 11559 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 05 Nov 2018 22:55:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 23:56:02 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 23:56:02 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 1: Would be nice to see in commit message how the update was actually done. Is it somehow autogenerated or manual? Is this documented somewhere? How often/when this shall be done? etc. -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Mon, 05 Nov 2018 23:56:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 5 23:58:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 5 Nov 2018 23:58:50 +0000 Subject: Change in osmo-bsc[master]: bsc: gsm0808: Fix return code in bsc_compl_l3 In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11605 ) Change subject: bsc: gsm0808: Fix return code in bsc_compl_l3 ...................................................................... Patch Set 1: (1 comment) Or, even better, use errno constants. https://gerrit.osmocom.org/#/c/11605/1/src/osmo-bsc/gsm_08_08.c File src/osmo-bsc/gsm_08_08.c: https://gerrit.osmocom.org/#/c/11605/1/src/osmo-bsc/gsm_08_08.c at 385 PS1, Line 385: return complete_layer3(conn, msg, msc) ? 0 : -1; I think it's better to use another number to distinguish between different error paths. -- To view, visit https://gerrit.osmocom.org/11605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 Gerrit-Change-Number: 11605 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Mon, 05 Nov 2018 23:58:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 07:27:39 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 07:27:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11562 ) Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 06 Nov 2018 07:27:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 08:05:33 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 08:05:33 +0000 Subject: Change in osmo-gsm-manuals[master]: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11611 Change subject: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo ...................................................................... Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 --- M common/chapters/abis.adoc 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/11/11611/1 diff --git a/common/chapters/abis.adoc b/common/chapters/abis.adoc index a53d6f3..15f7e3d 100644 --- a/common/chapters/abis.adoc +++ b/common/chapters/abis.adoc @@ -29,8 +29,11 @@ === Locate Abis/IP based BTS We can use a tool called abisip-find to be able to find BTS which is -connected in the network. This tool is located under: -'./openbsc/openbsc/src/ipaccess' +connected in the network. This tool is located in the OsmoBSC project +repository under: +'./src/ipaccess' + + ==== abisip-find @@ -79,8 +82,8 @@ ==== ipaccess-config This program is very helpful tool which is used to configure Unit ID and -Primarly OML IP. You can find this tool under: -'./openbsc/openbsc/src/ipaccess' +Primarly OML IP. You can find this tool in the OpenBSC repository under: +'./src/ipaccess' .Example: using ipaccess-config to configure Unit ID and Primarly OML IP of -- To view, visit https://gerrit.osmocom.org/11611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 Gerrit-Change-Number: 11611 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 08:05:34 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 08:05:34 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBTS: Print VTY command in fixed-width font Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11612 Change subject: OsmoBTS: Print VTY command in fixed-width font ...................................................................... OsmoBTS: Print VTY command in fixed-width font Surrounding with '@' didn't seem to yield the intended result, the charactars appeared in the compiled document. Change-Id: I66e7949fa4a6c2164bf9572a2beaf8ace169fa1c --- M OsmoBTS/chapters/interfaces.adoc M common/chapters/bts.adoc 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/12/11612/1 diff --git a/OsmoBTS/chapters/interfaces.adoc b/OsmoBTS/chapters/interfaces.adoc index 127d4dc..9fefa72 100644 --- a/OsmoBTS/chapters/interfaces.adoc +++ b/OsmoBTS/chapters/interfaces.adoc @@ -152,5 +152,5 @@ with the PHY. The default PCU socket interface name is `/tmp/pcu_sock`, but this can -be overridden by the @pcu-socket@ VTY command in the BTS configuration +be overridden by the `pcu-socket` VTY command in the BTS configuration VTY node. diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index 81ca1a2..2e11db1 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -349,7 +349,7 @@ ==== Dynamic Timeslot Configuration Examples -This is an extract of an @osmo-bsc@ or @osmo-nitb@ config file. A timeslot +This is an extract of an `osmo-bsc` or `osmo-nitb` config file. A timeslot configuration with five Osmocom style dynamic timeslots and one dedicated PDCH may look like this: -- To view, visit https://gerrit.osmocom.org/11612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I66e7949fa4a6c2164bf9572a2beaf8ace169fa1c Gerrit-Change-Number: 11612 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 08:05:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 08:05:36 +0000 Subject: Change in osmo-gsm-manuals[master]: VTY: Remove osmo-nitb VTY port number example Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11613 Change subject: VTY: Remove osmo-nitb VTY port number example ...................................................................... VTY: Remove osmo-nitb VTY port number example We reference the port list appendix where all the ports used by various Osmocom projects are listed and it's unlikely that pointing out the osmo-nitb port would significantly help the reader, so just remove the reference. Change-Id: I354d50314ba248835191fa3da122032201618a0e --- M common/chapters/vty.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/13/11613/1 diff --git a/common/chapters/vty.adoc b/common/chapters/vty.adoc index 3f72718..c9e3d59 100644 --- a/common/chapters/vty.adoc +++ b/common/chapters/vty.adoc @@ -66,7 +66,7 @@ === Accessing the telnet VTY The VTY of a given Osmocom program is implemented as a telnet server, -listening to a specific TCP port. For `osmo-nitb`, this port is `4242`. +listening to a specific TCP port. Please see <> to check for the default TCP port number of the VTY interface of the specific Osmocom software you would like to -- To view, visit https://gerrit.osmocom.org/11613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I354d50314ba248835191fa3da122032201618a0e Gerrit-Change-Number: 11613 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 08:05:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 08:05:36 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBTS: Fix typo Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11614 Change subject: OsmoBTS: Fix typo ...................................................................... OsmoBTS: Fix typo Change-Id: I0a4c9f052f14816e88ed0a4a5fff9b3854da195a --- M OsmoBTS/chapters/configuration.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/14/11614/1 diff --git a/OsmoBTS/chapters/configuration.adoc b/OsmoBTS/chapters/configuration.adoc index dbc7a29..558bd4b 100644 --- a/OsmoBTS/chapters/configuration.adoc +++ b/OsmoBTS/chapters/configuration.adoc @@ -4,7 +4,7 @@ application is starting, the A-bis OML connection is established towards the BSC. Almost all BTS configuration (such as ARFCN, channel configuration, transmit power, etc.) will be sent from the BSC to the -BTS via OML messages. After OML start-up has competed, the BSC will +BTS via OML messages. After OML start-up has completed, the BSC will instruct the BTS to establish the RSL connections. Given that most configuration is downloaded from the BSC into the BTS at -- To view, visit https://gerrit.osmocom.org/11614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0a4c9f052f14816e88ed0a4a5fff9b3854da195a Gerrit-Change-Number: 11614 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 08:05:37 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 08:05:37 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBSC/HLR/MSC: Fix default config file name Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11615 Change subject: OsmoBSC/HLR/MSC: Fix default config file name ...................................................................... OsmoBSC/HLR/MSC: Fix default config file name Mention that the default is not openbsc.cfg, but osmo-*.cfg Change-Id: I139e6004e28d6f918f31792e634214a6153edd0e --- M OsmoBSC/chapters/running.adoc M OsmoHLR/chapters/running.adoc M OsmoMSC/chapters/running.adoc 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/15/11615/1 diff --git a/OsmoBSC/chapters/running.adoc b/OsmoBSC/chapters/running.adoc index 6747a29..f62ba6e 100644 --- a/OsmoBSC/chapters/running.adoc +++ b/OsmoBSC/chapters/running.adoc @@ -21,7 +21,7 @@ Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be - used. If none is specified, use `openbsc.cfg` in the current + used. If none is specified, use `osmo-bsc.cfg` in the current working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been diff --git a/OsmoHLR/chapters/running.adoc b/OsmoHLR/chapters/running.adoc index 44b66f2..5f24746 100644 --- a/OsmoHLR/chapters/running.adoc +++ b/OsmoHLR/chapters/running.adoc @@ -21,7 +21,7 @@ Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be - used. If none is specified, use `openbsc.cfg` in the current + used. If none is specified, use `osmo-hlr.cfg` in the current working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been diff --git a/OsmoMSC/chapters/running.adoc b/OsmoMSC/chapters/running.adoc index 8656a58..cb68157 100644 --- a/OsmoMSC/chapters/running.adoc +++ b/OsmoMSC/chapters/running.adoc @@ -21,7 +21,7 @@ Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be - used. If none is specified, use `openbsc.cfg` in the current + used. If none is specified, use `osmo-msc.cfg` in the current working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been -- To view, visit https://gerrit.osmocom.org/11615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I139e6004e28d6f918f31792e634214a6153edd0e Gerrit-Change-Number: 11615 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 08:05:38 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 08:05:38 +0000 Subject: Change in osmo-gsm-manuals[master]: Change OpenBSC mentions to OsmoBSC where applicable Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11616 Change subject: Change OpenBSC mentions to OsmoBSC where applicable ...................................................................... Change OpenBSC mentions to OsmoBSC where applicable Change-Id: I4cc6874302b6089a54d44b09f08660a25e46d4dc --- M OsmoPCU/gb/bssgp.adoc M common/chapters/abis.adoc M common/chapters/bts.adoc 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/16/11616/1 diff --git a/OsmoPCU/gb/bssgp.adoc b/OsmoPCU/gb/bssgp.adoc index fe30d84..18f1842 100644 --- a/OsmoPCU/gb/bssgp.adoc +++ b/OsmoPCU/gb/bssgp.adoc @@ -490,7 +490,7 @@ described in <>. OsmoPCU allocates a BVC context for the BVCI given by OsmoBTS, which -in turn receives it from OpenBSC via OML procedures. +in turn receives it from OsmoBSC or OsmoNITB via OML procedures. In addition to the BVCI identifying the OsmoPCU side of BSSGP connection, there is also special BVCI which is accepted by OsmoPCU in diff --git a/common/chapters/abis.adoc b/common/chapters/abis.adoc index 15f7e3d..7524661 100644 --- a/common/chapters/abis.adoc +++ b/common/chapters/abis.adoc @@ -82,7 +82,7 @@ ==== ipaccess-config This program is very helpful tool which is used to configure Unit ID and -Primarly OML IP. You can find this tool in the OpenBSC repository under: +Primarly OML IP. You can find this tool in the OsmoBSC repository under: './src/ipaccess' diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index 2e11db1..eb28497 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -3,7 +3,7 @@ The main functionality of the BSC component is to manage BTSs. As such, provisioning BTSs within the BSC is one of the most common tasks during -BSC operation. Just like about anything else in OpenBSC, they are +BSC operation. Just like about anything else in OsmoBSC, they are configured using the VTY. BTSs are internally numbered with integer numbers starting from "0" for -- To view, visit https://gerrit.osmocom.org/11616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4cc6874302b6089a54d44b09f08660a25e46d4dc Gerrit-Change-Number: 11616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 08:05:38 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 08:05:38 +0000 Subject: Change in osmo-gsm-manuals[master]: Logging: Describe all log options, including set-all and force-all Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11617 Change subject: Logging: Describe all log options, including set-all and force-all ...................................................................... Logging: Describe all log options, including set-all and force-all Change-Id: Ica03c3ea08289314819448a22ae7ed38a7bd4f83 --- M common/chapters/logging.adoc 1 file changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/17/11617/1 diff --git a/common/chapters/logging.adoc b/common/chapters/logging.adoc index db6afdb..a89526c 100644 --- a/common/chapters/logging.adoc +++ b/common/chapters/logging.adoc @@ -70,6 +70,53 @@ Management category to info, you can use the following command: `log level mm info`. +There is also a special command to set all categories as a one-off to a desired +log level. For example, to silence all messages but those logged as notice and +above issue the command: `log level set-all notice` + +Afterwards you can adjust specific categories as usual. + +A similar command is `log level force-all ` which causes all categories +to behave as if set to log level until the command is reverted with +`no log level force-all` after which the individually-configured log levels will +again take effect. The difference between `set-all` and `force-all` is that +`set-all` actually changes the individual category settings while `force-all` +is a (temporary) override of those settings and does not change them. + +[[log_options]] +=== Log printing options + +The logging system has various options to change the information +displayed in the log message. + +log color 1:: + With this option each log message will log with the color of its + category. The color is hard-coded and can not be changed. As with + other options a '0' disables this functionality. + +log timestamp 1:: + Includes the current time in the log message. When logging to syslog + this option should not be needed, but may come in handy when debugging + an issue while logging to file. + +log print extended-timestamp 1:: + In order to debug time-critical issues this option will print a + timestamp with millisecond granularity. + +log print category 1:: + Prefix each log message with the category name. + +log print category-hex 1:: + Prefix each log message with the category number in hex ('<000b>'). + +log print level 1:: + Prefix each log message with the name of the log level. + +log print file 1:: + Prefix each log message with the source file and line number. Append + the keyword `last` to append the file information instead of prefixing + it. + [[log_filters]] === Log filters -- To view, visit https://gerrit.osmocom.org/11617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ica03c3ea08289314819448a22ae7ed38a7bd4f83 Gerrit-Change-Number: 11617 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 09:04:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 09:04:59 +0000 Subject: Change in osmo-gsm-manuals[master]: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11611 ) Change subject: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11611/1/common/chapters/abis.adoc File common/chapters/abis.adoc: https://gerrit.osmocom.org/#/c/11611/1/common/chapters/abis.adoc at 85 PS1, Line 85: Primarly OML IP. You can find this tool in the OpenBSC repository under: OsmoBSC -- To view, visit https://gerrit.osmocom.org/11611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 Gerrit-Change-Number: 11611 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 09:04:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 09:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 09:05:49 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBTS: Print VTY command in fixed-width font In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11612 ) Change subject: OsmoBTS: Print VTY command in fixed-width font ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66e7949fa4a6c2164bf9572a2beaf8ace169fa1c Gerrit-Change-Number: 11612 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 09:05:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 09:07:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 09:07:53 +0000 Subject: Change in osmo-gsm-manuals[master]: VTY: Remove osmo-nitb VTY port number example In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11613 ) Change subject: VTY: Remove osmo-nitb VTY port number example ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I354d50314ba248835191fa3da122032201618a0e Gerrit-Change-Number: 11613 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 09:07:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 09:08:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 09:08:30 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBTS: Fix typo In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11614 ) Change subject: OsmoBTS: Fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a4c9f052f14816e88ed0a4a5fff9b3854da195a Gerrit-Change-Number: 11614 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 09:08:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 09:08:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 09:08:50 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBSC/HLR/MSC: Fix default config file name In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11615 ) Change subject: OsmoBSC/HLR/MSC: Fix default config file name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I139e6004e28d6f918f31792e634214a6153edd0e Gerrit-Change-Number: 11615 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 09:08:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 09:09:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 09:09:57 +0000 Subject: Change in osmo-gsm-manuals[master]: Change OpenBSC mentions to OsmoBSC where applicable In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11616 ) Change subject: Change OpenBSC mentions to OsmoBSC where applicable ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11616/1/common/chapters/bts.adoc File common/chapters/bts.adoc: https://gerrit.osmocom.org/#/c/11616/1/common/chapters/bts.adoc at 6 PS1, Line 6: BSC operation. Just like about anything else in OsmoBSC, they are take chance to remove extra spacing after dot? -- To view, visit https://gerrit.osmocom.org/11616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cc6874302b6089a54d44b09f08660a25e46d4dc Gerrit-Change-Number: 11616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 09:09:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue Nov 6 09:58:49 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 06 Nov 2018 09:58:49 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in xUbuntu_17.10/i586 In-Reply-To: References: Message-ID: <5be1660951046_23db8a86808489f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/xUbuntu_17.10/i586 Package network:osmocom:nightly/libusrp failed to build in xUbuntu_17.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 237s] Warning: mkbaselibs missing in build root, skipping baselibs [ 237s] ... saving statistics [ 237s] ... saving built packages [ 237s] DEBS/libusrp1_3.4.2.20181105_i386.deb [ 237s] DEBS/libusrp_3.4.2.20181105.tar.xz [ 237s] DEBS/libusrp_3.4.2.20181105.dsc [ 237s] DEBS/libusrp-firmware_3.4.2.20181105_i386.deb [ 237s] DEBS/libusrp-utils_3.4.2.20181105_i386.deb [ 237s] DEBS/libusrp-dev_3.4.2.20181105_i386.deb [ 237s] DEBS/libusrp_3.4.2.20181105_i386.changes [ 237s] DEBS/libusrp-doc_3.4.2.20181105_all.deb [ 237s] OTHER/_statistics [ 237s] [ 237s] morla3 finished "build libusrp_3.4.2.20181105.dsc" at Mon Nov 5 19:54:53 UTC 2018. [ 237s] [ 237s] ### VM INTERACTION START ### [ 240s] [ 226.759914] sysrq: SysRq : Power Off [ 240s] [ 226.786092] reboot: Power down [ 240s] ### VM INTERACTION END ### [ 240s] build: extracting built packages... [ 240s] DEBS/libusrp1_3.4.2.20181105_i386.deb [ 240s] DEBS/libusrp_3.4.2.20181105.tar.xz [ 240s] DEBS/libusrp_3.4.2.20181105.dsc [ 240s] DEBS/libusrp-firmware_3.4.2.20181105_i386.deb [ 240s] DEBS/libusrp-utils_3.4.2.20181105_i386.deb [ 240s] DEBS/libusrp-dev_3.4.2.20181105_i386.deb [ 240s] DEBS/libusrp_3.4.2.20181105_i386.changes [ 240s] DEBS/libusrp-doc_3.4.2.20181105_all.deb [ 240s] OTHER/_statistics -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:15:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 10:15:45 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11606 ) Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11606/1/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/11606/1/tests/gsm0408/gsm0408_test.c at 955 PS1, Line 955: gscon_release_lchans > Could you please clarify, how is this related to the change? [?] Otherwise linker fails with an error, probably because the C file containing those symbols is not included statically into the binary. I just took same approach already used, see bsc_subscr_con_allocate above. -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 06 Nov 2018 10:15:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:17:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 10:17:49 +0000 Subject: Change in osmo-gsm-manuals[master]: Logging: Describe all log options, including set-all and force-all In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11617 ) Change subject: Logging: Describe all log options, including set-all and force-all ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica03c3ea08289314819448a22ae7ed38a7bd4f83 Gerrit-Change-Number: 11617 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 10:17:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:25:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 10:25:21 +0000 Subject: Change in osmo-bsc[master]: bsc: gsm0808: Fix return code in bsc_compl_l3 In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11605 to look at the new patch set (#2). Change subject: bsc: gsm0808: Fix return code in bsc_compl_l3 ...................................................................... bsc: gsm0808: Fix return code in bsc_compl_l3 complete_layer3 returns true if everything succeeded, false otherwise. However, its caller bsc_compl_l3 returns unix style (0 sucess, negative error). This commit has no real effect since only caller of bsc_compl_l3 never checks return code, but will check it in the future. Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/11605/2 -- To view, visit https://gerrit.osmocom.org/11605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 Gerrit-Change-Number: 11605 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:25:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 10:25:21 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11606 to look at the new patch set (#2). Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... gsm0408_rcvmsg: Release lchan if L3 fails to complete gscon_release_lchans stub is added to gsm0408_test.c to make linker happy. Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 --- M src/osmo-bsc/gsm_04_08_rr.c M tests/gsm0408/gsm0408_test.c 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/11606/2 -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:38:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 6 Nov 2018 10:38:58 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: collect artifacts again Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11618 Change subject: ttcn3-testsuites: collect artifacts again ...................................................................... ttcn3-testsuites: collect artifacts again Collect build artifacts just like the manually created jobs did it. Related: OS#3681 Change-Id: I5b0f5de87125374c9a48d0a47e6a4e655d7ed3bb --- M jobs/ttcn3-testsuites.yml 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/18/11618/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index fc4f306..a5c5fe4 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -97,6 +97,13 @@ notify-every-unstable-build: true recipients: laforge at gnumonks.org send-to-individuals: false + - archive: + allow-empty: false + artifacts: logs/**/* + case-sensitive: true + default-excludes: true + fingerprint: false + only-if-success: false properties: - build-blocker: use-build-blocker: true -- To view, visit https://gerrit.osmocom.org/11618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5b0f5de87125374c9a48d0a47e6a4e655d7ed3bb Gerrit-Change-Number: 11618 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:39:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 10:39:06 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11601 ) Change subject: Support cipher mode reject with extended cause ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 06 Nov 2018 10:39:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:41:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 6 Nov 2018 10:41:17 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: collect artifacts again In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11618 ) Change subject: ttcn3-testsuites: collect artifacts again ...................................................................... Patch Set 1: Verified+1 Rolled out and working. old job without build artifacts: https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-mgw-test-latest/20/ new job *with* build artifacts: https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-mgw-test-latest/21/ That section of the config was copied from a dump of the manually created jobs, that I did with jenkins-job-wrecker (so it's exactly the same). -- To view, visit https://gerrit.osmocom.org/11618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b0f5de87125374c9a48d0a47e6a4e655d7ed3bb Gerrit-Change-Number: 11618 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 06 Nov 2018 10:41:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:49:10 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 10:49:10 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11519 to look at the new patch set (#3). Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... add aggregated rtp connection stats to osmo-mgw Add a counter group for aggregated RTP connection statistics. This group contains RTP counters which aggregate values of the ephemeral RTP counters maintained per connection (mgcp_conn). This provides a global overview of RTP processing for each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters'. While here, fix a typo in an item of the mgcp_conn_rate_ctr_desc array: "rtp:octets_rx" was displayed for outbound packes; now says "_tx". Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 5 files changed, 80 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/19/11519/3 -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:49:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 10:49:24 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: AddIP addr for umtrx Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11619 Change subject: ansible: gsm-tester: AddIP addr for umtrx ...................................................................... ansible: gsm-tester: AddIP addr for umtrx Change-Id: I7fb65e3c337fc82c787e925fbbdf9eaf7569defd --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/19/11619/1 diff --git a/ansible/roles/gsm-tester-network/templates/interface.j2 b/ansible/roles/gsm-tester-network/templates/interface.j2 index f694261..30af679 100644 --- a/ansible/roles/gsm-tester-network/templates/interface.j2 +++ b/ansible/roles/gsm-tester-network/templates/interface.j2 @@ -68,3 +68,8 @@ iface {{ bts_interface }}:12 inet static address 10.42.42.53 netmask 255.255.255.0 + +auto {{ bts_interface }}:13 +iface {{ bts_interface }}:13 inet static + address 10.42.42.54 + netmask 255.255.255.0 -- To view, visit https://gerrit.osmocom.org/11619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7fb65e3c337fc82c787e925fbbdf9eaf7569defd Gerrit-Change-Number: 11619 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:50:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 10:50:25 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11519 ) Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11519/2/include/osmocom/mgcp/mgcp_conn.h File include/osmocom/mgcp/mgcp_conn.h: https://gerrit.osmocom.org/#/c/11519/2/include/osmocom/mgcp/mgcp_conn.h at 64 PS2, Line 64: [RTP_OCTETS_TX_CTR] = {"all_rtp:octets_tx", "Total outbound rtp octets."}, > You ar still sneaking this octets_rx/octets_tx change without at least describing it in the commit l [?] I am moving this entire array around so I might as well fix the silly typo while I'm at it. But I have now added a paragraph to the log message about it. -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 10:50:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:52:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 10:52:04 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11519 ) Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 10:52:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 10:52:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 10:52:36 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Add IP addr for umtrx In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11619 ) Change subject: ansible: gsm-tester: Add IP addr for umtrx ...................................................................... ansible: gsm-tester: Add IP addr for umtrx Change-Id: I7fb65e3c337fc82c787e925fbbdf9eaf7569defd --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/19/11619/2 -- To view, visit https://gerrit.osmocom.org/11619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7fb65e3c337fc82c787e925fbbdf9eaf7569defd Gerrit-Change-Number: 11619 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:00:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 11:00:39 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1573 PS1, Line 1573: * (called once at startup by main function) */ > That's first notice I get regarding we use OSMO_ASSERT during allocations, I would say we usually do [?] Can you please be more specific? How strongly do you care about the OSMO_ASSERT? I am getting different opinions from you and Harald. I have already indicated that I will do whatever both of you want, but you must make non-contradictory suggestions. -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 11:00:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:01:05 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 11:01:05 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11521 to look at the new patch set (#3). Change subject: add DLCX command statistics to osmo-mgw ...................................................................... add DLCX command statistics to osmo-mgw Add a counter group for DLCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of DLCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters' While here, rename MGCP_MDCX_FAIL_DEFERRED_BY_POLICY to MGCP_MDCX_DEFERRED_BY_POLICY; we have decided that deferred connections aren't failures, and this keeps names used by DLCX and MDCX in sync. Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Depends: I80d36181600901ae2e0f321dc02b5d54ddc94139I Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 69 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/11521/3 -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:09:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 11:09:26 +0000 Subject: Change in libosmocore[master]: IPA: make deprecation warning external Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11620 Change subject: IPA: make deprecation warning external ...................................................................... IPA: make deprecation warning external Although ipa_ccm_idtag_parse_off() is deprecated, it's used to implement ipa_ccm_idtag_parse() in libosmocore which leads to unnecessary deprecation warning. There's no obvious way to replace it with recommended functions because ipa_ccm_idtag_parse_off() is not a wrapper around ipa_ccm_id_{get,resp}_parse() but an independent implementation. Let's suppress this warning inside libosmocore but keep deprecation for external projects. Change-Id: I793c56392834ff2c8cc3a08a9a5c18fbcd4be882 --- M include/osmocom/gsm/ipa.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/11620/1 diff --git a/include/osmocom/gsm/ipa.h b/include/osmocom/gsm/ipa.h index 93cb1bf..183f8f5 100644 --- a/include/osmocom/gsm/ipa.h +++ b/include/osmocom/gsm/ipa.h @@ -29,7 +29,7 @@ int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len) OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead"); int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) - OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead"); + OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE("Use ipa_ccm_id_{get,resp}_parse instead"); /* parse payload of IPA CCM ID GET into a osmocom TLV style representation */ int ipa_ccm_id_get_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len); -- To view, visit https://gerrit.osmocom.org/11620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I793c56392834ff2c8cc3a08a9a5c18fbcd4be882 Gerrit-Change-Number: 11620 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:11:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 11:11:25 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1573 PS1, Line 1573: OSMO_ASSERT(trunk->mgcp_dlcx_ctr_group); > Can you please be more specific? How strongly do you care about the OSMO_ASSERT? [?] Harald: "We don't use OSMO_ASSERT() on our allocations, do we?" Pau: "That's first notice I get regarding we use OSMO_ASSERT during allocations, I would say we usually don't." I think we are both on the same opinion here? -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 11:11:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:13:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 11:13:01 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 11:13:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:24:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 6 Nov 2018 11:24:55 +0000 Subject: Change in libosmocore[master]: gsm/gsup.h: cosmetic: use tab for comment alignment Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11621 Change subject: gsm/gsup.h: cosmetic: use tab for comment alignment ...................................................................... gsm/gsup.h: cosmetic: use tab for comment alignment Change-Id: Id71d4b45e2b9f42da5e23e709ad97d4d0abfc3d9 --- M include/osmocom/gsm/gsup.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/11621/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 0ef5a75..cd6fd31 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -207,7 +207,7 @@ /*! Session state \ref osmo_gsup_session_state */ enum osmo_gsup_session_state session_state; /*! Unique session identifier and origination flag. - * Encoded only when \ref session_state != 0x00 */ + * Encoded only when \ref session_state != 0x00 */ uint32_t session_id; /*! ASN.1 encoded MAP payload for Supplementary Services */ -- To view, visit https://gerrit.osmocom.org/11621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id71d4b45e2b9f42da5e23e709ad97d4d0abfc3d9 Gerrit-Change-Number: 11621 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:28:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 11:28:42 +0000 Subject: Change in libosmocore[master]: gsm/gsup.h: cosmetic: use tab for comment alignment In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11621 ) Change subject: gsm/gsup.h: cosmetic: use tab for comment alignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id71d4b45e2b9f42da5e23e709ad97d4d0abfc3d9 Gerrit-Change-Number: 11621 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 11:28:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:53:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 11:53:35 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Add support for dev-args cfg parameter Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11622 Change subject: osmo-trx: Add support for dev-args cfg parameter ...................................................................... osmo-trx: Add support for dev-args cfg parameter Change-Id: I3cff225e378e187779bf2b0c7d65bd6b97217104 --- M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/22/11622/1 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 3f2ddc7..d1bee54 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -73,6 +73,7 @@ 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF, 'bts[].osmo_trx.trx_ip': schema.IPV4, 'bts[].osmo_trx.remote_user': schema.STR, + 'bts[].osmo_trx.dev_args': schema.STR, 'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index e7f2fb8..643b6ed 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -24,6 +24,9 @@ %else: multi-arfcn disable %endif +%if osmo_trx.get('dev_args', False): + dev-args ${osmo_trx.dev_args} +%endif tx-sps 4 rx-sps 4 clock-ref ${osmo_trx.clock_reference} -- To view, visit https://gerrit.osmocom.org/11622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3cff225e378e187779bf2b0c7d65bd6b97217104 Gerrit-Change-Number: 11622 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:53:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 11:53:37 +0000 Subject: Change in osmo-gsm-tester[master]: resurces.conf.prod: Add UmTRX device Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11623 Change subject: resurces.conf.prod: Add UmTRX device ...................................................................... resurces.conf.prod: Add UmTRX device Change-Id: I11f3275bddcc1c0c5bcd75e6a32f040a8f7c1174 --- M example/resources.conf.prod A example/scenarios/trx-umtrx.conf 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/23/11623/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 22134e7..36c49df 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -33,6 +33,20 @@ clock_reference: external multi_arfcn: true +- label: UmTRX + type: osmo-bts-trx + ipa_unit_id: 12 + addr: 10.42.42.54 + band: GSM-1800 + ciphers: [a5_0, a5_1] + osmo_trx: + type: uhd + launch_trx: true + remote_user: jenkins + trx_ip: 10.42.42.118 + dev_args: addr=10.42.42.130,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345 + clock_reference: internal + - label: LimeSDR-USB type: osmo-bts-trx ipa_unit_id: 11 diff --git a/example/scenarios/trx-umtrx.conf b/example/scenarios/trx-umtrx.conf new file mode 100644 index 0000000..c13fa49 --- /dev/null +++ b/example/scenarios/trx-umtrx.conf @@ -0,0 +1,4 @@ +resources: + bts: + - label: UmTRX + type: osmo-bts-trx -- To view, visit https://gerrit.osmocom.org/11623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I11f3275bddcc1c0c5bcd75e6a32f040a8f7c1174 Gerrit-Change-Number: 11623 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 11:53:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 11:53:37 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Add tests for UmTRX Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11624 Change subject: default-suites: Add tests for UmTRX ...................................................................... default-suites: Add tests for UmTRX Change-Id: I0d0fe17676550a96d9bcf795faf43f7e6b82fb1a --- M example/default-suites.conf 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/24/11624/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index c7f2377..dc9b579 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -51,6 +51,25 @@ - dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr-any - dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo +- nitb_sms:trx-umtrx +- sms:trx-umtrx +- nitb_ussd:trx-umtrx +- ussd:trx-umtrx +- voice:trx-umtrx+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:trx-umtrx+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:trx-umtrx+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:trx-umtrx+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:trx-umtrx+mod-bts0-ts-tchh+cfg-codec-hr3 +- voice:trx-umtrx+mod-bts0-dynts-ipa+cfg-codec-fr-any +- voice:trx-umtrx+mod-bts0-dynts-osmo +- voice:trx-umtrx+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- gprs:trx-umtrx +- gprs:trx-umtrx+mod-bts0-dynts-ipa +- gprs:trx-umtrx+mod-bts0-dynts-osmo +- gprs:trx-umtrx+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- dynts:trx-umtrx+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:trx-umtrx+mod-bts0-dynts67-osmo + - nitb_sms:nanobts - sms:nanobts+band-1900 - nitb_ussd:nanobts+band-1900 -- To view, visit https://gerrit.osmocom.org/11624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0d0fe17676550a96d9bcf795faf43f7e6b82fb1a Gerrit-Change-Number: 11624 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:06:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:06:47 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to test gprs IPv4 data plane In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11462 ) Change subject: Add support to test gprs IPv4 data plane ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c Gerrit-Change-Number: 11462 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 12:06:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:12 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to test gprs IPv4 data plane In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11462 ) Change subject: Add support to test gprs IPv4 data plane ...................................................................... Patch Set 4: Code-Review+2 I updated ofono manually in prod osmo-gsm-tester, merging now. -- To view, visit https://gerrit.osmocom.org/11462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c Gerrit-Change-Number: 11462 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 12:07:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:23 +0000 Subject: Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11474 ) Change subject: pcap_recorder: Add support to run in netns ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 Gerrit-Change-Number: 11474 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 12:07:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:27 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to test gprs IPv4 data plane In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11462 ) Change subject: Add support to test gprs IPv4 data plane ...................................................................... Add support to test gprs IPv4 data plane Since the modem iface and the GGSN iface are on the same host/netns, it's really difficult to conveniently test data plane without getting routing loops. As a result, either GGSN or modem iface must be moved to a different namespace. The decision after a few discussions was finally to move modem interfaces to a different netns. Expected setup: * ofono is patched to avoid removing modem if it detects through udev that its net iface was removed (due to for instance, net iface being moved to another netns and thus not being reachable anymore by systemd-udev process running in root netns). * After ofono is started (and successfully configured all the modems and detected its net ifaces through syfs/udev), script "modem-netns-setup.py start" which creates a netns for each modem, naming it after its usb path ID. net ifaces for that modem are moved into its netns. * Modem is configured to use 802-3 data format, and as a result the net iface is configured through DHCP (DHCP req only replied AFTER pdp ctx is activated!). * Since osmo-gsm-tester knowns the modem USB path ID (available in resources.conf), it can run required steps (ifup, DHCP) to configure the interface. The interface name is provided by ofono to osmo-gsm-tester. * As a result, any process willing to transmit data through the modem must be in the modem netns. Related: OS#2308 Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c --- M example/resources.conf.prod M example/resources.conf.rnd M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/process.py M src/osmo_gsm_tester/suite.py M suites/gprs/ping.py A utils/osmo-gsm-tester_netns_exec.sh 7 files changed, 69 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, but someone else must approve diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 22134e7..b12a7bc 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -122,14 +122,14 @@ ki: 'EBAB63D06C3F546A16C977CB40E57C68' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + features: ['sms', 'voice', 'ussd', 'sim'] - label: sierra_2nd path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.3' ki: 'EBD2B5F6CF3374106D0A66C11F922001' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + features: ['sms', 'voice', 'ussd', 'sim'] - label: ec20 path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' @@ -143,7 +143,7 @@ ki: '5752B3F43277C35D2D1D957007DF74E2' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['gprs', 'sim'] + features: ['sim'] osmocon_phone: - serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_00897B41-if00-port0' diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index dbdf3cc..63650e1 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -72,14 +72,14 @@ ki: '80A37E6FDEA931EAC92FFA5F671EFEAD' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + features: ['sms', 'voice', 'ussd', 'sim'] - label: sierra_2nd path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.3' ki: '00969E283349D354A8239E877F2E0866' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + features: ['sms', 'voice', 'ussd', 'sim'] - label: ec20 path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.6' @@ -93,7 +93,7 @@ ki: '2F70DCA43C45ACB97E947FDD0C7CA30A' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['gprs', 'sim'] + features: ['sim'] osmocon_phone: - serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_0089279D-if00-port0' diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py index 21b208c..d35933a 100644 --- a/src/osmo_gsm_tester/modem.py +++ b/src/osmo_gsm_tester/modem.py @@ -17,10 +17,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from . import log, util, sms +from . import log, util, sms, process from .event_loop import MainLoop from pydbus import SystemBus, Variant +import os # Required for Gio.Cancellable. # See https://lazka.github.io/pgi-docs/Gio-2.0/classes/Cancellable.html#Gio.Cancellable @@ -323,15 +324,17 @@ CTX_PROT_IPv6 = 'ipv6' CTX_PROT_IPv46 = 'dual' - def __init__(self, conf): + def __init__(self, suite_run, conf): + self.suite_run = suite_run self.conf = conf self.syspath = conf.get('path') self.dbuspath = get_dbuspath_from_syspath(self.syspath) super().__init__(log.C_TST, self.dbuspath) - self.dbg('creating from syspath %s', self.syspath) + self.dbg('creating from syspath %s' % self.syspath) self.msisdn = None self._ki = None self._imsi = None + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name().strip('/'))) self.sms_received_list = [] self.dbus = ModemDbusInteraction(self.dbuspath) self.register_attempts = 0 @@ -358,6 +361,9 @@ self.dbus.cleanup() self.dbus = None + def netns(self): + return os.path.basename(self.syspath.rstrip('/')) + def properties(self, *args, **kwargs): '''Return a dict of properties on this modem. For the actual arguments, see ModemDbusInteraction.properties(), which this function calls. The @@ -627,6 +633,23 @@ connmgr.RemoveContext(ctx_id) self.log('context deactivated', path=ctx_id) + def run_netns_wait(self, name, popen_args): + proc = process.NetNSProcess(name, self.run_dir.new_dir(name), self.netns(), popen_args, + env={}) + process.run_proc_sync(proc) + + def setup_context_data_plane(self, ctx_id): + self.dbg('setup_context_data', path=ctx_id) + ctx = systembus_get(ctx_id) + ctx_settings = ctx.GetProperties().get('Settings', None) + if not ctx_settings: + raise log.Error('%s no Settings found! No way to get iface!' % ctx_id) + iface = ctx_settings.get('Interface', None) + if not iface: + raise log.Error('%s Settings contains no iface! %r' % (ctx_id, repr(ctx_settings))) + self.run_netns_wait('ifup', ('ip', 'link', 'set', 'dev', iface, 'up')) + self.run_netns_wait('dhcp', ('udhcpc', '-q', '-i', iface)) + def sms_send(self, to_msisdn_or_modem, *tokens): if isinstance(to_msisdn_or_modem, Modem): to_msisdn = to_msisdn_or_modem.msisdn diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index fb5c6f6..a845f7f 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -100,6 +100,9 @@ time.sleep(wait_step) return False + def send_signal(self, sig): + os.kill(self.process_obj.pid, sig) + def terminate(self): if self.process_obj is None: return @@ -109,21 +112,21 @@ while True: # first try SIGINT to allow stdout+stderr flushing self.log('Terminating (SIGINT)') - os.kill(self.process_obj.pid, signal.SIGINT) + self.send_signal(signal.SIGINT) self.killed = signal.SIGINT if self._poll_termination(): break # SIGTERM maybe? self.log('Terminating (SIGTERM)') - self.process_obj.terminate() + self.send_signal(signal.SIGTERM) self.killed = signal.SIGTERM if self._poll_termination(): break # out of patience self.log('Terminating (SIGKILL)') - self.process_obj.kill() + self.send_signal(signal.SIGKILL) self.killed = signal.SIGKILL break; @@ -236,6 +239,22 @@ ' '.join(self.popen_args))] self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) +class NetNSProcess(Process): + NETNS_EXEC_BIN = 'osmo-gsm-tester_netns_exec.sh' + def __init__(self, name, run_dir, netns, popen_args, **popen_kwargs): + super().__init__(name, run_dir, popen_args, **popen_kwargs) + self.netns = netns + + self.popen_args = ['sudo', self.NETNS_EXEC_BIN, self.netns] + list(popen_args) + self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs) + + # HACK: Since we run under sudo, only way to kill root-owned process is to kill as root... + # This function is overwritten from Process. + def send_signal(self, sig): + kill_cmd = ('kill', '-%d' % int(sig), str(self.process_obj.pid)) + run_local_netns_sync(self.run_dir, self.name()+"-kill", self.netns, kill_cmd) + + def run_proc_sync(proc): try: proc.launch() @@ -252,6 +271,11 @@ proc = Process(name, run_dir, popen_args) run_proc_sync(proc) +def run_local_netns_sync(run_dir, name, netns, popen_args): + run_dir =run_dir.new_dir(name) + proc = NetNSProcess(name, run_dir, netns, popen_args) + run_proc_sync(proc) + def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None): run_dir = run_dir.new_dir(name) proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args) diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 22a47a2..67ddefd 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -328,7 +328,7 @@ def modem(self, specifics=None): conf = self.reserved_resources.get(resource.R_MODEM, specifics=specifics) self.dbg('create Modem object', conf=conf) - ms = modem.Modem(conf) + ms = modem.Modem(self, conf) self.register_for_cleanup(ms) return ms diff --git a/suites/gprs/ping.py b/suites/gprs/ping.py index 1647445..9186fe6 100755 --- a/suites/gprs/ping.py +++ b/suites/gprs/ping.py @@ -48,8 +48,10 @@ # We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) -sleep(5) -# TODO: send ping to server or open TCP conn with a socket in python +print("Setting up data plan for %r" % repr(ctx_id_v4)) +ms.setup_context_data_plane(ctx_id_v4) +print("Running 10 ping requests for %r" % repr(ctx_id_v4)) +ms.run_netns_wait('ping', ('ping', '-c', '10', ggsn.addr())) ms.deactivate_context(ctx_id_v4) # We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) diff --git a/utils/osmo-gsm-tester_netns_exec.sh b/utils/osmo-gsm-tester_netns_exec.sh new file mode 100755 index 0000000..336b746 --- /dev/null +++ b/utils/osmo-gsm-tester_netns_exec.sh @@ -0,0 +1,5 @@ +#!/bin/bash +netns="$1" +shift +#TODO: Later on I may want to call myself with specific ENV and calling sudo in order to run inside the netns but with dropped privileges +ip netns exec $netns "$@" -- To view, visit https://gerrit.osmocom.org/11462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icb06bdfcdd37c797be95ab5addb28da2d9f6681c Gerrit-Change-Number: 11462 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:28 +0000 Subject: Change in osmo-gsm-tester[master]: pcap_recorder: Add support to run in netns In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11474 ) Change subject: pcap_recorder: Add support to run in netns ...................................................................... pcap_recorder: Add support to run in netns Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 --- M src/osmo_gsm_tester/pcap_recorder.py 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, but someone else must approve diff --git a/src/osmo_gsm_tester/pcap_recorder.py b/src/osmo_gsm_tester/pcap_recorder.py index 98dea8b..70833d0 100644 --- a/src/osmo_gsm_tester/pcap_recorder.py +++ b/src/osmo_gsm_tester/pcap_recorder.py @@ -26,7 +26,7 @@ class PcapRecorder(log.Origin): - def __init__(self, suite_run, run_dir, iface=None, filters=''): + def __init__(self, suite_run, run_dir, iface=None, filters='', netns=None): self.iface = iface if not self.iface: self.iface = "any" @@ -34,16 +34,20 @@ super().__init__(log.C_RUN, 'pcap-recorder_%s' % self.iface, filters=self.filters) self.suite_run = suite_run self.run_dir = run_dir + self.netns = netns self.start() def start(self): self.dbg('Recording pcap', self.run_dir, self.filters) dumpfile = os.path.join(os.path.abspath(self.run_dir), self.name() + ".pcap") - self.process = process.Process(self.name(), self.run_dir, - ('tcpdump', '-n', - '-i', self.iface, - '-w', dumpfile, - self.filters)) + popen_args = ('tcpdump', '-n', + '-i', self.iface, + '-w', dumpfile, + self.filters) + if self.netns: + self.process = process.NetNSProcess(self.name(), self.run_dir, self.netns, popen_args) + else: + self.process = process.Process(self.name(), self.run_dir, popen_args) self.suite_run.remember_to_stop(self.process) self.process.launch() -- To view, visit https://gerrit.osmocom.org/11474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie1c848254f221f26c59e7f4bd8c079fe3e7bdfc2 Gerrit-Change-Number: 11474 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:29 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: Add extra IPaddr to pool In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11475 ) Change subject: resources.conf: Add extra IPaddr to pool ...................................................................... resources.conf: Add extra IPaddr to pool Change-Id: If0f1a6a3f4e99091ed117bc7a77a5e60eccb2425 --- M example/resources.conf.prod M example/resources.conf.rnd 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/example/resources.conf.prod b/example/resources.conf.prod index b12a7bc..0c8792e 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -9,6 +9,7 @@ - addr: 10.42.42.7 - addr: 10.42.42.8 - addr: 10.42.42.9 +- addr: 10.42.42.10 bts: - label: sysmoBTS 1002 diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 63650e1..dd9dc8f 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -9,6 +9,7 @@ - addr: 10.42.42.7 - addr: 10.42.42.8 - addr: 10.42.42.9 +- addr: 10.42.42.10 bts: - label: sysmoBTS 1002 -- To view, visit https://gerrit.osmocom.org/11475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If0f1a6a3f4e99091ed117bc7a77a5e60eccb2425 Gerrit-Change-Number: 11475 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:30 +0000 Subject: Change in osmo-gsm-tester[master]: Introduce iperf3 testing infrastructure In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11476 ) Change subject: Introduce iperf3 testing infrastructure ...................................................................... Introduce iperf3 testing infrastructure Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e --- A src/osmo_gsm_tester/iperf3.py M src/osmo_gsm_tester/suite.py A suites/gprs/iperf3.py M suites/gprs/suite.conf 4 files changed, 189 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py new file mode 100644 index 0000000..8141fea --- /dev/null +++ b/src/osmo_gsm_tester/iperf3.py @@ -0,0 +1,107 @@ +# osmo_gsm_tester: specifics for running an iperf3 client and server +# +# Copyright (C) 2018 by sysmocom - s.f.m.c. GmbH +# +# Author: Pau Espin Pedrol +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import json + +from . import log, util, process, pcap_recorder + +DEFAULT_SRV_PORT = 5003 + +class IPerf3Server(log.Origin): + + def __init__(self, suite_run, ip_address): + super().__init__(log.C_RUN, 'iperf3-srv_%s' % ip_address.get('addr')) + self.run_dir = None + self.config_file = None + self.process = None + self.suite_run = suite_run + self.ip_address = ip_address + self._port = DEFAULT_SRV_PORT + + def start(self): + self.log('Starting iperf3-srv') + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + + pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, + 'host %s and port not 22' % self.addr()) + + self.log_file = self.run_dir.new_file('iperf3_srv.json') + self.process = process.Process(self.name(), self.run_dir, + ('iperf3', '-s', '-B', self.addr(), + '-p', str(self._port), '-J', + '--logfile', os.path.abspath(self.log_file)), + env={}) + self.suite_run.remember_to_stop(self.process) + self.process.launch() + + def stop(self): + self.suite_run.stop_process(self.process) + + def get_results(self): + with open(self.log_file) as f: + data = json.load(f) + return data + + def addr(self): + return self.ip_address.get('addr') + + def port(self): + return self._port + + def running(self): + return not self.process.terminated() + + def create_client(self): + return IPerf3Client(self.suite_run, self) + +class IPerf3Client(log.Origin): + + def __init__(self, suite_run, iperf3srv): + super().__init__(log.C_RUN, 'iperf3-cli_%s' % iperf3srv.addr()) + self.run_dir = None + self.config_file = None + self.process = None + self.server = iperf3srv + self.suite_run = suite_run + + def run_test(self, netns=None): + self.log('Starting iperf3-client connecting to %s:%d' % (self.server.addr(), self.server.port())) + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + + pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, + 'host %s and port not 22' % self.server.addr(), netns) + + self.log_file = self.run_dir.new_file('iperf3_cli.json') + popen_args = ('iperf3', '-c', self.server.addr(), + '-p', str(self.server.port()), '-J', + '--logfile', os.path.abspath(self.log_file)) + if netns: + self.process = process.NetNSProcess(self.name(), self.run_dir, netns, popen_args, env={}) + else: + self.process = process.Process(self.name(), self.run_dir, popen_args, env={}) + process.run_proc_sync(self.process) + return self.get_results() + + def get_results(self): + with open(self.log_file) as f: + data = json.load(f) + return data + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 67ddefd..e5ac9a8 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -23,7 +23,7 @@ import pprint from . import config, log, util, resource, test from .event_loop import MainLoop -from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon, ms_driver +from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon, ms_driver, iperf3 class Timeout(Exception): pass @@ -349,6 +349,12 @@ self.register_for_cleanup(osmocon_obj) return osmocon_obj + def iperf3srv(self, ip_address=None): + if ip_address is None: + ip_address = self.ip_address() + iperf3srv_obj = iperf3.IPerf3Server(self, ip_address) + return iperf3srv_obj + def msisdn(self): msisdn = self.resources_pool.next_msisdn(self) self.log('using MSISDN', msisdn) diff --git a/suites/gprs/iperf3.py b/suites/gprs/iperf3.py new file mode 100755 index 0000000..a1dd62c --- /dev/null +++ b/suites/gprs/iperf3.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def print_results(cli_res, srv_res): + cli_sent = cli_res['end']['sum_sent'] + cli_recv = cli_res['end']['sum_received'] + print("RESULT client:") + print("\tSEND: %d KB, %d kbps, %d seconds (%d retrans)" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'], cli_sent['retransmits'])) + print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) + print("RESULT server:") + print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'])) + print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) + +hlr = suite.hlr() +bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms = suite.modem() +iperf3srv = suite.iperf3srv() +iperf3cli = iperf3srv.create_client() + +bsc.bts_add(bts) +sgsn.bts_add(bts) + +print('start iperfv3 server...') +iperf3srv.start() + +print('start network...') +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() + +hlr.subscriber_add(ms) + +ms.connect(msc.mcc_mnc()) +ms.attach() + +ms.log_info() + +print('waiting for modems to attach...') +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) + +print('waiting for modems to attach to data services...') +wait(ms.is_attached) + +# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) +ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) +print("Setting up data plan for %r" % repr(ctx_id_v4)) +ms.setup_context_data_plane(ctx_id_v4) + +print("Running iperf3 client to %s through %r" % (iperf3srv.addr(),repr(ctx_id_v4))) +res = iperf3cli.run_test(ms.netns()) +iperf3srv.stop() +print_results(res, iperf3srv.get_results()) + +ms.deactivate_context(ctx_id_v4) diff --git a/suites/gprs/suite.conf b/suites/gprs/suite.conf index 1590b7d..a24bc5d 100644 --- a/suites/gprs/suite.conf +++ b/suites/gprs/suite.conf @@ -1,6 +1,6 @@ resources: ip_address: - - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn + - times: 9 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn, iperf3srv bts: - times: 1 modem: -- To view, visit https://gerrit.osmocom.org/11476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6ff6bef14feb535d98ca41b9788700d699e1ef1e Gerrit-Change-Number: 11476 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:32 +0000 Subject: Change in osmo-gsm-tester[master]: Add support to enable EGPRS In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11497 ) Change subject: Add support to enable EGPRS ...................................................................... Add support to enable EGPRS Change-Id: I682f0c1b4cb97b704d646f18f54e748baaefd677 --- M example/defaults.conf A example/scenarios/mod-bts0-egprs.conf M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 7 files changed, 16 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/example/defaults.conf b/example/defaults.conf index 1855883..eee17b1 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -31,6 +31,7 @@ stream_id: 255 osmobsc_bts_type: sysmobts channel_allocator: ascending + gprs_mode: gprs num_trx: 1 max_trx: 1 trx_list: diff --git a/example/scenarios/mod-bts0-egprs.conf b/example/scenarios/mod-bts0-egprs.conf new file mode 100644 index 0000000..542dd9d --- /dev/null +++ b/example/scenarios/mod-bts0-egprs.conf @@ -0,0 +1,3 @@ +modifiers: + bts: + - gprs_mode: egprs diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 86afeec..0c941e0 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -77,6 +77,7 @@ 'osmo_trx': { 'bts_ip': self.remote_addr(), 'trx_ip': self.trx_remote_ip(), + 'egprs': 'enable' if self.conf_for_bsc()['gprs_mode'] == 'egprs' else 'disable', 'channels': [{} for trx_i in range(self.num_trx())] } } diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 3f2ddc7..6898926 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -57,6 +57,7 @@ 'bts[].direct_pcu': schema.BOOL_STR, 'bts[].ciphers[]': schema.CIPHER, 'bts[].channel_allocator': schema.CHAN_ALLOCATOR, + 'bts[].gprs_mode': schema.GPRS_MODE, 'bts[].num_trx': schema.UINT, 'bts[].max_trx': schema.UINT, 'bts[].trx_list[].addr': schema.IPV4, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 12cfd7a..14fe640 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -110,6 +110,11 @@ return raise ValueError('Unknown Channel Allocator Policy %r' % val) +def gprs_mode(val): + if val in ('none', 'gprs', 'egprs'): + return + raise ValueError('Unknown GPRS mode %r' % val) + def codec(val): if val in ('hr1', 'hr2', 'hr3', 'fr1', 'fr2', 'fr3'): return @@ -136,6 +141,7 @@ MODEM_FEATURE = 'modem_feature' PHY_CHAN = 'chan' CHAN_ALLOCATOR = 'chan_allocator' +GPRS_MODE = 'gprs_mode' CODEC = 'codec' OSMO_TRX_CLOCK_REF = 'osmo_trx_clock_ref' @@ -156,6 +162,7 @@ MODEM_FEATURE: modem_feature, PHY_CHAN: phy_channel_config, CHAN_ALLOCATOR: channel_allocator, + GPRS_MODE: gprs_mode, CODEC: codec, OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref, } diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 0d53ccb..4f39f79 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -57,8 +57,8 @@ % endif ip.access unit_id ${bts.ipa_unit_id} 0 oml ip.access stream_id ${bts.stream_id} line 0 -% if bts.get('sgsn', False): - gprs mode gprs +% if bts.get('sgsn', False) and bts['gprs_mode'] != 'none': + gprs mode ${bts.gprs_mode} gprs routing area ${bts.routing_area_code} gprs network-control-order nc1 gprs cell bvci ${bts.bvci} diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index e7f2fb8..ede1902 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -18,7 +18,7 @@ bind-ip ${osmo_trx.trx_ip} remote-ip ${osmo_trx.bts_ip} base-port 5700 - egprs disable + egprs ${osmo_trx.egprs} %if osmo_trx.get('multi_arfcn', False): multi-arfcn enable %else: -- To view, visit https://gerrit.osmocom.org/11497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I682f0c1b4cb97b704d646f18f54e748baaefd677 Gerrit-Change-Number: 11497 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:32 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites.conf: Enable testing egprs In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11498 ) Change subject: default-suites.conf: Enable testing egprs ...................................................................... default-suites.conf: Enable testing egprs Change-Id: I1885e2a749e62547f60b9c35e15f1277b2627bb4 --- M example/default-suites.conf 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/example/default-suites.conf b/example/default-suites.conf index c7f2377..26a42a6 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -10,6 +10,7 @@ - voice:sysmo+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:sysmo+mod-bts0-dynts-osmo - gprs:sysmo +- gprs:sysmo+mod-bts0-egprs - gprs:sysmo+mod-bts0-dynts-ipa - gprs:sysmo+mod-bts0-dynts-osmo - dynts:sysmo+mod-bts0-dynts67-ipa+cfg-codec-fr-any @@ -28,6 +29,7 @@ - voice:trx-b200+mod-bts0-dynts-osmo - voice:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:trx-b200 +- gprs:trx-b200+mod-bts0-egprs - gprs:trx-b200+mod-bts0-dynts-ipa - gprs:trx-b200+mod-bts0-dynts-osmo - gprs:trx-b200+mod-bts0-numtrx2+mod-bts0-chanallocdescend @@ -46,6 +48,7 @@ - voice:trx-sysmocell5000+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:trx-sysmocell5000+mod-bts0-dynts-osmo - gprs:trx-sysmocell5000 +- gprs:trx-sysmocell5000+mod-bts0-egprs - gprs:trx-sysmocell5000+mod-bts0-dynts-ipa - gprs:trx-sysmocell5000+mod-bts0-dynts-osmo - dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr-any @@ -61,6 +64,7 @@ - voice:nanobts+band-1900+mod-bts0-ts-tchh+cfg-codec-hr3 - voice:nanobts+band-1900+mod-bts0-dynts-ipa+cfg-codec-fr-any - gprs:nanobts+band-1900 +- gprs:nanobts+band-1900+mod-bts0-egprs - gprs:nanobts+band-1900+mod-bts0-dynts-ipa - dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr-any @@ -74,6 +78,7 @@ - voice:nanobts+band-900+mod-bts0-dynts-ipa+cfg-codec-fr-any - voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - gprs:nanobts+band-900 +- gprs:nanobts+band-900+mod-bts0-egprs - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend - dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr-any -- To view, visit https://gerrit.osmocom.org/11498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1885e2a749e62547f60b9c35e15f1277b2627bb4 Gerrit-Change-Number: 11498 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:07:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:07:33 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: ec20: Enable voice support In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11508 ) Change subject: resources.conf: ec20: Enable voice support ...................................................................... resources.conf: ec20: Enable voice support It was tested that it could do MO and MT voicecall just fine as SierraW modems. Change-Id: Ie14c00f9f80e00fdbb52ab82a53b4b5a187d41e7 --- M example/resources.conf.prod M example/resources.conf.rnd 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 0c8792e..b4ab445 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -137,7 +137,7 @@ ki: '07F35D0A9476646169669401215580E0' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sms', 'ussd', 'gprs', 'sim'] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: gobi2k path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5' diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index dd9dc8f..61c328e 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -87,7 +87,7 @@ ki: 'BB70807226393CDBAC8DD3439FF54252' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sms', 'ussd', 'gprs', 'sim'] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - label: gobi2k path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.5' -- To view, visit https://gerrit.osmocom.org/11508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie14c00f9f80e00fdbb52ab82a53b4b5a187d41e7 Gerrit-Change-Number: 11508 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:13:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:13:08 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Add tests for UmTRX In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11624 to look at the new patch set (#2). Change subject: default-suites: Add tests for UmTRX ...................................................................... default-suites: Add tests for UmTRX Change-Id: I0d0fe17676550a96d9bcf795faf43f7e6b82fb1a --- M example/default-suites.conf 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/24/11624/2 -- To view, visit https://gerrit.osmocom.org/11624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0d0fe17676550a96d9bcf795faf43f7e6b82fb1a Gerrit-Change-Number: 11624 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:15:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:15:50 +0000 Subject: Change in osmo-bsc[master]: gsm_data: make cgi_for_msc available for other modules In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11527 ) Change subject: gsm_data: make cgi_for_msc available for other modules ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d Gerrit-Change-Number: 11527 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 12:15:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:17:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:17:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11607 ) Change subject: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae Gerrit-Change-Number: 11607 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 12:17:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:17:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:17:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11607 ) Change subject: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11607/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11607/1//COMMIT_MSG at 10 PS1, Line 10: imissing, lets add one. typo -- To view, visit https://gerrit.osmocom.org/11607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae Gerrit-Change-Number: 11607 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 12:17:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:21:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:21:31 +0000 Subject: Change in osmo-bts[master]: LC15: Fix missing fill frame and GSM 05.08 mandatory frame In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/5753 ) Change subject: LC15: Fix missing fill frame and GSM 05.08 mandatory frame ...................................................................... Patch Set 9: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/5753/9/src/osmo-bts-litecell15/l1_if.c File src/osmo-bts-litecell15/l1_if.c: https://gerrit.osmocom.org/#/c/5753/9/src/osmo-bts-litecell15/l1_if.c at 365 PS9, Line 365: LOGP(DL1C, LOGL_DEBUG, "%s tn=%u: Sending fill frame on in none DTX mode " This text keeps being really confusing and needs fixing. First, we don't send any fill frame here, we only create and fill the message. Second: "on in none DTX mode" makes no sense to me. -- To view, visit https://gerrit.osmocom.org/5753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e9bf9438c0b400e4d29eb39ffae37207e34db6 Gerrit-Change-Number: 5753 Gerrit-PatchSet: 9 Gerrit-Owner: Minh-Quang Nguyen Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Minh-Quang Nguyen Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 06 Nov 2018 12:21:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:31:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 12:31:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/9374/3/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/#/c/9374/3/pcu/PCU_Tests.ttcn at 223 PS3, Line 223: if (dec_PDU_ML3_NW_MS_backtrack(payload, pdu) != 0) { > what does this _backtrack do? The _backtrack variant of this function allows us to ignore decoding errors of unrelated Layer1 frames. The code: pdu := dec_PDU_ML3_NW_MS(payload); will sometimes result in an error such as: Dynamic test case error: While RAW-decoding type '@MobileL3_Types.PDU_ML3_NW_MS': Can not decode type '@MobileL3_Types.PDU_ML3_NW_MS', because invalid message was received The _backtrack variant returns an error code and hence allows us to skip such frames. -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 12:31:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:53:19 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 6 Nov 2018 12:53:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11607 to look at the new patch set (#2). Change subject: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template ...................................................................... BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template The receive template for the BSSMAP HANDOVER PERFORMED MESSAGE is missing, lets add one. Related OS#3645 Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae --- M library/BSSMAP_Templates.ttcn 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/11607/2 -- To view, visit https://gerrit.osmocom.org/11607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae Gerrit-Change-Number: 11607 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:55:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 12:55:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11607 ) Change subject: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae Gerrit-Change-Number: 11607 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 12:55:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:59:39 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 12:59:39 +0000 Subject: Change in osmo-ci[master]: misc: Install patchelf to add/set an rpath if wanted In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11579 ) Change subject: misc: Install patchelf to add/set an rpath if wanted ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 Gerrit-Change-Number: 11579 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 12:59:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 12:59:42 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 12:59:42 +0000 Subject: Change in osmo-ci[master]: misc: Install patchelf to add/set an rpath if wanted In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11579 ) Change subject: misc: Install patchelf to add/set an rpath if wanted ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 Gerrit-Change-Number: 11579 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 12:59:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:02:23 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 13:02:23 +0000 Subject: Change in osmo-ci[master]: misc: Install patchelf to add/set an rpath if wanted In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11579 to look at the new patch set (#2). Change subject: misc: Install patchelf to add/set an rpath if wanted ...................................................................... misc: Install patchelf to add/set an rpath if wanted Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M docker/Dockerfile.deb8_amd64 M docker/Dockerfile.deb8_i386 M docker/Dockerfile_osmocom_jenkins.amd64 4 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/79/11579/2 -- To view, visit https://gerrit.osmocom.org/11579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 Gerrit-Change-Number: 11579 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:14:02 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 13:14:02 +0000 Subject: Change in osmo-ci[master]: misc: Install patchelf to add/set an rpath if wanted In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11579 ) Change subject: misc: Install patchelf to add/set an rpath if wanted ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 Gerrit-Change-Number: 11579 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 13:14:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:14:05 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 13:14:05 +0000 Subject: Change in osmo-ci[master]: misc: Install patchelf to add/set an rpath if wanted In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11579 ) Change subject: misc: Install patchelf to add/set an rpath if wanted ...................................................................... misc: Install patchelf to add/set an rpath if wanted Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M docker/Dockerfile.deb8_amd64 M docker/Dockerfile.deb8_i386 M docker/Dockerfile_osmocom_jenkins.amd64 4 files changed, 10 insertions(+), 0 deletions(-) Approvals: Holger Freyther: Looks good to me, approved; Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 2200638..16e72ed 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -47,6 +47,7 @@ - libopencore-amrnb-dev # by LimeSuite - cmake + - patchelf - name: install build dependencies and libraries apt: diff --git a/docker/Dockerfile.deb8_amd64 b/docker/Dockerfile.deb8_amd64 index c996396..19e41dc 100644 --- a/docker/Dockerfile.deb8_amd64 +++ b/docker/Dockerfile.deb8_amd64 @@ -38,3 +38,6 @@ # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc + +# Add rpath to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf diff --git a/docker/Dockerfile.deb8_i386 b/docker/Dockerfile.deb8_i386 index 9605106..6b45b59 100644 --- a/docker/Dockerfile.deb8_i386 +++ b/docker/Dockerfile.deb8_i386 @@ -38,3 +38,6 @@ # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc + +# Add rpath to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index cc68bf4..3acff70 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -42,5 +42,8 @@ # and all RUN DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen g++ libtalloc-dev libpcsclite-dev make gcc pkgconf libtool autoconf autoconf-archive automake libortp-dev asciidoc mscgen git libsctp-dev libpcap-dev osc libc-ares-dev libgps-dev libsofia-sip-ua-glib-dev libssl-dev libsqlite3-dev libusb-dev libffi-dev libfftw3-dev flex bison libdbi-dev libsnmp-dev libncurses5-dev libgsm1-dev python-minimal python3 libdbd-sqlite3 cppcheck htop libgmp-dev gawk texinfo flex bison bc libsigsegv-dev libffi-dev libusb-1.0-0-dev libreadline-dev debhelper devscripts gcc-arm-none-eabi git-buildpackage dh-systemd dh-autoreconf bc openssh-client stow +# Add rpath to binaries +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y patchelf + ADD http://git.osmocom.org/python/osmo-python-tests/patch /tmp/commit RUN git clone git://git.osmocom.org/python/osmo-python-tests && cd osmo-python-tests && ./contrib/jenkins.sh -- To view, visit https://gerrit.osmocom.org/11579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6e4ad2e3855af7bcefc22d4190cc4e6f58581857 Gerrit-Change-Number: 11579 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:14:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 6 Nov 2018 13:14:09 +0000 Subject: Change in libosmocore[master]: gsm/gsup.h: cosmetic: use tab for comment alignment In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11621 ) Change subject: gsm/gsup.h: cosmetic: use tab for comment alignment ...................................................................... gsm/gsup.h: cosmetic: use tab for comment alignment Change-Id: Id71d4b45e2b9f42da5e23e709ad97d4d0abfc3d9 --- M include/osmocom/gsm/gsup.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 0ef5a75..cd6fd31 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -207,7 +207,7 @@ /*! Session state \ref osmo_gsup_session_state */ enum osmo_gsup_session_state session_state; /*! Unique session identifier and origination flag. - * Encoded only when \ref session_state != 0x00 */ + * Encoded only when \ref session_state != 0x00 */ uint32_t session_id; /*! ASN.1 encoded MAP payload for Supplementary Services */ -- To view, visit https://gerrit.osmocom.org/11621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id71d4b45e2b9f42da5e23e709ad97d4d0abfc3d9 Gerrit-Change-Number: 11621 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:15:34 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 13:15:34 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Initialize event_server_sk_tmp_dir in ctor In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11594 to look at the new patch set (#2). Change subject: ms_driver: Initialize event_server_sk_tmp_dir in ctor ...................................................................... ms_driver: Initialize event_server_sk_tmp_dir in ctor Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/94/11594/2 -- To view, visit https://gerrit.osmocom.org/11594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 Gerrit-Change-Number: 11594 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:15:44 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 13:15:44 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Initialize event_server_sk_tmp_dir in ctor In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11594 ) Change subject: ms_driver: Initialize event_server_sk_tmp_dir in ctor ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 Gerrit-Change-Number: 11594 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 13:15:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:15:59 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 13:15:59 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Initialize event_server_sk_tmp_dir in ctor In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11594 ) Change subject: ms_driver: Initialize event_server_sk_tmp_dir in ctor ...................................................................... ms_driver: Initialize event_server_sk_tmp_dir in ctor Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Holger Freyther: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 808989e..a4d81c1 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -64,6 +64,7 @@ self._loop = SimpleLoop() self._suite_run.remember_to_stop(self) self._test_case = None + self.event_server_sk_tmp_dir = None if len(self.event_server_path().encode()) > 107: raise log.Error('Path for event_server socket is longer than max allowed len for unix socket path (107):', self.event_server_path()) -- To view, visit https://gerrit.osmocom.org/11594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9f39a25f292262cf335df371f434995e58c9ae93 Gerrit-Change-Number: 11594 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:17:49 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Tue, 6 Nov 2018 13:17:49 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Use terminate not kill and initialize in ctor In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11595 ) Change subject: ms_driver: Use terminate not kill and initialize in ctor ...................................................................... ms_driver: Use terminate not kill and initialize in ctor Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b --- M src/osmo_ms_driver/starter.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 86ad446..5218a57 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -39,6 +39,7 @@ def __init__(self, name_number, tmp_dir): super().__init__("osmo-ms-virt-phy", name_number, tmp_dir) self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number) + self._vphy_proc = None def phy_filename(self): return self._phy_filename @@ -61,7 +62,7 @@ def kill(self): """Clean up things.""" if self._vphy_proc: - self._vphy_proc.kill() + self._vphy_proc.terminate() class OsmoMobile(Launcher): def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): @@ -72,6 +73,7 @@ self._phy_filename = phy_filename self._ev_server_path = ev_server_path self._imsi, self._ki = next(self._imsi_ki_generator) + self._omob_proc = None def imsi(self): return self._imsi @@ -122,4 +124,4 @@ def kill(self): """Clean up things.""" if self._omob_proc: - self._omob_proc.kill() + self._omob_proc.terminate() -- To view, visit https://gerrit.osmocom.org/11595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b Gerrit-Change-Number: 11595 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 13:51:58 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 13:51:58 +0000 Subject: Change in libasn1c[master]: remove a redundant assertion Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11625 Change subject: remove a redundant assertion ...................................................................... remove a redundant assertion Prevent an assert() with an uninitialized variable. The same assertion is run again once the variable t2m_count has been initialized. Similar change was made upstream, albeit in a different function, as part of this commit: https://github.com/vlm/asn1c/commit/fb6344ef750a4d822ecd613819deba89b181b932 Change-Id: Ib81e76cfb339838f5e8981d175176557f1a8a63f Related: CID#57935 --- M src/constr_SET.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/25/11625/1 diff --git a/src/constr_SET.c b/src/constr_SET.c index 8a124c0..b249869 100644 --- a/src/constr_SET.c +++ b/src/constr_SET.c @@ -670,7 +670,6 @@ /* * Finalize order of the components. */ - assert(t2m_count == td->elements_count); if(t2m_build_own) { /* * Sort the underlying members according to their -- To view, visit https://gerrit.osmocom.org/11625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib81e76cfb339838f5e8981d175176557f1a8a63f Gerrit-Change-Number: 11625 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:04:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 14:04:38 +0000 Subject: Change in osmo-mgw[master]: add aggregated rtp connection stats to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11519 ) Change subject: add aggregated rtp connection stats to osmo-mgw ...................................................................... add aggregated rtp connection stats to osmo-mgw Add a counter group for aggregated RTP connection statistics. This group contains RTP counters which aggregate values of the ephemeral RTP counters maintained per connection (mgcp_conn). This provides a global overview of RTP processing for each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters'. While here, fix a typo in an item of the mgcp_conn_rate_ctr_desc array: "rtp:octets_rx" was displayed for outbound packes; now says "_tx". Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 5 files changed, 80 insertions(+), 14 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index c8c2cfd..aa5607f 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -194,9 +194,12 @@ int vty_number_endpoints; struct mgcp_endpoint *endpoints; - /* rate counters */ + /* Rate counter group which contains stats for processed CRCX commands. */ struct rate_ctr_group *mgcp_crcx_ctr_group; + /* Rate counter group which contains stats for processed MDCX commands. */ struct rate_ctr_group *mgcp_mdcx_ctr_group; + /* Rate counter group which aggregates stats of individual RTP connections. */ + struct rate_ctr_group *all_rtp_conn_stats; }; enum mgcp_role { diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 3da7334..b0978a6 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -25,6 +25,7 @@ #include #include +#include #include /* RTP connection related counters */ @@ -35,7 +36,36 @@ RTP_OCTETS_RX_CTR, RTP_PACKETS_TX_CTR, RTP_OCTETS_TX_CTR, - RTP_DROPPED_PACKETS_CTR + RTP_DROPPED_PACKETS_CTR, + RTP_NUM_CONNECTIONS, +}; + +/* RTP per-connection statistics. Instances of the corresponding rate counter group + * exist for the lifetime of an RTP connection. + * Must be kept in sync with all_rtp_conn_rate_ctr_desc below */ +static const struct rate_ctr_desc mgcp_conn_rate_ctr_desc[] = { + [IN_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:in", "Inbound rtp-stream timestamp errors."}, + [OUT_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:out", "Outbound rtp-stream timestamp errors."}, + [RTP_PACKETS_RX_CTR] = {"rtp:packets_rx", "Inbound rtp packets."}, + [RTP_OCTETS_RX_CTR] = {"rtp:octets_rx", "Inbound rtp octets."}, + [RTP_PACKETS_TX_CTR] = {"rtp:packets_tx", "Outbound rtp packets."}, + [RTP_OCTETS_TX_CTR] = {"rtp:octets_tx", "Outbound rtp octets."}, + [RTP_DROPPED_PACKETS_CTR] = {"rtp:dropped", "dropped rtp packets."} +}; + +/* Aggregated RTP connection stats. These are updated when an RTP connection is freed. + * Must be kept in sync with mgcp_conn_rate_ctr_desc above */ +static const struct rate_ctr_desc all_rtp_conn_rate_ctr_desc[] = { + [IN_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_in", "Total inbound rtp-stream timestamp errors."}, + [OUT_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_out", "Total outbound rtp-stream timestamp errors."}, + [RTP_PACKETS_RX_CTR] = {"all_rtp:packets_rx", "Total inbound rtp packets."}, + [RTP_OCTETS_RX_CTR] = {"all_rtp:octets_rx", "Total inbound rtp octets."}, + [RTP_PACKETS_TX_CTR] = {"all_rtp:packets_tx", "Total outbound rtp packets."}, + [RTP_OCTETS_TX_CTR] = {"all_rtp:octets_tx", "Total outbound rtp octets."}, + [RTP_DROPPED_PACKETS_CTR] = {"all_rtp:dropped", "Total dropped rtp packets."}, + + /* This last counter does not exist in per-connection stats, only here. */ + [RTP_NUM_CONNECTIONS] = {"all_rtp:num_closed_conns", "Total number of rtp connections closed."} }; struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp, diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 820c63a..fce8a78 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -31,22 +31,12 @@ #include #include -static const struct rate_ctr_desc rate_ctr_desc[] = { - [IN_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:in", "Inbound rtp-stream timestamp errors."}, - [OUT_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:out", "Outbound rtp-stream timestamp errors."}, - [RTP_PACKETS_RX_CTR] = {"rtp:packets_rx", "Inbound rtp packets."}, - [RTP_OCTETS_RX_CTR] = {"rtp:octets_rx", "Inbound rtp octets."}, - [RTP_PACKETS_TX_CTR] = {"rtp:packets_tx", "Outbound rtp packets."}, - [RTP_OCTETS_TX_CTR] = {"rtp:octets_rx", "Outbound rtp octets."}, - [RTP_DROPPED_PACKETS_CTR] = {"rtp:dropped", "dropped rtp packets."} -}; - const static struct rate_ctr_group_desc rate_ctr_group_desc = { .group_name_prefix = "conn_rtp", .group_description = "rtp connection statistics", .class_id = 1, - .num_ctr = ARRAY_SIZE(rate_ctr_desc), - .ctr_desc = rate_ctr_desc + .num_ctr = ARRAY_SIZE(mgcp_conn_rate_ctr_desc), + .ctr_desc = mgcp_conn_rate_ctr_desc }; @@ -234,6 +224,27 @@ return NULL; } +static void +aggregate_rtp_conn_stats(struct mgcp_trunk_config *trunk, struct mgcp_conn_rtp *conn_rtp) +{ + struct rate_ctr_group *all_stats = trunk->all_rtp_conn_stats; + struct rate_ctr_group *conn_stats = conn_rtp->rate_ctr_group; + int i; + + if (all_stats == NULL || conn_stats == NULL) + return; + + /* Compared to per-connection RTP statistics, aggregated RTP statistics + * contain one additional rate couter item (RTP_NUM_CONNECTIONS). + * All other counters in both counter groups correspond to each other. */ + OSMO_ASSERT(conn_stats->desc->num_ctr + 1 == all_stats->desc->num_ctr); + + for (i = 0; i < conn_stats->desc->num_ctr; i++) + rate_ctr_add(&all_stats->ctr[i], conn_stats->ctr[i].current); + + rate_ctr_inc(&all_stats->ctr[RTP_NUM_CONNECTIONS]); +} + /*! free a connection by its ID. * \param[in] endp associated endpoint * \param[in] id identification number of the connection */ @@ -253,6 +264,7 @@ switch (conn->type) { case MGCP_CONN_TYPE_RTP: + aggregate_rtp_conn_stats(endp->tcfg, &conn->u.rtp); mgcp_rtp_conn_cleanup(&conn->u.rtp); break; default: diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 3a0e4ea..90c282c 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -42,6 +42,7 @@ #include #include #include +#include struct mgcp_request { char *name; @@ -103,6 +104,14 @@ .ctr_desc = mgcp_mdcx_ctr_desc }; +const static struct rate_ctr_group_desc all_rtp_conn_rate_ctr_group_desc = { + .group_name_prefix = "all_rtp_conn", + .group_description = "aggregated statistics for all rtp connections", + .class_id = 1, + .num_ctr = ARRAY_SIZE(all_rtp_conn_rate_ctr_desc), + .ctr_desc = all_rtp_conn_rate_ctr_desc +}; + static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data); static struct msgb *handle_create_con(struct mgcp_parse_data *data); static struct msgb *handle_delete_con(struct mgcp_parse_data *data); @@ -1494,6 +1503,7 @@ * a better way of assigning indices? */ static unsigned int crcx_rate_ctr_index = 0; static unsigned int mdcx_rate_ctr_index = 0; + static unsigned int all_rtp_conn_rate_ctr_index = 0; if (trunk->mgcp_crcx_ctr_group == NULL) { trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index); @@ -1507,6 +1517,13 @@ talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group); mdcx_rate_ctr_index++; } + if (trunk->all_rtp_conn_stats == NULL) { + trunk->all_rtp_conn_stats = rate_ctr_group_alloc(ctx, &all_rtp_conn_rate_ctr_group_desc, + all_rtp_conn_rate_ctr_index); + OSMO_ASSERT(trunk->all_rtp_conn_stats); + talloc_set_destructor(trunk->all_rtp_conn_stats, free_rate_counter_group); + all_rtp_conn_rate_ctr_index++; + } } /*! allocate configuration with default values. diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index ed8aca5..e40d412 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -253,6 +253,10 @@ vty_out(vty, " %s:%s", cfg->mgcp_mdcx_ctr_group->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_mdcx_ctr_group); } + if (show_stats && cfg->all_rtp_conn_stats) { + vty_out(vty, " %s:%s", cfg->all_rtp_conn_stats->desc->group_description, VTY_NEWLINE); + vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->all_rtp_conn_stats); + } } #define SHOW_MGCP_STR "Display information about the MGCP Media Gateway\n" -- To view, visit https://gerrit.osmocom.org/11519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139 Gerrit-Change-Number: 11519 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:09:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 14:09:30 +0000 Subject: Change in libasn1c[master]: remove a redundant assertion In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11625 ) Change subject: remove a redundant assertion ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib81e76cfb339838f5e8981d175176557f1a8a63f Gerrit-Change-Number: 11625 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 14:09:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:10:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 14:10:20 +0000 Subject: Change in osmo-bsc[master]: vty: don't show GPRS details if not configured Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11626 Change subject: vty: don't show GPRS details if not configured ...................................................................... vty: don't show GPRS details if not configured In 'show bts' command only display details of GPRS MO if GPRS is configured for this BTS. Change-Id: I082a9fecfa337dff5342b79cca8144b0ceaab15d --- M src/osmo-bsc/bsc_vty.c 1 file changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/11626/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 410cdac..84752dd 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -447,14 +447,19 @@ net_dump_nmstate(vty, &bts->mo.nm_state); vty_out(vty, " Site Mgr NM State: "); net_dump_nmstate(vty, &bts->site_mgr.mo.nm_state); - vty_out(vty, " GPRS NSE: "); - net_dump_nmstate(vty, &bts->gprs.nse.mo.nm_state); - vty_out(vty, " GPRS CELL: "); - net_dump_nmstate(vty, &bts->gprs.cell.mo.nm_state); - vty_out(vty, " GPRS NSVC0: "); - net_dump_nmstate(vty, &bts->gprs.nsvc[0].mo.nm_state); - vty_out(vty, " GPRS NSVC1: "); - net_dump_nmstate(vty, &bts->gprs.nsvc[1].mo.nm_state); + + if (bts->gprs.mode != BTS_GPRS_NONE) { + vty_out(vty, " GPRS NSE: "); + net_dump_nmstate(vty, &bts->gprs.nse.mo.nm_state); + vty_out(vty, " GPRS CELL: "); + net_dump_nmstate(vty, &bts->gprs.cell.mo.nm_state); + vty_out(vty, " GPRS NSVC0: "); + net_dump_nmstate(vty, &bts->gprs.nsvc[0].mo.nm_state); + vty_out(vty, " GPRS NSVC1: "); + net_dump_nmstate(vty, &bts->gprs.nsvc[1].mo.nm_state); + } else + vty_out(vty, " GPRS: not configured%s", VTY_NEWLINE); + vty_out(vty, " Paging: %u pending requests, %u free slots%s", paging_pending_requests_nr(bts), bts->paging.available_slots, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/11626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I082a9fecfa337dff5342b79cca8144b0ceaab15d Gerrit-Change-Number: 11626 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:14:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 14:14:03 +0000 Subject: Change in osmo-bsc[master]: vty: don't show GPRS details if not configured In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11626 ) Change subject: vty: don't show GPRS details if not configured ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I082a9fecfa337dff5342b79cca8144b0ceaab15d Gerrit-Change-Number: 11626 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 06 Nov 2018 14:14:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:19:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 14:19:34 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: prod has now 8 modems attached Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11627 Change subject: ansible: gsm-tester: prod has now 8 modems attached ...................................................................... ansible: gsm-tester: prod has now 8 modems attached 4 EC20 modems were attached, and the issue with only 3 out of the 4 showing up was fixed a while ago. Change-Id: I0e0876fd5581e9eb56c498078ae8cd8c68ede5b5 --- M ansible/host_vars/osmo-gsm-tester-prod.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/27/11627/1 diff --git a/ansible/host_vars/osmo-gsm-tester-prod.yml b/ansible/host_vars/osmo-gsm-tester-prod.yml index 9d195de..92d8169 100644 --- a/ansible/host_vars/osmo-gsm-tester-prod.yml +++ b/ansible/host_vars/osmo-gsm-tester-prod.yml @@ -8,4 +8,4 @@ ip: 10.42.42.122 # how many modems are connected via a quadmodem? -gsm_modems: 3 +gsm_modems: 8 -- To view, visit https://gerrit.osmocom.org/11627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0e0876fd5581e9eb56c498078ae8cd8c68ede5b5 Gerrit-Change-Number: 11627 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:37:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 14:37:11 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Support power cycling multiple quad modems Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11628 Change subject: ansible: gsm-tester: Support power cycling multiple quad modems ...................................................................... ansible: gsm-tester: Support power cycling multiple quad modems uhubctl doesn't support acting on several hubs from same vendor at once. Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 --- M ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/28/11628/1 diff --git a/ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh b/ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh index 626a04e..f461d81 100755 --- a/ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh +++ b/ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh @@ -1,9 +1,15 @@ #!/bin/sh set -ex -uhubctl -p 123456 -a 0 -n 1d50:4002 + +locations="$(uhubctl -n 1d50:4002 | grep "Current status for hub" | awk '{print $5}')" +for l in $locations; do + uhubctl -p 123456 -a 0 -n 1d50:4002 -l $l +done # give a lot of time to discharge capacitors on the board sleep 20 -uhubctl -p 123456 -a 1 -n 1d50:4002 +for l in $locations; do + uhubctl -p 123456 -a 1 -n 1d50:4002 -l $l +done attempts=30 while [ "x$(uhubctl | grep -e 05c6 -e 1199 -c)" != "x{{ gsm_modems }}" ]; do attempts=$(($attempts - 1)) -- To view, visit https://gerrit.osmocom.org/11628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 Gerrit-Change-Number: 11628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:40:06 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 14:40:06 +0000 Subject: Change in osmo-bsc[master]: check return value of gsm48_multirate_config() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11629 Change subject: check return value of gsm48_multirate_config() ...................................................................... check return value of gsm48_multirate_config() Check the return value of gsm48_multirate_config() in function lchan_set_single_amr_mode(). This prevents an invalid AMR mode from being configured for a logical channel. Because the VTY parsier limits the AMR mode range to 0-7 this is just a theoretical issue. However, this fact is beyond the understanding of a static code analyzer, and the absence of error handling was indeed setting a bad example. Change-Id: I61153a44e8b7a38332bf38718397be9b339d5f25 Related: CID#188940 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 21 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/11629/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 410cdac..0b951c0 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4483,10 +4483,11 @@ } /* configure the lchan for a single AMR mode (as specified) */ -static int lchan_set_single_amr_mode(struct gsm_lchan *lchan, uint8_t amr_mode) +static int lchan_set_single_amr_mode(struct vty *vty, struct gsm_lchan *lchan, uint8_t amr_mode) { struct amr_multirate_conf mr; struct gsm48_multi_rate_conf *mr_conf; + int rc, vty_rc = CMD_SUCCESS; mr_conf = (struct gsm48_multi_rate_conf *) &mr.gsm48_ie; if (amr_mode > 7) @@ -4505,10 +4506,22 @@ /* encode this configuration into the lchan for both uplink and * downlink direction */ - gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes); - gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes); + rc = gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (%s, amr mode %d, ms) - check parameters%s", + gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + rc = gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (%s, amr mode %d, bts) - check parameters%s", + gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE); + vty_rc = CMD_WARNING; + } - return 0; + return vty_rc; } /* Debug/Measurement command to activate a given logical channel @@ -4564,14 +4577,16 @@ else if (!strcmp(codec_str, "efr")) lchan->tch_mode = GSM48_CMODE_SPEECH_EFR; else if (!strcmp(codec_str, "amr")) { - int amr_mode; + int amr_mode, vty_rc; if (argc < 7) { vty_out(vty, "%% AMR requires specification of AMR mode%s", VTY_NEWLINE); return CMD_WARNING; } amr_mode = atoi(argv[6]); lchan->tch_mode = GSM48_CMODE_SPEECH_AMR; - lchan_set_single_amr_mode(lchan, amr_mode); + vty_rc = lchan_set_single_amr_mode(vty, lchan, amr_mode); + if (vty_rc != CMD_SUCCESS) + return vty_rc; } vty_out(vty, "%% activating lchan %s%s", gsm_lchan_name(lchan), VTY_NEWLINE); rsl_tx_chan_activ(lchan, RSL_ACT_TYPE_INITIAL, 0); -- To view, visit https://gerrit.osmocom.org/11629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I61153a44e8b7a38332bf38718397be9b339d5f25 Gerrit-Change-Number: 11629 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:46:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 14:46:50 +0000 Subject: Change in osmo-bsc[master]: check return value of gsm48_multirate_config() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11629 ) Change subject: check return value of gsm48_multirate_config() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I61153a44e8b7a38332bf38718397be9b339d5f25 Gerrit-Change-Number: 11629 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 14:46:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 14:51:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 14:51:27 +0000 Subject: Change in osmo-bsc[master]: prevent a NULL pointer dereference in debug_candidate() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11630 Change subject: prevent a NULL pointer dereference in debug_candidate() ...................................................................... prevent a NULL pointer dereference in debug_candidate() Prevent a potential NULL pointer dereference in debug logging of the handover decision 2 implementation. The existing logic didn't correctly account for the fact that bts->candidate may be a NULL pointer. Change-Id: Ie3d672d835bbc136809e593a819a6dda7c84a88e Related: CID#188880 --- M src/osmo-bsc/handover_decision_2.c 1 file changed, 15 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/30/11630/1 diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index a8fff63..833b1d0 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -827,18 +827,21 @@ "RX level %d -> %d\n", rxlev2dbm(rxlev), rxlev2dbm(candidate->avg)); - if (candidate->bts == lchan->ts->trx->bts) - LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, - "RX level %d; " - HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", - rxlev2dbm(candidate->avg), - HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); - else if (candidate->bts) - LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, - "RX level %d -> %d; " - HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", - rxlev2dbm(rxlev), rxlev2dbm(candidate->avg), - HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); + if (candidate->bts) { + if (candidate->bts == lchan->ts->trx->bts) { + LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, + "RX level %d; " + HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", + rxlev2dbm(candidate->avg), + HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); + } else { + LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, + "RX level %d -> %d; " + HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", + rxlev2dbm(rxlev), rxlev2dbm(candidate->avg), + HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); + } + } } /* add candidate for re-assignment within the current cell */ -- To view, visit https://gerrit.osmocom.org/11630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3d672d835bbc136809e593a819a6dda7c84a88e Gerrit-Change-Number: 11630 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 15:06:51 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem info after HW upgrade Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11631 Change subject: resources.conf.prod: Update modem info after HW upgrade ...................................................................... resources.conf.prod: Update modem info after HW upgrade A new quadmodem with 4xEC20 has been added to the Prod setup. Change-Id: I51f0b7dd7a1857d34fc2c5076016caeffa15240d --- M example/resources.conf.prod 1 file changed, 35 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/31/11631/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index b4ab445..1c7eb4a 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -132,13 +132,6 @@ ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'sim'] -- label: ec20 - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' - ki: '07F35D0A9476646169669401215580E0' - auth_algo: 'comp128v1' - ciphers: [a5_0, a5_1] - features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - - label: gobi2k path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5' ki: '5752B3F43277C35D2D1D957007DF74E2' @@ -146,5 +139,40 @@ ciphers: [a5_0, a5_1] features: ['sim'] +- label: ec20_1 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' + ki: '07F35D0A9476646169669401215580E0' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'sim'] + +- label: ec20_2 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.2' + ki: '278B899D126C31F3B24D21E3EB556530' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'sim'] + +- label: ec20_3 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.3' + ki: 'B43BBCD8DE4D594F4146DE3D8ADC589D' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'sim'] + +- label: ec20_4 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.5' + ki: 'A41F06F39DE3B0295C178A674D3E3636' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'sim'] + +- label: ec20_5 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.6' + ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'sim'] + osmocon_phone: - serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_00897B41-if00-port0' -- To view, visit https://gerrit.osmocom.org/11631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I51f0b7dd7a1857d34fc2c5076016caeffa15240d Gerrit-Change-Number: 11631 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 6 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 6 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#299?= In-Reply-To: <1591322793.436.1541430607268.JavaMail.jenkins@jenkins.osmocom.org> References: <1591322793.436.1541430607268.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1205185202.453.1541517007300.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:19:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 15:19:51 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem info after HW upgrade In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11631 to look at the new patch set (#2). Change subject: resources.conf.prod: Update modem info after HW upgrade ...................................................................... resources.conf.prod: Update modem info after HW upgrade A new quadmodem with 4xEC20 has been added to the Prod setup. Change-Id: I51f0b7dd7a1857d34fc2c5076016caeffa15240d --- M example/resources.conf.prod 1 file changed, 35 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/31/11631/2 -- To view, visit https://gerrit.osmocom.org/11631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I51f0b7dd7a1857d34fc2c5076016caeffa15240d Gerrit-Change-Number: 11631 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:29:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 6 Nov 2018 15:29:43 +0000 Subject: Change in osmo-bts[master]: prevent potential NULL dereference in virtbts's tx_tchh_fn Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11632 Change subject: prevent potential NULL dereference in virtbts's tx_tchh_fn ...................................................................... prevent potential NULL dereference in virtbts's tx_tchh_fn If chan_state->ongoing_facch is set, this code's logic suggests that both msg_facch and msg_tch could be NULL. Don't dereference msg_tch unconditionally. Change-Id: Icf5584396c5b925d55ca9380dd4f869ae5d72da3 Related: CID#172047 --- M src/osmo-bts-virtual/scheduler_virtbts.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/11632/1 diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 2248afc..25f6583 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -463,7 +463,7 @@ if (msg_facch) { tx_to_virt_um(l1t, tn, fn, chan, msg_facch); msgb_free(msg_tch); - } else + } else if (msg_tch) tx_to_virt_um(l1t, tn, fn, chan, msg_tch); send_burst: -- To view, visit https://gerrit.osmocom.org/11632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icf5584396c5b925d55ca9380dd4f869ae5d72da3 Gerrit-Change-Number: 11632 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:29:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 6 Nov 2018 15:29:59 +0000 Subject: Change in libosmocore[master]: GSUP: introduce new InvokeID Information Element Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11633 Change subject: GSUP: introduce new InvokeID Information Element ...................................................................... GSUP: introduce new InvokeID Information Element Each invoke component in TCAP is identified by an unique InvokeID, assigned by the application that originates the invoke. The InvokeID is returned in the response, and allows the originator to correlate the reply with the invoke operation to which it belongs. Since GSUP has no TCAP layer, there are optional SESSION_ID and SESSION_STATE IEs aimed to 'emulate' the dialog. This change introduces the new optional INVOKE_ID IE. InvokeID is required in order to support multy-part SMS over GSUP. Change-Id: If14006b035ff465b73b39ea4cd59e5fd16a4d7ff Related: OS#3587 --- M TODO-RELEASE M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err 5 files changed, 33 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/11633/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index a4c48ca..4bed90d 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ libosmogsm gsm48_push_l3hdr() (re)introduced in gsm/gsm48.h (GSM 04.08 API) libosmogsm gsm48_push_l3hdr_tid() a wrapper around gsm48_push_l3hdr() libosmogsm osmo_gsup_message extended with SMS related fields +libosmogsm osmo_gsup_message extended with InvokeID diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index f314672..867b409 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -86,6 +86,7 @@ OSMO_GSUP_SESSION_ID_IE = 0x30, OSMO_GSUP_SESSION_STATE_IE = 0x31, + OSMO_GSUP_INVOKE_ID_IE = 0x32, /*! Supplementary Services payload */ OSMO_GSUP_SS_INFO_IE = 0x35, @@ -223,6 +224,9 @@ /*! Unique session identifier and origination flag. * Encoded only when \ref session_state != 0x00 */ uint32_t session_id; + /*! InvokeID, maps REQ/RES pairs within a single session. + * Encoded only when \ref invoke_id != NULL */ + int8_t *invoke_id; /*! ASN.1 encoded MAP payload for Supplementary Services */ uint8_t *ss_info; diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index dbab424..5555d68 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -448,6 +448,10 @@ gsup_msg->session_state = *value; break; + case OSMO_GSUP_INVOKE_ID_IE: + gsup_msg->invoke_id = (int8_t *) value; + break; + case OSMO_GSUP_SS_INFO_IE: gsup_msg->ss_info = value; gsup_msg->ss_info_len = value_len; @@ -657,6 +661,12 @@ msgb_tlv_put(msg, OSMO_GSUP_SESSION_STATE_IE, sizeof(u8), &u8); } + if (gsup_msg->invoke_id) { + uint8_t *invoke_id = (uint8_t *) gsup_msg->invoke_id; + msgb_tlv_put(msg, OSMO_GSUP_INVOKE_ID_IE, + sizeof(*invoke_id), invoke_id); + } + if (gsup_msg->ss_info) { msgb_tlv_put(msg, OSMO_GSUP_SS_INFO_IE, gsup_msg->ss_info_len, gsup_msg->ss_info); diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 4eef483..a8c0b4e 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -226,6 +226,8 @@ 0xde, 0xad, 0xbe, 0xef, 0x31, 0x01, /* Session state (BEGIN) */ 0x01, + 0x32, 0x01, /* InvokeID */ + 0xfa, /* SM related IEs */ 0x40, 0x09, /* SM-RP-DA (Destination Address) */ @@ -246,6 +248,8 @@ 0xde, 0xad, 0xbe, 0xef, 0x31, 0x01, /* Session state (BEGIN) */ 0x01, + 0x32, 0x01, /* InvokeID */ + 0xfa, /* SM related IEs */ 0x40, 0x0a, /* SM-RP-DA (Destination Address) */ @@ -267,6 +271,8 @@ 0xde, 0xad, 0xbe, 0xef, 0x31, 0x01, /* Session state (END) */ 0x03, + 0x32, 0x01, /* InvokeID */ + 0xfa, /* SM related IEs */ 0x42, 0x04, /* SM-RP-UI (TPDU) */ diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 37aa4ce..864b6af 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -49,14 +49,14 @@ generated message: 22 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 35 08 a3 06 02 01 01 02 01 47 original message: 22 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 35 08 a3 06 02 01 01 02 01 47 IMSI: 123456789012345 - generated message: 24 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 40 09 03 07 91 52 75 47 99 09 82 41 02 ff 00 42 04 de ad be ef - original message: 24 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 40 09 03 07 91 52 75 47 99 09 82 41 02 ff 00 42 04 de ad be ef + generated message: 24 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 32 01 fa 40 09 03 07 91 52 75 47 99 09 82 41 02 ff 00 42 04 de ad be ef + original message: 24 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 32 01 fa 40 09 03 07 91 52 75 47 99 09 82 41 02 ff 00 42 04 de ad be ef IMSI: 123456789012345 - generated message: 28 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 40 0a 01 08 21 43 65 87 09 21 43 f5 41 09 03 07 91 52 75 47 99 09 82 42 04 de ad be ef - original message: 28 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 40 0a 01 08 21 43 65 87 09 21 43 f5 41 09 03 07 91 52 75 47 99 09 82 42 04 de ad be ef + generated message: 28 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 32 01 fa 40 0a 01 08 21 43 65 87 09 21 43 f5 41 09 03 07 91 52 75 47 99 09 82 42 04 de ad be ef + original message: 28 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 32 01 fa 40 0a 01 08 21 43 65 87 09 21 43 f5 41 09 03 07 91 52 75 47 99 09 82 42 04 de ad be ef IMSI: 123456789012345 - generated message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 42 04 de ad be ef - original message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 42 04 de ad be ef + generated message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 32 01 fa 42 04 de ad be ef + original message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 32 01 fa 42 04 de ad be ef IMSI: 123456789012345 message 0: tested 11 truncations, 11 parse failures message 1: tested 14 truncations, 13 parse failures @@ -75,9 +75,9 @@ message 14: tested 20 truncations, 18 parse failures message 15: tested 42 truncations, 39 parse failures message 16: tested 30 truncations, 27 parse failures - message 17: tested 41 truncations, 36 parse failures - message 18: tested 49 truncations, 44 parse failures - message 19: tested 26 truncations, 23 parse failures + message 17: tested 44 truncations, 38 parse failures + message 18: tested 52 truncations, 46 parse failures + message 19: tested 29 truncations, 25 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures message 1: tested 3584 modifications, 770 parse failures @@ -96,6 +96,6 @@ message 14: tested 5120 modifications, 1030 parse failures message 15: tested 10752 modifications, 1262 parse failures message 16: tested 7680 modifications, 1271 parse failures - message 17: tested 10496 modifications, 2557 parse failures - message 18: tested 12544 modifications, 2304 parse failures - message 19: tested 6656 modifications, 1289 parse failures + message 17: tested 11264 modifications, 2812 parse failures + message 18: tested 13312 modifications, 2559 parse failures + message 19: tested 7424 modifications, 1546 parse failures -- To view, visit https://gerrit.osmocom.org/11633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If14006b035ff465b73b39ea4cd59e5fd16a4d7ff Gerrit-Change-Number: 11633 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:31:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 15:31:09 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 4: (13 comments) patch set coming up... https://gerrit.osmocom.org/#/c/11560/4/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11560/4/src/gits at 2 PS4, Line 2: argparse > argparse is not used. [?] the reason why argparse will not work so well is passing arguments to git. consider: gits clean -dxf then 'gits' will argparse the -dxf arguments, but they were intended to be passed on to each 'cd subdir/; git clean -dxf' cmdline. good catch about -h https://gerrit.osmocom.org/#/c/11560/4/src/gits at 11 PS4, Line 11: re_status_mods = re.compile('^\t(modified|deleted):.*') > This is only used once in the code. [?] I think I'd rather precompile all others here as well https://gerrit.osmocom.org/#/c/11560/4/src/gits at 29 PS4, Line 29: print(' '.join(cmd)) > How about differentiating the command from the output it produces? For example with a leading '>' ch [?] can do. I think I'd use the '+ ' ala 'set -x' https://gerrit.osmocom.org/#/c/11560/4/src/gits at 37 PS4, Line 37: sys.stderr.flush() > why flush the output only when the section_marker is needed? not sure. probably came from previous code... should probably flush above instead https://gerrit.osmocom.org/#/c/11560/4/src/gits at 45 PS4, Line 45: m > how about "branch" as variable name? it's a re "match object" https://gerrit.osmocom.org/#/c/11560/4/src/gits at 48 PS4, Line 48: return m.group(1) this one is the branch https://gerrit.osmocom.org/#/c/11560/4/src/gits at 68 PS4, Line 68: up to date > With git 2.11.0 I get: [?] yeah, that's the main ultra drawback of this script so far. I really really shouldn't use porcelain. I'm not sure how to use plumbing though, so far it's "works-for-me" -- do you know how to fix that? https://gerrit.osmocom.org/#/c/11560/4/src/gits at 122 PS4, Line 122: strs.append(''.join(branch_info)) > why make a list first, and then join it? that's my common string composition pattern. If I do "str = str + more", then I create an ever growing string in a loop. If I append to a list and later join, I only create one large string in the end. Well, it's premature optimization, but I prefer that style. In this instance it was about conditionally adding strings. a bit overboard, yes https://gerrit.osmocom.org/#/c/11560/4/src/gits at 194 PS4, Line 194: print('\n===== %s =====' % git_dir) > If we print out something like "> cd %s && %s" before the output of the command, it would be consist [?] I like more visible markers in this case https://gerrit.osmocom.org/#/c/11560/4/src/gits at 200 PS4, Line 200: SkipThisRepos > How about "SkipThisRepo"? repo is commonly used to abbreviate repository, so when reading "repos" I' [?] I've always thought of "repos", not "repo", had the same "conflict" with stsp many years ago... :) https://gerrit.osmocom.org/#/c/11560/4/src/gits at 223 PS4, Line 223: if v == answer: : return answer : if v == '*': : return answer > how about: [?] I see, but I prefer listing each valid_answers case in its separate 'if' https://gerrit.osmocom.org/#/c/11560/4/src/gits at 359 PS4, Line 359: cmd_do(sys.argv[1:]) > I'm not sure if it's a good idea to perform "do" by default - whenever there's a typo in any of the [?] but I want to write 'gits fetch' :) and don't want to write a shim for each and every one of those... you're right of course, maybe a shim then. https://gerrit.osmocom.org/#/c/11560/4/src/gits at 362 PS4, Line 362: # vim: shiftwidth=2 expandtab tabstop=2 > Since there are not Python coding guidelines in the wiki yet: [?] wow, you're just as obsessed with details like I am! -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 06 Nov 2018 15:31:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:36:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 15:36:41 +0000 Subject: Change in osmo-bts[master]: prevent potential NULL dereference in virtbts's tx_tchh_fn In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11632 ) Change subject: prevent potential NULL dereference in virtbts's tx_tchh_fn ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11632/1/src/osmo-bts-virtual/scheduler_virtbts.c File src/osmo-bts-virtual/scheduler_virtbts.c: https://gerrit.osmocom.org/#/c/11632/1/src/osmo-bts-virtual/scheduler_virtbts.c at 463 PS1, Line 463: if (msg_facch) { IIUC, whe chan_state->dl_ongoing_facch is TRUE, that means msg_facch cannot be NULL (unless something really bad is going on), and as a result we always go into this branch. Can tx_tch_common return msg_facch==NULL and msg_tch==NULL at the same time? -- To view, visit https://gerrit.osmocom.org/11632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf5584396c5b925d55ca9380dd4f869ae5d72da3 Gerrit-Change-Number: 11632 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 15:36:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:38:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 15:38:33 +0000 Subject: Change in osmo-dev[master]: sanitize.opts: add osmo-sip-connector --enable-sanitize In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11593 ) Change subject: sanitize.opts: add osmo-sip-connector --enable-sanitize ...................................................................... sanitize.opts: add osmo-sip-connector --enable-sanitize Otherwise it is not able to link asan-enabled libosmocore in the binaries. Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 --- M sanitize.opts 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/93/11593/2 -- To view, visit https://gerrit.osmocom.org/11593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 Gerrit-Change-Number: 11593 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:38:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 15:38:34 +0000 Subject: Change in osmo-dev[master]: deps: comment out osmo-trx Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11634 Change subject: deps: comment out osmo-trx ...................................................................... deps: comment out osmo-trx osmo-trx shouldn't run with address sanitizer. But omitting --enable-sanitize from osmo-trx breaks 'make check', so then the whole top-level makefile will end in error with sanitize.opts. A user wanting to build osmo-trx can just uncomment that line. Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb --- M 2G.deps M 3G+2G.deps 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/34/11634/1 diff --git a/2G.deps b/2G.deps index cf2723a..c77646e 100644 --- a/2G.deps +++ b/2G.deps @@ -10,4 +10,4 @@ osmo-msc libosmo-sccp osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn libosmo-sccp osmo-ggsn osmo-hlr -osmo-trx libosmocore +#osmo-trx libosmocore diff --git a/3G+2G.deps b/3G+2G.deps index b82e7c9..71691a0 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -13,4 +13,4 @@ osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn osmo-iuh osmo-ggsn osmo-hlr osmo-sip-connector libosmocore -osmo-trx libosmocore +#osmo-trx libosmocore -- To view, visit https://gerrit.osmocom.org/11634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb Gerrit-Change-Number: 11634 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:38:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 15:38:34 +0000 Subject: Change in osmo-dev[master]: 2G.deps: add osmo-sip-connector Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11635 Change subject: 2G.deps: add osmo-sip-connector ...................................................................... 2G.deps: add osmo-sip-connector Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3 --- M 2G.deps 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/35/11635/1 diff --git a/2G.deps b/2G.deps index c77646e..e4a4be5 100644 --- a/2G.deps +++ b/2G.deps @@ -10,4 +10,5 @@ osmo-msc libosmo-sccp osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn libosmo-sccp osmo-ggsn osmo-hlr +osmo-sip-connector libosmocore #osmo-trx libosmocore -- To view, visit https://gerrit.osmocom.org/11635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3 Gerrit-Change-Number: 11635 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:38:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 15:38:49 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11560 to look at the new patch set (#5). Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 426 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/5 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:47:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 15:47:17 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem info after HW upgrade In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11631 ) Change subject: resources.conf.prod: Update modem info after HW upgrade ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51f0b7dd7a1857d34fc2c5076016caeffa15240d Gerrit-Change-Number: 11631 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 15:47:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 15:47:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 15:47:19 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.prod: Update modem info after HW upgrade In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11631 ) Change subject: resources.conf.prod: Update modem info after HW upgrade ...................................................................... resources.conf.prod: Update modem info after HW upgrade A new quadmodem with 4xEC20 has been added to the Prod setup. Change-Id: I51f0b7dd7a1857d34fc2c5076016caeffa15240d --- M example/resources.conf.prod 1 file changed, 35 insertions(+), 7 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/resources.conf.prod b/example/resources.conf.prod index b4ab445..0cab84f 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -132,13 +132,6 @@ ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'sim'] -- label: ec20 - path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' - ki: '07F35D0A9476646169669401215580E0' - auth_algo: 'comp128v1' - ciphers: [a5_0, a5_1] - features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] - - label: gobi2k path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.5' ki: '5752B3F43277C35D2D1D957007DF74E2' @@ -146,5 +139,40 @@ ciphers: [a5_0, a5_1] features: ['sim'] +- label: ec20_1 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.6' + ki: '07F35D0A9476646169669401215580E0' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + +- label: ec20_2 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.2' + ki: '278B899D126C31F3B24D21E3EB556530' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + +- label: ec20_3 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.3' + ki: 'B43BBCD8DE4D594F4146DE3D8ADC589D' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + +- label: ec20_4 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.5' + ki: 'A41F06F39DE3B0295C178A674D3E3636' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + +- label: ec20_5 + path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.3/1-5.3.6' + ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146' + auth_algo: 'comp128v1' + ciphers: [a5_0, a5_1] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] + osmocon_phone: - serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_00897B41-if00-port0' -- To view, visit https://gerrit.osmocom.org/11631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I51f0b7dd7a1857d34fc2c5076016caeffa15240d Gerrit-Change-Number: 11631 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:04:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 16:04:54 +0000 Subject: Change in libosmocore[master]: NS: log address:port on error Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11636 Change subject: NS: log address:port on error ...................................................................... NS: log address:port on error Change-Id: If2dc533a6dc150254f5d44b672f04bb728e7e927 --- M src/gb/gprs_ns.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/11636/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 198ead1..34bbfde 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1510,6 +1510,8 @@ struct msgb *msg = gprs_ns_msgb_alloc(); int ret = 0; socklen_t saddr_len = sizeof(*saddr); + uint16_t port, addr_len = 32; + char addr[addr_len]; if (!msg) { *error = -ENOMEM; @@ -1519,8 +1521,9 @@ ret = recvfrom(bfd->fd, msg->data, NS_ALLOC_SIZE - NS_ALLOC_HEADROOM, 0, (struct sockaddr *)saddr, &saddr_len); if (ret < 0) { - LOGP(DNS, LOGL_ERROR, "recv error %s during NSIP recv\n", - strerror(errno)); + osmo_sockaddr_to_str_and_uint(addr, addr_len, &port, (const struct sockaddr*)saddr); + LOGP(DNS, LOGL_ERROR, "recv error %s during NSIP recvfrom %s:%u\n", + strerror(errno), addr, port); msgb_free(msg); *error = ret; return NULL; -- To view, visit https://gerrit.osmocom.org/11636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If2dc533a6dc150254f5d44b672f04bb728e7e927 Gerrit-Change-Number: 11636 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:10:56 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 16:10:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Fix DTE by requesting the correct type Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11637 Change subject: hlr: Fix DTE by requesting the correct type ...................................................................... hlr: Fix DTE by requesting the correct type Previous commit d686a8a54873eb61fae7d55cb001378dae3fbd7d from Vadim introduced a copy and paste error. Change-Id: I5075b17a810762651e0c7d638cc4c35c58436cd9 --- M hlr/HLR_EUSE.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/11637/1 diff --git a/hlr/HLR_EUSE.ttcn b/hlr/HLR_EUSE.ttcn index 93eb8f4..fbb496c 100644 --- a/hlr/HLR_EUSE.ttcn +++ b/hlr/HLR_EUSE.ttcn @@ -58,7 +58,7 @@ var SS_FacilityInformation dec_fac, rsp_fac; var octetstring ss_rsp; - f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, state_ie); + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SESSION_STATE_IE, state_ie); var GSUP_SessionState ss_state := state_ie.session_state; f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie); -- To view, visit https://gerrit.osmocom.org/11637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5075b17a810762651e0c7d638cc4c35c58436cd9 Gerrit-Change-Number: 11637 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:13:22 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 6 Nov 2018 16:13:22 +0000 Subject: Change in libosmocore[master]: gsm_29_118: add missing include to header file Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11638 Change subject: gsm_29_118: add missing include to header file ...................................................................... gsm_29_118: add missing include to header file The header file gsm_29_118.h is defining variables of type struct value_string, which is declared in core/utils.h. We should add an include to utils.h to prevent confusion when the header is used. Change-Id: I9f9bb62d29cd068820ad5aa677717bd448de3f4a Related: OS#3615 --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/11638/1 diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index 24e9de2..c344f04 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -1,5 +1,6 @@ #pragma once +#include /* TS 29.118 Section 9.2 */ enum sgsap_msg_type { -- To view, visit https://gerrit.osmocom.org/11638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9f9bb62d29cd068820ad5aa677717bd448de3f4a Gerrit-Change-Number: 11638 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:19:11 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 16:19:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11562 ) Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 06 Nov 2018 16:19:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:22:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 16:22:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11562 ) Change subject: bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL ...................................................................... bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL We cannot notify RSL Emulation layer about expecting a specific FN (during ts_RSLDC_ChanRqd) because we only know the FN after sending the RACH request, and since notification to RSL Emulation happens async, it can happen (verified) that ChanRqd message from BTS arrives and is handled before we register the RACH req into the ConnectionTable. Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 --- M bts/BTS_Tests.ttcn M library/RSL_Emulation.ttcn 2 files changed, 70 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 5b073ef..64c2510 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1344,6 +1344,28 @@ } } +/* Send RACH request through l1CTL and wait for ChanReq on RSL BST->BSC */ +private function f_rach_req_wait_chan_rqd(integer ra) runs on ConnHdlr return GsmFrameNumber { + var GsmFrameNumber fn; + timer T := 8.0; + + /* advertise to RSL Emulation that we expect to receive confirmation from RACH */ + RSL.send(ts_RSLDC_ChanRqd_anyFN(int2oct(ra,1))); + + f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, g_pars.l1_pars.ms_power_level); + /* Send the actual RACH */ + fn := f_L1CTL_RACH(L1CTL, ra); + + T.start; + alt { + [] RSL.receive(tr_RSL_CHAN_RQD(int2oct(ra,1), fn)) { setverdict(pass, "Received CHAN-RQD from RACH REQ") } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Timeout waiting for CHAN-RQD from RACH REQ <", ra, ", ", fn, ">")); + } + } + T.stop + return fn; +} /* Establish dedicated channel: L1CTL + RSL side */ private function f_est_dchan(boolean encr_enable := false) runs on ConnHdlr { @@ -1351,10 +1373,8 @@ var ImmediateAssignment imm_ass; var integer ra := 23; - f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, g_pars.l1_pars.ms_power_level); - fn := f_L1CTL_RACH(L1CTL, ra); - /* This arrives on CCHAN, so we cannot test for receiving CHAN RQDhere */ - //RSL.receive(tr_RSL_CHAN_RQD(int2oct(23,1))); + /* Send RACH request and wait for ChanReq */ + fn := f_rach_req_wait_chan_rqd(ra); /* Activate channel on BTS side */ f_rsl_chan_act(g_pars.chan_mode, encr_enable); diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index cf02d00..cdeca74 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -47,14 +47,19 @@ type record RSLDC_ChanRqd { OCT1 ra, - GsmFrameNumber fn + GsmFrameNumber fn optional }; -template RSLDC_ChanRqd ts_RSLDC_ChanRqd(OCT1 ra, GsmFrameNumber fn) := { +template (value) RSLDC_ChanRqd ts_RSLDC_ChanRqd(OCT1 ra, GsmFrameNumber fn) := { ra := ra, fn := fn } +template (value) RSLDC_ChanRqd ts_RSLDC_ChanRqd_anyFN(OCT1 ra) := { + ra := ra, + fn := omit +} + type port RSL_DCHAN_PT message { inout RSLDC_ChanRqd, RSL_Message; } with { extension "internal" }; @@ -183,15 +188,36 @@ return -1; } +/* Matches by only RA if FN is ommited in one of the connections allocated */ +private function f_cid_by_ra_fn2(OCT1 ra, RSL_IE_FrameNumber fn) +runs on RSL_Emulation_CT return integer { + var integer i; + for (i := 0; i < sizeof(ConnectionTable); i := i+1) { + if (ispresent(ConnectionTable[i].ra) and + ConnectionTable[i].ra == ra) { + if (not ispresent(ConnectionTable[i].ra_fn) or + fn == valueof(ts_RSL_IE_FrameNumber(ConnectionTable[i].ra_fn))) { + return i; + } + } + } + log("No Dchan handler for ", ra, fn); + return -1; +} + /* create an ew client with given RA and FN */ -private function f_cid_create(OCT1 ra, GsmFrameNumber fn, RSL_DchanHdlr comp_ref) +private function f_cid_create(OCT1 ra, template (omit) GsmFrameNumber fn, RSL_DchanHdlr comp_ref) runs on RSL_Emulation_CT { var integer i; for (i := 0; i < sizeof(ConnectionTable); i := i+1) { if (not ispresent(ConnectionTable[i].ra) and not ispresent(ConnectionTable[i].trx_nr)) { ConnectionTable[i].ra := ra; - ConnectionTable[i].ra_fn := fn; + if (ispresent(fn)) { + ConnectionTable[i].ra_fn := valueof(fn); + } else { + ConnectionTable[i].ra_fn := omit; + } ConnectionTable[i].comp_ref := comp_ref; return; } @@ -394,6 +420,17 @@ } } } + [not bts_role] IPA_PT.receive(tr_RSL(tr_RSL_CHAN_RQD(?))) -> value rx_rsl { + var RSL_IE_RequestRef req_ref; + req_ref := rx_rsl.rsl.ies[1].body.req_ref; + cid := f_cid_by_ra_fn2(req_ref.ra, req_ref.frame_nr); + if (cid != -1) { + CLIENT_PT.send(rx_rsl.rsl) to ConnectionTable[cid].comp_ref; + f_cid_clear(cid); + } else { + CCHAN_PT.send(rx_rsl); + } + } [bts_role] IPA_PT.receive(tr_RSL(tr_RSL_PAGING_CMD(?, ?))) -> value rx_rsl { /* broadcast to all clients? */ @@ -446,6 +483,11 @@ ts_RSL_CHAN_RQD(chan_rqd.ra, chan_rqd.fn))); } + [not bts_role] CLIENT_PT.receive(RSLDC_ChanRqd:?) -> value chan_rqd sender vc_conn { + /* Store the knowledge that this sender has requested a certain RQ+time */ + f_cid_create(chan_rqd.ra, chan_rqd.fn, vc_conn); + } + [] CLIENT_PT.receive(tr_RSL_MsgType(?)) -> value rx_rsl_msg sender vc_conn { /* forward to BSC */ cid := f_cid_by_comp_ref(vc_conn); -- To view, visit https://gerrit.osmocom.org/11562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 Gerrit-Change-Number: 11562 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:23:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 16:23:39 +0000 Subject: Change in libosmocore[master]: gsm_29_118: add missing include to header file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11638 ) Change subject: gsm_29_118: add missing include to header file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f9bb62d29cd068820ad5aa677717bd448de3f4a Gerrit-Change-Number: 11638 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 16:23:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:26:26 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 16:26:26 +0000 Subject: Change in osmo-gsm-manuals[master]: Change OpenBSC mentions to OsmoBSC where applicable In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11616 ) Change subject: Change OpenBSC mentions to OsmoBSC where applicable ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11616/1/common/chapters/bts.adoc File common/chapters/bts.adoc: https://gerrit.osmocom.org/#/c/11616/1/common/chapters/bts.adoc at 6 PS1, Line 6: BSC operation. Just like about anything else in OsmoBSC, they are > take chance to remove extra spacing after dot? I did it in an extra patch now (for this file only). There are quite a few places where more spaces are used (without any effect on the output) so I removed them all. -- To view, visit https://gerrit.osmocom.org/11616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cc6874302b6089a54d44b09f08660a25e46d4dc Gerrit-Change-Number: 11616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 16:26:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:28:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 6 Nov 2018 16:28:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Fix DTE by requesting the correct type In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11637 ) Change subject: hlr: Fix DTE by requesting the correct type ...................................................................... Patch Set 1: Code-Review+1 Oh, damn, thanks a lot for this fix! -- To view, visit https://gerrit.osmocom.org/11637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5075b17a810762651e0c7d638cc4c35c58436cd9 Gerrit-Change-Number: 11637 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 06 Nov 2018 16:28:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:34:58 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 16:34:58 +0000 Subject: Change in osmo-gsm-manuals[master]: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11611 to look at the new patch set (#2). Change subject: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo ...................................................................... Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 --- M common/chapters/abis.adoc 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/11/11611/2 -- To view, visit https://gerrit.osmocom.org/11611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 Gerrit-Change-Number: 11611 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:34:59 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 16:34:59 +0000 Subject: Change in osmo-gsm-manuals[master]: common/chapters/bts: Remove duplicate spaces in text Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11639 Change subject: common/chapters/bts: Remove duplicate spaces in text ...................................................................... common/chapters/bts: Remove duplicate spaces in text Change-Id: I38f3e94342461f494ef547bcdccd2594c30e679d --- M common/chapters/bts.adoc 1 file changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/39/11639/1 diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index eb28497..30a33cc 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -1,20 +1,20 @@ [[bts]] == Reviewing and Provisioning BTS configuration -The main functionality of the BSC component is to manage BTSs. As such, +The main functionality of the BSC component is to manage BTSs. As such, provisioning BTSs within the BSC is one of the most common tasks during -BSC operation. Just like about anything else in OsmoBSC, they are +BSC operation. Just like about anything else in OsmoBSC, they are configured using the VTY. BTSs are internally numbered with integer numbers starting from "0" for -the first BTS. BTS numbers have to be contiguous, so you cannot +the first BTS. BTS numbers have to be contiguous, so you cannot configure 0,1,2 and then 5. === Reviewing current BTS status and configuration In order to view the status and properties of a BTS, you can issue the -`show bts` command. If used without any BTS number, it will display +`show bts` command. If used without any BTS number, it will display information about all provisioned BTS numbers. ---- @@ -55,9 +55,9 @@ specified BTS (`show trx 0 0`). Furthermore, information on the individual timeslots can be shown by -means of `show timeslot`. The output can be restricted to the +means of `show timeslot`. The output can be restricted to the timeslots of a single BTS (`show timeslot 0`) or that of a single -TRX (`show timeslot 0 0`). Finally, you can restrict the output to +TRX (`show timeslot 0 0`). Finally, you can restrict the output to a single timeslot by specifying the BTS, TRX and TS numbers (`show timeslot 0 0 4`). @@ -74,7 +74,7 @@ === Provisioning a new BTS In order to provision BTSs, you have to enter the BTS config node of the -VTY. In order to configure BTS 0, you can issue the following sequence +VTY. In order to configure BTS 0, you can issue the following sequence of commands: ---- @@ -87,12 +87,12 @@ At this point, you have a plethora of commands, in fact an entire hierarchy of commands to configure all aspects of the BTS, as well as -each of its TRX and each timeslot within each TRX. For a full +each of its TRX and each timeslot within each TRX. For a full reference, please consult the telnet VTY integrated help or the respective chapter in the VTY reference. BTS configuration depends quite a bit on the specific BTS vendor and -model. The section below provides just one possible example for the +model. The section below provides just one possible example for the case of a sysmoBTS. Note that from the `configure terminal` command onwards, the telnet VTY @@ -140,7 +140,7 @@ A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' messages to mobile stations, both via the BCCH in idle mode, was well as -via the SACCH in dedicated mode. There are many different types of such +via the SACCH in dedicated mode. There are many different types of such messages. For their detailed contents and encoding, please see _3GPP TS 24.008_ <<3gpp-ts-24-008>>. @@ -161,7 +161,7 @@ === Neighbor List configuration Every BTS sends a list of ARFCNs of neighbor cells -. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH +. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH . within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode For every BTS config node in the VTY, you can specify the behavior of @@ -184,17 +184,17 @@ === Configuring GPRS PCU parameters of a BTS In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located -inside the BTS. The BTS then establishes a Gb connection to the SGSN. +inside the BTS. The BTS then establishes a Gb connection to the SGSN. All the BTS-internal PCU configuration is performed via A-bis OML by means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' (NS Entity). There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' -nodes. At the time of this writing, only the NSVC 0 is supported by +nodes. At the time of this writing, only the NSVC 0 is supported by OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. -The respective VTY configuration parameters are described below. They +The respective VTY configuration parameters are described below. They all exist beneath each BTS VTY config node. But let's first start with a small example @@ -224,29 +224,29 @@ ==== `gprs cell bvci <2-65535>` -Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique +Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique between all BGSGP connections to one SGSN. NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique bvci. OsmoBSC will not ensure this policy. +allocated an unique bvci. OsmoBSC will not ensure this policy. ==== `gprs nsei <0-65535>` -Configures the 'NS Entity Identifier'. It must be unique between all NS +Configures the 'NS Entity Identifier'. It must be unique between all NS connections to one SGSN. NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique bvci. OsmoBSC will not ensure this policy. +allocated an unique bvci. OsmoBSC will not ensure this policy. ==== `gprs nsvc <0-1> nsvci <0-65535>` -Configures the 'NS Virtual Connection Identifier'. It must be unique +Configures the 'NS Virtual Connection Identifier'. It must be unique between all NS virtual connections to one SGSN. NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique nsvci. OsmoBSC will not ensure this policy. +allocated an unique nsvci. OsmoBSC will not ensure this policy. ==== `gprs nsvc <0-1> local udp port <0-65535>` @@ -266,7 +266,7 @@ ==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> -Configures the various GPRS NS related timers. Please check the GPRS NS +Configures the various GPRS NS related timers. Please check the GPRS NS specification for the detailed meaning of those timers. -- To view, visit https://gerrit.osmocom.org/11639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I38f3e94342461f494ef547bcdccd2594c30e679d Gerrit-Change-Number: 11639 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:36:02 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 16:36:02 +0000 Subject: Change in osmo-gsm-manuals[master]: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11611 ) Change subject: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11611/1/common/chapters/abis.adoc File common/chapters/abis.adoc: https://gerrit.osmocom.org/#/c/11611/1/common/chapters/abis.adoc at 85 PS1, Line 85: Primarly OML IP. You can find this tool in the OpenBSC repository under: > OsmoBSC Thanks, I actually fixed this in one of the later commits without realizing I introduced the issue. :-) -- To view, visit https://gerrit.osmocom.org/11611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 Gerrit-Change-Number: 11611 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 06 Nov 2018 16:36:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:55:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 6 Nov 2018 16:55:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: introduce new InvokeID IE Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11640 Change subject: library/GSUP_Types.ttcn: introduce new InvokeID IE ...................................................................... library/GSUP_Types.ttcn: introduce new InvokeID IE Each invoke component in TCAP is identified by an unique InvokeID, assigned by the application that originates the invoke. The InvokeID is returned in the response, and allows the originator to correlate the reply with the invoke operation to which it belongs. Since GSUP has no TCAP layer, there are optional SESSION_ID and SESSION_STATE IEs aimed to 'emulate' the dialog. This change introduces the new optional INVOKE_ID IE. InvokeID is required in order to support multy-part SMS over GSUP. Change-Id: Ib7ed702cb05328dc4d1f459efc93df4fa947d7ae Related: OS#3587 --- M library/GSUP_Types.ttcn 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/11640/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index d7d9a5b..fa8d1ce 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -43,6 +43,7 @@ OSMO_GSUP_SESSION_ID_IE ('30'O), OSMO_GSUP_SESSION_STATE_IE ('31'O), + OSMO_GSUP_INVOKE_ID_IE ('32'O), OSMO_GSUP_SS_INFO_IE ('35'O), /* SM related IEs (see 3GPP TS 29.002, section 7.6.8) */ @@ -140,6 +141,7 @@ charg_char, tag = OSMO_GSUP_CHARG_CHAR_IE; session_state, tag = OSMO_GSUP_SESSION_STATE_IE; session_id, tag = OSMO_GSUP_SESSION_ID_IE; + invoke_id, tag = OSMO_GSUP_INVOKE_ID_IE; ss_info, tag = OSMO_GSUP_SS_INFO_IE; sm_rp_da, tag = OSMO_GSUP_SM_RP_DA_IE; sm_rp_oa, tag = OSMO_GSUP_SM_RP_OA_IE; @@ -176,6 +178,7 @@ /* Session information */ GSUP_SessionState session_state, OCT4 session_id, + int8_t invoke_id, /* Supplementary Services */ octetstring ss_info, /* Short Message Service */ @@ -613,6 +616,21 @@ } } +template (value) GSUP_IE ts_GSUP_IE_InvokeID(int8_t invoke_id) := { + tag := OSMO_GSUP_INVOKE_ID_IE, + len := 0, /* overwritten */ + val := { + invoke_id := invoke_id + } +} +template GSUP_IE tr_GSUP_IE_InvokeID(template int8_t invoke_id) := { + tag := OSMO_GSUP_INVOKE_ID_IE, + len := ?, + val := { + invoke_id := invoke_id + } +} + /* Possible identity types for SM-RP-{OA|DA} IEs */ type enumerated GSUP_SM_RP_ODA_IdType { OSMO_GSUP_SM_RP_ODA_ID_NONE ('00'O), @@ -922,6 +940,7 @@ hexstring imsi, /* IMSI (dummy, because mandatory) */ OCT4 sid, /* TCAP transactionID */ GSUP_SessionState state, /* TCAP transaction state */ + int8_t invoke_id, /* InvokeID */ GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ @@ -931,6 +950,7 @@ valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SessionId(sid)), valueof(ts_GSUP_IE_SessionState(state)), + valueof(ts_GSUP_IE_InvokeID(invoke_id)), valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)), valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)), valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) @@ -940,6 +960,7 @@ template hexstring imsi := ?, template OCT4 sid := ?, /* TCAP TransactionID */ template GSUP_SessionState state := ?, /* TCAP transaction state */ + template int8_t invoke_id := ?, /* InvokeID */ template GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ template GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ @@ -949,6 +970,7 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SessionId(sid), tr_GSUP_IE_SessionState(state), + tr_GSUP_IE_InvokeID(invoke_id), tr_GSUP_IE_SM_RP_DA(sm_rp_da), tr_GSUP_IE_SM_RP_OA(sm_rp_oa), tr_GSUP_IE_SM_RP_UI(sm_rp_ui) @@ -959,6 +981,7 @@ hexstring imsi, OCT4 sid, /* TCAP TransactionID */ GSUP_SessionState state, /* TCAP transaction state */ + int8_t invoke_id, /* InvokeID */ octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ ) := ts_GSUP( OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT, @@ -966,6 +989,7 @@ valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SessionId(sid)), valueof(ts_GSUP_IE_SessionState(state)), + valueof(ts_GSUP_IE_InvokeID(invoke_id)), valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) } ); @@ -973,6 +997,7 @@ template hexstring imsi := ?, template OCT4 sid := ?, /* TCAP TransactionID */ template GSUP_SessionState state := ?, /* TCAP transaction state */ + template int8_t invoke_id := ?, /* InvokeID */ template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ ) := tr_GSUP( OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT, @@ -980,6 +1005,7 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SessionId(sid), tr_GSUP_IE_SessionState(state), + tr_GSUP_IE_InvokeID(invoke_id), tr_GSUP_IE_SM_RP_UI(sm_rp_ui) } ); @@ -988,6 +1014,7 @@ hexstring imsi, OCT4 sid, /* TCAP TransactionID */ GSUP_SessionState state, /* TCAP transaction state */ + int8_t invoke_id, /* InvokeID */ integer cause /* User error, see 12.2.3 */ ) := ts_GSUP( OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR, @@ -995,6 +1022,7 @@ valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SessionId(sid)), valueof(ts_GSUP_IE_SessionState(state)), + valueof(ts_GSUP_IE_InvokeID(invoke_id)), valueof(ts_GSUP_IE_Cause(cause)) } ); @@ -1002,6 +1030,7 @@ template hexstring imsi := ?, template OCT4 sid := ?, /* TCAP TransactionID */ template GSUP_SessionState state := ?, /* TCAP transaction state */ + template int8_t invoke_id := ?, /* InvokeID */ template integer cause := ? /* User error, see 12.2.3 */ ) := tr_GSUP( OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR, @@ -1009,6 +1038,7 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SessionId(sid), tr_GSUP_IE_SessionState(state), + tr_GSUP_IE_InvokeID(invoke_id), tr_GSUP_IE_Cause(cause) } ); @@ -1017,6 +1047,7 @@ hexstring imsi, OCT4 sid, /* TCAP TransactionID */ GSUP_SessionState state, /* TCAP transaction state */ + int8_t invoke_id, /* InvokeID */ GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ @@ -1032,6 +1063,7 @@ valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SessionId(sid)), valueof(ts_GSUP_IE_SessionState(state)), + valueof(ts_GSUP_IE_InvokeID(invoke_id)), valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)), valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)), valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) @@ -1041,6 +1073,7 @@ template hexstring imsi := ?, template OCT4 sid := ?, /* TCAP TransactionID */ template GSUP_SessionState state := ?, /* TCAP transaction state */ + template int8_t invoke_id := ?, /* InvokeID */ template GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */ template GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */ template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ @@ -1056,6 +1089,7 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SessionId(sid), tr_GSUP_IE_SessionState(state), + tr_GSUP_IE_InvokeID(invoke_id), tr_GSUP_IE_SM_RP_DA(sm_rp_da), tr_GSUP_IE_SM_RP_OA(sm_rp_oa), tr_GSUP_IE_SM_RP_UI(sm_rp_ui) @@ -1066,6 +1100,7 @@ hexstring imsi, OCT4 sid, /* TCAP TransactionID */ GSUP_SessionState state, /* TCAP transaction state */ + int8_t invoke_id, /* InvokeID */ octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ ) := ts_GSUP( OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, @@ -1073,6 +1108,7 @@ valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SessionId(sid)), valueof(ts_GSUP_IE_SessionState(state)), + valueof(ts_GSUP_IE_InvokeID(invoke_id)), valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui)) } ); @@ -1080,6 +1116,7 @@ template hexstring imsi := ?, template OCT4 sid := ?, /* TCAP TransactionID */ template GSUP_SessionState state := ?, /* TCAP transaction state */ + template int8_t invoke_id := ?, /* InvokeID */ template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */ ) := tr_GSUP( OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, @@ -1087,6 +1124,7 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SessionId(sid), tr_GSUP_IE_SessionState(state), + tr_GSUP_IE_InvokeID(invoke_id), tr_GSUP_IE_SM_RP_UI(sm_rp_ui) } ); @@ -1095,6 +1133,7 @@ hexstring imsi, OCT4 sid, /* TCAP TransactionID */ GSUP_SessionState state, /* TCAP transaction state */ + int8_t invoke_id, /* InvokeID */ integer cause /* User error, see 12.9.3 */ ) := ts_GSUP( OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, @@ -1102,6 +1141,7 @@ valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SessionId(sid)), valueof(ts_GSUP_IE_SessionState(state)), + valueof(ts_GSUP_IE_InvokeID(invoke_id)), valueof(ts_GSUP_IE_Cause(cause)) } ); @@ -1109,6 +1149,7 @@ template hexstring imsi := ?, template OCT4 sid := ?, /* TCAP TransactionID */ template GSUP_SessionState state := ?, /* TCAP transaction state */ + template int8_t invoke_id := ?, /* InvokeID */ template integer cause := ? /* User error, see 12.9.3 */ ) := tr_GSUP( OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, @@ -1116,6 +1157,7 @@ tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SessionId(sid), tr_GSUP_IE_SessionState(state), + tr_GSUP_IE_InvokeID(invoke_id), tr_GSUP_IE_Cause(cause) } ); -- To view, visit https://gerrit.osmocom.org/11640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7ed702cb05328dc4d1f459efc93df4fa947d7ae Gerrit-Change-Number: 11640 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:58:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 6 Nov 2018 16:58:02 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use enum value for OML IP Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11641 Change subject: ipaccess-config: Use enum value for OML IP ...................................................................... ipaccess-config: Use enum value for OML IP Change-Id: I3a708c3ba2271d9968daa264736411c9326fc404 --- M src/ipaccess/ipaccess-config.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/11641/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 5491700..0fb5ad9 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -409,7 +409,7 @@ msgb_put_u8(nmsg, NM_ATT_IPACC_PRIM_OML_CFG_LIST); msgb_put_u16(nmsg, len); - msgb_put_u8(nmsg, 0x88); + msgb_put_u8(nmsg, NM_ATT_IPACC_PRIM_OML_CFG); /* IP address */ msgb_put_u32(nmsg, ip); -- To view, visit https://gerrit.osmocom.org/11641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3a708c3ba2271d9968daa264736411c9326fc404 Gerrit-Change-Number: 11641 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 16:58:26 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 16:58:26 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid mempcy with NULL src In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11610 ) Change subject: layer23: Avoid mempcy with NULL src ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11610/1/src/host/layer23/src/common/main.c File src/host/layer23/src/common/main.c: https://gerrit.osmocom.org/#/c/11610/1/src/host/layer23/src/common/main.c at 146 PS1, Line 146: if (app && app->cfg_getopt_opt) It may make more sense to check app_opp here since app->cfg_getopt_opt() could in theory omit to set app_opp or set it to NULL -- To view, visit https://gerrit.osmocom.org/11610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 Gerrit-Change-Number: 11610 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 06 Nov 2018 16:58:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:00:15 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 17:00:15 +0000 Subject: Change in osmocom-bb[master]: cosmetic: fix trailing whitespace In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11608 ) Change subject: cosmetic: fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5c1a6d98079ad846d114584a17ba9d80d95e0595 Gerrit-Change-Number: 11608 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 06 Nov 2018 17:00:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:01:51 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 17:01:51 +0000 Subject: Change in osmo-sip-connector[master]: configure.ac: add --enable-sanitize In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11592 ) Change subject: configure.ac: add --enable-sanitize ...................................................................... configure.ac: add --enable-sanitize Add --enable-sanitize to ./configure, as a copy-paste from libosmocore. When building libosmocore with --enable-sanitize, osmo-sip-connector cannot be linked if it doesn't include asan as well. This is particularly annoying to me when using sanitize.opts in osmo-dev. I'd have to turn off *all* asan everywhere just to include the osmo-sip-connector dep that was recently added. Change-Id: I18761802db2f29d9f0c7f269197d5b5e191142c5 --- M configure.ac 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 98fdc94..cdb42a5 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,18 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING( + [--enable-sanitize], + [Compile with address sanitizer enabled], + )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + AC_ARG_ENABLE(werror, [AS_HELP_STRING( [--enable-werror], -- To view, visit https://gerrit.osmocom.org/11592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I18761802db2f29d9f0c7f269197d5b5e191142c5 Gerrit-Change-Number: 11592 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:07:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 17:07:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Introduce mp_ipa_up_timeout parameter In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11568 ) Change subject: bts: Introduce mp_ipa_up_timeout parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieb046358d8266ac94bd7b9e916e85f84de3ad319 Gerrit-Change-Number: 11568 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 06 Nov 2018 17:07:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:09:51 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 17:09:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix typos In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11553 ) Change subject: cosmetic: fix typos ...................................................................... cosmetic: fix typos Change-Id: I6e75af46e134d33f752214988054105aba91366c --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_LCLS.ttcn M bsc/MSC_ConnectionHandler.ttcn 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ae855bd..e3ac707 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -340,7 +340,7 @@ activate(as_Tguard()); } -/* expect to receive a RSL message matching a specified templaten on a given BTS / stream */ +/* expect to receive a RSL message matching a specified template on a given BTS / stream */ function f_exp_ipa_rx(integer bts_nr, template RSL_Message t_rx, float t_secs := 2.0, IpaStreamId sid := IPAC_PROTO_RSL_TRX0) runs on test_CT return RSL_Message { var ASP_RSL_Unitdata rx_rsl_ud; diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index dfbd946..1c51995 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -522,7 +522,7 @@ /* first call is not possible to be LS (no second leg yet) */ pars_a.lcls.exp_sts := LCLS_STS_not_possible_ls; - /* second call should then reuslt in LS */ + /* second call should then result in LS */ pars_b.lcls.exp_sts := LCLS_STS_locally_switched; /* Expect LS to be established successfully */ diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 546fa2d..003813a 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -432,7 +432,7 @@ /* Note: Do not use valueof() to get a value of this template, use * f_gen_test_hdlr_pars() instead in order to get a configuration that is - * matched to the current test sitation (aoio vs. sccplite) */ + * matched to the current test situation (aoio vs. sccplite) */ template (value) TestHdlrParams t_def_TestHdlrPars := { ra := '23'O, fn := 23, -- To view, visit https://gerrit.osmocom.org/11553 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6e75af46e134d33f752214988054105aba91366c Gerrit-Change-Number: 11553 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:11:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 17:11:44 +0000 Subject: Change in osmo-bsc[master]: vty: don't show GPRS details if not configured In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11626 ) Change subject: vty: don't show GPRS details if not configured ...................................................................... vty: don't show GPRS details if not configured In 'show bts' command only display details of GPRS MO if GPRS is configured for this BTS. Change-Id: I082a9fecfa337dff5342b79cca8144b0ceaab15d --- M src/osmo-bsc/bsc_vty.c 1 file changed, 13 insertions(+), 8 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 410cdac..84752dd 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -447,14 +447,19 @@ net_dump_nmstate(vty, &bts->mo.nm_state); vty_out(vty, " Site Mgr NM State: "); net_dump_nmstate(vty, &bts->site_mgr.mo.nm_state); - vty_out(vty, " GPRS NSE: "); - net_dump_nmstate(vty, &bts->gprs.nse.mo.nm_state); - vty_out(vty, " GPRS CELL: "); - net_dump_nmstate(vty, &bts->gprs.cell.mo.nm_state); - vty_out(vty, " GPRS NSVC0: "); - net_dump_nmstate(vty, &bts->gprs.nsvc[0].mo.nm_state); - vty_out(vty, " GPRS NSVC1: "); - net_dump_nmstate(vty, &bts->gprs.nsvc[1].mo.nm_state); + + if (bts->gprs.mode != BTS_GPRS_NONE) { + vty_out(vty, " GPRS NSE: "); + net_dump_nmstate(vty, &bts->gprs.nse.mo.nm_state); + vty_out(vty, " GPRS CELL: "); + net_dump_nmstate(vty, &bts->gprs.cell.mo.nm_state); + vty_out(vty, " GPRS NSVC0: "); + net_dump_nmstate(vty, &bts->gprs.nsvc[0].mo.nm_state); + vty_out(vty, " GPRS NSVC1: "); + net_dump_nmstate(vty, &bts->gprs.nsvc[1].mo.nm_state); + } else + vty_out(vty, " GPRS: not configured%s", VTY_NEWLINE); + vty_out(vty, " Paging: %u pending requests, %u free slots%s", paging_pending_requests_nr(bts), bts->paging.available_slots, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/11626 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I082a9fecfa337dff5342b79cca8144b0ceaab15d Gerrit-Change-Number: 11626 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:24:55 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 17:24:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: restructure tests In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11555 ) Change subject: BSC LCLS: restructure tests ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11555/2/bsc/BSC_Tests_LCLS.ttcn File bsc/BSC_Tests_LCLS.ttcn: https://gerrit.osmocom.org/#/c/11555/2/bsc/BSC_Tests_LCLS.ttcn at 302 PS2, Line 302: f_tc_lcls_recv_ls_exp_mgcp() Missing semicolon ; TTCN3 seems to accept it, but I think we want to keep this syntax as C-like as possible. -- To view, visit https://gerrit.osmocom.org/11555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Gerrit-Change-Number: 11555 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: daniel Gerrit-Comment-Date: Tue, 06 Nov 2018 17:24:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:25:00 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 17:25:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: remove explicit address In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11554 ) Change subject: BSC: remove explicit address ...................................................................... BSC: remove explicit address The osmo-bsc.cfg should work on localhost. Having arbitrary IP address in it seems confusing and might lead to hard-to-debug errors. Change-Id: Ideb8a78348af435f9992c42bce0bb197d1e73e04 --- M bsc/osmo-bsc.cfg 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index c7f34fc..bca5b20 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -344,7 +344,6 @@ no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text - dest 192.168.100.11 6666 0 type normal allow-emergency allow amr-config 12_2k forbidden -- To view, visit https://gerrit.osmocom.org/11554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ideb8a78348af435f9992c42bce0bb197d1e73e04 Gerrit-Change-Number: 11554 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:25:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 17:25:28 +0000 Subject: Change in osmo-sgsn[master]: Cleanup non-existent files from debian/copyright In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11566 ) Change subject: Cleanup non-existent files from debian/copyright ...................................................................... Cleanup non-existent files from debian/copyright Change-Id: I36a05b7c729cc1d050c8d07540ed1d867ca2d613 Related: OS#2534 --- M debian/copyright 1 file changed, 0 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/debian/copyright b/debian/copyright index 65f3ba7..cc631f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -50,8 +50,6 @@ src/gprs/.gitignore src/gprs/Makefile.am src/gprs/osmo_sgsn.cfg - src/libcommon/Makefile.am - src/libcommon/gsup_test_client.c tests/Makefile.am tests/atlocal.in tests/gbproxy/Makefile.am @@ -61,9 +59,6 @@ tests/gprs/gprs_test.ok tests/gtphub/Makefile.am tests/gtphub/gtphub_test.ok - tests/oap/Makefile.am - tests/oap/oap_client_test.err - tests/oap/oap_client_test.ok tests/sgsn/Makefile.am tests/sgsn/sgsn_test.ok tests/slhc/Makefile.am @@ -85,9 +80,7 @@ include/osmocom/sgsn/gprs_sndcp_pcomp.h include/osmocom/sgsn/gprs_sndcp_xid.h include/osmocom/sgsn/gprs_utils.h - include/osmocom/sgsn/gsup_client.h include/osmocom/sgsn/gtphub.h - include/osmocom/sgsn/oap_client.h include/osmocom/sgsn/signal.h src/gprs/crc24.c src/gprs/gb_proxy.c @@ -111,11 +104,9 @@ src/gprs/gprs_sndcp_xid.c src/gprs/gprs_subscriber.c src/gprs/gprs_utils.c - src/gprs/gsup_client.c src/gprs/gtphub.c src/gprs/gtphub_main.c src/gprs/gtphub_vty.c - src/gprs/oap_client.c src/gprs/sgsn_ares.c src/gprs/sgsn_auth.c src/gprs/sgsn_cdr.c @@ -123,16 +114,7 @@ src/gprs/sgsn_libgtp.c src/gprs/sgsn_main.c src/gprs/sgsn_vty.c - src/libcommon/debug.c - src/libcommon/gsm_data.c - src/libcommon/gsm_data_shared.c - src/libcommon/gsm_subscriber_base.c - src/libcommon/gsup_client.c - src/libcommon/oap_client.c - src/libcommon/socket.c - src/libcommon/talloc_ctx.c tests/gtphub/gtphub_test.c - tests/oap/oap_client_test.c tests/sgsn/sgsn_test.c tests/slhc/slhc_test.c tests/sndcp_xid/sndcp_xid_test.c -- To view, visit https://gerrit.osmocom.org/11566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I36a05b7c729cc1d050c8d07540ed1d867ca2d613 Gerrit-Change-Number: 11566 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:25:42 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 6 Nov 2018 17:25:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: restructure tests In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11555 ) Change subject: BSC LCLS: restructure tests ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Gerrit-Change-Number: 11555 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 06 Nov 2018 17:25:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:25:57 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 17:25:57 +0000 Subject: Change in libosmocore[master]: Fix deprecation warning in gsm0808_test In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11602 ) Change subject: Fix deprecation warning in gsm0808_test ...................................................................... Fix deprecation warning in gsm0808_test Use gsm0808_create_layer3_2() directly instead of deprecated wrapper. Change-Id: I44772666c929dfd94d25953379cf51b371ce202c --- M tests/gsm0808/gsm0808_test.c 1 file changed, 12 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 7111db9..671b839 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -102,7 +102,16 @@ 0xef, 0xcd, GSM0808_SCT_FR2 | 0xa0, 0x9f, GSM0808_SCT_CSD | 0x90, 0xc0 }; - + struct osmo_cell_global_id cgi = { + .lai = { + .plmn = { + .mcc = 0x2244, + .mnc = 0x1122, + }, + .lac = 0x3366, + }, + .cell_identity = 0x4488, + }; struct msgb *msg, *in_msg; struct gsm0808_speech_codec_list sc_list; printf("Testing creating Layer3 (AoIP)\n"); @@ -113,9 +122,8 @@ in_msg->l3h = in_msg->data; msgb_v_put(in_msg, 0x23); - msg = - gsm0808_create_layer3_aoip(in_msg, 0x1122, 0x2244, 0x3366, 0x4488, - &sc_list); + msg = gsm0808_create_layer3_2(in_msg, &cgi, &sc_list); + VERIFY(msg, res, ARRAY_SIZE(res)); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/11602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I44772666c929dfd94d25953379cf51b371ce202c Gerrit-Change-Number: 11602 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 6 17:34:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 6 Nov 2018 17:34:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_lc15, origi?= =?UTF-8?Q?n/nrw/litecell15,default,osmocom-master-debian9_#1377?= Message-ID: <1007154632.454.1541525661454.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 40.52 KB...] config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.103-fa3b4 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc8gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC select.lo CC signal.lo CC msgb.lo CC bits.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC vty.lo CC utils.lo CC logging_vty.lo CC vector.lo CC telnet_interface.lo CC command.lo CC stats_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo /bin/bash: line 2: 11962 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm690.lo -MD -MP -MF $depbase.Tpo -c -o gsm690.lo gsm690.c Makefile:471: recipe for target 'gsm690.lo' failed make[2]: *** [gsm690.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 6 17:39:11 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 6 Nov 2018 17:39:11 +0000 Subject: Change in osmo-msc[master]: WIP: SGs Interface initial code Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11642 Change subject: WIP: SGs Interface initial code ...................................................................... WIP: SGs Interface initial code - LU works - ISMI detach and EPS detach work (but presumably not as it should) - Paging works so far that if the MSC has to page it may send a paging request via SGs Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Related: OS#3615 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h A include/osmocom/msc/sgs_iface.h A include/osmocom/msc/sgs_vty.h M include/osmocom/msc/vlr.h A include/osmocom/msc/vlr_sgs.h M include/osmocom/msc/vty.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/msc_vty.c A src/libmsc/sgs_iface.c A src/libmsc/sgs_vty.c M src/libmsc/silent_call.c M src/libvlr/Makefile.am M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c A src/libvlr/vlr_sgs.c A src/libvlr/vlr_sgs_fsm.c A src/libvlr/vlr_sgs_fsm.h M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_ss.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/sms_queue/sms_queue_test.c 39 files changed, 2,060 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/11642/1 diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index ebc946a..35e8c5e 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -24,11 +24,14 @@ a_reset.h \ osmo_msc.h \ rrlp.h \ + sgs_iface.h \ + sgs_vty.h \ signal.h \ silent_call.h \ smpp.h \ sms_queue.h \ transaction.h \ vlr.h \ + vlr_sgs.h \ vty.h \ $(NULL) diff --git a/include/osmocom/msc/debug.h b/include/osmocom/msc/debug.h index 717cf74..28ba482 100644 --- a/include/osmocom/msc/debug.h +++ b/include/osmocom/msc/debug.h @@ -21,5 +21,6 @@ DVLR, DIUCS, DBSSAP, + DSGS, Debug_LastEntry, }; diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 085248c..94b5474 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -55,6 +55,7 @@ RAN_UNKNOWN, RAN_GERAN_A, /* 2G / A-interface */ RAN_UTRAN_IU, /* 3G / Iu-interface (IuCS or IuPS) */ + RAN_UTRAN_SGS, /* 4G / SGs-interface (csfb) */ }; extern const struct value_string ran_type_names[]; @@ -124,7 +125,7 @@ /* back pointers */ struct gsm_network *network; - /* connected via 2G or 3G? */ + /* connected via 2G, 3G or 4G csfb via SGs */ enum ran_type via_ran; uint16_t lac; diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index 01d9c58..762c8e6 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -5,6 +5,7 @@ #include #include +#include #include @@ -54,8 +55,8 @@ */ struct subscr_request *subscr_request_conn(struct vlr_subscr *vsub, gsm_cbfn *cbfn, void *param, - const char *label); - + const char *label, + enum sgsap_service_ind serv_ind); void subscr_remove_request(struct subscr_request *req); int subscr_rx_paging_response(struct msgb *msg, struct gsm_subscriber_connection *conn); diff --git a/include/osmocom/msc/sgs_iface.h b/include/osmocom/msc/sgs_iface.h new file mode 100644 index 0000000..ea2bd62 --- /dev/null +++ b/include/osmocom/msc/sgs_iface.h @@ -0,0 +1,103 @@ +#pragma once + +#include +#include +#include + +enum { + SGS_STATE_TS5, /* Started when sending the SGsAP-PAGING-REQUEST */ + SGS_STATE_TS6_2, /* TMSI reallocation, 5.2.3.5 */ + SGS_STATE_TS7, /* Started when SGsAP-ALERT-REQUEST is sent 5.3.2.1 */ + SGS_STATE_TS11, /* Reset ack timeout */ + SGS_STATE_TS14, /* Started when SGsAP-SERVICE-REQUEST is received 5.15.1 */ + SGS_STATE_TS15, /* Started when SGsAP-MO-CSFB-INDICATION is received 5.16.3 (UE fallback) */ + _NUM_SGS_STATE_TIMERS +}; + +enum { + SGS_STATE_NS7, /* Alert request retransmit */ + SGS_STATE_NS11, /* Reset repeat */ + _NUM_SGS_STATE_COUNTERS +}; + +static const unsigned int sgs_state_timer_defaults[_NUM_SGS_STATE_TIMERS] = { + [SGS_STATE_TS5] = SGS_TS5_DEFAULT, + [SGS_STATE_TS6_2] = SGS_TS6_2_DEFAULT, + [SGS_STATE_TS7] = SGS_TS7_DEFAULT, + [SGS_STATE_TS11] = SGS_TS11_DEFAULT, + [SGS_STATE_TS14] = SGS_TS14_DEFAULT, + [SGS_STATE_TS15] = SGS_TS15_DEFAULT, +}; + +static const unsigned int sgs_state_counter_defaults[_NUM_SGS_STATE_COUNTERS] = { + [SGS_STATE_NS7] = SGS_NS7_DEFAULT, + [SGS_STATE_NS11] = SGS_NS11_DEFAULT, +}; + +/* global SGs state */ +struct sgs_state { + /* list of MMEs (sgs_mme_ctx) */ + struct llist_head mme_list; + + /* list of SCTP client connections */ + struct llist_head conn_list; + + /* SCTP server for inbound SGs connections */ + struct osmo_stream_srv_link *srv_link; + + struct { + char *local_addr; + uint16_t local_port; + /* user-configured VLR name (FQDN) */ + char *vlr_name; + /* timers on VLR side */ + unsigned int timer[_NUM_SGS_STATE_TIMERS]; + /* countrs on VLR side */ + unsigned int counter[_NUM_SGS_STATE_COUNTERS]; + } cfg; +}; + +struct sgs_connection { + /* global list of SGs connections */ + struct llist_head list; + /* back-pointer */ + struct sgs_state *sgs; + + /* Socket name from osmo_sock_get_name() */ + char *sockname; + + /* MME for this connection, if any. This field is NULL until we + * receive the first "MME name" IE from the MME, which could be part + * of the RESET procedure, but also just a normal LU request. */ + struct sgs_mme_ctx *mme; + + /* represents the SCTP connection we accept()ed from this MME */ + struct osmo_stream_srv *srv; +}; + +struct sgs_mme_ctx { + /* global list of MME contexts */ + struct llist_head list; + /* back-pointer */ + struct sgs_state *sgs; + + /* MME name as string representation */ + char fqdn[GSM23003_MME_DOMAIN_LEN + 1]; + + /* current connection for this MME, if any. Can be NULL if the SCTP + * connection to the MME was lost and hasn't been re-established yet */ + struct sgs_connection *conn; + + /* FSM for the "VLR reset" procedure" */ + struct osmo_fsm_inst *fi; + unsigned int ns11_remaining; +}; + +extern struct sgs_state *g_sgs; + +struct sgs_state *sgs_init(void *ctx, struct gsm_network *network); +int sgs_open(struct sgs_state *sgs); +int sgs_iface_tx_paging(struct vlr_subscr *vsub, enum sgsap_service_ind serv_ind); + +extern const char *sgs_state_timer_names[_NUM_SGS_STATE_TIMERS]; +extern const char *sgs_state_counter_names[_NUM_SGS_STATE_COUNTERS]; diff --git a/include/osmocom/msc/sgs_vty.h b/include/osmocom/msc/sgs_vty.h new file mode 100644 index 0000000..75a0f24 --- /dev/null +++ b/include/osmocom/msc/sgs_vty.h @@ -0,0 +1,3 @@ +#pragma once + +void sgs_vty_init(void); diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index d52713c..d103be6 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -102,6 +102,13 @@ struct sgsn_mm_ctx; struct vlr_instance; +struct vlr_subscr; + +struct sgs_lu_response { + bool accepted; + struct vlr_subscr *vsub; +}; +typedef void (*vlr_sgs_lu_response_cb_t) (struct sgs_lu_response * response); /* The VLR subscriber is the part of the GSM subscriber state in VLR (CS) or * SGSN (PS), particularly while interacting with the HLR via GSUP */ @@ -151,6 +158,7 @@ struct osmo_fsm_inst *lu_fsm; struct osmo_fsm_inst *auth_fsm; struct osmo_fsm_inst *proc_arq_fsm; + struct osmo_fsm_inst *sgs_fsm; bool lu_complete; time_t expire_lu; @@ -174,6 +182,13 @@ uint8_t lac; enum ran_type attached_via_ran; } cs; + /* SGs (MME) specific parts */ + struct { + /* FIXME: probably use cs.lac for instead of introducing another lai here? */ + struct osmo_location_area_id lai; + vlr_sgs_lu_response_cb_t response_cb; + char mme_name[55 + 1]; + } sgs; struct gsm_classmark classmark; }; diff --git a/include/osmocom/msc/vlr_sgs.h b/include/osmocom/msc/vlr_sgs.h new file mode 100644 index 0000000..d177516 --- /dev/null +++ b/include/osmocom/msc/vlr_sgs.h @@ -0,0 +1,15 @@ +#pragma once + +enum sgs_ue_fsm_state { + SGS_UE_ST_NULL, + SGS_UE_ST_ASSOCIATED, + SGS_UE_ST_LA_UPD_PRES, +}; + +void vlr_sgs_reset(struct vlr_instance *vlr); +int vlr_sgs_loc_update(struct vlr_instance *vlr, + vlr_sgs_lu_response_cb_t response_cb, + char *mme_name, enum vlr_lu_type type, const char *imsi, struct osmo_location_area_id *new_lai); +void vlr_sgs_loc_update_acc_sent(struct vlr_subscr *vlr_subscr); +void vlr_sgs_loc_update_rej_sent(struct vlr_subscr *vlr_subscr); +void vlr_sgs_detach(struct vlr_instance *vlr, const char *imsi, bool eps); diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h index 6a55df7..2a3b18b 100644 --- a/include/osmocom/msc/vty.h +++ b/include/osmocom/msc/vty.h @@ -23,6 +23,7 @@ SMPP_NODE, SMPP_ESME_NODE, HLR_NODE, + CFG_SGS_NODE, }; int bsc_vty_init_extra(void); diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index 90bbbf8..2cf34cf 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -51,6 +51,8 @@ osmo_msc.c \ ctrl_commands.c \ subscr_conn.c \ + sgs_iface.c \ + sgs_vty.c \ $(NULL) if BUILD_IU libmsc_a_SOURCES += \ diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index f9888d7..54320d2 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1995,7 +1995,8 @@ vsub, setup_trig_pag_evt, trans, - "MNCC: establish call"); + "MNCC: establish call", + SGSAP_SERV_IND_CS_CALL); if (!trans->paging_request) { LOGP(DCC, LOGL_ERROR, "Failed to allocate paging token.\n"); vlr_subscr_put(vsub); diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 8d9169b..cb37db6 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -1132,7 +1132,8 @@ /* if not, we have to start paging */ LOGP(DLSMS, LOGL_DEBUG, "Sending SMS: no connection open, start paging %s\n", vlr_subscr_name(vsub)); - res = subscr_request_conn(vsub, paging_cb_send_sms, sms, "send SMS"); + res = subscr_request_conn(vsub, paging_cb_send_sms, sms, "send SMS", + SGSAP_SERV_IND_SMS); if (!res) { send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, GSM_PAGING_BUSY); sms_free(sms); diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index b863ce8..9adf5b7 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -347,7 +347,10 @@ /* Trigger Paging Request */ trans->paging_request = subscr_request_conn(vsub, - &handle_paging_event, trans, "GSM 09.11 SS/USSD"); + &handle_paging_event, + trans, + "GSM 09.11 SS/USSD", + SGSAP_SERV_IND_SMS); if (!trans->paging_request) { LOGP(DMM, LOGL_ERROR, "Failed to allocate paging token\n"); trans_free(trans); diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index fb61209..0645fa9 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -49,6 +49,7 @@ #include #include #include +#include void subscr_paging_cancel(struct vlr_subscr *vsub, enum gsm_paging_event event) { @@ -110,7 +111,7 @@ return 0; } -int msc_paging_request(struct vlr_subscr *vsub) +static int msc_paging_request(struct vlr_subscr *vsub, enum sgsap_service_ind serv_ind) { /* The subscriber was last seen in subscr->lac. Find out which * BSCs/RNCs are responsible and send them a paging request via open @@ -123,6 +124,8 @@ vsub->tmsi == GSM_RESERVED_TMSI? NULL : &vsub->tmsi, vsub->lac); + case RAN_UTRAN_SGS: + return sgs_iface_tx_paging(vsub, serv_ind); default: break; } @@ -143,10 +146,13 @@ * \param cbfn function to call when the conn is established. * \param param caller defined param to pass to cbfn(). * \param label human readable label of the request kind used for logging. + * \param label human readable label of the request kind used for logging. + * \param serv_ind sgsap service indicator (in case SGs interface is used to page) */ struct subscr_request *subscr_request_conn(struct vlr_subscr *vsub, gsm_cbfn *cbfn, void *param, - const char *label) + const char *label, + enum sgsap_service_ind serv_ind) { int rc; struct subscr_request *request; @@ -156,7 +162,7 @@ if (!vsub->cs.is_paging) { LOGP(DMM, LOGL_DEBUG, "Subscriber %s not paged yet, start paging.\n", vlr_subscr_name(vsub)); - rc = msc_paging_request(vsub); + rc = msc_paging_request(vsub, serv_ind); if (rc <= 0) { LOGP(DMM, LOGL_ERROR, "Subscriber %s paging failed: %d\n", vlr_subscr_name(vsub), rc); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index a16cec8..4683695 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -54,6 +54,7 @@ #include #include #include +#include static struct gsm_network *gsmnet = NULL; @@ -608,6 +609,17 @@ reqs += 1; vty_out(vty, " Paging: %s paging for %d requests%s", vsub->cs.is_paging ? "is" : "not", reqs, VTY_NEWLINE); + + /* SGs related */ + vty_out(vty, " SGs-state: %s%s", + osmo_fsm_state_name(vsub->sgs_fsm->fsm, vsub->sgs_fsm->state), + VTY_NEWLINE); + if (vsub->sgs.mme_name && strlen(vsub->sgs.mme_name)) + vty_out(vty, " SGs-MME: %s%s", vsub->sgs.mme_name, + VTY_NEWLINE); + else + vty_out(vty, " SGs-MME: (none)%s", VTY_NEWLINE); + vty_out(vty, " Use count: %u%s", vsub->use_count, VTY_NEWLINE); /* Connection */ @@ -1035,7 +1047,7 @@ return CMD_WARNING; } - req = subscr_request_conn(vsub, NULL, NULL, "manual Paging from VTY"); + req = subscr_request_conn(vsub, NULL, NULL, "manual Paging from VTY", SGSAP_SERV_IND_CS_CALL); if (req) vty_out(vty, "%% paging subscriber%s", VTY_NEWLINE); else @@ -1401,6 +1413,8 @@ return CMD_SUCCESS; } +extern void sgs_vty_init(void); + void msc_vty_init(struct gsm_network *msc_network) { OSMO_ASSERT(gsmnet == NULL); @@ -1440,6 +1454,7 @@ #ifdef BUILD_IU ranap_iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc); #endif + sgs_vty_init(); osmo_fsm_vty_add_cmds(); osmo_signal_register_handler(SS_SCALL, scall_cbfn, NULL); diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c new file mode 100644 index 0000000..69597be --- /dev/null +++ b/src/libmsc/sgs_iface.c @@ -0,0 +1,976 @@ +/* SGs Interface according to 3GPP TS 23.272 + TS 29.118 */ + +/* (C 2018 by Harald Welte + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include +#include + +#include +#include + +#define S(x) (1 << (x)) + +static struct osmo_fsm sgs_vlr_reset_fsm; + +/* See also comment in a_iface.c */ +static struct gsm_network *gsm_network = NULL; + +struct sgs_state *g_sgs; + +/*********************************************************************** + * SGs state per MME connection + ***********************************************************************/ + +struct sgs_state; +struct sgs_connection; + +const char *sgs_state_timer_names[_NUM_SGS_STATE_TIMERS] = { + [SGS_STATE_TS5] = "Ts5", + [SGS_STATE_TS6_2] = "Ts6-2", + [SGS_STATE_TS7] = "Ts7", + [SGS_STATE_TS11] = "Ts11", + [SGS_STATE_TS14] = "Ts14", + [SGS_STATE_TS15] = "Ts15", +}; + +const char *sgs_state_counter_names[_NUM_SGS_STATE_COUNTERS] = { + [SGS_STATE_NS7] = "Ns7", + [SGS_STATE_NS11] = "Ns11", +}; + +#define LOGSGC(sgc, lvl, fmt, args...) \ + LOGP(DSGS, lvl, "%s: " fmt, (sgc)->sockname, ## args) + +#define LOGMME(mme, lvl, fmt, args...) \ + LOGP(DSGS, lvl, "%s: " fmt, (mme)->fqdn ? (mme)->fqdn : (mme)->conn->sockname, ## args) + +enum sgs_vlr_reset_fsm_state { + SGS_VLRR_ST_NULL, + SGS_VLRR_ST_WAIT_ACK, + SGS_VLRR_ST_COMPLETE, +}; + +enum sgs_vlr_reset_fsm_event { + SGS_VLRR_E_START_RESET, + SGS_VLRR_E_RX_RESET_ACK, +}; + +/*********************************************************************** + * SGsAP transmit functions + ***********************************************************************/ + +#include + +static struct msgb *sgs_msgb_alloc(void) +{ + /* by far sufficient for the maximum size message of 298 bytes + * (9+7+5+3+10+253+10+1) SGsAP-UP-UD */ + return msgb_alloc_headroom(1024, 128, "SGsAP"); +} + +/*! Encode VLR/MME name from string and append to SGsAP msg */ +static void msgb_sgsap_name_put(struct msgb *msg, enum sgsap_iei iei, const char *name) +{ + uint8_t buf[APN_MAXLEN]; + uint8_t len; + + /* encoding is like DNS names, which is like APN fields */ + memset(buf, 0, sizeof(buf)); + len = osmo_apn_from_str(buf, sizeof(buf), name); + if (iei == SGSAP_IE_MME_NAME) + len = 55; + msgb_tlv_put(msg, iei, len, buf); +} + +/*! Encode IMSI from string representation and append to SGSaAP msg */ +static void msgb_sgsap_imsi_put(struct msgb *msg, const char *imsi) +{ + uint8_t buf[16]; + uint8_t len; + + /* encoding is just like TS 04.08 */ + len = gsm48_generate_mid_from_imsi(buf, imsi); + /* skip first two bytes (tag+length) so we can use msgb_tlv_put */ + msgb_tlv_put(msg, SGSAP_IE_IMSI, len - 2, buf + 2); +} + +/*! Encode IMSI from string representation and append to SGSaAP msg */ +static void msgb_sgsap_imsi_push(struct msgb *msg, const char *imsi) +{ + uint8_t buf[16]; + uint8_t len; + + /* encoding is just like TS 04.08 */ + len = gsm48_generate_mid_from_imsi(buf, imsi); + /* skip first two bytes (tag+length) so we can use msgb_tlv_put */ + msgb_tlv_push(msg, SGSAP_IE_IMSI, len - 2, buf + 2); +} + +static void sgs_tx(struct sgs_connection *sgc, enum sgsap_msg_type msg_type, struct msgb *msg) +{ + uint8_t *cur = msgb_push(msg, 1); + *cur = msg_type; + msgb_sctp_ppid(msg) = 0; + if (!sgc) { + LOGSGC(sgc, LOGL_NOTICE, "Cannot transmit %s: connection dead. Discarding\n", + sgsap_msg_type_name(msg_type)); + msgb_free(msg); + return; + } + osmo_stream_srv_send(sgc->srv, msg); +} + +/*! Transmit simple SGsAP message (only IE: IMSI) */ +static void sgs_tx_simple(struct sgs_connection *sgc, enum sgsap_msg_type msgt, const char *imsi) +{ + struct msgb *msg = sgs_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + sgs_tx(sgc, msgt, msg); +} + +/* 8.3 */ +void sgs_tx_alert_req(struct sgs_connection *sgc, const char *imsi) +{ + sgs_tx_simple(sgc, SGSAP_MSGT_ALERT_REQ, imsi); +} + +/* 8.4 */ +void sgs_tx_dl_ud(struct sgs_connection *sgc, const char *imsi, struct msgb *msg) +{ + msgb_sgsap_imsi_push(msg, imsi); + sgs_tx(sgc, SGSAP_MSGT_DL_UD, msg); +} + +/* 8.5 */ +void sgs_tx_eps_det_ack(struct sgs_connection *sgc, const char *imsi) +{ + sgs_tx_simple(sgc, SGSAP_MSGT_EPS_DET_ACK, imsi); +} + +/* 8.7 */ +void sgs_tx_imsi_det_ack(struct sgs_connection *sgc, const char *imsi) +{ + sgs_tx_simple(sgc, SGSAP_MSGT_IMSI_DET_ACK, imsi); +} + +/*! 8.9 SGsAP-LOCATION-UPDATE-ACCEPT. + * \param[in] sgc SGs Connection. + * \param[in] imsi IMSI of the subscriber. + * \param[in] lai Location Area Identity (optional, may be NULL). + * \param[in] new_id value part of new Mobile Identity (optional, may be NULL). + * \param[in] new_id_len length of \a new_id in octets. */ +void sgs_tx_lu_ack(struct sgs_connection *sgc, const char *imsi, + const struct osmo_location_area_id *lai, const uint8_t *new_id, unsigned int new_id_len) +{ + struct msgb *msg = sgs_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + if (lai) { + struct gsm48_loc_area_id lai_enc; + gsm48_generate_lai2(&lai_enc, lai); + msgb_tlv_put(msg, SGSAP_IE_LAI, 5, (uint8_t *) & lai_enc); + } + if (new_id && new_id_len) + msgb_tlv_put(msg, SGSAP_IE_MOBILE_ID, new_id_len, new_id); + sgs_tx(sgc, SGSAP_MSGT_LOC_UPD_ACK, msg); +} + +/* 8.10 */ +void sgs_tx_lu_rej(struct sgs_connection *sgc, const char *imsi, uint8_t rej_cause, + const struct osmo_location_area_id *lai) +{ + struct msgb *msg = sgs_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_tlv_put(msg, SGSAP_IE_REJECT_CAUSE, 1, &rej_cause); + if (lai) { + struct gsm48_loc_area_id lai_enc; + gsm48_generate_lai2(&lai_enc, lai); + msgb_tlv_put(msg, SGSAP_IE_LAI, 5, (uint8_t *) & lai_enc); + } + sgs_tx(sgc, SGSAP_MSGT_LOC_UPD_REJ, msg); +} + +/* 8.12 */ +void sgs_tx_mm_info_req(struct sgs_connection *sgc, const char *imsi, const uint8_t *mm_info, uint8_t len) +{ + struct msgb *msg = sgs_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_tlv_put(msg, SGSAP_IE_MM_INFO, len, mm_info); + sgs_tx(sgc, SGSAP_MSGT_MM_INFO_REQ, msg); +} + +/* 8.14 */ +void sgs_tx_paging_req(struct sgs_connection *sgc, const char *imsi, const char *vlr_name, uint8_t serv_ind) +{ + struct msgb *msg = sgs_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, vlr_name); + msgb_tlv_put(msg, SGSAP_IE_SERVICE_INDICATOR, 1, &serv_ind); + sgs_tx(sgc, SGSAP_MSGT_PAGING_REQ, msg); +} + +/* 8.15 */ +void sgs_tx_reset_ack_vlr(struct sgs_connection *sgc, const char *vlr_name) +{ + struct msgb *msg = sgs_msgb_alloc(); + msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, vlr_name); + sgs_tx(sgc, SGSAP_MSGT_RESET_ACK, msg); +} + +/* 8.16 */ +void sgs_tx_reset_ind_vlr(struct sgs_connection *sgc, const char *vlr_name) +{ + struct msgb *msg = sgs_msgb_alloc(); + msgb_sgsap_name_put(msg, SGSAP_IE_VLR_NAME, vlr_name); + sgs_tx(sgc, SGSAP_MSGT_RESET_IND, msg); +} + +/* 8.18 */ +void sgs_tx_status(struct sgs_connection *sgc, enum sgsap_sgs_cause cause, const char *imsi, const struct msgb *err_msg) +{ + struct msgb *msg = sgs_msgb_alloc(); + uint8_t c8 = cause; + + msgb_tlv_put(msg, SGSAP_IE_SGS_CAUSE, 1, &c8); + if (imsi) + msgb_sgsap_imsi_put(msg, imsi); + if (err_msg) + msgb_tlv_put(msg, SGSAP_IE_ERR_MSG, msgb_l2len(msg), msgb_l2(msg)); + sgs_tx(sgc, SGSAP_MSGT_STATUS, msg); +} + +/* same as above, but get IMSI from tlv_parsed */ +void sgs_tx_status_tp(struct sgs_connection *sgc, enum sgsap_sgs_cause cause, + const struct tlv_parsed *tp, const struct msgb *err_msg) +{ + struct msgb *msg = sgs_msgb_alloc(); + uint8_t c8 = cause; + + msgb_tlv_put(msg, SGSAP_IE_SGS_CAUSE, 1, &c8); + if (tp && TLVP_PRESENT(tp, SGSAP_IE_IMSI)) { + msgb_tlv_put(msg, SGSAP_IE_IMSI, TLVP_LEN(tp, SGSAP_IE_IMSI), TLVP_VAL(tp, SGSAP_IE_IMSI)); + } + if (err_msg) + msgb_tlv_put(msg, SGSAP_IE_ERR_MSG, msgb_l2len(msg), msgb_l2(msg)); + sgs_tx(sgc, SGSAP_MSGT_STATUS, msg); +} + +/* 8.23 */ +void sgs_tx_release_req(struct sgs_connection *sgc, const char *imsi, const uint8_t *sgs_cause) +{ + struct msgb *msg = sgs_msgb_alloc(); + msgb_sgsap_imsi_put(msg, imsi); + if (sgs_cause) + msgb_tlv_put(msg, SGSAP_IE_SGS_CAUSE, 1, sgs_cause); + sgs_tx(sgc, SGSAP_MSGT_RELEASE_REQ, msg); +} + +/* 8.24 */ +void sgs_tx_service_abort_req(struct sgs_connection *sgc, const char *imsi) +{ + sgs_tx_simple(sgc, SGSAP_MSGT_SERVICE_ABORT_REQ, imsi); +} + +/*********************************************************************** + * SGs utility functions + ***********************************************************************/ + +struct sgs_state *sgs_state_alloc(void *ctx) +{ + struct sgs_state *sgs = talloc_zero(ctx, struct sgs_state); + + INIT_LLIST_HEAD(&sgs->mme_list); + INIT_LLIST_HEAD(&sgs->conn_list); + + memcpy(sgs->cfg.timer, sgs_state_timer_defaults, sizeof(sgs->cfg.timer)); + memcpy(sgs->cfg.counter, sgs_state_counter_defaults, sizeof(sgs->cfg.counter)); + + sgs->cfg.vlr_name = talloc_strdup(sgs, "mmec02.mmegi0002.mme.epc.mnc070.mcc901.3gppnetwork.org"); + + return sgs; +} + +struct sgs_mme_ctx *sgs_mme_by_fqdn(struct sgs_state *sgs, const char *mme_fqdn) +{ + struct sgs_mme_ctx *mme; + + llist_for_each_entry(mme, &sgs->mme_list, list) { + if (!strcasecmp(mme_fqdn, mme->fqdn)) + return mme; + } + return NULL; +} + +static struct sgs_mme_ctx *sgs_mme_alloc(struct sgs_state *sgs, const char *mme_fqdn, const struct osmo_gummei *gummei) +{ + struct sgs_mme_ctx *mme; + + OSMO_ASSERT(sgs_mme_by_fqdn(sgs, mme_fqdn) == NULL); + + mme = talloc_zero(sgs, struct sgs_mme_ctx); + if (!mme) + return NULL; + mme->sgs = sgs; + OSMO_STRLCPY_ARRAY(mme->fqdn, mme_fqdn); + mme->fi = osmo_fsm_inst_alloc(&sgs_vlr_reset_fsm, mme, mme, LOGL_INFO, osmo_gummei_name(gummei)); + if (!mme->fi) { + talloc_free(mme); + return NULL; + } + llist_add_tail(&mme->list, &sgs->mme_list); + return mme; +} + +/* Decode and verify MME name */ +static int decode_mme_name(char *mme_name, const struct tlv_parsed *tp) +{ + const uint8_t *mme_name_enc = TLVP_VAL_MINLEN(tp, SGSAP_IE_MME_NAME, 55); + struct osmo_gummei gummei; + + if (!mme_name_enc) + return -EINVAL; + + /* decode the MME name from DNS labels to string */ + osmo_apn_to_str(mme_name, TLVP_VAL(tp, SGSAP_IE_MME_NAME), TLVP_LEN(tp, SGSAP_IE_MME_NAME)); + + /* try to parse the MME name into a GUMMEI as a test for the format */ + if (osmo_parse_mme_domain(&gummei, mme_name) < 0) + return -EINVAL; + + return 0; +} + +/* A MME FQDN was received (e.g. RESET-IND/RESET-ACK/LU-REQ) */ +static int sgs_mme_fqdn_received(struct sgs_connection *sgc, const char *mme_fqdn) +{ + struct sgs_mme_ctx *mme; + struct osmo_gummei gummei; + + /* caller must pass in a valid FQDN string syntax */ + OSMO_ASSERT(osmo_parse_mme_domain(&gummei, mme_fqdn) == 0); + + if (!sgc->mme) { + /* attempt to find MME with given name */ + mme = sgs_mme_by_fqdn(sgc->sgs, mme_fqdn); + if (!mme) + mme = sgs_mme_alloc(sgc->sgs, mme_fqdn, &gummei); + OSMO_ASSERT(mme); + + if (mme->conn) { + /* The MME context has another connection !?! */ + LOGSGC(sgc, LOGL_ERROR, "Rx MME name %s, but that MME already has other " + "SCTP connection?!?\n", mme_fqdn); + return -1; + } else { + /* associate the two */ + mme->conn = sgc; + sgc->mme = mme; + } + } else { + mme = sgc->mme; + if (strcasecmp(mme->fqdn, mme_fqdn) != 0) { + LOGMME(mme, LOGL_ERROR, "Rx MME name \"%s\" in packet from MME \"%s\" ?!?\n", mme_fqdn, + mme->fqdn); + return -2; + } + } + return 0; +} + +/* Safely get the mme-name for an sgs-connection */ +static char *sgs_mme_fqdn_get(struct sgs_connection *sgc) +{ + if (!sgc) + return NULL; + if (!sgc->mme) + return NULL; + if (strlen(sgc->mme->fqdn) <= 0) + return NULL; + return sgc->mme->fqdn; +} + +/* Find an sgs_mme_ctx for a given vlr subscriber, also check result */ +struct sgs_mme_ctx *sgs_mme_ctx_by_vsub(struct vlr_subscr *vsub, uint8_t msg_type) +{ + struct sgs_mme_ctx *mme; + + /* Find SGS connection by MME name */ + mme = sgs_mme_by_fqdn(g_sgs, vsub->sgs.mme_name); + if (!mme) { + LOGP(DSGS, LOGL_ERROR, "(sub %s) Tx %s can not find suitable MME!\n", + vlr_subscr_msisdn_or_name(vsub), sgsap_msg_type_name(msg_type)); + return NULL; + } + if (!mme->conn) { + LOGP(DSGS, LOGL_ERROR, + "(sub %s) Tx %s suitable MME found, but no SGS connection present!\n", + vlr_subscr_msisdn_or_name(vsub), sgsap_msg_type_name(msg_type)); + return NULL; + } + if (!mme->sgs) { + LOGP(DSGS, LOGL_ERROR, + "(sub %s) Tx %s suitable MME found, but no SGS state present!\n", + vlr_subscr_msisdn_or_name(vsub), sgsap_msg_type_name(msg_type)); + return NULL; + } + + return mme; +} + +/*********************************************************************** + * SGs incoming messages from the MME + ***********************************************************************/ + +static void sgs_rx_status(struct sgs_connection *sgc, struct msgb *msg, struct tlv_parsed *tp) +{ + uint8_t cause; + const uint8_t *cause_ptr; + const uint8_t *err_msg; + char imsi[32]; + + cause_ptr = TLVP_VAL_MINLEN(tp, SGSAP_IE_SGS_CAUSE, 1); + if (cause_ptr) + cause = *cause_ptr; + + if (TLVP_PRESENT(tp, SGSAP_IE_IMSI)) { + gsm48_mi_to_string(imsi, sizeof(imsi), TLVP_VAL(tp, SGSAP_IE_IMSI), TLVP_LEN(tp, SGSAP_IE_IMSI)); + } else + OSMO_STRLCPY_ARRAY(imsi, ""); + + if (TLVP_PRESENT(tp, SGSAP_IE_ERR_MSG)) + err_msg = TLVP_VAL(tp, SGSAP_IE_ERR_MSG); + else + err_msg = NULL; + + LOGSGC(sgc, LOGL_NOTICE, "Rx STATUS cause=%s, IMSI=%s, orig_msg=%s\n", + sgsap_sgs_cause_name(cause), imsi, err_msg ? osmo_hexdump(err_msg, TLVP_LEN(tp, SGSAP_IE_ERR_MSG)) : ""); +} + +static void sgs_rx_reset_ind(struct sgs_connection *sgc, struct msgb *msg, const struct tlv_parsed *tp) +{ +/* Perform a reset of the SGS FSM of all subscribers that are present in the VLR */ + vlr_sgs_reset(gsm_network->vlr); + sgs_tx_reset_ack_vlr(sgc, sgc->sgs->cfg.vlr_name); +} + +static void sgs_rx_reset_ack(struct sgs_connection *sgc, struct msgb *msg, const struct tlv_parsed *tp) +{ + /* dispatch event to VLR reset FSM for this MME */ + if (sgc->mme && sgc->mme->fi) + osmo_fsm_inst_dispatch(sgc->mme->fi, SGS_VLRR_E_RX_RESET_ACK, msg); +} + +static void sgs_rx_log_upd_resp_cb(struct sgs_lu_response *response) +{ + struct vlr_subscr *vsub = response->vsub; + struct sgs_mme_ctx *mme; + uint8_t new_id[2 + GSM48_TMSI_LEN]; + uint8_t *new_id_ptr = new_id; + unsigned int new_id_len = 0; + uint8_t resp_msg_type; + + if (response->accepted) + resp_msg_type = SGSAP_MSGT_LOC_UPD_ACK; + else + resp_msg_type = SGSAP_MSGT_LOC_UPD_REJ; + + mme = sgs_mme_ctx_by_vsub(vsub, resp_msg_type); + if (!mme) + return; + + if (response->accepted) { + if (vsub->tmsi != GSM_RESERVED_TMSI) { + new_id_len = gsm48_generate_mid_from_tmsi(new_id, vsub->tmsi); + new_id_ptr = new_id + 2; + new_id_len -= 2; + } + sgs_tx_lu_ack(mme->conn, vsub->imsi, &vsub->sgs.lai, new_id_ptr, new_id_len); + vlr_sgs_loc_update_acc_sent(vsub); + } else { + sgs_tx_lu_rej(mme->conn, vsub->imsi, SGSAP_SGS_CAUSE_IMSI_UNKNOWN, &vsub->sgs.lai); + vlr_sgs_loc_update_rej_sent(vsub); + } +} + +static void sgs_rx_loc_upd_req(struct sgs_connection *sgc, struct msgb *msg, const struct tlv_parsed *tp, char *imsi) +{ + const uint8_t *lu_type_ie; + enum vlr_lu_type type; + struct osmo_location_area_id new_lai; + const struct gsm48_loc_area_id *gsm48_lai; + int rc; + char *mme_name; + + /* Determine MME-Name */ + mme_name = sgs_mme_fqdn_get(sgc); + if (!mme_name) { + sgs_tx_lu_rej(sgc, imsi, SGSAP_SGS_CAUSE_IMSI_UNKNOWN, NULL); + return; + } + + /* Parse LU-Type */ + lu_type_ie = TLVP_VAL_MINLEN(tp, SGSAP_IE_EPS_LU_TYPE, 1); + if (!lu_type_ie) { + LOGSGC(sgc, LOGL_ERROR, "Rx SGsAP-LOCATION-UPDATE-REQ with no/invalid LU type!\n"); + sgs_tx_status_tp(sgc, SGSAP_SGS_CAUSE_MISSING_MAND_IE, tp, msg); + return; + } + if (lu_type_ie[0] == 0x01) + type = VLR_LU_TYPE_IMSI_ATTACH; + else + type = VLR_LU_TYPE_REGULAR; + + /* Parse LAI of the new location */ + gsm48_lai = (struct gsm48_loc_area_id *)TLVP_VAL_MINLEN(tp, SGSAP_IE_LAI, 5); + if (!gsm48_lai) { + LOGSGC(sgc, LOGL_ERROR, "Rx SGsAP-LOCATION-UPDATE-REQ with no/invalid NEW LAI type!\n"); + sgs_tx_status_tp(sgc, SGSAP_SGS_CAUSE_MISSING_MAND_IE, tp, msg); + return; + } + gsm48_decode_lai2(gsm48_lai, &new_lai); + + /* Perform actual location update */ + rc = vlr_sgs_loc_update(gsm_network->vlr, sgs_rx_log_upd_resp_cb, mme_name, type, imsi, &new_lai); + if (rc != 0) + sgs_tx_lu_rej(sgc, imsi, SGSAP_SGS_CAUSE_IMSI_UNKNOWN, NULL); +} + +static void sgs_rx_imsi_det_ind(struct sgs_connection *sgc, struct msgb *msg, const struct tlv_parsed *tp, char *imsi) +{ + vlr_sgs_detach(gsm_network->vlr, imsi, false); + sgs_tx_imsi_det_ack(sgc, imsi); +} + +static void sgs_rx_eps_det_ind(struct sgs_connection *sgc, struct msgb *msg, const struct tlv_parsed *tp, char *imsi) +{ + vlr_sgs_detach(gsm_network->vlr, imsi, true); + sgs_tx_eps_det_ack(sgc, imsi); +} + +/* Page a subscriber via SGs-interface */ +int sgs_iface_tx_paging(struct vlr_subscr *vsub, enum sgsap_service_ind serv_ind) +{ + struct sgs_mme_ctx *mme; + + mme = sgs_mme_ctx_by_vsub(vsub, SGSAP_MSGT_PAGING_REQ); + if (!mme) + return -EINVAL; + + sgs_tx_paging_req(mme->conn, vsub->imsi, mme->sgs->cfg.vlr_name, serv_ind); + return 0; +} + +int sgs_rx(struct sgs_connection *sgc, struct msgb *msg) +{ + uint8_t msg_type = msg->l2h[0]; + struct tlv_parsed tp; + int rc; + char imsi[GSM48_MI_SIZE]; + char mme_name[55 + 1]; + + /* When the receiving entity receives a message that is too short to contain a complete + * message type information element, the receiving entity shall ignore that message. */ + if (msgb_l2len(msg) < 1) { + sgs_tx_status(sgc, SGSAP_SGS_CAUSE_MISSING_MAND_IE, NULL, msg); + msgb_free(msg); + return 0; + } + + /* Parse TLV elements */ + rc = tlv_parse(&tp, &sgsap_ie_tlvdef, msgb_l2(msg) + 1, msgb_l2len(msg) - 1, 0, 0); + if (rc < 0) { + LOGSGC(sgc, LOGL_NOTICE, "SGsAP Message %s parsing error\n", sgsap_msg_type_name(msg_type)); + sgs_tx_status(sgc, SGSAP_SGS_CAUSE_SEMANT_INCORR_MSG, NULL, msg); + msgb_free(msg); + return 0; + } + + /* Most of the messages contain an IMSI as mandatory IE, parse it right here */ + if (!TLVP_PRESENT(&tp, SGSAP_IE_IMSI) && + msg_type != SGSAP_MSGT_STATUS && msg_type != SGSAP_MSGT_RESET_IND && msg_type != SGSAP_MSGT_RESET_ACK) { + /* reject the message; all but the three above have mandatory IMSI */ + LOGSGC(sgc, LOGL_NOTICE, "SGsAP Message %s without IMSI, dropping\n", sgsap_msg_type_name(msg_type)); + sgs_tx_status(sgc, SGSAP_SGS_CAUSE_MISSING_MAND_IE, NULL, msg); + msgb_free(msg); + return 0; + } + memset(imsi, 0, sizeof(imsi)); + if (TLVP_PRESENT(&tp, SGSAP_IE_IMSI)) { + gsm48_mi_to_string(imsi, sizeof(imsi), TLVP_VAL(&tp, SGSAP_IE_IMSI), TLVP_LEN(&tp, SGSAP_IE_IMSI)); + /* FIXME: Is there a well defined minimum length (MCC=3 + MNC=2 + MSIN=1 => 6?) */ + if (strlen(imsi) <= 6) { + LOGSGC(sgc, LOGL_NOTICE, "SGsAP Message %s with short IMSI, dropping\n", + sgsap_msg_type_name(msg_type)); + sgs_tx_status(sgc, SGSAP_SGS_CAUSE_INVALID_MAND_IE, NULL, msg); + msgb_free(msg); + return 0; + } + } + + /* Some messages contain an MME-NAME as mandatore IE, parse it right here. The + * MME-NAME is als immediately registered with the sgc, so it will be implicitly + * known to all functions that have access to the sgc context. */ + if (!TLVP_PRESENT(&tp, SGSAP_IE_MME_NAME) + && (msg_type == SGSAP_MSGT_RESET_IND || msg_type == SGSAP_MSGT_RESET_ACK + || msg_type == SGSAP_MSGT_LOC_UPD_REQ || msg_type == SGSAP_MSGT_IMSI_DET_IND + || msg_type == SGSAP_MSGT_EPS_DET_IND)) { + LOGSGC(sgc, LOGL_NOTICE, "SGsAP Message %s without MME-Name, dropping\n", + sgsap_msg_type_name(msg_type)); + sgs_tx_status(sgc, SGSAP_SGS_CAUSE_MISSING_MAND_IE, NULL, msg); + msgb_free(msg); + return 0; + } + memset(mme_name, 0, sizeof(mme_name)); + if (TLVP_PRESENT(&tp, SGSAP_IE_MME_NAME)) { + if (decode_mme_name(mme_name, &tp) != 0) { + LOGSGC(sgc, LOGL_NOTICE, "SGsAP Message %s with invalid MME-Name, dropping\n", + sgsap_msg_type_name(msg_type)); + sgs_tx_status_tp(sgc, SGSAP_SGS_CAUSE_INVALID_MAND_IE, &tp, msg); + msgb_free(msg); + return 0; + } + /* Regsister/check mme_name with sgc */ + if (sgs_mme_fqdn_received(sgc, mme_name) < 0) { + sgs_tx_status_tp(sgc, SGSAP_SGS_CAUSE_MSG_INCOMP_STATE, &tp, msg); + LOGSGC(sgc, LOGL_NOTICE, "SGsAP Message %s with invalid MME-Name, dropping\n", + sgsap_msg_type_name(msg_type)); + msgb_free(msg); + return 0; + } + } + + /* dispatch msg to various handler functions. msgb ownership remains here! */ + switch (msg_type) { + case SGSAP_MSGT_STATUS: + sgs_rx_status(sgc, msg, &tp); + break; + case SGSAP_MSGT_RESET_IND: + sgs_rx_reset_ind(sgc, msg, &tp); + break; + case SGSAP_MSGT_RESET_ACK: + sgs_rx_reset_ack(sgc, msg, &tp); + break; + case SGSAP_MSGT_LOC_UPD_REQ: + sgs_rx_loc_upd_req(sgc, msg, &tp, imsi); + break; + case SGSAP_MSGT_IMSI_DET_IND: + sgs_rx_imsi_det_ind(sgc, msg, &tp, imsi); + break; + case SGSAP_MSGT_EPS_DET_IND: + sgs_rx_eps_det_ind(sgc, msg, &tp, imsi); + break; + case SGSAP_MSGT_TMSI_REALL_CMPL: + case SGSAP_MSGT_ALERT_ACK: + case SGSAP_MSGT_ALERT_REJ: + case SGSAP_MSGT_PAGING_REJ: + case SGSAP_MSGT_UE_ACT_IND: + case SGSAP_MSGT_UE_UNREACHABLE: + case SGSAP_MSGT_UL_UD: + case SGSAP_MSGT_SERVICE_REQ: + case SGSAP_MSGT_MO_CSFB_IND: + LOGSGC(sgc, LOGL_NOTICE, "Rx unmplemented SGsAP %s: %s\n", + sgsap_msg_type_name(msg_type), msgb_hexdump(msg)); + sgs_tx_status_tp(sgc, SGSAP_SGS_CAUSE_MSG_UNKNOWN, &tp, msg); + break; + default: + LOGSGC(sgc, LOGL_NOTICE, "Rx unknown SGsAP message type 0x%02x: %s\n", msg_type, msgb_hexdump(msg)); + sgs_tx_status_tp(sgc, SGSAP_SGS_CAUSE_MSG_UNKNOWN, &tp, msg); + break; + } + msgb_free(msg); + return 0; +} + +/*********************************************************************** + * SGs connection "VLR Reset Procedure" FSM + ***********************************************************************/ + +static const struct value_string sgs_vlr_reset_fsm_event_names[] = { + {SGS_VLRR_E_START_RESET, "START-RESET"}, + {SGS_VLRR_E_RX_RESET_ACK, "RX-RESET-ACK"}, + {0, NULL} +}; + +static void sgs_vlr_reset_fsm_null(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case SGS_VLRR_E_RX_RESET_ACK: + break; + default: + OSMO_ASSERT(0); + break; + } +} + +static void sgs_vlr_reset_fsm_wait_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case SGS_VLRR_E_RX_RESET_ACK: + osmo_fsm_inst_state_chg(fi, SGS_VLRR_ST_COMPLETE, 0, 0); + break; + default: + OSMO_ASSERT(0); + break; + } +} + +static void sgs_vlr_reset_fsm_complete(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case SGS_VLRR_E_RX_RESET_ACK: + break; + default: + OSMO_ASSERT(0); + break; + } +} + +static void sgs_vlr_reset_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgs_mme_ctx *mme = (struct sgs_mme_ctx *)fi->priv; + struct sgs_connection *sgc = mme->conn; + struct sgs_state *sgs = mme->sgs; + + switch (event) { + case SGS_VLRR_E_START_RESET: + osmo_fsm_inst_state_chg(fi, SGS_VLRR_ST_NULL, 0, 0); + mme->ns11_remaining = sgs->cfg.counter[SGS_STATE_NS11]; + /* send a reset message and enter WAIT_ACK state */ + sgs_tx_reset_ind_vlr(sgc, sgs->cfg.vlr_name); + osmo_fsm_inst_state_chg(fi, SGS_VLRR_ST_WAIT_ACK, sgs->cfg.timer[SGS_STATE_TS11], 11); + break; + default: + OSMO_ASSERT(0); + break; + } +} + +static int sgs_vlr_reset_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + struct sgs_mme_ctx *mme = (struct sgs_mme_ctx *)fi->priv; + struct sgs_connection *sgc = mme->conn; + struct sgs_state *sgs = mme->sgs; + + switch (fi->T) { + case 11: + if (mme->ns11_remaining >= 1) { + sgs_tx_reset_ind_vlr(sgc, sgc->sgs->cfg.vlr_name); + osmo_fsm_inst_state_chg(fi, SGS_VLRR_ST_WAIT_ACK, sgs->cfg.timer[SGS_STATE_TS11], 11); + mme->ns11_remaining--; + } else { + LOGMME(mme, LOGL_ERROR, "Ts11 expired more than Ns11 times, giving up\n"); + osmo_fsm_inst_state_chg(fi, SGS_VLRR_ST_NULL, 0, 0); + } + break; + default: + OSMO_ASSERT(0); + break; + } + return 0; +} + +static const struct osmo_fsm_state sgs_vlr_reset_fsm_states[] = { + [SGS_VLRR_ST_NULL] = { + /* We haven't even tried yet to send a RESET */ + .name = "NULL", + .action = sgs_vlr_reset_fsm_null, + .in_event_mask = S(SGS_VLRR_E_RX_RESET_ACK), + .out_state_mask = S(SGS_VLRR_ST_NULL) | S(SGS_VLRR_ST_WAIT_ACK), + }, + [SGS_VLRR_ST_WAIT_ACK] = { + /* We're waiting for a SGsAP_RESET_ACK */ + .name = "WAIT-ACK", + .action = sgs_vlr_reset_fsm_wait_ack, + .in_event_mask = S(SGS_VLRR_E_RX_RESET_ACK), + .out_state_mask = S(SGS_VLRR_ST_NULL) | + S(SGS_VLRR_ST_COMPLETE) | S(SGS_VLRR_ST_WAIT_ACK), + }, + [SGS_VLRR_ST_COMPLETE] = { + /* Reset procedure to this MME has been completed */ + .name = "COMPLETE", + .action = sgs_vlr_reset_fsm_complete, + .in_event_mask = S(SGS_VLRR_E_RX_RESET_ACK), + .out_state_mask = S(SGS_VLRR_ST_NULL) | S(SGS_VLRR_ST_COMPLETE), + }, +}; + +static struct osmo_fsm sgs_vlr_reset_fsm = { + .name = "SGs-VLR-RESET", + .states = sgs_vlr_reset_fsm_states, + .allstate_event_mask = S(SGS_VLRR_E_START_RESET), + .allstate_action = sgs_vlr_reset_fsm_allstate, + .timer_cb = sgs_vlr_reset_fsm_timer_cb, + .log_subsys = DSGS, + .event_names = sgs_vlr_reset_fsm_event_names, +}; + +/*********************************************************************** + * SGs connection server + ***********************************************************************/ + +#include + +static int sgs_conn_readable_cb(struct osmo_stream_srv *conn) +{ + struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); + struct sgs_connection *sgc = osmo_stream_srv_get_data(conn); + struct msgb *msg = sgs_msgb_alloc(); + struct sctp_sndrcvinfo sinfo; + int flags = 0; + int rc; + + /* we cannot use osmo_stream_srv_recv() here, as we might get some out-of-band info from + * SCTP. FIXME: add something like osmo_stream_srv_recv_sctp() to libosmo-netif and use + * it here as well as in libosmo-sigtran */ + rc = sctp_recvmsg(ofd->fd, msgb_data(msg), msgb_tailroom(msg), NULL, NULL, &sinfo, &flags); + if (rc < 0) { + osmo_stream_srv_destroy(conn); + goto out; + } else if (rc == 0) { + osmo_stream_srv_destroy(conn); + goto out; + } else { + msgb_put(msg, rc); + } + + if (flags & MSG_NOTIFICATION) { + union sctp_notification *notif = (union sctp_notification *)msgb_data(msg); + + switch (notif->sn_header.sn_type) { + case SCTP_SHUTDOWN_EVENT: + osmo_stream_srv_destroy(conn); + break; + case SCTP_ASSOC_CHANGE: + /* do we have to notify the SGs code about this? */ + break; + default: + break; + } + rc = 0; + goto out; + } + + /* set l2 header, as that's what we use in SGs code */ + msg->l2h = msgb_data(msg); + + if (msgb_sctp_ppid(msg) != 0) { + LOGSGC(sgc, LOGL_NOTICE, "Ignoring SCTP PPID %ld (spec violation)\n", msgb_sctp_ppid(msg)); + msgb_free(msg); + return 0; + } + /* handle message */ + sgs_rx(sgc, msg); + + return 0; +out: + msgb_free(msg); + return rc; +} + +static int sgs_conn_closed_cb(struct osmo_stream_srv *conn) +{ + struct sgs_connection *sgc = osmo_stream_srv_get_data(conn); + + LOGSGC(sgc, LOGL_NOTICE, "Connection lost\n"); + if (sgc->mme) { + /* unlink ourselves from the MME context */ + if (sgc->mme->conn == sgc) + sgc->mme->conn = NULL; + } + llist_del(&sgc->list); + return 0; +} + +/* call-back when new connection is accept() ed on SGs */ +static int sgs_accept_cb(struct osmo_stream_srv_link *link, int fd) +{ + struct sgs_state *sgs = osmo_stream_srv_link_get_data(link); + struct sgs_connection *sgc = talloc_zero(link, struct sgs_connection); + OSMO_ASSERT(sgc); + sgc->sgs = sgs; + sgc->sockname = osmo_sock_get_name(sgc, fd); + sgc->srv = osmo_stream_srv_create(sgc, link, fd, sgs_conn_readable_cb, sgs_conn_closed_cb, sgc); + if (!sgc->srv) { + talloc_free(sgc); + return -1; + } + LOGSGC(sgc, LOGL_INFO, "Accepted new SGs connection\n"); + llist_add_tail(&sgc->list, &sgs->conn_list); + + return 0; +} + +/* global init function */ +struct sgs_state *sgs_init(void *ctx, struct gsm_network *network) +{ + struct sgs_state *sgs; + struct osmo_stream_srv_link *link; + + gsm_network = network; + + sgs = sgs_state_alloc(ctx); + OSMO_ASSERT(sgs); + + /* We currently only support one SGs instance */ + OSMO_ASSERT(!g_sgs); + g_sgs = sgs; + + osmo_fsm_register(&sgs_vlr_reset_fsm); + + sgs->srv_link = link = osmo_stream_srv_link_create(ctx); + OSMO_ASSERT(sgs->srv_link); + osmo_stream_srv_link_set_nodelay(link, true); + //osmo_stream_srv_link_set_addr(link, local_ip); + osmo_stream_srv_link_set_port(link, 29118); + osmo_stream_srv_link_set_proto(link, IPPROTO_SCTP); + osmo_stream_srv_link_set_data(link, sgs); + osmo_stream_srv_link_set_accept_cb(link, sgs_accept_cb); + sgs_open(sgs); + + return sgs; +} + +int sgs_open(struct sgs_state *sgs) +{ + int rc; + struct osmo_fd *ofd = osmo_stream_srv_link_get_ofd(sgs->srv_link); + char *name; + + rc = osmo_stream_srv_link_open(sgs->srv_link); + if (rc < 0) { + LOGP(DSGS, LOGL_ERROR, "SGs socket cannot be opened: %s\n", strerror(errno)); + return rc; + } + name = osmo_sock_get_name(sgs, ofd->fd); + LOGP(DSGS, LOGL_NOTICE, "SGs socket bound to %s\n", name); + talloc_free(name); + return 0; +} diff --git a/src/libmsc/sgs_vty.c b/src/libmsc/sgs_vty.c new file mode 100644 index 0000000..6a0b1ad --- /dev/null +++ b/src/libmsc/sgs_vty.c @@ -0,0 +1,176 @@ +/* SGs Interface according to 3GPP TS 23.272 + TS 29.118 */ + +/* (C 2018 by Harald Welte + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +struct cmd_node cfg_sgs_node = { + CFG_SGS_NODE, + "%s(config-sgs)# ", + 1 +}; + +DEFUN(cfg_sgs, cfg_sgs_cmd, "sgs", "Configure the SGs interface\n") +{ + vty->index = g_sgs; + vty->node = CFG_SGS_NODE; + + return CMD_SUCCESS; +} + +DEFUN(cfg_sgs_local_ip, cfg_sgs_local_ip_cmd, + "local-ip A.B.C.D", "Set the Local IP Address of the SGs interface\n" "Local IP Address of the SGs interface\n") +{ + struct sgs_state *sgs = vty->index; + int rc; + + osmo_stream_srv_link_set_addr(sgs->srv_link, argv[0]); + + rc = sgs_open(sgs); + if (rc < 0) { + vty_out(vty, "%% SGs socket cannot be opened: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_sgs_local_port, cfg_sgs_local_port_cmd, + "local-port <0-65535>", "Set the local SCTP port of the SGs interface\n" "Local SCTP port of the SGs interface\n") +{ + struct sgs_state *sgs = vty->index; + int rc; + + osmo_stream_srv_link_set_port(sgs->srv_link, atoi(argv[0])); + + rc = sgs_open(sgs); + if (rc < 0) { + vty_out(vty, "%% SGs socket cannot be opened: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_sgs_vlr_name, cfg_sgs_vlr_name_cmd, + "vlr-name FQDN", "Set the SGs VLR Name as per TS 29.118 9.4.22\n" "Fully-Qualified Domain Name of this VLR\n") +{ + struct sgs_state *sgs = vty->index; + osmo_talloc_replace_string(sgs, &sgs->cfg.vlr_name, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_sgs_timer, cfg_sgs_timer_cmd, + "timer (Ts5|TS6-2|Ts7|Ts11|Ts14|Ts15) <1-120>", + "Configure SGs Timer\n" + "Paging procedure guard timer\n" + "TMSI reallocation guard timer\n" + "Non-EPS alert procedure guard timer\n" + "VLR reset guard timer\n" + "UE fallback prcoedure timer\n" "MO UE fallback procedure guard timer\n" "Time in seconds\n") +{ + struct sgs_state *sgs = vty->index; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(sgs->cfg.timer); i++) { + if (!strcmp(argv[0], sgs_state_timer_names[i])) { + sgs->cfg.timer[i] = atoi(argv[1]); + return CMD_SUCCESS; + } + } + + return CMD_WARNING; +} + +DEFUN(cfg_sgs_counter, cfg_sgs_counter_cmd, + "counter (Ns7|Ns11) <0-255>", + "Configure SGs Counter\n" "Non-EPS alert request retry counter\n" "VLR reset retry counter\n" "Counter value\n") +{ + struct sgs_state *sgs = vty->index; + unsigned int i = 0; + + for (i = 0; i < ARRAY_SIZE(sgs->cfg.counter); i++) { + if (!strcmp(argv[0], sgs_state_counter_names[i])) { + sgs->cfg.counter[i] = atoi(argv[1]); + return CMD_SUCCESS; + } + } + + return CMD_WARNING; +} + +DEFUN(show_sgs_conn, show_sgs_conn_cmd, "show sgs-connections", SHOW_STR "Show SGs interface connections / MMEs\n") +{ + struct sgs_connection *sgc; + + llist_for_each_entry(sgc, &g_sgs->conn_list, list) { + vty_out(vty, " %s %s%s", sgc->sockname, sgc->mme ? sgc->mme->fqdn : "", VTY_NEWLINE); + } + return CMD_SUCCESS; +} + +static int config_write_sgs(struct vty *vty) +{ + struct sgs_state *sgs = g_sgs; + unsigned int i; + + vty_out(vty, "sgs%s", VTY_NEWLINE); + if (sgs->cfg.local_port != 29118) + vty_out(vty, " local-port %u%s", sgs->cfg.local_port, VTY_NEWLINE); + if (sgs->cfg.local_addr) + vty_out(vty, " local-ip %s%s", sgs->cfg.local_addr, VTY_NEWLINE); + if (sgs->cfg.vlr_name) + vty_out(vty, " vlr-name %s%s", sgs->cfg.vlr_name, VTY_NEWLINE); + + for (i = 0; i < ARRAY_SIZE(sgs->cfg.timer); i++) { + if (sgs->cfg.timer[i] == sgs_state_timer_defaults[i]) + continue; + vty_out(vty, " timer %s %u%s", sgs_state_timer_names[i], sgs->cfg.timer[i], VTY_NEWLINE); + } + + for (i = 0; i < ARRAY_SIZE(sgs->cfg.counter); i++) { + if (sgs->cfg.timer[i] == sgs_state_counter_defaults[i]) + continue; + vty_out(vty, " counter %s %u%s", sgs_state_counter_names[i], sgs->cfg.counter[i], VTY_NEWLINE); + } + + return 1; +} + +void sgs_vty_init(void) +{ + /* configuration commands / nodes */ + install_element(CONFIG_NODE, &cfg_sgs_cmd); + install_node(&cfg_sgs_node, config_write_sgs); + install_element(CFG_SGS_NODE, &cfg_sgs_local_ip_cmd); + install_element(CFG_SGS_NODE, &cfg_sgs_local_port_cmd); + install_element(CFG_SGS_NODE, &cfg_sgs_timer_cmd); + install_element(CFG_SGS_NODE, &cfg_sgs_counter_cmd); + install_element(CFG_SGS_NODE, &cfg_sgs_vlr_name_cmd); + + install_element_ve(&show_sgs_conn_cmd); +} diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index 9888894..a173a0f 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -129,7 +129,8 @@ * This doesn't apply to the situation after MSCSPLIT with an * A-interface. */ req = subscr_request_conn(vsub, paging_cb_silent, data, - "establish silent call"); + "establish silent call", + SGSAP_SERV_IND_CS_CALL); if (!req) return -ENODEV; return 0; diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index dcae1c7..790943c 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -16,6 +16,7 @@ vlr_auth_fsm.h \ vlr_core.h \ vlr_lu_fsm.h \ + vlr_sgs_fsm.h \ $(NULL) noinst_LIBRARIES = libvlr.a @@ -25,4 +26,6 @@ vlr_access_req_fsm.c \ vlr_auth_fsm.c \ vlr_lu_fsm.c \ + vlr_sgs.c \ + vlr_sgs_fsm.c \ $(NULL) diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f7572f2..920c332 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -41,6 +42,7 @@ #include "vlr_auth_fsm.h" #include "vlr_lu_fsm.h" #include "vlr_access_req_fsm.h" +#include "vlr_sgs_fsm.h" #define SGSN_SUBSCR_MAX_RETRIES 3 #define SGSN_SUBSCR_RETRY_INTERVAL 10 @@ -247,6 +249,11 @@ INIT_LLIST_HEAD(&vsub->cs.requests); INIT_LLIST_HEAD(&vsub->ps.pdp_list); + /* Create an SGs FSM, which is needed to control CSFB, + * in cases where CSFB/SGs is not in use, this FSM will + * just do nothing. (see also: sgs_iface.c) */ + vlr_sgs_fsm_create(vsub); + llist_add_tail(&vsub->list, &vlr->subscribers); return vsub; } @@ -292,6 +299,10 @@ { llist_del(&vsub->list); DEBUGP(DREF, "freeing VLR subscr %s\n", vlr_subscr_name(vsub)); + + /* Remove SGs FSM (see also: sgs_iface.c) */ + vlr_sgs_fsm_remove(vsub); + talloc_free(vsub); } @@ -816,7 +827,13 @@ static int vlr_subscr_handle_lu_res(struct vlr_subscr *vsub, const struct osmo_gsup_message *gsup) { - if (!vsub->lu_fsm) { + struct sgs_lu_response sgs_lu_response; + bool sgs_lu_in_progress = false; + + if (vsub->sgs_fsm->state == SGS_UE_ST_LA_UPD_PRES) + sgs_lu_in_progress = true; + + if (!vsub->lu_fsm && !sgs_lu_in_progress) { LOGVSUBP(LOGL_ERROR, vsub, "Rx GSUP LU Result " "without LU in progress\n"); return -ENODEV; @@ -827,7 +844,12 @@ * nested INSERT SUBSCRIBER DATA transaction */ vlr_subscr_gsup_insert_data(vsub, gsup); - osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_LU_RES, NULL); + if (sgs_lu_in_progress) { + sgs_lu_response.accepted = true; + sgs_lu_response.vsub = vsub; + vsub->sgs.response_cb(&sgs_lu_response); + } else + osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_LU_RES, NULL); return 0; } @@ -836,7 +858,13 @@ static int vlr_subscr_handle_lu_err(struct vlr_subscr *vsub, const struct osmo_gsup_message *gsup) { - if (!vsub->lu_fsm) { + struct sgs_lu_response sgs_lu_response; + bool sgs_lu_in_progress = false; + + if (vsub->sgs_fsm->state == SGS_UE_ST_LA_UPD_PRES) + sgs_lu_in_progress = true; + + if (!vsub->lu_fsm && !sgs_lu_in_progress) { LOGVSUBP(LOGL_ERROR, vsub, "Rx GSUP LU Error " "without LU in progress\n"); return -ENODEV; @@ -845,9 +873,13 @@ LOGVSUBP(LOGL_DEBUG, vsub, "UpdateLocation failed; gmm_cause: %s\n", get_value_string(gsm48_gmm_cause_names, gsup->cause)); - osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_LU_RES, - (void *)&gsup->cause); - + if (sgs_lu_in_progress) { + sgs_lu_response.accepted = false; + sgs_lu_response.vsub = vsub; + vsub->sgs.response_cb(&sgs_lu_response); + } else + osmo_fsm_inst_dispatch(vsub->lu_fsm, VLR_ULA_E_HLR_LU_RES, + (void *)&gsup->cause); return 0; } @@ -1157,6 +1189,9 @@ vsub->imsi_detached_flag = true; vsub->expire_lu = VLR_SUBSCRIBER_NO_EXPIRATION; + /* Inform the UE-SGs FSM that the subscriber has been detached */ + osmo_fsm_inst_dispatch(vsub->sgs_fsm, SGS_UE_E_RX_DETACH_IND_FROM_UE, NULL); + /* balancing the get from vlr_lu_compl_fsm_success() */ vlr_subscr_expire(vsub); @@ -1206,6 +1241,8 @@ vlr_lu_fsm_init(); /* vlr_access_request_fsm.c */ vlr_parq_fsm_init(); + /* vlr_sgs_fsm.c */ + vlr_sgs_fsm_init(); return vlr; } diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 717db42..10cb656 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -27,6 +27,7 @@ #include "vlr_core.h" #include "vlr_auth_fsm.h" #include "vlr_lu_fsm.h" +#include "vlr_sgs_fsm.h" #define S(x) (1 << (x)) @@ -1045,6 +1046,11 @@ OSMO_ASSERT(lfp->vsub); + /* At this point we know for which subscriber the location update is, + * we now must inform SGs-UE FSM that we received a location update + * via A, IU or Gs interface. */ + osmo_fsm_inst_dispatch(lfp->vsub->sgs_fsm, SGS_UE_E_RX_LU_FROM_A_IU_GS, NULL); + /* See 3GPP TS 23.012, procedure Retrieve_IMEISV_If_Required */ if ((!vlr->cfg.retrieve_imeisv_early) || (lfp->type == VLR_LU_TYPE_PERIODIC && lfp->vsub->imeisv[0])) { diff --git a/src/libvlr/vlr_sgs.c b/src/libvlr/vlr_sgs.c new file mode 100644 index 0000000..d8c3a36 --- /dev/null +++ b/src/libvlr/vlr_sgs.c @@ -0,0 +1,124 @@ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Harald Welte, Philipp Maier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include +#include "vlr_sgs_fsm.h" + +/* Reset all SGs-Associations back to zero. + * \param[in] vlr VLR instace. */ +void vlr_sgs_reset(struct vlr_instance *vlr) +{ + struct vlr_subscr *vsub; + + OSMO_ASSERT(vlr); + + LOGP(DVLR, LOGL_INFO, "dropping all SGs associations.\n"); + + llist_for_each_entry(vsub, &vlr->subscribers, list) { + osmo_fsm_inst_dispatch(vsub->sgs_fsm, SGS_UE_E_RX_RESET_FROM_MME, NULL); + } +} + +/*! Perform an SGs location update. + * \param[in] vlr VLR instace. + * \param[in] response_cb calback function that is called when LU is done. + * \param[in] mme_name fqdn of the requesting MME (mme-name). + * \param[in] type location update type (normal or IMSI attach). + * \param[in] imsi mobile identity (IMSI). + * \param[in] new_lai identifier of the new location area. + * \returns 0 in case of success, -EINVAL in case of error. */ +int vlr_sgs_loc_update(struct vlr_instance *vlr, + vlr_sgs_lu_response_cb_t response_cb, + char *mme_name, enum vlr_lu_type type, const char *imsi, struct osmo_location_area_id *new_lai) +{ + struct vlr_subscr *vsub = NULL; + vsub = vlr_subscr_find_or_create_by_imsi(vlr, imsi, NULL); + + OSMO_ASSERT(response_cb); + + if (!vsub) { + LOGP(DSGS, LOGL_ERROR, "VLR subscriber allocation failed\n"); + return -EINVAL; + } + + vsub->sgs.response_cb = response_cb; + vlr_subscr_set_imsi(vsub, imsi); + osmo_strlcpy(vsub->sgs.mme_name, mme_name, sizeof(vsub->sgs.mme_name)); + + osmo_fsm_inst_dispatch(vsub->sgs_fsm, SGS_UE_E_RX_LU_FROM_MME, NULL); + + /* FIXME: put type parameter to the right place! */ + printf("==============================TYPE %x\n", type); + + /* FIXME: see note for struct member in vlr.h */ + memcpy(&vsub->sgs.lai, new_lai, sizeof(vsub->sgs.lai)); + + return 0; +} + +/*! Notify that the SGs Location Update accept message has been sent to MME. + * \param[in] vlr_subscr VLR subscriber. */ +void vlr_sgs_loc_update_acc_sent(struct vlr_subscr *vlr_subscr) +{ + osmo_fsm_inst_dispatch(vlr_subscr->sgs_fsm, SGS_UE_E_TX_LU_ACCEPT, NULL); +} + +/*! Notify that the SGs Location Update reject message has been sent to MME. + * \param[in] vlr_subscr VLR subscriber. */ +void vlr_sgs_loc_update_rej_sent(struct vlr_subscr *vlr_subscr) +{ + osmo_fsm_inst_dispatch(vlr_subscr->sgs_fsm, SGS_UE_E_TX_LU_REJECT, NULL); +} + +/*! Perform an SGs ISMI/EPS detach */ +void vlr_sgs_detach(struct vlr_instance *vlr, const char *imsi, bool eps) +{ + struct vlr_subscr *vsub; + vsub = vlr_subscr_find_by_imsi(vlr, imsi); + if (!vsub) { + /* Subscriber never existed or got already (implicitly) detached. */ + return; + } + + /* FIXME: What about the eps parameter? How is EPS Detach different + * from IMSI Detach? */ + + vsub->imsi_detached_flag = true; + vsub->expire_lu = VLR_SUBSCRIBER_NO_EXPIRATION; + + /* Inform the UE-SGs FSM that the subscriber has been detached */ + osmo_fsm_inst_dispatch(vsub->sgs_fsm, SGS_UE_E_RX_DETACH_IND_FROM_MME, NULL); + + /* balancing the get from vlr_lu_compl_fsm_success() */ + vlr_subscr_expire(vsub); +} + +/*! Check if the has an SGs association. + * \returns true if a an SGs association is present, otherwise false */ +bool vlr_sgs_assoc(struct vlr_subscr * vlr_subscr) +{ + if (vlr_subscr->sgs_fsm->state == SGS_UE_ST_ASSOCIATED) + return true; + return false; +} diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c new file mode 100644 index 0000000..ebfc1ba --- /dev/null +++ b/src/libvlr/vlr_sgs_fsm.c @@ -0,0 +1,236 @@ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Harald Welte, Philipp Maier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include + +#include "vlr_sgs_fsm.h" +#include "vlr_core.h" + +#define S(x) (1 << (x)) + +static const struct value_string sgs_ue_fsm_event_names[] = { + {SGS_UE_E_VLR_FAILURE, "VLR_FAILURE"}, + {SGS_UE_E_RX_RESET_FROM_MME, "RX_RESET_FROM_MME"}, + {SGS_UE_E_RX_DETACH_IND_FROM_MME, "RX_DETACH_IND_FROM_MME"}, + {SGS_UE_E_RX_DETACH_IND_FROM_UE, "RX_DETACH_IND_FROM_UE"}, /* vlr.c */ + {SGS_UE_E_RX_LU_FROM_A_IU_GS, "RX_LU_FROM_A_Iu_Gs"}, /* vlr_lu_fsm.c */ + {SGS_UE_E_RX_PAGING_FAILURE, "RX_PAGING_FAILURE"}, + {SGS_UE_E_RX_ALERT_FAILURE, "RX_ALERT_FAILURE"}, + {SGS_UE_E_RX_LU_FROM_MME, "RX_LU_FROM_MME"}, + {SGS_UE_E_TX_LU_REJECT, "TX_LU_REJECT"}, + {SGS_UE_E_TX_LU_ACCEPT, "TX_LU_ACCEPT"}, + {SGS_UE_E_TX_PAGING, "TX_PAGING"}, + {SGS_UE_E_RX_SGSAP_UE_UNRECHABLE, "RX_SGSAP_UE_UNREACH"}, + {SGS_UE_E_RX_TMSI_REALLOC, "RX_TMSI_REALLOC"}, + {0, NULL} +}; + +/* Figure 4.2.2.1 SGs-NULL */ +static void sgs_ue_fsm_null(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct vlr_subscr *vsub = fi->priv; + int rc; + + switch (event) { + case SGS_UE_E_RX_LU_FROM_MME: + osmo_fsm_inst_state_chg(fi, SGS_UE_ST_LA_UPD_PRES, 0, 0); + rc = vlr_subscr_req_lu(vsub, vsub->vlr->cfg.is_ps); + if (rc != 0) + LOGPFSML(fi, LOGL_ERROR, "(sub %s) HLR LU request failed\n", vlr_subscr_msisdn_or_name(vsub)); + break; + case SGS_UE_E_TX_PAGING: + /* do nothing */ + break; + case SGS_UE_E_RX_PAGING_FAILURE: + /* do nothing */ + break; + default: + OSMO_ASSERT(0); + } +} + +/* Figure 4.2.2.1 SGs-LA-UPDATE-PRESENT */ +static void sgs_ue_fsm_lau_present(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct vlr_subscr *vsub = fi->priv; + + switch (event) { + case SGS_UE_E_TX_LU_ACCEPT: + vsub->cs.attached_via_ran = RAN_UTRAN_SGS; + osmo_fsm_inst_state_chg(fi, SGS_UE_ST_ASSOCIATED, 0, 0); + vsub->conf_by_radio_contact_ind = true; + break; + case SGS_UE_E_TX_LU_REJECT: + case SGS_UE_E_RX_PAGING_FAILURE: + case SGS_UE_E_RX_ALERT_FAILURE: + /* FIXME: Not sure if we really must reset this, it will + * be overwritten anyway when RAN changes to 2G or 3G? */ + if (vsub->cs.attached_via_ran == RAN_UTRAN_SGS) + vsub->cs.attached_via_ran = RAN_UNKNOWN; + osmo_fsm_inst_state_chg(fi, SGS_UE_ST_NULL, 0, 0); + break; + case SGS_UE_E_TX_PAGING: + /* do nothing */ + break; + default: + OSMO_ASSERT(0); + } +} + +/* Figure 4.2.2.1 SGs-ASSOCIATED */ +static void sgs_ue_fsm_associated(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct vlr_subscr *vsub = fi->priv; + int rc; + + switch (event) { + case SGS_UE_E_TX_PAGING: + /* do nothing */ + break; + case SGS_UE_E_RX_TMSI_REALLOC: + /* do nothing */ + break; + case SGS_UE_E_RX_SGSAP_UE_UNRECHABLE: + /* do nothing */ + break; + case SGS_UE_E_RX_PAGING_FAILURE: + case SGS_UE_E_RX_ALERT_FAILURE: + /* FIXME: Not sure if we really must reset this, it will + * be overwritten anyway when RAN changes to 2G or 3G? */ + if (vsub->cs.attached_via_ran == RAN_UTRAN_SGS) + vsub->cs.attached_via_ran = RAN_UNKNOWN; + osmo_fsm_inst_state_chg(fi, SGS_UE_ST_NULL, 0, 0); + break; + case SGS_UE_E_RX_LU_FROM_MME: + osmo_fsm_inst_state_chg(fi, SGS_UE_ST_LA_UPD_PRES, 0, 0); + rc = vlr_subscr_req_lu(vsub, vsub->vlr->cfg.is_ps); + if (rc != 0) + LOGPFSML(fi, LOGL_ERROR, "(sub %s) HLR LU request failed\n", vlr_subscr_msisdn_or_name(vsub)); + break; + default: + OSMO_ASSERT(0); + } +} + +/* Figure 4.2.2.1 From any of the three states (at the VLR) */ +static void sgs_ue_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct vlr_subscr *vsub = fi->priv; + + osmo_fsm_inst_update_id(fi, vlr_subscr_msisdn_or_name(vsub)); + + switch (event) { + case SGS_UE_E_VLR_FAILURE: + case SGS_UE_E_RX_RESET_FROM_MME: + case SGS_UE_E_RX_DETACH_IND_FROM_MME: + case SGS_UE_E_RX_DETACH_IND_FROM_UE: + case SGS_UE_E_RX_LU_FROM_A_IU_GS: + osmo_fsm_inst_state_chg(fi, SGS_UE_ST_NULL, 0, 0); + break; + default: + OSMO_ASSERT(0); + } +} + +static int sgs_ue_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + return 0; +} + +static const struct osmo_fsm_state sgs_ue_fsm_states[] = { + [SGS_UE_ST_NULL] = { + .name = "SGs-NULL", + .action = sgs_ue_fsm_null, + .in_event_mask = S(SGS_UE_E_RX_LU_FROM_MME) | + S(SGS_UE_E_TX_PAGING) | S(SGS_UE_E_RX_PAGING_FAILURE), + .out_state_mask = S(SGS_UE_ST_NULL) | S(SGS_UE_ST_LA_UPD_PRES), + }, + [SGS_UE_ST_ASSOCIATED] = { + .name = "SGs-ASSOCIATED", + .action = sgs_ue_fsm_associated, + .in_event_mask = S(SGS_UE_E_TX_PAGING) | + S(SGS_UE_E_RX_TMSI_REALLOC) | + S(SGS_UE_E_RX_SGSAP_UE_UNRECHABLE) | + S(SGS_UE_E_RX_PAGING_FAILURE) | + S(SGS_UE_E_RX_ALERT_FAILURE) | S(SGS_UE_E_RX_LU_FROM_MME), + .out_state_mask = S(SGS_UE_ST_NULL) | + S(SGS_UE_ST_ASSOCIATED) | S(SGS_UE_ST_LA_UPD_PRES), + }, + [SGS_UE_ST_LA_UPD_PRES] = { + .name = "SGs-LA-UPDATE-PRESENT", + .action = sgs_ue_fsm_lau_present, + .in_event_mask = S(SGS_UE_E_TX_LU_ACCEPT) | + S(SGS_UE_E_TX_LU_REJECT) | + S(SGS_UE_E_TX_PAGING) | S(SGS_UE_E_RX_PAGING_FAILURE) | S(SGS_UE_E_RX_ALERT_FAILURE), + .out_state_mask = S(SGS_UE_ST_NULL) | + S(SGS_UE_ST_ASSOCIATED) | S(SGS_UE_ST_LA_UPD_PRES), + }, +}; + +static struct osmo_fsm sgs_ue_fsm = { + .name = "SGs-UE", + .states = sgs_ue_fsm_states, + .num_states = ARRAY_SIZE(sgs_ue_fsm_states), + .allstate_event_mask = S(SGS_UE_E_RX_RESET_FROM_MME) | + S(SGS_UE_E_VLR_FAILURE) | + S(SGS_UE_E_RX_DETACH_IND_FROM_MME) | S(SGS_UE_E_RX_DETACH_IND_FROM_UE) | S(SGS_UE_E_RX_LU_FROM_A_IU_GS), + .allstate_action = sgs_ue_fsm_allstate, + .timer_cb = sgs_ue_fsm_timer_cb, + .log_subsys = DSGS, + .event_names = sgs_ue_fsm_event_names, +}; + +/*! Initalize/Register SGs FSM in osmo-fsm subsystem */ +void vlr_sgs_fsm_init(void) +{ + if (osmo_fsm_find_by_name(sgs_ue_fsm.name) != &sgs_ue_fsm) + osmo_fsm_register(&sgs_ue_fsm); +} + +/*! Crate SGs FSM in struct vlr_subscr. + * \param[in] vsub VLR subscriber for which the SGs FSM should be created. */ +void vlr_sgs_fsm_create(struct vlr_subscr *vsub) +{ + /* An SGSs FSM must not be created twice! */ + OSMO_ASSERT(!vsub->sgs_fsm); + + vsub->sgs_fsm = osmo_fsm_inst_alloc(&sgs_ue_fsm, vsub, vsub, LOGL_INFO, vlr_subscr_msisdn_or_name(vsub)); + OSMO_ASSERT(vsub->sgs_fsm); + + osmo_fsm_inst_state_chg(vsub->sgs_fsm, SGS_UE_ST_NULL, 0, 0); + +// DEBUGP(DSGS, "(sub %s) SGs FSM created\n", vlr_subscr_msisdn_or_name(vsub)); +} + +/*! Remove SGs FSM from struct vlr_subscr. + * \param[in] vsub VLR subscriber from which the SGs FSM should be removed. */ +void vlr_sgs_fsm_remove(struct vlr_subscr *vsub) +{ + /* An SGSs FSM must exist! */ + OSMO_ASSERT(vsub->sgs_fsm); + + osmo_fsm_inst_state_chg(vsub->sgs_fsm, SGS_UE_ST_NULL, 0, 0); + osmo_fsm_inst_term(vsub->sgs_fsm, OSMO_FSM_TERM_REGULAR, NULL); + vsub->sgs_fsm = NULL; +} diff --git a/src/libvlr/vlr_sgs_fsm.h b/src/libvlr/vlr_sgs_fsm.h new file mode 100644 index 0000000..2233ceb --- /dev/null +++ b/src/libvlr/vlr_sgs_fsm.h @@ -0,0 +1,41 @@ +/* (C) 2018 by sysmocom s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Harald Welte, Philipp Maier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#pragma once + +enum sgs_ue_fsm_event { + SGS_UE_E_VLR_FAILURE, + SGS_UE_E_RX_RESET_FROM_MME, + SGS_UE_E_RX_DETACH_IND_FROM_MME, + SGS_UE_E_RX_DETACH_IND_FROM_UE, + SGS_UE_E_RX_LU_FROM_A_IU_GS, + SGS_UE_E_RX_PAGING_FAILURE, + SGS_UE_E_RX_ALERT_FAILURE, + SGS_UE_E_RX_LU_FROM_MME, + SGS_UE_E_TX_LU_REJECT, + SGS_UE_E_TX_LU_ACCEPT, + SGS_UE_E_TX_PAGING, + SGS_UE_E_RX_SGSAP_UE_UNRECHABLE, + SGS_UE_E_RX_TMSI_REALLOC, +}; + +void vlr_sgs_fsm_init(void); +void vlr_sgs_fsm_create(struct vlr_subscr *vsub); +void vlr_sgs_fsm_remove(struct vlr_subscr *vsub); diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am index bcc4ada..abe9ad3 100644 --- a/src/osmo-msc/Makefile.am +++ b/src/osmo-msc/Makefile.am @@ -12,6 +12,7 @@ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOCTRL_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ $(LIBSMPP34_CFLAGS) \ $(LIBOSMORANAP_CFLAGS) \ $(LIBASN1C_CFLAGS) \ @@ -40,11 +41,13 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCTRL_LIBS) \ $(LIBOSMOABIS_LIBS) \ + $(LIBOSMONETIF_LIBS) \ $(LIBSMPP34_LIBS) \ $(LIBOSMOSIGTRAN_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBOSMOGSUPCLIENT_LIBS) \ -ldbi \ + -lsctp \ $(NULL) if BUILD_IU osmo_msc_LDADD += \ diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 53d27d3..f5bec7d 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -61,6 +61,7 @@ #include #include #include +#include #ifdef BUILD_IU #include @@ -493,6 +494,12 @@ .description = "BSSAP Protocol (A Interface)", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DSGS] = { + .name = "DSGS", + .description = "SGs Interface (SGsAP)", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, + }; @@ -570,6 +577,7 @@ if (smpp_openbsc_alloc_init(tall_msc_ctx) < 0) return -1; #endif + sgs_init(tall_msc_ctx, msc_network); rc = vty_read_config_file(msc_cmdline_config.config_file, NULL); if (rc < 0) { diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index 6591557..cf5d67a 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -320,3 +320,23 @@ test_no_auth_reuse_utran, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 5819e51..486aa30 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -588,3 +588,23 @@ test_call_mo_to_unknown_timeout, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 8129781..fd5dd10 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -1003,3 +1003,23 @@ test_wrong_sres_length, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index 8f256b1..b1ea4d0 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -1512,3 +1512,23 @@ test_cm_service_needs_classmark_update, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c index 13bed42..51c7d03 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c @@ -456,3 +456,23 @@ test_hlr_no_insert_data, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c index a237695..ae5f154 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.c @@ -118,3 +118,23 @@ test_hlr_timeout_lu_upd_loc_result, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c index a4851b3..7ea2e79 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c @@ -368,3 +368,23 @@ test_classmark_update_timeout, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index b34ddd7..c3e3cd1 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -983,3 +983,23 @@ test_no_authen_subscr_expire, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index d206571..4af6571 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -404,3 +404,23 @@ test_reject_paging_resp_during_paging_resp, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index 247e7ae..7af526f 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -203,3 +203,24 @@ test_lu_unknown_tmsi, NULL }; + + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c index 34aa634..ab43002 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.c +++ b/tests/msc_vlr/msc_vlr_test_ss.c @@ -213,3 +213,23 @@ test_ss_ussd_no_geran, /* Network-originated */ NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index 62e280e..ffd209a 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -880,3 +880,23 @@ test_umts_authen_only_sres_utran, NULL }; + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index 6ce0b88..5f87c17 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -236,3 +236,23 @@ return 0; } + +void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data) {} +struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv) { return NULL; } +void osmo_stream_srv_destroy(struct osmo_stream_srv *conn) {} +struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, + int fd, int (*cb)(struct osmo_stream_srv *conn), + int (*closed_cb)(struct osmo_stream_srv *conn), + void *data) { return NULL; } +void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg) {} +void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto) {} +struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link) { return NULL; } +struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx) { return NULL; } +void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn) { return NULL; } +void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay) {} +void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb) + (struct osmo_stream_srv_link *link, int fd)) {} +int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { return 0; } +void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link) { return NULL; } +void osmo_stream_srv_link_set_port(struct osmo_stream_srv_link *link, uint16_t port) {} +int sctp_recvmsg(int sd, void *msg, size_t len, void *from, void *fromlen, void *info, int *msg_flags) { return 0; } -- To view, visit https://gerrit.osmocom.org/11642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I73359925fc1ca72b33a1466e6ac41307f2f0b11d Gerrit-Change-Number: 11642 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:01:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:01:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: cleanup test config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11643 Change subject: PCU: cleanup test config ...................................................................... PCU: cleanup test config * remove unused parameters * add expected results * use control for default test execution * only tests which could (in theory) pass are left in control Previously generic control had some tests which never called "setverdict(pass)" which means they would always fail. Such tests might be useful during development but should not be part of test set executed by default. Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a Related: OS#2890 --- M pcu/PCU_Tests.cfg M pcu/PCU_Tests.ttcn A pcu/expected-results.xml 3 files changed, 12 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/11643/1 diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index 7e0b9f2..5975290 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -7,10 +7,6 @@ ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC [MODULE_PARAMETERS] -#mp_local_ip := "192.168.100.239" -#mp_local_udp_port := 23000 -#mp_remote_ip := "192.168.100.196" -#mp_remote_udp_port := 21000 PCU_Tests.mp_nsconfig := { local_ip := "127.0.0.1", local_udp_port := 23000, @@ -36,26 +32,18 @@ } [TESTPORT_PARAMETERS] -#*.BSCVTY.CTRL_MODE := "client" -#*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" -#*.BSCVTY.CTRL_PORTNUM := "4242" -#*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes" -#*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" -#*.BSCVTY.CTRL_READMODE := "buffered" -#*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" -#*.BSCVTY.PROMPT1 := "OpenBSC> " -#*.BSCVTY.PROMPT2 := "OpenBSC# " -#*.BSCVTY.REGEX_PROMPT1 := "^OpenBSC.*$" - *.*.udpReuseAddress := "yes"; [MAIN_CONTROLLER] [EXECUTE] +PCU_Tests.control +# for internal use only: will always fail when called as part of normal routine #PCU_Tests.TC_selftest_llc #PCU_Tests.TC_selftest_rlcmac #PCU_Tests.TC_selftest_bssgp #PCU_Tests.TC_nsem #PCU_Tests.TC_paging -PCU_Tests.TC_rach +#PCU_Tests.TC_rach #PCU_Tests.TC_selftest_rr +#PCU_Tests.TC_dl_tbf diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a63ca1d..adbc73e 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -630,12 +630,8 @@ control { - execute(TC_selftest_bssgp()); execute(TC_selftest_ns()); - execute(TC_selftest_llc()); - execute(TC_selftest_rr()); - execute(TC_selftest_rlcmac()); - execute(TC_nsem()); - execute(TC_paging()); + execute(TC_ul_tbf_single_llc_sizes()); + execute(TC_ul_tbf()); } }; diff --git a/pcu/expected-results.xml b/pcu/expected-results.xml new file mode 100644 index 0000000..aec661d --- /dev/null +++ b/pcu/expected-results.xml @@ -0,0 +1,6 @@ + + + + + + -- To view, visit https://gerrit.osmocom.org/11643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a Gerrit-Change-Number: 11643 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:01:57 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:01:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS: print ip:port on error Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11644 Change subject: NS: print ip:port on error ...................................................................... NS: print ip:port on error Change-Id: I2f558021b7754db9593934888d12f9c879dc2988 --- M library/NS_Emulation.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/11644/1 diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 7cccb25..ca4d1d6 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -83,7 +83,9 @@ /* Connect the UDP socket */ res := f_IPL4_connect(NSCP, config.remote_ip, config.remote_udp_port, config.local_ip, config.local_udp_port, 0, { udp := {}}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect NS UDP socket, check your configuration"); + setverdict(fail, "Could not connect NS UDP socket from " & + config.local_ip & ":" & int2str(config.local_udp_port) & + " to " & config.remote_ip & ":" & int2str(config.remote_udp_port)); mtc.stop; } g_conn_id := res.connId; -- To view, visit https://gerrit.osmocom.org/11644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2f558021b7754db9593934888d12f9c879dc2988 Gerrit-Change-Number: 11644 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:06:55 +0000 Subject: Change in osmo-bsc[master]: LCLS: explicitly check for mode before closing the loop In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11565 to look at the new patch set (#2). Change subject: LCLS: explicitly check for mode before closing the loop ...................................................................... LCLS: explicitly check for mode before closing the loop * expand logging to print the name of LCLS mode in use * explicitly check for MGW mode before closing the loop via MGCP MDCX Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Related: OS#3659 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/gsm_data.c M src/osmo-bsc/osmo_bsc_lcls.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 26 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/11565/2 -- To view, visit https://gerrit.osmocom.org/11565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Gerrit-Change-Number: 11565 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:06:55 +0000 Subject: Change in osmo-bsc[master]: LCLS: move mode check into separate function In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11551 to look at the new patch set (#4). Change subject: LCLS: move mode check into separate function ...................................................................... LCLS: move mode check into separate function Before closing or breaking the loop in LCLS we do preliminary checks. To facilitate adding new LCLS modes it's restructured as follows: * move check into dedicated static function * explicitly check for MGW mode in endpoint check * check for mode mismatch Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Related: OS#3659 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/11551/4 -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:06:55 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11552 to look at the new patch set (#4). Change subject: LCLS: add bts-loop variant ...................................................................... LCLS: add bts-loop variant Add LCLS variant where the loop is closed on BTS level instead of MGW. The main difference is the handling of connection-related messages (we use IPA RSL instead of MGCP), the configuration and correlation logic remains the same. Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Fixes: OS#3659 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/gsm_data.c M src/osmo-bsc/osmo_bsc_lcls.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 29 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/11552/4 -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:13:00 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:13:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: explicitly check for RSL_IE_CHAN_NR In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11556 ) Change subject: BSC LCLS: explicitly check for RSL_IE_CHAN_NR ...................................................................... BSC LCLS: explicitly check for RSL_IE_CHAN_NR Check that channel number IE is present in the received message. This fixes following warning: The value returned by function `@RSL_Types.f_rsl_find_ie' is not used Change-Id: Icc6824d7acef809d76c70b5ff060a8261a82e2be Related: OS#3659 --- M bsc/BSC_Tests_LCLS.ttcn 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 1c51995..0151329 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -605,8 +605,11 @@ [] CONN_A.receive(tr_RSL_DEACT_SACCH(?)); [] CONN_A.receive(tr_RSL_RF_CHAN_REL(?)) -> value rsl { var RSL_IE_Body ieb; - f_rsl_find_ie(rsl, RSL_IE_CHAN_NR, ieb); - CONN_A.send(ts_RSL_RF_CHAN_REL_ACK(ieb.chan_nr)); + if (f_rsl_find_ie(rsl, RSL_IE_CHAN_NR, ieb) == true) { + CONN_A.send(ts_RSL_RF_CHAN_REL_ACK(ieb.chan_nr)); + } else { + log("Unable to find chan# in RSL_RF_CHAN_REL") + } } [] CONN_A.receive(tr_BSSMAP_ClearComplete) { CONN_A.send(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); -- To view, visit https://gerrit.osmocom.org/11556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icc6824d7acef809d76c70b5ff060a8261a82e2be Gerrit-Change-Number: 11556 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:13:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:13:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: cosmetic: fix compilation warnings In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11557 ) Change subject: cosmetic: fix compilation warnings ...................................................................... cosmetic: fix compilation warnings Drop 'return' statements after 'mtc.stop' as they cause following warning from TTCN-3 compiler: warning: Control never reaches this statement Change-Id: I6210ecf5fcb39f751116ad63a69d2ae8651a60c5 --- M library/MGCP_Emulation.ttcn M library/Osmocom_CTRL_Functions.ttcn 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn index c3d09b9..3dfbbc8 100644 --- a/library/MGCP_Emulation.ttcn +++ b/library/MGCP_Emulation.ttcn @@ -385,7 +385,6 @@ } setverdict(fail, "Couldn't find Expect for CRCX", cmd); mtc.stop; - return ret; } private function f_create_expect(ExpectCriteria crit, MGCP_ConnHdlr hdlr) @@ -459,7 +458,6 @@ setverdict(fail, "Unknown payload type ", pt); mtc.stop; - return ""; } } diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn index da3b80d..4356ba9 100644 --- a/library/Osmocom_CTRL_Functions.ttcn +++ b/library/Osmocom_CTRL_Functions.ttcn @@ -41,12 +41,10 @@ [] pt.receive(tr_CtrlMsgError) -> value rx { setverdict(fail, "Error in CTRL GET ", variable, ": ", rx.err.reason); mtc.stop; - return "FAIL"; } [] T.timeout { setverdict(fail, "Timeout waiting for CTRL GET REPLY ", variable); mtc.stop; - return "TIMEOUT"; } } return rx.resp.val; @@ -85,7 +83,6 @@ [] T.timeout { setverdict(fail, "Timeout waiting for TRAP ", variable); mtc.stop; - return "TIMEOUT"; } } return rx.trap.val; -- To view, visit https://gerrit.osmocom.org/11557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6210ecf5fcb39f751116ad63a69d2ae8651a60c5 Gerrit-Change-Number: 11557 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:28:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:28:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: restructure tests In-Reply-To: References: Message-ID: Hello daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11555 to look at the new patch set (#4). Change subject: BSC LCLS: restructure tests ...................................................................... BSC LCLS: restructure tests Move duplicated code into separate functions to simplify adding test cases which do not use MGW MDCX methods for closing the loop. Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Related: OS#3659 --- M bsc/BSC_Tests_LCLS.ttcn 1 file changed, 52 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/11555/4 -- To view, visit https://gerrit.osmocom.org/11555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Gerrit-Change-Number: 11555 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:28:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:28:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: add bts-loop tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11559 to look at the new patch set (#5). Change subject: BSC LCLS: add bts-loop tests ...................................................................... BSC LCLS: add bts-loop tests Add basic establishment and teardown tests for 'bts-loop' mode of LCLS: * add explicit vty init for desired LCLS kind * add necessary IPA RSL MDCX functions * explicitly pass LCLS kind as a parameter to shared functions (defaulting to 'mgw-loop') Change-Id: I40e786b430591899c722d99d685db26efa868508 Related: OS#3659 --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_LCLS.ttcn M bsc/expected-results.xml 3 files changed, 134 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/11559/5 -- To view, visit https://gerrit.osmocom.org/11559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I40e786b430591899c722d99d685db26efa868508 Gerrit-Change-Number: 11559 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:28:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:28:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log number of expected/seen *CX messages on failure Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11645 Change subject: BSC: log number of expected/seen *CX messages on failure ...................................................................... BSC: log number of expected/seen *CX messages on failure Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/11645/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 003813a..4b7a297 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -817,10 +817,10 @@ ", mdcx_seen=", g_media.mgcp_conn[i].mdcx_seen, ", mdcx_seen_exp=", g_media.mgcp_conn[i].mdcx_seen_exp); if(g_media.mgcp_conn[i].crcx_seen != g_media.mgcp_conn[i].crcx_seen_exp) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-CRCX transactions"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-CRCX transactions on g_media.mgcp_conn[" & int2str(i) & "]"); } if(g_media.mgcp_conn[i].mdcx_seen != g_media.mgcp_conn[i].mdcx_seen_exp) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-MDCX transactions"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-MDCX transactions on g_media.mgcp_conn[" & int2str(i) & "]"); } } } -- To view, visit https://gerrit.osmocom.org/11645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 Gerrit-Change-Number: 11645 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:30:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:30:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: LCLS: explicitly check for *CX adjustment In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11558 ) Change subject: LCLS: explicitly check for *CX adjustment ...................................................................... Patch Set 4: Moved to separate commit. -- To view, visit https://gerrit.osmocom.org/11558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076 Gerrit-Change-Number: 11558 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Harald Welte Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 18:30:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:33:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:33:19 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak conn_exists() In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11458 to look at the new patch set (#2). Change subject: msc_vlr_tests: tweak conn_exists() ...................................................................... msc_vlr_tests: tweak conn_exists() * constify function parameter * internalize parameter check Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 --- M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 2 files changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/58/11458/2 -- To view, visit https://gerrit.osmocom.org/11458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 Gerrit-Change-Number: 11458 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 18:34:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 18:34:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS: print ip:port on error In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11644 ) Change subject: NS: print ip:port on error ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f558021b7754db9593934888d12f9c879dc2988 Gerrit-Change-Number: 11644 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 18:34:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 19:22:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 19:22:22 +0000 Subject: Change in libosmocore[master]: socket.c: fix IP and port buffer sizes In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11520 ) Change subject: socket.c: fix IP and port buffer sizes ...................................................................... Patch Set 1: Code-Review+1 in both cases this reduces the buffer size, resp. from 16 to 6 and from 64 to 46. It's probably correct and not harmful, but I ask myself, why bother? -- To view, visit https://gerrit.osmocom.org/11520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia25e2f3277ad2f60df31c08d12f42c1e6d2a14a6 Gerrit-Change-Number: 11520 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 06 Nov 2018 19:22:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 19:23:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 19:23:30 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: collect artifacts again In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11618 ) Change subject: ttcn3-testsuites: collect artifacts again ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b0f5de87125374c9a48d0a47e6a4e655d7ed3bb Gerrit-Change-Number: 11618 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 06 Nov 2018 19:23:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 19:23:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 19:23:32 +0000 Subject: Change in osmo-ci[master]: ttcn3-testsuites: collect artifacts again In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11618 ) Change subject: ttcn3-testsuites: collect artifacts again ...................................................................... ttcn3-testsuites: collect artifacts again Collect build artifacts just like the manually created jobs did it. Related: OS#3681 Change-Id: I5b0f5de87125374c9a48d0a47e6a4e655d7ed3bb --- M jobs/ttcn3-testsuites.yml 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index fc4f306..a5c5fe4 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -97,6 +97,13 @@ notify-every-unstable-build: true recipients: laforge at gnumonks.org send-to-individuals: false + - archive: + allow-empty: false + artifacts: logs/**/* + case-sensitive: true + default-excludes: true + fingerprint: false + only-if-success: false properties: - build-blocker: use-build-blocker: true -- To view, visit https://gerrit.osmocom.org/11618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5b0f5de87125374c9a48d0a47e6a4e655d7ed3bb Gerrit-Change-Number: 11618 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 19:25:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 19:25:13 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use enum value for OML IP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11641 ) Change subject: ipaccess-config: Use enum value for OML IP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a708c3ba2271d9968daa264736411c9326fc404 Gerrit-Change-Number: 11641 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 19:25:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 19:25:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 19:25:19 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use enum value for OML IP In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11641 ) Change subject: ipaccess-config: Use enum value for OML IP ...................................................................... ipaccess-config: Use enum value for OML IP Change-Id: I3a708c3ba2271d9968daa264736411c9326fc404 --- M src/ipaccess/ipaccess-config.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 5491700..0fb5ad9 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -409,7 +409,7 @@ msgb_put_u8(nmsg, NM_ATT_IPACC_PRIM_OML_CFG_LIST); msgb_put_u16(nmsg, len); - msgb_put_u8(nmsg, 0x88); + msgb_put_u8(nmsg, NM_ATT_IPACC_PRIM_OML_CFG); /* IP address */ msgb_put_u32(nmsg, ip); -- To view, visit https://gerrit.osmocom.org/11641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3a708c3ba2271d9968daa264736411c9326fc404 Gerrit-Change-Number: 11641 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 19:26:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 19:26:59 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Support power cycling multiple quad modems In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11628 ) Change subject: ansible: gsm-tester: Support power cycling multiple quad modems ...................................................................... Patch Set 1: Code-Review+2 i hope you verified that it works... -- To view, visit https://gerrit.osmocom.org/11628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 Gerrit-Change-Number: 11628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 19:26:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:01:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 20:01:51 +0000 Subject: Change in osmo-bsc[master]: vty doc: drop "(HO algo 2 only)" strings In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11581 ) Change subject: vty doc: drop "(HO algo 2 only)" strings ...................................................................... Patch Set 1: Code-Review+2 let me apply this, since I'm 110% sure and there's no need for anyone to review it, really. -- To view, visit https://gerrit.osmocom.org/11581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612 Gerrit-Change-Number: 11581 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 20:01:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:01:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 20:01:53 +0000 Subject: Change in osmo-bsc[master]: vty doc: drop "(HO algo 2 only)" strings In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11581 ) Change subject: vty doc: drop "(HO algo 2 only)" strings ...................................................................... vty doc: drop "(HO algo 2 only)" strings These indicators are a legacy of early handover_decision_2.c work, where there were no separate handover1 and handover2 config commands. No need to restate the abundantly obvious anymore. Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612 --- M include/osmocom/bsc/handover_cfg.h M src/osmo-bsc/handover_vty.c M tests/handover_cfg.vty 3 files changed, 26 insertions(+), 27 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h index 865fab9..92b5cd4 100644 --- a/include/osmocom/bsc/handover_cfg.h +++ b/include/osmocom/bsc/handover_cfg.h @@ -21,11 +21,10 @@ #define HO_CFG_STR_WIN_RXQUAL HO_CFG_STR_WIN "Received-Quality averaging\n" #define HO_CFG_STR_POWER_BUDGET "Neighbor cell power triggering\n" "Neighbor cell power triggering\n" #define HO_CFG_STR_AVG_COUNT "Number of values to average over\n" -#define HO_CFG_STR_2 " (HO algo 2 only)\n" -#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO" HO_CFG_STR_2 -#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs" HO_CFG_STR_2 -#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested" HO_CFG_STR_2 -#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers" HO_CFG_STR_2 +#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO\n" +#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs\n" +#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested\n" +#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers\n" #define as_is(x) (x) @@ -185,14 +184,14 @@ HO_CFG_ONE_MEMBER(bool, hodec2_as_active, 0, \ "handover2 ", "assignment", "0|1", a2bool, "%d", bool2i, \ HO_CFG_STR_HANDOVER2 \ - "Enable or disable in-call channel re-assignment" HO_CFG_STR_2 \ + "Enable or disable in-call channel re-assignment\n" \ "Disable in-call assignment\n" \ "Enable in-call assignment\n") \ \ HO_CFG_ONE_MEMBER(bool, hodec2_full_tdma, subset, \ "handover2 ", "tdma-measurement", "full|subset", a2tdma, "%s", tdma2a, \ HO_CFG_STR_HANDOVER2 \ - "Define measurement set of TDMA frames" HO_CFG_STR_2 \ + "Define measurement set of TDMA frames\n" \ "Full set of 102/104 TDMA frames\n" \ "Sub set of 4 TDMA frames (SACCH)\n") \ \ @@ -241,7 +240,7 @@ HO_CFG_ONE_MEMBER(int, hodec2_ho_max, 9999, \ "handover2 ", "max-handovers", "<1-9999>", atoi, "%d", as_is, \ HO_CFG_STR_HANDOVER2 \ - "Maximum number of concurrent handovers allowed per cell" HO_CFG_STR_2 \ + "Maximum number of concurrent handovers allowed per cell\n" \ "Number\n") \ \ HO_CFG_ONE_MEMBER(int, hodec2_penalty_max_dist, 300, \ @@ -268,7 +267,7 @@ HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \ "handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \ HO_CFG_STR_HANDOVER2 \ - "Immediately retry on handover/assignment failure" HO_CFG_STR_2 \ + "Immediately retry on handover/assignment failure\n" \ "Number of retries\n") \ #define HO_CFG_ALL_MEMBERS \ diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c index 51e448e..7979511 100644 --- a/src/osmo-bsc/handover_vty.c +++ b/src/osmo-bsc/handover_vty.c @@ -106,7 +106,7 @@ DEFUN(cfg_net_ho_congestion_check_interval, cfg_net_ho_congestion_check_interval_cmd, "handover2 congestion-check (disabled|<1-999>|now)", HO_CFG_STR_HANDOVER2 - "Configure congestion check interval" HO_CFG_STR_2 + "Configure congestion check interval\n" "Disable congestion checking, do not handover based on cell overload\n" "Congestion check interval in seconds (default " OSMO_STRINGIFY_VAL(HO_CFG_CONGESTION_CHECK_DEFAULT) ")\n" diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty index 119eaf5..94c20d9 100644 --- a/tests/handover_cfg.vty +++ b/tests/handover_cfg.vty @@ -218,15 +218,15 @@ window Measurement averaging settings power Neighbor cell power triggering maximum Maximum Timing-Advance value (i.e. MS distance) before triggering HO - assignment Enable or disable in-call channel re-assignment (HO algo 2 only) - tdma-measurement Define measurement set of TDMA frames (HO algo 2 only) - min Minimum Level/Quality thresholds before triggering HO (HO algo 2 only) - afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only) - min-free-slots Minimum free TCH timeslots before cell is considered congested (HO algo 2 only) - max-handovers Maximum number of concurrent handovers allowed per cell (HO algo 2 only) - penalty-time Set penalty times to wait between repeated handovers (HO algo 2 only) - retries Immediately retry on handover/assignment failure (HO algo 2 only) - congestion-check Configure congestion check interval (HO algo 2 only) + assignment Enable or disable in-call channel re-assignment + tdma-measurement Define measurement set of TDMA frames + min Minimum Level/Quality thresholds before triggering HO + afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs + min-free-slots Minimum free TCH timeslots before cell is considered congested + max-handovers Maximum number of concurrent handovers allowed per cell + penalty-time Set penalty times to wait between repeated handovers + retries Immediately retry on handover/assignment failure + congestion-check Configure congestion check interval OsmoBSC(config-net)# handover algorithm ? 1 Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only. @@ -437,14 +437,14 @@ window Measurement averaging settings power Neighbor cell power triggering maximum Maximum Timing-Advance value (i.e. MS distance) before triggering HO - assignment Enable or disable in-call channel re-assignment (HO algo 2 only) - tdma-measurement Define measurement set of TDMA frames (HO algo 2 only) - min Minimum Level/Quality thresholds before triggering HO (HO algo 2 only) - afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only) - min-free-slots Minimum free TCH timeslots before cell is considered congested (HO algo 2 only) - max-handovers Maximum number of concurrent handovers allowed per cell (HO algo 2 only) - penalty-time Set penalty times to wait between repeated handovers (HO algo 2 only) - retries Immediately retry on handover/assignment failure (HO algo 2 only) + assignment Enable or disable in-call channel re-assignment + tdma-measurement Define measurement set of TDMA frames + min Minimum Level/Quality thresholds before triggering HO + afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs + min-free-slots Minimum free TCH timeslots before cell is considered congested + max-handovers Maximum number of concurrent handovers allowed per cell + penalty-time Set penalty times to wait between repeated handovers + retries Immediately retry on handover/assignment failure OsmoBSC(config-net-bts)# handover algorithm ? 1 Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only. -- To view, visit https://gerrit.osmocom.org/11581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612 Gerrit-Change-Number: 11581 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:10:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 20:10:59 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11504 to look at the new patch set (#3). Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... gsm0808: add BSSMAP Cell Identifier matching API Add * osmo_lai_cmp() (to use in gsm0808_cell_id_u_matches()) * osmo_cgi_cmp() (to use in gsm0808_cell_id_u_matches()) * gsm0808_cell_id_u_matches() (to re-use for single IDs and lists) * gsm0808_cell_ids_match() * gsm0808_cell_id_matches_list() * Unit tests in gsm0808_test.c Rationale: For inter-BSC handover, it is interesting to find matches between *differing* Cell Identity kinds. For example, if a cell as CGI 23-42-3-5, and a HO for LAC-CI 3-5 should be handled, we need to see the match. This is most interesting for osmo-msc, i.e. to direct the BSSMAP Handover Request towards the correct BSC. It is also interesting for osmo-bsc's VTY interface, to be able to manage cells' neighbors and to trigger manual handovers by various Cell Identity handles, as the user would expect them. Change-Id: I5535f0d149c2173294538df75764dd181b023312 --- M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M src/gsm/gsm0808_utils.c M src/gsm/gsm23003.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 573 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/11504/3 -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:11:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 20:11:52 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11504/2/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/11504/2/tests/gsm0808/gsm0808_test.c at 1721 PS2, Line 1721: struct test_cell_id_matching_data { > Shouldn't all these structs be static? Maybe that helps with compiler error. yep, should be static, regardless; thanks for catching. Since I can't reproduce the compiler error, let's see what jenkins says this time round. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 20:11:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:12:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 20:12:34 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 2: hrm. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 20:12:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:16:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 20:16:58 +0000 Subject: Change in libosmocore[master]: jenkins: print gcc version in log Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11646 Change subject: jenkins: print gcc version in log ...................................................................... jenkins: print gcc version in log Change-Id: I8dfac78868f64213413e80cc52ac585d9d4a2c93 --- M contrib/jenkins_arch.sh 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/11646/1 diff --git a/contrib/jenkins_arch.sh b/contrib/jenkins_arch.sh index 99ce5c1..93dd8bb 100755 --- a/contrib/jenkins_arch.sh +++ b/contrib/jenkins_arch.sh @@ -14,7 +14,11 @@ exit 1 fi -set -x -e +set -x + +gcc --version + +set -e case "$arch" in -- To view, visit https://gerrit.osmocom.org/11646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8dfac78868f64213413e80cc52ac585d9d4a2c93 Gerrit-Change-Number: 11646 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:22:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 6 Nov 2018 20:22:27 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 4: jenkins tests with gcc 6.3.0-18+deb9u1, my gcc is gcc (Debian 8.2.0-9) 8.2.0. So a) this code will work as soon as we upgrade gcc. But b) do we really want to depend on newer gcc :/ Appears I need to think of some cumbersome magic to initialize the structs. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 06 Nov 2018 20:22:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:56:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 6 Nov 2018 20:56:36 +0000 Subject: Change in libosmocore[master]: core/msgb.h: introduce msgb_l4len() helper Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11647 Change subject: core/msgb.h: introduce msgb_l4len() helper ...................................................................... core/msgb.h: introduce msgb_l4len() helper There is already a group of similar functions for L1, L2 and L3, but L4 was missing. The L4 is usually used for parsing of complex L3 messages, such as SS/USSD and SMS. This change introduces a similar halper for L4. Change-Id: I755f2d654bbdad2a8b4f94df9023bdd370b07ae6 --- M TODO-RELEASE M include/osmocom/core/msgb.h 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/11647/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 64833d2..5222ec9 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ libosmogsm gsm0480_l3hdr_push() removed from gsm/gsm0480.h (was not exposed) libosmogsm gsm48_push_l3hdr() (re)introduced in gsm/gsm48.h (GSM 04.08 API) libosmogsm gsm48_push_l3hdr_tid() a wrapper around gsm48_push_l3hdr() +libosmocore msgb_l4len new symbol (exposed as 'static inline' in msgb.h) diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index b1cb6ec..86177f1 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -169,6 +169,18 @@ return msgb->tail - (uint8_t *)msgb_l3(msgb); } +/*! determine length of L4 message + * \param[in] msgb message buffer + * \returns size of L4 message in bytes + * + * This function computes the number of bytes between the tail of the + * message and the layer 4 header. + */ +static inline unsigned int msgb_l4len(const struct msgb *msgb) +{ + return msgb->tail - (uint8_t *)msgb_l4(msgb); +} + /*! determine the length of the header * \param[in] msgb message buffer * \returns number of bytes between start of buffer and start of msg -- To view, visit https://gerrit.osmocom.org/11647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I755f2d654bbdad2a8b4f94df9023bdd370b07ae6 Gerrit-Change-Number: 11647 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 20:58:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 6 Nov 2018 20:58:16 +0000 Subject: Change in libosmocore[master]: core/msgb.h: introduce msgb_l4len() helper In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11647 to look at the new patch set (#2). Change subject: core/msgb.h: introduce msgb_l4len() helper ...................................................................... core/msgb.h: introduce msgb_l4len() helper There is already a group of similar functions for L1, L2 and L3, but L4 was missing. The L4 is usually used for parsing of complex L3 messages, such as SS/USSD and SMS. This change introduces a similar halper for L4. Change-Id: I755f2d654bbdad2a8b4f94df9023bdd370b07ae6 --- M TODO-RELEASE M include/osmocom/core/msgb.h 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/11647/2 -- To view, visit https://gerrit.osmocom.org/11647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I755f2d654bbdad2a8b4f94df9023bdd370b07ae6 Gerrit-Change-Number: 11647 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:43:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:43:00 +0000 Subject: Change in libosmocore[master]: core/msgb.h: introduce msgb_l4len() helper In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11647 ) Change subject: core/msgb.h: introduce msgb_l4len() helper ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I755f2d654bbdad2a8b4f94df9023bdd370b07ae6 Gerrit-Change-Number: 11647 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 06 Nov 2018 21:43:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:43:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:43:02 +0000 Subject: Change in libosmocore[master]: core/msgb.h: introduce msgb_l4len() helper In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11647 ) Change subject: core/msgb.h: introduce msgb_l4len() helper ...................................................................... core/msgb.h: introduce msgb_l4len() helper There is already a group of similar functions for L1, L2 and L3, but L4 was missing. The L4 is usually used for parsing of complex L3 messages, such as SS/USSD and SMS. This change introduces a similar halper for L4. Change-Id: I755f2d654bbdad2a8b4f94df9023bdd370b07ae6 --- M TODO-RELEASE M include/osmocom/core/msgb.h 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 64833d2..5222ec9 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ libosmogsm gsm0480_l3hdr_push() removed from gsm/gsm0480.h (was not exposed) libosmogsm gsm48_push_l3hdr() (re)introduced in gsm/gsm48.h (GSM 04.08 API) libosmogsm gsm48_push_l3hdr_tid() a wrapper around gsm48_push_l3hdr() +libosmocore msgb_l4len new symbol (exposed as 'static inline' in msgb.h) diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index b1cb6ec..8843db0 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -169,6 +169,18 @@ return msgb->tail - (uint8_t *)msgb_l3(msgb); } +/*! determine length of L4 message + * \param[in] msgb message buffer + * \returns size of L4 message in bytes + * + * This function computes the number of bytes between the tail of the + * message and the layer 4 header. + */ +static inline unsigned int msgb_l4len(const struct msgb *msgb) +{ + return msgb->tail - (uint8_t *)msgb_sms(msgb); +} + /*! determine the length of the header * \param[in] msgb message buffer * \returns number of bytes between start of buffer and start of msg -- To view, visit https://gerrit.osmocom.org/11647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I755f2d654bbdad2a8b4f94df9023bdd370b07ae6 Gerrit-Change-Number: 11647 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:43:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:43:15 +0000 Subject: Change in libosmocore[master]: jenkins: print gcc version in log In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11646 ) Change subject: jenkins: print gcc version in log ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8dfac78868f64213413e80cc52ac585d9d4a2c93 Gerrit-Change-Number: 11646 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 06 Nov 2018 21:43:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:43:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:43:16 +0000 Subject: Change in libosmocore[master]: jenkins: print gcc version in log In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11646 ) Change subject: jenkins: print gcc version in log ...................................................................... jenkins: print gcc version in log Change-Id: I8dfac78868f64213413e80cc52ac585d9d4a2c93 --- M contrib/jenkins_arch.sh 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins_arch.sh b/contrib/jenkins_arch.sh index 99ce5c1..93dd8bb 100755 --- a/contrib/jenkins_arch.sh +++ b/contrib/jenkins_arch.sh @@ -14,7 +14,11 @@ exit 1 fi -set -x -e +set -x + +gcc --version + +set -e case "$arch" in -- To view, visit https://gerrit.osmocom.org/11646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8dfac78868f64213413e80cc52ac585d9d4a2c93 Gerrit-Change-Number: 11646 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:43:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:43:33 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Add IP addr for umtrx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11619 ) Change subject: ansible: gsm-tester: Add IP addr for umtrx ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fb65e3c337fc82c787e925fbbdf9eaf7569defd Gerrit-Change-Number: 11619 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 06 Nov 2018 21:43:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:43:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:43:52 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Support power cycling multiple quad modems In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11628 ) Change subject: ansible: gsm-tester: Support power cycling multiple quad modems ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 Gerrit-Change-Number: 11628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 21:43:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:43:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:43:59 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Support power cycling multiple quad modems In-Reply-To: References: Message-ID: Harald Welte has removed a vote on this change. Change subject: ansible: gsm-tester: Support power cycling multiple quad modems ...................................................................... Removed Verified+1 by Harald Welte -- To view, visit https://gerrit.osmocom.org/11628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 Gerrit-Change-Number: 11628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:44:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:44:04 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Support power cycling multiple quad modems In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11628 ) Change subject: ansible: gsm-tester: Support power cycling multiple quad modems ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 Gerrit-Change-Number: 11628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 06 Nov 2018 21:44:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:44:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:44:27 +0000 Subject: Change in libosmocore[master]: socket.c: fix IP and port buffer sizes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11520 ) Change subject: socket.c: fix IP and port buffer sizes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia25e2f3277ad2f60df31c08d12f42c1e6d2a14a6 Gerrit-Change-Number: 11520 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 06 Nov 2018 21:44:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:44:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:44:28 +0000 Subject: Change in libosmocore[master]: socket.c: fix IP and port buffer sizes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11520 ) Change subject: socket.c: fix IP and port buffer sizes ...................................................................... socket.c: fix IP and port buffer sizes Use INET6_ADDRSTRLEN (46) instead of 64 for IP address buffers, and 6 instead of 16 for port buffers (the highest possible port number is 65535). Change-Id: Ia25e2f3277ad2f60df31c08d12f42c1e6d2a14a6 --- M src/socket.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/socket.c b/src/socket.c index c7e1c9d..0e17a28 100644 --- a/src/socket.c +++ b/src/socket.c @@ -57,7 +57,7 @@ const char *host, uint16_t port, bool passive) { struct addrinfo hints, *result; - char portbuf[16]; + char portbuf[6]; int rc; snprintf(portbuf, sizeof(portbuf), "%u", port); @@ -698,7 +698,7 @@ { struct sockaddr sa; socklen_t len = sizeof(sa); - char ipbuf[64], portbuf[16]; + char ipbuf[INET6_ADDRSTRLEN], portbuf[6]; int rc; rc = local ? getsockname(fd, &sa, &len) : getpeername(fd, &sa, &len); @@ -769,8 +769,8 @@ */ char *osmo_sock_get_name(void *ctx, int fd) { - char hostbuf_l[64], hostbuf_r[64]; - char portbuf_l[16], portbuf_r[16]; + char hostbuf_l[INET6_ADDRSTRLEN], hostbuf_r[INET6_ADDRSTRLEN]; + char portbuf_l[6], portbuf_r[6]; /* get local */ if (osmo_sock_get_name2(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true)) -- To view, visit https://gerrit.osmocom.org/11520 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia25e2f3277ad2f60df31c08d12f42c1e6d2a14a6 Gerrit-Change-Number: 11520 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:45:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:45:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: cleanup test config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11643 ) Change subject: PCU: cleanup test config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a Gerrit-Change-Number: 11643 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 21:45:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:45:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:45:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: cleanup test config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11643 ) Change subject: PCU: cleanup test config ...................................................................... Patch Set 1: as an addition, the split of the config file between a .default file and a .cfg file makes sense. The .default should contain things that are typically the same, like NSEI settings and the like, while the .cfg contains IP addresses and ports that are more likely to be overridden by local setup. This can be a follow-up patch. -- To view, visit https://gerrit.osmocom.org/11643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a Gerrit-Change-Number: 11643 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 21:45:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:46:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:46:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS: print ip:port on error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11644 ) Change subject: NS: print ip:port on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f558021b7754db9593934888d12f9c879dc2988 Gerrit-Change-Number: 11644 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 06 Nov 2018 21:46:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:47:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:47:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Introduce mp_ipa_up_timeout parameter In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11568 ) Change subject: bts: Introduce mp_ipa_up_timeout parameter ...................................................................... bts: Introduce mp_ipa_up_timeout parameter Some test env may take more than 10 seconds to (re-)start a BTS, so let's make it variable through this parameter. For instance it was observed that running osmo-bts-sysmo through ssh inside a sysmobts can sometimes take a good number of seconds (specially because ssh connection can take a while to be established successfully). Change-Id: Ieb046358d8266ac94bd7b9e916e85f84de3ad319 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 64c2510..cde9562 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -63,6 +63,8 @@ integer mp_ms_power_level_exp := 7; integer mp_ms_actual_ta_exp := 0; integer mp_timing_offset_256syms_exp := 512; + /* Time to wait for RSL conn from BTS during startup of test */ + float mp_ipa_up_timeout := 10.0; } type record of RslChannelNr ChannelNrs; @@ -296,7 +298,7 @@ /* global init function */ function f_init(charstring id := "BTS-Test") runs on test_CT { - timer T := 10.0; + timer T := mp_ipa_up_timeout; g_AllChannels := { /* TS 1..4: TCH/F */ valueof(ts_RslChanNr_Bm(1)), valueof(ts_RslChanNr_Bm(2)), -- To view, visit https://gerrit.osmocom.org/11568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ieb046358d8266ac94bd7b9e916e85f84de3ad319 Gerrit-Change-Number: 11568 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:47:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:47:46 +0000 Subject: Change in osmocom-bb[master]: cosmetic: fix trailing whitespace In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11608 ) Change subject: cosmetic: fix trailing whitespace ...................................................................... cosmetic: fix trailing whitespace Change-Id: I5c1a6d98079ad846d114584a17ba9d80d95e0595 --- M src/host/layer23/src/common/gps.c 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c index e9aaa97..3ec7377 100644 --- a/src/host/layer23/src/common/gps.c +++ b/src/host/layer23/src/common/gps.c @@ -234,7 +234,7 @@ if (line[23] == 'W') longitude = 360.0 - longitude; g.longitude = longitude; - + LOGP(DGPS, LOGL_DEBUG, "%s\n", line); LOGP(DGPS, LOGL_INFO, " time=%02d:%02d:%02d %04d-%02d-%02d, " "diff-to-host=%d, latitude=%do%.4f, longitude=%do%.4f\n", @@ -324,8 +324,8 @@ case 38400: baud = B38400; break; case 57600: - baud = B57600; break; - case 115200: + baud = B57600; break; + case 115200: baud = B115200; break; } @@ -399,4 +399,3 @@ return; } } - -- To view, visit https://gerrit.osmocom.org/11608 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5c1a6d98079ad846d114584a17ba9d80d95e0595 Gerrit-Change-Number: 11608 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:47:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:47:56 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix build against gpsd >= 3.18 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11609 ) Change subject: layer23: Fix build against gpsd >= 3.18 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e97d3e8c3688064c959ea60ecef50cfbbc1bcd6 Gerrit-Change-Number: 11609 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 06 Nov 2018 21:47:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 21:48:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 6 Nov 2018 21:48:04 +0000 Subject: Change in osmocom-bb[master]: layer23: Fix build against gpsd >= 3.18 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11609 ) Change subject: layer23: Fix build against gpsd >= 3.18 ...................................................................... layer23: Fix build against gpsd >= 3.18 Change-Id: I0e97d3e8c3688064c959ea60ecef50cfbbc1bcd6 --- M src/host/layer23/src/common/gps.c 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c index 3ec7377..35ee416 100644 --- a/src/host/layer23/src/common/gps.c +++ b/src/host/layer23/src/common/gps.c @@ -60,9 +60,20 @@ #if GPSD_API_MAJOR_VERSION >= 5 static struct gps_data_t _gdata; -#define gps_poll gps_read #endif +static inline int compat_gps_read(struct gps_data_t *data) +{ +/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */ +#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0 + return gps_read(data, NULL, 0); +#elif GPSD_API_MAJOR_VERSION >= 5 + return gps_read(data); +#else + return gps_poll(data); +#endif +} + int osmo_gpsd_cb(struct osmo_fd *bfd, unsigned int what) { struct tm *tm; @@ -85,7 +96,7 @@ #endif /* polling returned an error */ - if (gps_poll(gdata)) + if (compat_gps_read(gdata)) goto gps_not_ready; /* data are valid */ -- To view, visit https://gerrit.osmocom.org/11609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0e97d3e8c3688064c959ea60ecef50cfbbc1bcd6 Gerrit-Change-Number: 11609 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 6 21:49:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 6 Nov 2018 21:49:38 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_oc?= =?UTF-8?Q?t,master,default,osmocom-master-debian9_#1378?= Message-ID: <1923036201.455.1541540978042.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 59.49 KB...] Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC signal.lo CC select.lo CC bits.lo CC bitvec.lo CC msgb.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC utils.lo CC write_queue.lo CC logging.lo CC socket.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC vector.lo CC utils.lo CC telnet_interface.lo CC logging_vty.lo CC stats_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rsl.lo CC tlv_parser.lo CC comp128.lo CC comp128v23.lo CC gsm_utils.lo CC gsm48.lo CC rxlev_stat.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo /bin/bash: line 2: 4504 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -I/usr/include/p11-kit-1 -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm48_ie.lo -MD -MP -MF $depbase.Tpo -c -o gsm48_ie.lo gsm48_ie.c Makefile:593: recipe for target 'gsm48_ie.lo' failed make[3]: *** [gsm48_ie.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:698: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 6 21:51:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 6 Nov 2018 21:51:20 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_lc15, ?= =?UTF-8?Q?origin/nrw/litecell15,default,osmocom-master-debian9_#1378?= In-Reply-To: <1007154632.454.1541525661454.JavaMail.jenkins@jenkins.osmocom.org> References: <1007154632.454.1541525661454.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1629371636.456.1541541080360.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Nov 6 22:13:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 22:13:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: PCU: cleanup test config In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11643 ) Change subject: PCU: cleanup test config ...................................................................... PCU: cleanup test config * remove unused parameters * add expected results * use control for default test execution * only tests which could (in theory) pass are left in control Previously generic control had some tests which never called "setverdict(pass)" which means they would always fail. Such tests might be useful during development but should not be part of test set executed by default. Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a Related: OS#2890 --- M pcu/PCU_Tests.cfg M pcu/PCU_Tests.ttcn A pcu/expected-results.xml 3 files changed, 12 insertions(+), 22 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg index 7e0b9f2..5975290 100644 --- a/pcu/PCU_Tests.cfg +++ b/pcu/PCU_Tests.cfg @@ -7,10 +7,6 @@ ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC [MODULE_PARAMETERS] -#mp_local_ip := "192.168.100.239" -#mp_local_udp_port := 23000 -#mp_remote_ip := "192.168.100.196" -#mp_remote_udp_port := 21000 PCU_Tests.mp_nsconfig := { local_ip := "127.0.0.1", local_udp_port := 23000, @@ -36,26 +32,18 @@ } [TESTPORT_PARAMETERS] -#*.BSCVTY.CTRL_MODE := "client" -#*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1" -#*.BSCVTY.CTRL_PORTNUM := "4242" -#*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes" -#*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" -#*.BSCVTY.CTRL_READMODE := "buffered" -#*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" -#*.BSCVTY.PROMPT1 := "OpenBSC> " -#*.BSCVTY.PROMPT2 := "OpenBSC# " -#*.BSCVTY.REGEX_PROMPT1 := "^OpenBSC.*$" - *.*.udpReuseAddress := "yes"; [MAIN_CONTROLLER] [EXECUTE] +PCU_Tests.control +# for internal use only: will always fail when called as part of normal routine #PCU_Tests.TC_selftest_llc #PCU_Tests.TC_selftest_rlcmac #PCU_Tests.TC_selftest_bssgp #PCU_Tests.TC_nsem #PCU_Tests.TC_paging -PCU_Tests.TC_rach +#PCU_Tests.TC_rach #PCU_Tests.TC_selftest_rr +#PCU_Tests.TC_dl_tbf diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index a63ca1d..adbc73e 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -630,12 +630,8 @@ control { - execute(TC_selftest_bssgp()); execute(TC_selftest_ns()); - execute(TC_selftest_llc()); - execute(TC_selftest_rr()); - execute(TC_selftest_rlcmac()); - execute(TC_nsem()); - execute(TC_paging()); + execute(TC_ul_tbf_single_llc_sizes()); + execute(TC_ul_tbf()); } }; diff --git a/pcu/expected-results.xml b/pcu/expected-results.xml new file mode 100644 index 0000000..aec661d --- /dev/null +++ b/pcu/expected-results.xml @@ -0,0 +1,6 @@ + + + + + + -- To view, visit https://gerrit.osmocom.org/11643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a Gerrit-Change-Number: 11643 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 22:13:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 22:13:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: NS: print ip:port on error In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11644 ) Change subject: NS: print ip:port on error ...................................................................... NS: print ip:port on error Change-Id: I2f558021b7754db9593934888d12f9c879dc2988 --- M library/NS_Emulation.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 7cccb25..ca4d1d6 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -83,7 +83,9 @@ /* Connect the UDP socket */ res := f_IPL4_connect(NSCP, config.remote_ip, config.remote_udp_port, config.local_ip, config.local_udp_port, 0, { udp := {}}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect NS UDP socket, check your configuration"); + setverdict(fail, "Could not connect NS UDP socket from " & + config.local_ip & ":" & int2str(config.local_udp_port) & + " to " & config.remote_ip & ":" & int2str(config.remote_udp_port)); mtc.stop; } g_conn_id := res.connId; -- To view, visit https://gerrit.osmocom.org/11644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2f558021b7754db9593934888d12f9c879dc2988 Gerrit-Change-Number: 11644 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 6 22:14:57 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 6 Nov 2018 22:14:57 +0000 Subject: Change in osmo-bsc[master]: LCLS: move MGCP MDCX into separate function In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11564 ) Change subject: LCLS: move MGCP MDCX into separate function ...................................................................... LCLS: move MGCP MDCX into separate function Move code using MDCX via MGCP into separate function to make adding alternative MDCX variants easier. Change-Id: I5fafa3b12a39c83bdf64e16e192dd2454d069cf4 Related: OS#3659 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 11 insertions(+), 9 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index b8bf601..e642976 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -227,6 +227,15 @@ osmo_fsm_inst_dispatch(conn->lcls.fi, LCLS_EV_APPLY_CFG_CSC, NULL); } +/* Close the loop for LCLS using MGCP */ +static inline void lcls_mdcx(const struct gsm_subscriber_connection *conn, struct mgcp_conn_peer *mdcx_info) +{ + mgcp_pick_codec(mdcx_info, conn->lchan, false); + + mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, MGCP_VERB_MDCX, mdcx_info, + NULL, 0, 0, NULL); +} + static void lcls_break_local_switching(struct gsm_subscriber_connection *conn) { struct mgcp_conn_peer mdcx_info; @@ -242,11 +251,7 @@ .port = conn->user_plane.msc_assigned_rtp_port, }; osmo_strlcpy(mdcx_info.addr, conn->user_plane.msc_assigned_rtp_addr, sizeof(mdcx_info.addr)); - mgcp_pick_codec(&mdcx_info, conn->lchan, false); - - mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, - MGCP_VERB_MDCX, &mdcx_info, - NULL, 0, 0, NULL); + lcls_mdcx(conn, &mdcx_info); } static bool lcls_enable_possible(struct gsm_subscriber_connection *conn) @@ -596,10 +601,7 @@ mdcx_info = *other_mgw_info; /* Make sure the request doesn't want to use the other side's endpoint string. */ mdcx_info.endpoint[0] = 0; - mgcp_pick_codec(&mdcx_info, conn->lchan, false); - mgw_endpoint_ci_request(conn->user_plane.mgw_endpoint_ci_msc, - MGCP_VERB_MDCX, &mdcx_info, - NULL, 0, 0, NULL); + lcls_mdcx(conn, &mdcx_info); } static void lcls_locally_switched_wait_break_fn(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/11564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5fafa3b12a39c83bdf64e16e192dd2454d069cf4 Gerrit-Change-Number: 11564 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 6 23:20:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 6 Nov 2018 23:20:31 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts?= =?UTF-8?Q?_=C2=BB_oct,master,default,osmocom-master-debian9_#1379?= In-Reply-To: <1923036201.455.1541540978042.JavaMail.jenkins@jenkins.osmocom.org> References: <1923036201.455.1541540978042.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <895709251.457.1541546431128.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed Nov 7 00:09:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 7 Nov 2018 00:09:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2391?= Message-ID: <472843455.458.1541549375261.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 677.98 KB...] CC HNBRegisterAccept.o CC HNBRegisterReject.o CC UERegisterRequest.o CC UERegisterAccept.o CC UERegisterReject.o CC UEDe-Register.o CC HNBDe-Register.o CC ErrorIndication.o CC CSGMembershipUpdate.o CC TNLUpdateRequest.o CC TNLUpdateResponse.o CC TNLUpdateFailure.o CC HNBConfigTransferRequest.o CC HNBConfigTransferResponse.o CC RelocationComplete.o CC U-RNTIQueryRequest.o CC U-RNTIQueryResponse.o CC PrivateMessage.o CC IE.o AR libosmo-asn1-hnbap.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in rua make[4]: Entering directory ' CC RUA_Presence.o CC RUA_Criticality.o CC RUA_ProcedureCode.o CC RUA_ProtocolIE-ID.o CC RUA_PrivateIE-ID.o CC RUA_TriggeringMessage.o CC RUA_IE-Extensions.o CC RUA_CN-DomainIndicator.o CC RUA_CSGMembershipStatus.o CC RUA_Establishment-Cause.o CC RUA_Context-ID.o CC RUA_IntraDomainNasNodeSelector.o CC RUA_Gsm-map-IDNNS.o CC RUA_Ansi-41-IDNNS.o CC RUA_RANAP-Message.o CC RUA_RoutingParameter.o CC RUA_Cause.o CC RUA_CauseRadioNetwork.o CC RUA_CauseTransport.o CC RUA_CauseProtocol.o CC RUA_CauseMisc.o CC RUA_CriticalityDiagnostics.o In file included from :8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics.h:17, from RUA_CriticalityDiagnostics.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RUA_CriticalityDiagnostics-IE-List.o CC RUA_TypeOfError.o CC RUA_RUA-PDU.o CC RUA_InitiatingMessage.o In file included from :8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from RUA_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RUA_SuccessfulOutcome.o CC RUA_UnsuccessfulOutcome.o CC RUA_Connect.o CC RUA_DirectTransfer.o CC RUA_Disconnect.o CC RUA_ConnectionlessTransfer.o CC RUA_ErrorIndication.o CC RUA_PrivateMessage.o CC RUA_IE.o AR libosmo-asn1-rua.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in ranap make[4]: Entering directory ' CC RANAP_Criticality.lo CC RANAP_Presence.lo CC RANAP_PrivateIE-ID.lo CC RANAP_ProcedureCode.lo CC RANAP_TriggeringMessage.lo CC RANAP_ProtocolIE-ID.lo CC RANAP_IE-Extensions.lo CC RANAP_ProtocolExtensionID.lo CC RANAP_AccuracyFulfilmentIndicator.lo CC RANAP_AllocationOrRetentionPriority.lo CC RANAP_Alt-RAB-Parameters.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateType.lo CC RANAP_Alt-RAB-Parameter-MaxBitrates.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo CC RANAP_AlternativeRABConfigurationRequest.lo CC RANAP_APN.lo CC RANAP_AreaIdentity.lo CC RANAP_Ass-RAB-Parameters.lo CC RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Ass-RAB-Parameter-MaxBitrateList.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../include/osmocom/ranap/RANAP_SAI.h:17, from ../../include/osmocom/ranap/RANAP_AreaIdentity.h:14, from RANAP_AreaIdentity.c:7: ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RANAP_AuthorisedPLMNs.lo CC RANAP_AuthorisedSNAs.lo CC RANAP_BindingID.lo CC RANAP_BroadcastAssistanceDataDecipheringKeys.lo CC RANAP_Cause.lo CC RANAP_CauseMisc.lo CC RANAP_CauseNAS.lo CC RANAP_CauseProtocol.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:14, from RANAP_AuthorisedPLMNs.c:7: ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: ?struct MemberC? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberC { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberC { ^~~~~~~~~~~~~ CC RANAP_CauseRadioNetwork.lo CC RANAP_CauseRadioNetworkExtension.lo CC RANAP_CauseNon-Standard.lo CC RANAP_CauseTransmissionNetwork.lo CC RANAP_Cell-Access-Mode.lo CC RANAP_CellBased.lo CC RANAP_CellIdList.lo CC RANAP_Cell-Id.lo CC RANAP_Cell-Capacity-Class-Value.lo CC RANAP_CellLoadInformation.lo CC RANAP_CellLoadInformationGroup.lo CC RANAP_ClientType.lo CC RANAP_CellType.lo CC RANAP_CriticalityDiagnostics.lo CC RANAP_CriticalityDiagnostics-IE-List.lo CC RANAP_MessageStructure.lo CC RANAP_CGI.lo CC RANAP_ChosenEncryptionAlgorithm.lo CC RANAP_ChosenIntegrityProtectionAlgorithm.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics.h:17, from RANAP_CriticalityDiagnostics.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:14, from RANAP_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ CC RANAP_CI.lo CC RANAP_ClassmarkInformation2.lo CC RANAP_ClassmarkInformation3.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_MessageStructure.h:14, from RANAP_MessageStructure.c:7: ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:23: warning: ?struct MemberL? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberL { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_MessageStructure.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberL { ^~~~~~~~~~~~~ CC RANAP_CN-DomainIndicator.lo CC RANAP_CN-ID.lo CC RANAP_Correlation-ID.lo CC RANAP_CSFB-Information.lo CC RANAP_CSG-Id.lo CC RANAP_CSG-Id-List.lo CC RANAP_CSG-Membership-Status.lo CC RANAP_DataPDUType.lo CC RANAP_DataVolumeReference.lo /bin/bash: line 1: 23931 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.11-319c\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.11-319c\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.11-319c\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_DataPDUType.lo -MD -MP -MF .deps/RANAP_DataPDUType.Tpo -c -o RANAP_DataPDUType.lo RANAP_DataPDUType.c /bin/bash: line 1: 23497 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.11-319c\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.11-319c\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.11-319c\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_CSFB-Information.lo -MD -MP -MF .deps/RANAP_CSFB-Information.Tpo -c -o RANAP_CSFB-Information.lo RANAP_CSFB-Information.c Makefile:2506: recipe for target 'RANAP_DataPDUType.lo' failed make[4]: *** [RANAP_DataPDUType.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... Makefile:2506: recipe for target 'RANAP_CSFB-Information.lo' failed make[4]: *** [RANAP_CSFB-Information.lo] Error 139 make[4]: Leaving directory ' Makefile:642: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:454: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:458: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Wed Nov 7 01:01:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 7 Nov 2018 01:01:46 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2392?= In-Reply-To: <472843455.458.1541549375261.JavaMail.jenkins@jenkins.osmocom.org> References: <472843455.458.1541549375261.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <162318776.459.1541552506321.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Nov 7 02:40:36 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 02:40:36 +0000 Subject: Change in osmo-gsm-tester[master]: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11580 to look at the new patch set (#3). Change subject: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH ...................................................................... misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH Instead of each binary launcher having to check if there is a lib/ directory and then setting a LD_LIBRARY_PATH we can use an RPATH and know these binaries pick-up the right libraries. This requires I6e4ad2e3855af7bcefc22d4190cc4e6f58581857. Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 --- M contrib/jenkins-build-common.sh 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/80/11580/3 -- To view, visit https://gerrit.osmocom.org/11580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 Gerrit-Change-Number: 11580 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 02:42:38 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 02:42:38 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11596 to look at the new patch set (#2). Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... ms_driver: Allow to specify env and binary name/path For the proper trial/suite integration we can't assume that the virtphy/mobile are in the PATH and that they can be executed direcyly (e.g. need a LD_LIBRARY_PATH to be applied). Introduce BinaryOptions to pass the name/path of the two executables and the env to use. Default this to virtphy/mobile and an empty environment. Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 4 files changed, 27 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/96/11596/2 -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 02:51:43 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 02:51:43 +0000 Subject: Change in osmo-ci[master]: ansible: Wrap distro version number as string for ansible Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11648 Change subject: ansible: Wrap distro version number as string for ansible ...................................................................... ansible: Wrap distro version number as string for ansible Change-Id: I58591ee37c6ec1479778c3f90ed8004a7e2adf1e --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml M ansible/roles/osmocom-jenkins-slave/tasks/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/48/11648/1 diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 87a616c..30e4ece 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -40,4 +40,4 @@ install_recommends: no with_items: - openjdk-8-jre-headless - when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9' diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index 98cae55..36bc424 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -27,7 +27,7 @@ - name: install ttcn3 dependencies include_tasks: ttcn3-slave.yml - when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= '9' - name: copy .gitconfig copy: diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 16e72ed..b2a2f2b 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -105,7 +105,7 @@ install_recommends: no with_items: - liblua5.3-dev - when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9' - name: install liblimesuite-dev for stretch or later apt: @@ -115,4 +115,4 @@ install_recommends: no with_items: - liblimesuite-dev - when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9' -- To view, visit https://gerrit.osmocom.org/11648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I58591ee37c6ec1479778c3f90ed8004a7e2adf1e Gerrit-Change-Number: 11648 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 03:52:27 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 03:52:27 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Switch to process.Process from subprocess In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11597 to look at the new patch set (#2). Change subject: ms_driver: Switch to process.Process from subprocess ...................................................................... ms_driver: Switch to process.Process from subprocess Use a single tmp/rundir for all these instances. In the next step we can create separate directories. Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 4 files changed, 27 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/11597/2 -- To view, visit https://gerrit.osmocom.org/11597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 Gerrit-Change-Number: 11597 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 03:52:27 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 03:52:27 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: use the util.Dir and create one dir per instance In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11598 to look at the new patch set (#2). Change subject: ms_driver: use the util.Dir and create one dir per instance ...................................................................... ms_driver: use the util.Dir and create one dir per instance Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/starter.py 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/98/11598/2 -- To view, visit https://gerrit.osmocom.org/11598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 Gerrit-Change-Number: 11598 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 03:52:27 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 03:52:27 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Consult the suite to get the binaries In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11599 to look at the new patch set (#2). Change subject: ms_driver: Consult the suite to get the binaries ...................................................................... ms_driver: Consult the suite to get the binaries Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/99/11599/2 -- To view, visit https://gerrit.osmocom.org/11599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 Gerrit-Change-Number: 11599 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 03:52:37 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 03:52:37 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Fix subject in the header Message-ID: Holger Freyther has uploaded this change for review. ( https://gerrit.osmocom.org/11649 Change subject: ms_driver: Fix subject in the header ...................................................................... ms_driver: Fix subject in the header Change-Id: I47e688b9fe3aef6679e3c82c641393ab041cbec3 --- M src/osmo_ms_driver/location_update_test.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/49/11649/1 diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index 010c278..dfa33c3 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -1,4 +1,4 @@ -# osmo_ms_driver: Locationg Update Test +# osmo_ms_driver: Location Update Test # Create MS's and wait for the Location Update to succeed. # # Copyright (C) 2018 by Holger Hans Peter Freyther -- To view, visit https://gerrit.osmocom.org/11649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I47e688b9fe3aef6679e3c82c641393ab041cbec3 Gerrit-Change-Number: 11649 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 09:31:35 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 09:31:35 +0000 Subject: Change in osmo-gsm-tester[master]: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11580 ) Change subject: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH ...................................................................... Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 Gerrit-Change-Number: 11580 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 09:31:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 09:31:50 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 7 Nov 2018 09:31:50 +0000 Subject: Change in osmo-gsm-tester[master]: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11580 ) Change subject: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH ...................................................................... Patch Set 3: -Verified -Code-Review -- To view, visit https://gerrit.osmocom.org/11580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 Gerrit-Change-Number: 11580 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 09:31:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:17:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:17:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log number of expected/seen *CX messages on failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11645 ) Change subject: BSC: log number of expected/seen *CX messages on failure ...................................................................... Patch Set 1: Code-Review-1 The commit description doesn't match with what the patch does. -- To view, visit https://gerrit.osmocom.org/11645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 Gerrit-Change-Number: 11645 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:17:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:20:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:20:42 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 4: > jenkins tests with gcc 6.3.0-18+deb9u1, my gcc is gcc (Debian > 8.2.0-9) 8.2.0. > > So a) this code will work as soon as we upgrade gcc. > But b) do we really want to depend on newer gcc :/ > > Appears I need to think of some cumbersome magic to initialize the > structs. afaiu, moving them inside a function (main()?) may be enough, since then they are not static (of course removing the static keyword). -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:20:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:21:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:21:47 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Add IP addr for umtrx In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11619 ) Change subject: ansible: gsm-tester: Add IP addr for umtrx ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fb65e3c337fc82c787e925fbbdf9eaf7569defd Gerrit-Change-Number: 11619 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:21:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:23:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:23:23 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Support power cycling multiple quad modems In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11628 ) Change subject: ansible: gsm-tester: Support power cycling multiple quad modems ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 Gerrit-Change-Number: 11628 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:23:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:23:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:23:39 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: prod has now 8 modems attached In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11627 ) Change subject: ansible: gsm-tester: prod has now 8 modems attached ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0e0876fd5581e9eb56c498078ae8cd8c68ede5b5 Gerrit-Change-Number: 11627 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:23:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:23:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:23:42 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Add IP addr for umtrx In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11619 ) Change subject: ansible: gsm-tester: Add IP addr for umtrx ...................................................................... ansible: gsm-tester: Add IP addr for umtrx Change-Id: I7fb65e3c337fc82c787e925fbbdf9eaf7569defd --- M ansible/roles/gsm-tester-network/templates/interface.j2 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ansible/roles/gsm-tester-network/templates/interface.j2 b/ansible/roles/gsm-tester-network/templates/interface.j2 index f694261..30af679 100644 --- a/ansible/roles/gsm-tester-network/templates/interface.j2 +++ b/ansible/roles/gsm-tester-network/templates/interface.j2 @@ -68,3 +68,8 @@ iface {{ bts_interface }}:12 inet static address 10.42.42.53 netmask 255.255.255.0 + +auto {{ bts_interface }}:13 +iface {{ bts_interface }}:13 inet static + address 10.42.42.54 + netmask 255.255.255.0 -- To view, visit https://gerrit.osmocom.org/11619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7fb65e3c337fc82c787e925fbbdf9eaf7569defd Gerrit-Change-Number: 11619 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:23:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:23:42 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: prod has now 8 modems attached In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11627 ) Change subject: ansible: gsm-tester: prod has now 8 modems attached ...................................................................... ansible: gsm-tester: prod has now 8 modems attached 4 EC20 modems were attached, and the issue with only 3 out of the 4 showing up was fixed a while ago. Change-Id: I0e0876fd5581e9eb56c498078ae8cd8c68ede5b5 --- M ansible/host_vars/osmo-gsm-tester-prod.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Pau Espin Pedrol: Verified diff --git a/ansible/host_vars/osmo-gsm-tester-prod.yml b/ansible/host_vars/osmo-gsm-tester-prod.yml index 9d195de..92d8169 100644 --- a/ansible/host_vars/osmo-gsm-tester-prod.yml +++ b/ansible/host_vars/osmo-gsm-tester-prod.yml @@ -8,4 +8,4 @@ ip: 10.42.42.122 # how many modems are connected via a quadmodem? -gsm_modems: 3 +gsm_modems: 8 -- To view, visit https://gerrit.osmocom.org/11627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0e0876fd5581e9eb56c498078ae8cd8c68ede5b5 Gerrit-Change-Number: 11627 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:23:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:23:43 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: Support power cycling multiple quad modems In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11628 ) Change subject: ansible: gsm-tester: Support power cycling multiple quad modems ...................................................................... ansible: gsm-tester: Support power cycling multiple quad modems uhubctl doesn't support acting on several hubs from same vendor at once. Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 --- M ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh b/ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh index 626a04e..f461d81 100755 --- a/ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh +++ b/ansible/roles/gsm-tester/templates/quad_modem_power_cycle.sh @@ -1,9 +1,15 @@ #!/bin/sh set -ex -uhubctl -p 123456 -a 0 -n 1d50:4002 + +locations="$(uhubctl -n 1d50:4002 | grep "Current status for hub" | awk '{print $5}')" +for l in $locations; do + uhubctl -p 123456 -a 0 -n 1d50:4002 -l $l +done # give a lot of time to discharge capacitors on the board sleep 20 -uhubctl -p 123456 -a 1 -n 1d50:4002 +for l in $locations; do + uhubctl -p 123456 -a 1 -n 1d50:4002 -l $l +done attempts=30 while [ "x$(uhubctl | grep -e 05c6 -e 1199 -c)" != "x{{ gsm_modems }}" ]; do attempts=$(($attempts - 1)) -- To view, visit https://gerrit.osmocom.org/11628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I01e698c96240130ed6f632f82383f6020d2a3b81 Gerrit-Change-Number: 11628 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:24:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 10:24:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 4: Please rebase to latest master, add the test to control() and expected_results.xml -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 07 Nov 2018 10:24:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:32:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:32:03 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Fix subject in the header In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11649 ) Change subject: ms_driver: Fix subject in the header ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I47e688b9fe3aef6679e3c82c641393ab041cbec3 Gerrit-Change-Number: 11649 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:32:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:35:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:35:25 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11596 ) Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11596/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11596/3//COMMIT_MSG at 11 PS3, Line 11: direcyly (e.g. need a LD_LIBRARY_PATH to be applied). still contains the typo. -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:35:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:37:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:37:56 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Switch to process.Process from subprocess In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11597 ) Change subject: ms_driver: Switch to process.Process from subprocess ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 Gerrit-Change-Number: 11597 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:37:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:41:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:41:45 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: use the util.Dir and create one dir per instance In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11598 ) Change subject: ms_driver: use the util.Dir and create one dir per instance ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11598/2/src/osmo_gsm_tester/ms_driver.py File src/osmo_gsm_tester/ms_driver.py: https://gerrit.osmocom.org/#/c/11598/2/src/osmo_gsm_tester/ms_driver.py at 74 PS2, Line 74: self.event_server_sk_tmp_dir = tempfile.mkdtemp('', 'ogteventserversk') if suite_run != None, you should use it to create the tmp dir inside the run dir, like we do with all other resources/objects. This way everything ends up per-test in a dir tree which can be archived by jenkins. You can do that on a followup patch. -- To view, visit https://gerrit.osmocom.org/11598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 Gerrit-Change-Number: 11598 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:41:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:42:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:42:55 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Consult the suite to get the binaries In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11599 ) Change subject: ms_driver: Consult the suite to get the binaries ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 Gerrit-Change-Number: 11599 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:42:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:44:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:44:39 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10687 ) Change subject: suits: Add an initial test for the ms_driver ...................................................................... Patch Set 9: (1 comment) https://gerrit.osmocom.org/#/c/10687/9//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10687/9//COMMIT_MSG at 7 PS9, Line 7: suits: Add an initial test for the ms_driver typo. I personally think I fixed this twice already, but I guess it keeps being rewritten when you rebase+push. -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 9 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:44:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:45:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:45:13 +0000 Subject: Change in osmo-ci[master]: ansible: Wrap distro version number as string for ansible In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11648 ) Change subject: ansible: Wrap distro version number as string for ansible ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58591ee37c6ec1479778c3f90ed8004a7e2adf1e Gerrit-Change-Number: 11648 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 07 Nov 2018 10:45:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:45:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 10:45:59 +0000 Subject: Change in osmo-gsm-tester[master]: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11580 ) Change subject: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 Gerrit-Change-Number: 11580 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:45:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:47:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 7 Nov 2018 10:47:47 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 5: Code-Review-1 (6 comments) gits was not executable in the last patchset (chmod +x gits) https://gerrit.osmocom.org/#/c/11560/4/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11560/4/src/gits at 2 PS4, Line 2: > the reason why argparse will not work so well is passing arguments to git. consider: [?] this works well with argparse, see the example below https://gerrit.osmocom.org/#/c/11560/4/src/gits at 68 PS4, Line 68: args): > yeah, that's the main ultra drawback of this script so far. I really really shouldn't use porcelain. [?] This seems to work - do you get the same output with your version? $ git status --porcelain --long On branch master Your branch is up-to-date with 'origin/master'. nothing to commit, working tree clean https://gerrit.osmocom.org/#/c/11560/4/src/gits at 194 PS4, Line 194: lines = [] > I like more visible markers in this case What I meant: keep the ==== marker that is there, and add this line below: print('+ %s' % ' '.join(cmd)) https://gerrit.osmocom.org/#/c/11560/4/src/gits at 359 PS4, Line 359: for git_dir in git_dirs(): > but I want to write 'gits fetch' :) [?] you don't need a shim for every git command, you can just put them in a list and iterate over them: import argparse def parse_args(): parser = argparse.ArgumentParser() sub = parser.add_subparsers(title="action", dest="action") sub.required = True sub.add_parser("status", aliases=["s", "st"], help="show a branch summary...") do = sub.add_parser("do", help="run arbitrary git command...") do.add_argument("args_passed", nargs=argparse.REMAINDER) # direct pass-through to git for action in ["fetch"]: action_parser = sub.add_parser(action) action_parser.add_argument("args_passed", nargs=argparse.REMAINDER) return parser.parse_args() if __name__ == '__main__': args = parse_args() if args.action == "status": cmd_status() # ... (other commands here) elif args.action == "do": cmd_do(args.args_passed) else: # pass directly through to git cmd_do([args.action] + args.args_passed) https://gerrit.osmocom.org/#/c/11560/4/src/gits at 362 PS4, Line 362: sys.stdout.flush() > wow, you're just as obsessed with details like I am! yeah :) https://gerrit.osmocom.org/#/c/11560/5/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11560/5/src/gits at 6 PS5, Line 6: # This program is free software: you can redistribute it and/or modify Out of curiosity: why not use the shorter SPDX form? # SPDX-License-Identifier: GPL-3.0-or-later -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 07 Nov 2018 10:47:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:49:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 7 Nov 2018 10:49:39 +0000 Subject: Change in osmo-dev[master]: sanitize.opts: add osmo-sip-connector --enable-sanitize In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11593 ) Change subject: sanitize.opts: add osmo-sip-connector --enable-sanitize ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 Gerrit-Change-Number: 11593 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 10:49:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:50:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 7 Nov 2018 10:50:16 +0000 Subject: Change in osmo-dev[master]: 2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11635 ) Change subject: 2G.deps: add osmo-sip-connector ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3 Gerrit-Change-Number: 11635 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 07 Nov 2018 10:50:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 10:52:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 7 Nov 2018 10:52:52 +0000 Subject: Change in osmo-dev[master]: deps: comment out osmo-trx In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11634 ) Change subject: deps: comment out osmo-trx ...................................................................... Patch Set 1: Code-Review+1 looks good. the best way would probably be adding "--enable-sanitize-tests" to osmo-trx, like pespin commented in IRC. -- To view, visit https://gerrit.osmocom.org/11634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb Gerrit-Change-Number: 11634 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 07 Nov 2018 10:52:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 11:34:59 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 7 Nov 2018 11:34:59 +0000 Subject: Change in osmo-mgw[master]: mgcp_protocol: increase buffer space for codec name in LCO In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11466 ) Change subject: mgcp_protocol: increase buffer space for codec name in LCO ...................................................................... mgcp_protocol: increase buffer space for codec name in LCO The function that parses the LCO uses an internal buffer to store the codec name that has been issued via LCO. This buffer is only 9 byte long, this means an 8 character string can be stored. If a codec name exceeds this limit it gets chopped. For example "GSM-HR-08" becomes "GSM-HR-0", which may mess up the codec negotiation. - Increase the buffer from 9 to 17 byte. Change-Id: I17ce7acde1f23ab1394227d74214fe2a55cd2264 Related: OS#3673 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 90c282c..3313164 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -579,7 +579,7 @@ const char *options) { char *p_opt, *a_opt; - char codec[9]; + char codec[17]; if (!options) return 0; @@ -605,7 +605,7 @@ * (e.g. a:PCMU;G726-32) But this implementation only supports a single * codec only. */ a_opt = strstr(lco->string, "a:"); - if (a_opt && sscanf(a_opt, "a:%8[^,]", codec) == 1) { + if (a_opt && sscanf(a_opt, "a:%16[^,]", codec) == 1) { talloc_free(lco->codec); lco->codec = talloc_strdup(ctx, codec); } -- To view, visit https://gerrit.osmocom.org/11466 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I17ce7acde1f23ab1394227d74214fe2a55cd2264 Gerrit-Change-Number: 11466 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 11:35:21 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 7 Nov 2018 11:35:21 +0000 Subject: Change in libosmocore[master]: gsm_29_118: add missing include to header file In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11638 ) Change subject: gsm_29_118: add missing include to header file ...................................................................... gsm_29_118: add missing include to header file The header file gsm_29_118.h is defining variables of type struct value_string, which is declared in core/utils.h. We should add an include to utils.h to prevent confusion when the header is used. Change-Id: I9f9bb62d29cd068820ad5aa677717bd448de3f4a Related: OS#3615 --- M include/osmocom/gsm/protocol/gsm_29_118.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index 24e9de2..c344f04 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -1,5 +1,6 @@ #pragma once +#include /* TS 29.118 Section 9.2 */ enum sgsap_msg_type { -- To view, visit https://gerrit.osmocom.org/11638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9f9bb62d29cd068820ad5aa677717bd448de3f4a Gerrit-Change-Number: 11638 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 11:37:27 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 7 Nov 2018 11:37:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11607 ) Change subject: BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template ...................................................................... BSSMAP_Templates: Add missing tr_BSSMAP_HandoverPerformed template The receive template for the BSSMAP HANDOVER PERFORMED MESSAGE is missing, lets add one. Related OS#3645 Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae --- M library/BSSMAP_Templates.ttcn 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 118168e..d00a5ab 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -823,6 +823,26 @@ } } +template PDU_BSSAP tr_BSSMAP_HandoverPerformed +modifies tr_BSSAP_BSSMAP := { + pdu := { + bssmap := { + handoverPerformed := { + messageType := '17'O, + cause := ?, + cellIdentifier := ?, + chosenChannel := omit, + chosenEncryptionAlgorithm := omit, + lSAIdentifier := omit, + talkerPriority := omit, + codecList := omit, + speechCodec := omit, + lCLS_BSS_Status := omit + } + } + } +} + template BSSMAP_IE_IMSI ts_BSSMAP_Imsi(hexstring imsi_digits) := { elementIdentifier := '08'O, lengthIndicator := 0, /* overwritten */ -- To view, visit https://gerrit.osmocom.org/11607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I527913203b2d5bfa26c181c4bb79481a9cd283ae Gerrit-Change-Number: 11607 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: Make IP address helper accessible via header file Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11650 Change subject: Make IP address helper accessible via header file ...................................................................... Make IP address helper accessible via header file Change-Id: I4bc157bf296e28678de6d9c9823f91810132a58c --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/11650/1 diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index 886e7d6..ba44669 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -35,6 +35,8 @@ #define GSM48_LEN2PLEN(a) (((a) << 2) | 1) +const char *ip_to_a(uint32_t ip); + int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len); int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index b86780d..2eda884 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1770,7 +1770,7 @@ return -EINVAL; } -static const char *ip_to_a(uint32_t ip) +const char *ip_to_a(uint32_t ip) { struct in_addr ia; ia.s_addr = htonl(ip); -- To view, visit https://gerrit.osmocom.org/11650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4bc157bf296e28678de6d9c9823f91810132a58c Gerrit-Change-Number: 11650 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: constify rsl_tx_ipacc_*cx() parameters Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11651 Change subject: constify rsl_tx_ipacc_*cx() parameters ...................................................................... constify rsl_tx_ipacc_*cx() parameters Change-Id: Ib34c8e3fb51d067581aefa1c80f8be1f6db9512e --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c M tests/gsm0408/gsm0408_test.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/11651/1 diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index ba44669..5ada3fc 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -61,8 +61,8 @@ int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci); /* ip.access specfic RSL extensions */ -int rsl_tx_ipacc_crcx(struct gsm_lchan *lchan); -int rsl_tx_ipacc_mdcx(struct gsm_lchan *lchan); +int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan); +int rsl_tx_ipacc_mdcx(const struct gsm_lchan *lchan); int rsl_ipacc_mdcx_to_rtpsock(struct gsm_lchan *lchan); int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 2eda884..bd104ed 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1830,7 +1830,7 @@ /*! Send Issue IPA RSL CRCX to configure the RTP port of the BTS. * \param[in] lchan Logical Channel for which we issue CRCX */ -int rsl_tx_ipacc_crcx(struct gsm_lchan *lchan) +int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan) { struct msgb *msg = rsl_msgb_alloc(); struct abis_rsl_dchan_hdr *dh; @@ -1856,7 +1856,7 @@ * \param[in] lchan Logical Channel for which we issue MDCX * Remote (MGW) IP address, port and payload types for RTP are determined from lchan->abis_ip. */ -int rsl_tx_ipacc_mdcx(struct gsm_lchan *lchan) +int rsl_tx_ipacc_mdcx(const struct gsm_lchan *lchan) { struct msgb *msg = rsl_msgb_alloc(); struct abis_rsl_dchan_hdr *dh; diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index faeca39..f2b85e4 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -968,7 +968,7 @@ int rsl_chan_mode_modify_req(struct gsm_lchan *ts) { return 0; } -int rsl_tx_ipacc_crcx(struct gsm_lchan *lchan) { return 0; } +int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan) { return 0; } void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg, int link_id, int allow_sacch) {} -- To view, visit https://gerrit.osmocom.org/11651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib34c8e3fb51d067581aefa1c80f8be1f6db9512e Gerrit-Change-Number: 11651 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: LCLS: expand logging to print the name of the mode in use Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11652 Change subject: LCLS: expand logging to print the name of the mode in use ...................................................................... LCLS: expand logging to print the name of the mode in use Change-Id: I56b57936ae82984e84896228da5a83115a78bbd7 Related: OS#3659 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/gsm_data.c M src/osmo-bsc/osmo_bsc_lcls.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/11652/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 6ca0330..32b161e 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -59,6 +59,13 @@ /* we may later introduce BTS_LOOP here: direct RTP between BTSs */ }; +extern const struct value_string bsc_lcls_mode_names[]; + +static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m) +{ + return get_value_string(bsc_lcls_mode_names, m); +} + /*! /brief Information on a remote MSC for libbsc. */ struct bsc_msc_data { diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 08d5bcb..56eb24e 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -47,6 +47,12 @@ void *tall_bsc_ctx = NULL; +const struct value_string bsc_lcls_mode_names[] = { + { BSC_LCLS_MODE_DISABLED, "disabled" }, + { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" }, + { 0, NULL } +}; + static LLIST_HEAD(bts_models); void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index e642976..a406643 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -240,7 +240,9 @@ { struct mgcp_conn_peer mdcx_info; - LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS\n"); + LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS(%s)\n", + bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); + if (!conn->user_plane.mgw_endpoint_ci_msc) { /* the MGCP FSM has died, e.g. due to some MGCP/SDP parsing error */ LOGPFSML(conn->lcls.fi, LOGL_NOTICE, "Cannot disable LCLS without MSC-side MGCP FSM\n"); @@ -581,7 +583,8 @@ OSMO_ASSERT(conn_other); - LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS\n"); + LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS(%s)\n", + bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); if (!conn->user_plane.mgw_endpoint_ci_msc) { LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without MSC-side MGCP FSM. FIXME\n"); return; diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index f90ad6f..14fd274 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -38,12 +38,6 @@ #define IPA_STR "IP.ACCESS specific\n" -static const struct value_string bsc_lcls_mode_names[] = { - { BSC_LCLS_MODE_DISABLED, "disabled" }, - { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" }, - { 0, NULL } -}; - static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty) { return bsc_gsmnet->bsc_data; -- To view, visit https://gerrit.osmocom.org/11652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I56b57936ae82984e84896228da5a83115a78bbd7 Gerrit-Change-Number: 11652 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:10:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:10:14 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:10:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:10:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:10:34 +0000 Subject: Change in osmo-bsc[master]: LCLS: explicitly check for mode before closing the loop In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11565 ) Change subject: LCLS: explicitly check for mode before closing the loop ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Gerrit-Change-Number: 11565 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:10:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:10:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:10:39 +0000 Subject: Change in osmo-bsc[master]: LCLS: move mode check into separate function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11551 ) Change subject: LCLS: move mode check into separate function ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:10:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:12:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:12:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log MGCP connection on failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11645 to look at the new patch set (#2). Change subject: BSC: log MGCP connection on failure ...................................................................... BSC: log MGCP connection on failure Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/11645/2 -- To view, visit https://gerrit.osmocom.org/11645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 Gerrit-Change-Number: 11645 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:12:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:12:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log MGCP connection number on failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11645 to look at the new patch set (#3). Change subject: BSC: log MGCP connection number on failure ...................................................................... BSC: log MGCP connection number on failure Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/11645/3 -- To view, visit https://gerrit.osmocom.org/11645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 Gerrit-Change-Number: 11645 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:20:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:20:31 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11577 to look at the new patch set (#5). Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Update 3GPP TS 08.08 Cause handling * add Class definitions * add helper to check for extended bit * add helper to get Cause's Class * use enum in gsm0808_cause_name() and gsm0808_create_cipher_reject() to avoid confusion between class and cause * update gsm0808_create_cipher_reject() comments Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Related: OS#3187 --- M TODO-RELEASE M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 6 files changed, 59 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/11577/5 -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:20:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:20:31 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11601 to look at the new patch set (#3). Change subject: Support cipher mode reject with extended cause ...................................................................... Support cipher mode reject with extended cause * add function to generate cipher mode reject with extended (2-byte) Cause IE * add function to get (extended) Cause value * add helper wrapper for BSSAP TLV parsing * add corresponding (extended cause) test * update existing (non-extended cause) test * use enum as a parameter for existing non-extended version to make interface more unified Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Related: OS#3187 --- M TODO-RELEASE M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 8 files changed, 94 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/11601/3 -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:32:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 12:32:42 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 4: Code-Review-1 (1 comment) I think you should also update TODO-RELEASE file as well. Provided it's still used during the release preparation. Pau? https://gerrit.osmocom.org/#/c/11504/4/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/11504/4/src/gsm/gsm0808_utils.c at 1401 PS4, Line 1401: match_nr --; That looks odd - why space before decrement? -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:32:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:36:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 12:36:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log MGCP connection number on failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11645 ) Change subject: BSC: log MGCP connection number on failure ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 Gerrit-Change-Number: 11645 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:36:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:37:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 12:37:17 +0000 Subject: Change in osmo-bsc[master]: Make IP address helper accessible via header file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11650 ) Change subject: Make IP address helper accessible via header file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4bc157bf296e28678de6d9c9823f91810132a58c Gerrit-Change-Number: 11650 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:37:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:37:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 12:37:37 +0000 Subject: Change in osmo-bsc[master]: constify rsl_tx_ipacc_*cx() parameters In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11651 ) Change subject: constify rsl_tx_ipacc_*cx() parameters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib34c8e3fb51d067581aefa1c80f8be1f6db9512e Gerrit-Change-Number: 11651 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:37:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:38:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 12:38:52 +0000 Subject: Change in osmo-bsc[master]: LCLS: expand logging to print the name of the mode in use In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11652 ) Change subject: LCLS: expand logging to print the name of the mode in use ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I56b57936ae82984e84896228da5a83115a78bbd7 Gerrit-Change-Number: 11652 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:38:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 12:41:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 12:41:16 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 4: (1 comment) > (1 comment) > > I think you should also update TODO-RELEASE file as well. Provided > it's still used during the release preparation. Pau? Not really mandatory, I end up looking at git log anyway, since people usually forget to add stuff there (or they dn't realize that they are changing API/ABI at all). https://gerrit.osmocom.org/#/c/11504/4/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/11504/4/src/gsm/gsm0808_utils.c at 1401 PS4, Line 1401: match_nr --; > That looks odd - why space before decrement? Agree -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 12:41:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 13:10:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 13:10:39 +0000 Subject: Change in osmo-bsc[master]: Make IP address helper accessible via header file In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11650 ) Change subject: Make IP address helper accessible via header file ...................................................................... Make IP address helper accessible via header file Change-Id: I4bc157bf296e28678de6d9c9823f91810132a58c --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index 886e7d6..ba44669 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -35,6 +35,8 @@ #define GSM48_LEN2PLEN(a) (((a) << 2) | 1) +const char *ip_to_a(uint32_t ip); + int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len); int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index b86780d..2eda884 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1770,7 +1770,7 @@ return -EINVAL; } -static const char *ip_to_a(uint32_t ip) +const char *ip_to_a(uint32_t ip) { struct in_addr ia; ia.s_addr = htonl(ip); -- To view, visit https://gerrit.osmocom.org/11650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4bc157bf296e28678de6d9c9823f91810132a58c Gerrit-Change-Number: 11650 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 13:10:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 13:10:40 +0000 Subject: Change in osmo-bsc[master]: constify rsl_tx_ipacc_*cx() parameters In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11651 ) Change subject: constify rsl_tx_ipacc_*cx() parameters ...................................................................... constify rsl_tx_ipacc_*cx() parameters Change-Id: Ib34c8e3fb51d067581aefa1c80f8be1f6db9512e --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c M tests/gsm0408/gsm0408_test.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index ba44669..5ada3fc 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -61,8 +61,8 @@ int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci); /* ip.access specfic RSL extensions */ -int rsl_tx_ipacc_crcx(struct gsm_lchan *lchan); -int rsl_tx_ipacc_mdcx(struct gsm_lchan *lchan); +int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan); +int rsl_tx_ipacc_mdcx(const struct gsm_lchan *lchan); int rsl_ipacc_mdcx_to_rtpsock(struct gsm_lchan *lchan); int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 2eda884..bd104ed 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1830,7 +1830,7 @@ /*! Send Issue IPA RSL CRCX to configure the RTP port of the BTS. * \param[in] lchan Logical Channel for which we issue CRCX */ -int rsl_tx_ipacc_crcx(struct gsm_lchan *lchan) +int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan) { struct msgb *msg = rsl_msgb_alloc(); struct abis_rsl_dchan_hdr *dh; @@ -1856,7 +1856,7 @@ * \param[in] lchan Logical Channel for which we issue MDCX * Remote (MGW) IP address, port and payload types for RTP are determined from lchan->abis_ip. */ -int rsl_tx_ipacc_mdcx(struct gsm_lchan *lchan) +int rsl_tx_ipacc_mdcx(const struct gsm_lchan *lchan) { struct msgb *msg = rsl_msgb_alloc(); struct abis_rsl_dchan_hdr *dh; diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index faeca39..f2b85e4 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -968,7 +968,7 @@ int rsl_chan_mode_modify_req(struct gsm_lchan *ts) { return 0; } -int rsl_tx_ipacc_crcx(struct gsm_lchan *lchan) { return 0; } +int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan) { return 0; } void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg, int link_id, int allow_sacch) {} -- To view, visit https://gerrit.osmocom.org/11651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib34c8e3fb51d067581aefa1c80f8be1f6db9512e Gerrit-Change-Number: 11651 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 13:21:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 13:21:11 +0000 Subject: Change in osmo-pcu[master]: deb: add missing copyright file Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11653 Change subject: deb: add missing copyright file ...................................................................... deb: add missing copyright file File is imported as-is from current .deb package Change-Id: Ib05480c0eea91bfb55bfc7ab446ea60932096d3d --- A debian/copyright 1 file changed, 132 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/53/11653/1 diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..853cd6e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,132 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: osmo-pcu +Source: git://git.osmocom.org/osmo-pcu +Files-Excluded: debian + +Files: * +Copyright: 2009-2015 Holger Hans Peter Freyther + 2013 Jacob Erlbeck + 2016-2017 sysmocom s.m.f.c. GmbH + 2015 by Yves Godin +License: AGPL-3.0+ + +Files: src/gprs_ms_storage.h + src/gprs_ms_storage.cpp + src/gprs_ms.h + src/gprs_coding_scheme.cpp + src/gprs_coding_scheme.h + src/cxx_linuxlist.h + src/pcu_vty_functions.cpp + src/pcu_vty_functions.h + src/pcu_utils.h + src/gprs_codel.c + src/gprs_codel.h +Copyright: 2016-2017 sysmocom s.m.f.c. GmbH +License: GPL-2.0+ + +Files: osmoappdesc.py +Copyright: 2013 by Katerina Barone-Adesi +License: GPL-3.0+ + +Files: src/gprs_debug.cpp + src/gprs_debug.h + src/pcu_main.cpp + src/pcu_l1_if.h + src/gsm_timer.cpp + src/gsm_timer.h +Copyright: 2012 Ivan Klyuchnikov +License: GPL-2.0+ + +Files: src/tbf.cpp + src/tbf_ul.cpp + src/tbf_dl.cpp + src/sba.cpp + src/sba.h + src/llc.cpp + src/encoding.cpp + src/encoding.h + src/gprs_rlcmac.cpp + src/gprs_rlcmac_ts_alloc.cpp +Copyright: 2012 Ivan Klyuchnikov + 2012 Andreas Eversberg + 2013 by Holger Hans Peter Freyther +License: GPL-2.0+ + +Files: src/gprs_rlcmac.h + src/gprs_bssgp_pcu.cpp + src/gprs_bssgp_pcu.h + src/bts.h +Copyright: 2012 Ivan Klyuchnikov + 2013 by Holger Hans Peter Freyther +License: GPL-2.0+ + +Files: src/rlc.h + src/decoding.cpp + src/decoding.h +Copyright: 2012 Ivan Klyuchnikov + 2012 Andreas Eversberg +License: GPL-2.0+ + +Files: src/rlc.cpp + src/llc.h + src/tbf.h +Copyright: 2013 by Holger Hans Peter Freyther +License: GPL-2.0+ + +Files: src/pcu_l1_if.cpp + src/gprs_rlcmac_meas.cpp + src/gprs_rlcmac_sched.cpp + src/osmobts_sock.cpp +Copyright: 2012 Andreas Eversberg +License: GPL-2.0+ + +Files: src/csn1.h + src/csn1.cpp + src/gsm_rlcmac.cpp + src/gsm_rlcmac.h +Copyright: 2011 Vincent Helfre + 2011 ST-Ericsson (Jari Sassi) +License: GPL-2.0+ + +License: AGPL-3.0+ + All rights not specifically granted under this license are reserved. + . + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published by the + Free Software Foundation; either version 3 of the License, or (at your + option) any later version. + +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + Version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +License: GPL-2.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + Version 2 can be found in `/usr/share/common-licenses/GPL-2'. + -- To view, visit https://gerrit.osmocom.org/11653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib05480c0eea91bfb55bfc7ab446ea60932096d3d Gerrit-Change-Number: 11653 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 14:11:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 14:11:22 +0000 Subject: Change in osmo-bsc[master]: paging: Make default T3113 timeout dynamic Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11654 Change subject: paging: Make default T3113 timeout dynamic ...................................................................... paging: Make default T3113 timeout dynamic Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f --- M src/osmo-bsc/net_init.c M src/osmo-bsc/paging.c 2 files changed, 31 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11654/1 diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index 1199bdc..5ea564d 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -37,7 +37,7 @@ { .T=3109, .default_val=5, .desc="RSL SACCH deactivation" }, { .T=3111, .default_val=2, .desc="Wait time before RSL RF Channel Release" }, { .T=993111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" }, - { .T=3113, .default_val=10, .desc="Paging"}, + { .T=3113, .default_val=7, .desc="Paging"}, { .T=3115, .default_val=10, .desc="(unused)" }, { .T=3117, .default_val=10, .desc="(unused)" }, { .T=3119, .default_val=10, .desc="(unused)" }, diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index afe3245..a5fed32 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -287,6 +287,34 @@ paging_remove_request(&req->bts->paging, req); } + +#define GSM_FRAME_DURATION_us 4615 +#define GSM51_MFRAME_DURATION_us (51 * GSM_FRAME_DURATION_us) /* 235365 us */ +static unsigned int calculate_timer_3113(struct gsm_bts *bts) +{ + unsigned int to_us, to; + struct T_def *d = T_def_get_entry(bts->network->T_defs, 3113); + + /* VTY value overrides default dynamic value */ + if (d->val != d->default_val) + return d->val; + + /* TODO: take into account load of paging group for req->bsub */ + + /* MFRMS defines repeat interval of paging messages for MSs that belong + * to same paging group accross multiple 51 frame multiframes. + * MAXTRANS defines maximum number of RACH retransmissions. + */ + to_us = GSM51_MFRAME_DURATION_us * (bts->si_common.chan_desc.bs_pa_mfrms + 2) * + bts->si_common.rach_control.max_trans; + + /* ceiling in seconds + extra time */ + to = (to_us + 999999) / 1000000 + d->default_val; + LOGP(DPAG, LOGL_DEBUG, "(bts=%d) Paging request calculated T3113 expires in %u seconds\n", + bts->nr, to); + return to; +} + /*! Start paging + paging timer for given subscriber on given BTS * \param bts BTS on which to page * \param[in] bsub subscriber we want to page @@ -317,7 +345,8 @@ req->chan_type = type; req->msc = msc; osmo_timer_setup(&req->T3113, paging_T3113_expired, req); - osmo_timer_schedule(&req->T3113, T_def_get(bts->network->T_defs, 3113, T_S, -1), 0); + int t3113_timeout_s = calculate_timer_3113(bts); + osmo_timer_schedule(&req->T3113, t3113_timeout_s, 0); llist_add_tail(&req->entry, &bts_entry->pending_requests); paging_schedule_if_needed(bts_entry); -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 14:26:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 14:26:26 +0000 Subject: Change in libosmocore[master]: Add helper wrapper for BSSAP TLV parsing Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11655 Change subject: Add helper wrapper for BSSAP TLV parsing ...................................................................... Add helper wrapper for BSSAP TLV parsing Change-Id: Ib228368901ce90a02a5664f2510593371c7d29cd --- M include/osmocom/gsm/gsm0808.h 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/11655/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index cdbb273..652aae9 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -173,6 +173,9 @@ const struct tlv_definition *gsm0808_att_tlvdef(void); +/*! Parse BSSAP TLV structure using \ref tlv_parse */ +#define osmo_bssap_tlv_parse(dec, buf, len) tlv_parse(dec, gsm0808_att_tlvdef(), buf, len, 0, 0) + const char *gsm0808_bssmap_name(uint8_t msg_type); const char *gsm0808_bssap_name(uint8_t msg_type); const char *gsm0808_cause_name(uint8_t cause); -- To view, visit https://gerrit.osmocom.org/11655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib228368901ce90a02a5664f2510593371c7d29cd Gerrit-Change-Number: 11655 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 14:28:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 7 Nov 2018 14:28:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9374 to look at the new patch set (#5). Change subject: start implementing the TC_paging() PCU test ...................................................................... start implementing the TC_paging() PCU test Implement a basic paging test for the PCU, which is passing for paging via TMSI (but only if osmo-pcu is started after the test is started). Previously, this test code amounted to a debugging loop which never terminated. Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Related: OS#2404 --- M library/L3_Templates.ttcn M pcu/PCU_Tests.ttcn M pcu/expected-results.xml 3 files changed, 66 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/9374/5 -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 14:29:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 7 Nov 2018 14:29:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 5: > Patch Set 4: > > Please rebase to latest master, add the test to control() and expected_results.xml Done. See patch set 5. -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 07 Nov 2018 14:29:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 14:40:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 14:40:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 5: (1 comment) Would be nice to update comment in PCU_Tests.cfg https://gerrit.osmocom.org/#/c/9374/5/pcu/expected-results.xml File pcu/expected-results.xml: https://gerrit.osmocom.org/#/c/9374/5/pcu/expected-results.xml at 2 PS5, Line 2: Not 100% sure but I think we got to update number of tests as well. -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 07 Nov 2018 14:40:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 14:41:07 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 7 Nov 2018 14:41:07 +0000 Subject: Change in libosmocore[master]: Add helper wrapper for BSSAP TLV parsing In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11655 ) Change subject: Add helper wrapper for BSSAP TLV parsing ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib228368901ce90a02a5664f2510593371c7d29cd Gerrit-Change-Number: 11655 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 07 Nov 2018 14:41:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 7 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 7 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#300?= In-Reply-To: <1205185202.453.1541517007300.JavaMail.jenkins@jenkins.osmocom.org> References: <1205185202.453.1541517007300.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <465047328.475.1541603407578.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:15:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 7 Nov 2018 15:15:49 +0000 Subject: Change in osmo-dev[master]: deps: comment out osmo-trx In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11634 ) Change subject: deps: comment out osmo-trx ...................................................................... Patch Set 1: Code-Review-1 Actually... how about adding a comment on top that describes why this was commented out? # does not work with address sanitizer -- To view, visit https://gerrit.osmocom.org/11634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb Gerrit-Change-Number: 11634 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 07 Nov 2018 15:15:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:42:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 7 Nov 2018 15:42:01 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11656 Change subject: use enums consistently instead of falling back to int ...................................................................... use enums consistently instead of falling back to int The two existing enums defined in gprs_sndcp_xid.h, for protocol and data compression algorithm numbers respectively, were assigned to 'int' variables when their values were copied to other structures. This prevented the compiler from checking the enum value coverage during switch statements and also tripped up Coverity scans looking for enum value mismatch problems. So instead of copying enums to ints, make use of the enums throughout. Structures which can contain values from both enums now use a union of both, forcing us to be very explicit about which set of values we are dealing with. Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Related: CID#149102 --- M include/osmocom/sgsn/gprs_sndcp_comp.h M include/osmocom/sgsn/gprs_sndcp_xid.h M src/gprs/gprs_sndcp.c M src/gprs/gprs_sndcp_comp.c M src/gprs/gprs_sndcp_dcomp.c M src/gprs/gprs_sndcp_pcomp.c M src/gprs/gprs_sndcp_xid.c M tests/sndcp_xid/sndcp_xid_test.c 8 files changed, 177 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/11656/1 diff --git a/include/osmocom/sgsn/gprs_sndcp_comp.h b/include/osmocom/sgsn/gprs_sndcp_comp.h index c04f7d4..1573132 100644 --- a/include/osmocom/sgsn/gprs_sndcp_comp.h +++ b/include/osmocom/sgsn/gprs_sndcp_comp.h @@ -41,9 +41,12 @@ uint8_t comp[MAX_COMP]; /* see also: 6.5.1.1.5 and 6.6.1.1.5 */ /* Algorithm parameters */ - int algo; /* Algorithm type (see gprs_sndcp_xid.h) */ - int compclass; /* See gprs_sndcp_xid.h/c */ - void *state; /* Algorithm status and parameters */ + union { + enum gprs_sndcp_hdr_comp_algo pcomp; + enum gprs_sndcp_data_comp_algo dcomp; + } algo; /* Algorithm type (see gprs_sndcp_xid.h) */ + enum gprs_sndcp_xid_param_types compclass; /* See gprs_sndcp_xid.h/c */ + void *state; /* Algorithm status and parameters */ }; #define MAX_COMP 16 /* Maximum number of possible pcomp/dcomp values */ diff --git a/include/osmocom/sgsn/gprs_sndcp_xid.h b/include/osmocom/sgsn/gprs_sndcp_xid.h index e64bc52..2b63f50 100644 --- a/include/osmocom/sgsn/gprs_sndcp_xid.h +++ b/include/osmocom/sgsn/gprs_sndcp_xid.h @@ -32,6 +32,19 @@ #define MAX_NSAPI 11 /* Maximum number usable NSAPIs */ #define MAX_ROHC 16 /* Maximum number of ROHC compression profiles */ +/* According to: 3GPP TS 44.065, 6.5.1.1.4 Algorithm identifier */ +enum gprs_sndcp_hdr_comp_algo { + RFC_1144, /* TCP/IP header compression, see also 6.5.2 */ + RFC_2507, /* TCP/UDP/IP header compression, see also: 6.5.3 */ + ROHC /* Robust Header Compression, see also 6.5.4 */ +}; + +/* According to: 3GPP TS 44.065, 6.5.1.1.4 Algorithm identifier */ +enum gprs_sndcp_data_comp_algo { + V42BIS, /* V.42bis data compression, see also 6.6.2 */ + V44 /* V44 data compression, see also: 6.6.3 */ +}; + /* According to: 3GPP TS 44.065, 6.5.1.1 Format of the protocol control * information compression field (Figure 7) and 3GPP TS 44.065, * 6.6.1.1 Format of the data compression field (Figure 9) */ @@ -45,7 +58,10 @@ unsigned int entity; /* Algorithm identifier, see also: 6.5.1.1.4 and 6.6.1.1.4 */ - int algo; + union { + enum gprs_sndcp_hdr_comp_algo pcomp; + enum gprs_sndcp_data_comp_algo dcomp; + } algo; /* Number of contained PCOMP / DCOMP values */ uint8_t comp_len; @@ -62,24 +78,12 @@ struct gprs_sndcp_dcomp_v44_params *v44_params; }; -/* According to: 3GPP TS 44.065, 6.5.1.1.4 Algorithm identifier */ -enum gprs_sndcp_hdr_comp_algo { - RFC_1144, /* TCP/IP header compression, see also 6.5.2 */ - RFC_2507, /* TCP/UDP/IP header compression, see also: 6.5.3 */ - ROHC /* Robust Header Compression, see also 6.5.4 */ -}; - -/* According to: 3GPP TS 44.065, 6.5.1.1.4 Algorithm identifier */ -enum gprs_sndcp_data_comp_algo { - V42BIS, /* V.42bis data compression, see also 6.6.2 */ - V44 /* V44 data compression, see also: 6.6.3 */ -}; - /* According to: 3GPP TS 44.065, 8 SNDCP XID parameters */ enum gprs_sndcp_xid_param_types { SNDCP_XID_VERSION_NUMBER, SNDCP_XID_DATA_COMPRESSION, /* See also: subclause 6.6.1 */ SNDCP_XID_PROTOCOL_COMPRESSION, /* See also: subclause 6.5.1 */ + SNDCP_XID_INVALID_COMPRESSION /* Not part of the spec; this means we found an invalid value */ }; /* According to: 3GPP TS 44.065, 6.5.2.1 Parameters (Table 5) */ @@ -209,7 +213,7 @@ /* Find out to which compression class the specified comp-field belongs * (header compression or data compression?) */ -int gprs_sndcp_get_compression_class( +enum gprs_sndcp_xid_param_types gprs_sndcp_get_compression_class( const struct gprs_sndcp_comp_field *comp_field); /* Dump a list with SNDCP-XID fields (Debug) */ diff --git a/src/gprs/gprs_sndcp.c b/src/gprs/gprs_sndcp.c index 52eeb75..f0239cb 100644 --- a/src/gprs/gprs_sndcp.c +++ b/src/gprs/gprs_sndcp.c @@ -934,7 +934,7 @@ rfc1144_params.s01 = sgsn->cfg.pcomp_rfc1144.s01; rfc1144_comp_field.p = 1; rfc1144_comp_field.entity = entity; - rfc1144_comp_field.algo = RFC_1144; + rfc1144_comp_field.algo.pcomp = RFC_1144; rfc1144_comp_field.comp[RFC1144_PCOMP1] = 1; rfc1144_comp_field.comp[RFC1144_PCOMP2] = 2; rfc1144_comp_field.comp_len = RFC1144_PCOMP_NUM; @@ -952,7 +952,7 @@ v42bis_params.p2 = sgsn->cfg.dcomp_v42bis.p2; v42bis_comp_field.p = 1; v42bis_comp_field.entity = entity; - v42bis_comp_field.algo = V42BIS; + v42bis_comp_field.algo.dcomp = V42BIS; v42bis_comp_field.comp[V42BIS_DCOMP1] = 1; v42bis_comp_field.comp_len = V42BIS_DCOMP_NUM; v42bis_comp_field.v42bis_params = &v42bis_params; @@ -1021,7 +1021,7 @@ comp_field->p = 0; /* Process proposed parameters */ - switch (comp_field->algo) { + switch (comp_field->algo.pcomp) { case RFC_1144: if (sgsn->cfg.pcomp_rfc1144.passive && comp_field->rfc1144_params->nsapi_len > 0) { @@ -1068,7 +1068,7 @@ comp_field->p = 0; /* Process proposed parameters */ - switch (comp_field->algo) { + switch (comp_field->algo.dcomp) { case V42BIS: if (sgsn->cfg.dcomp_v42bis.passive && comp_field->v42bis_params->nsapi_len > 0) { diff --git a/src/gprs/gprs_sndcp_comp.c b/src/gprs/gprs_sndcp_comp.c index 60b15b9..0b73de5 100644 --- a/src/gprs/gprs_sndcp_comp.c +++ b/src/gprs/gprs_sndcp_comp.c @@ -55,32 +55,36 @@ memcpy(comp_entity->nsapi, comp_field->rfc1144_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.pcomp = comp_field->algo.pcomp; } else if (comp_field->rfc2507_params) { comp_entity->nsapi_len = comp_field->rfc2507_params->nsapi_len; memcpy(comp_entity->nsapi, comp_field->rfc2507_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.pcomp = comp_field->algo.pcomp; } else if (comp_field->rohc_params) { comp_entity->nsapi_len = comp_field->rohc_params->nsapi_len; memcpy(comp_entity->nsapi, comp_field->rohc_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.pcomp = comp_field->algo.pcomp; } else if (comp_field->v42bis_params) { comp_entity->nsapi_len = comp_field->v42bis_params->nsapi_len; memcpy(comp_entity->nsapi, comp_field->v42bis_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.dcomp = comp_field->algo.dcomp; } else if (comp_field->v44_params) { comp_entity->nsapi_len = comp_field->v44_params->nsapi_len; memcpy(comp_entity->nsapi, comp_field->v44_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.dcomp = comp_field->algo.dcomp; } else { /* The caller is expected to check carefully if the all * data fields required for compression entity creation * are present. Otherwise we blow an assertion here */ OSMO_ASSERT(false); } - comp_entity->algo = comp_field->algo; /* Check if an NSAPI is selected, if not, it does not make sense * to create the compression entity, since the caller should @@ -92,7 +96,7 @@ * (Protocol or Data compresson ?) */ comp_entity->compclass = gprs_sndcp_get_compression_class(comp_field); - OSMO_ASSERT(comp_entity->compclass != -1); + OSMO_ASSERT(comp_entity->compclass != SNDCP_XID_INVALID_COMPRESSION); /* Create an algorithm specific compression context */ if (comp_entity->compclass == SNDCP_XID_PROTOCOL_COMPRESSION) { diff --git a/src/gprs/gprs_sndcp_dcomp.c b/src/gprs/gprs_sndcp_dcomp.c index 04ff491..00e40a7 100644 --- a/src/gprs/gprs_sndcp_dcomp.c +++ b/src/gprs/gprs_sndcp_dcomp.c @@ -83,7 +83,7 @@ OSMO_ASSERT(comp_field); if (comp_entity->compclass == SNDCP_XID_DATA_COMPRESSION - && comp_entity->algo == V42BIS) { + && comp_entity->algo.dcomp == V42BIS) { OSMO_ASSERT(comp_field->v42bis_params); comp_entity->state = v42bis_init(ctx, NULL, comp_field->v42bis_params->p0, @@ -114,7 +114,7 @@ OSMO_ASSERT(comp_entity); if (comp_entity->compclass == SNDCP_XID_DATA_COMPRESSION - && comp_entity->algo == V42BIS) { + && comp_entity->algo.dcomp == V42BIS) { if (comp_entity->state) { v42bis_free((v42bis_state_t *) comp_entity->state); comp_entity->state = NULL; @@ -293,7 +293,7 @@ /* Note: Currently V42BIS is the only compression method we * support, so the only allowed algorithm is V42BIS */ - OSMO_ASSERT(comp_entity->algo == V42BIS); + OSMO_ASSERT(comp_entity->algo.dcomp == V42BIS); /* Find pcomp_index */ pcomp_index = gprs_sndcp_comp_get_idx(comp_entity, pcomp); @@ -339,7 +339,7 @@ /* Note: Currently V42BIS is the only compression method we * support, so the only allowed algorithm is V42BIS */ - OSMO_ASSERT(comp_entity->algo == V42BIS); + OSMO_ASSERT(comp_entity->algo.dcomp == V42BIS); /* Run compression algo */ rc = v42bis_compress_unitdata(&pcomp_index, data, len, diff --git a/src/gprs/gprs_sndcp_pcomp.c b/src/gprs/gprs_sndcp_pcomp.c index 2911b5e..5f7f22a 100644 --- a/src/gprs/gprs_sndcp_pcomp.c +++ b/src/gprs/gprs_sndcp_pcomp.c @@ -53,7 +53,7 @@ OSMO_ASSERT(comp_field); if (comp_entity->compclass == SNDCP_XID_PROTOCOL_COMPRESSION - && comp_entity->algo == RFC_1144) { + && comp_entity->algo.pcomp == RFC_1144) { OSMO_ASSERT(comp_field->rfc1144_params); comp_entity->state = slhc_init(ctx, comp_field->rfc1144_params->s01 + 1, @@ -79,7 +79,7 @@ OSMO_ASSERT(comp_entity); if (comp_entity->compclass == SNDCP_XID_PROTOCOL_COMPRESSION - && comp_entity->algo == RFC_1144) { + && comp_entity->algo.pcomp == RFC_1144) { if (comp_entity->state) { slhc_free((struct slcompress *)comp_entity->state); comp_entity->state = NULL; @@ -214,7 +214,7 @@ /* Note: Currently RFC1144 is the only compression method we * support, so the only allowed algorithm is RFC1144 */ - OSMO_ASSERT(comp_entity->algo == RFC_1144); + OSMO_ASSERT(comp_entity->algo.pcomp == RFC_1144); /* Find pcomp_index */ pcomp_index = gprs_sndcp_comp_get_idx(comp_entity, pcomp); @@ -263,7 +263,7 @@ /* Note: Currently RFC1144 is the only compression method we * support, so the only allowed algorithm is RFC1144 */ - OSMO_ASSERT(comp_entity->algo == RFC_1144); + OSMO_ASSERT(comp_entity->algo.pcomp == RFC_1144); /* Run compression algo */ rc = rfc1144_compress(&pcomp_index, data, len, comp_entity->state); diff --git a/src/gprs/gprs_sndcp_xid.c b/src/gprs/gprs_sndcp_xid.c index 8f844b5..44db377 100644 --- a/src/gprs/gprs_sndcp_xid.c +++ b/src/gprs/gprs_sndcp_xid.c @@ -42,9 +42,11 @@ * about the referenced algorithm to the parser. */ struct entity_algo_table { unsigned int entity; /* see also: 6.5.1.1.3 and 6.6.1.1.3 */ - unsigned int algo; /* see also: 6.5.1.1.4 and 6.6.1.1.4 */ - unsigned int compclass; /* Can be either SNDCP_XID_DATA_COMPRESSION or - SNDCP_XID_PROTOCOL_COMPRESSION */ + union { + enum gprs_sndcp_hdr_comp_algo pcomp; + enum gprs_sndcp_data_comp_algo dcomp; + } algo; /* see also: 6.5.1.1.4 and 6.6.1.1.4 */ + enum gprs_sndcp_xid_param_types compclass; }; /* FUNCTIONS RELATED TO SNDCP-XID ENCODING */ @@ -386,6 +388,7 @@ int len; int expected_length; int i; + enum gprs_sndcp_xid_param_types compclass; uint8_t payload_bytes[256]; int payload_bytes_len = -1; @@ -443,7 +446,19 @@ OSMO_ASSERT(comp_field->entity <= 0x1f); /* Check if the algorithm number is within bounds */ - OSMO_ASSERT(comp_field->algo >= 0 || comp_field->algo <= 0x1f); + + compclass = gprs_sndcp_get_compression_class(comp_field); + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + OSMO_ASSERT(comp_field->algo.pcomp >= 0 || comp_field->algo.pcomp <= 0x1f); + break; + case SNDCP_XID_DATA_COMPRESSION: + OSMO_ASSERT(comp_field->algo.dcomp >= 0 || comp_field->algo.dcomp <= 0x1f); + break; + default: + OSMO_ASSERT(false); + break; /* not reached */ + } /* Zero out buffer */ memset(dst, 0, dst_maxlen); @@ -459,7 +474,10 @@ /* Encode algorithm number */ if (comp_field->p) { - *dst |= comp_field->algo & 0x1F; + if (compclass == SNDCP_XID_PROTOCOL_COMPRESSION) + *dst |= comp_field->algo.pcomp & 0x1F; + else + *dst |= comp_field->algo.dcomp & 0x1F; dst++; dst_counter++; } @@ -501,7 +519,7 @@ /* Find out to which compression class the specified comp-field belongs * (header compression or data compression?) */ -int gprs_sndcp_get_compression_class(const struct gprs_sndcp_comp_field +enum gprs_sndcp_xid_param_types gprs_sndcp_get_compression_class(const struct gprs_sndcp_comp_field *comp_field) { OSMO_ASSERT(comp_field); @@ -517,7 +535,7 @@ else if (comp_field->v44_params) return SNDCP_XID_DATA_COMPRESSION; else - return -EINVAL; + return SNDCP_XID_INVALID_COMPRESSION; } /* Convert all compression fields to bytstreams */ @@ -1005,10 +1023,10 @@ return byte_counter; } -/* Lookup algorithm identfier by entity ID */ -static int lookup_algorithm_identifier(int entity, const struct - entity_algo_table - *lt, unsigned int lt_len, int compclass) +/* Lookup protocol compression algorithm identfier by entity ID */ +static enum gprs_sndcp_hdr_comp_algo lookup_algorithm_identifier_pcomp(int entity, + const struct entity_algo_table *lt, + unsigned int lt_len) { int i; @@ -1017,26 +1035,46 @@ for (i = 0; i < lt_len; i++) { if ((lt[i].entity == entity) - && (lt[i].compclass == compclass)) - return lt[i].algo; + && (lt[i].compclass == SNDCP_XID_PROTOCOL_COMPRESSION)) + return lt[i].algo.pcomp; } - return -1; + return SNDCP_XID_INVALID_COMPRESSION; +} + +/* Lookup a data compression algorithm identfier by entity ID */ +static enum gprs_sndcp_data_comp_algo lookup_algorithm_identifier_dcomp(int entity, + const struct entity_algo_table *lt, + unsigned int lt_len) +{ + int i; + + if (!lt) + return -1; + + for (i = 0; i < lt_len; i++) { + if ((lt[i].entity == entity) + && (lt[i].compclass == SNDCP_XID_DATA_COMPRESSION)) + return lt[i].algo.dcomp; + } + + return SNDCP_XID_INVALID_COMPRESSION; } /* Helper function for decode_comp_field(), decodes * numeric pcomp/dcomp values */ static int decode_comp_values(struct gprs_sndcp_comp_field *comp_field, - const uint8_t *src, int compclass) + const uint8_t *src, enum gprs_sndcp_xid_param_types compclass) { int src_counter = 0; int i; if (comp_field->p) { /* Determine the number of expected PCOMP/DCOMP values */ - if (compclass == SNDCP_XID_PROTOCOL_COMPRESSION) { + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: /* For protocol compression */ - switch (comp_field->algo) { + switch (comp_field->algo.pcomp) { case RFC_1144: comp_field->comp_len = RFC1144_PCOMP_NUM; break; @@ -1052,9 +1090,10 @@ default: return -EINVAL; } - } else { + break; + case SNDCP_XID_DATA_COMPRESSION: /* For data compression */ - switch (comp_field->algo) { + switch (comp_field->algo.dcomp) { case V42BIS: comp_field->comp_len = V42BIS_DCOMP_NUM; break; @@ -1067,6 +1106,9 @@ default: return -EINVAL; } + break; + default: + return -EINVAL; } for (i = 0; i < comp_field->comp_len; i++) { @@ -1094,7 +1136,7 @@ { int rc; - switch (comp_field->algo) { + switch (comp_field->algo.pcomp) { case RFC_1144: comp_field->rfc1144_params = talloc_zero(comp_field, struct gprs_sndcp_pcomp_rfc1144_params); @@ -1142,7 +1184,7 @@ { int rc; - switch (comp_field->algo) { + switch (comp_field->algo.dcomp) { case V42BIS: comp_field->v42bis_params = talloc_zero(comp_field, struct gprs_sndcp_dcomp_v42bis_params); @@ -1180,7 +1222,8 @@ static int decode_comp_field(struct gprs_sndcp_comp_field *comp_field, const uint8_t *src, unsigned int src_len, const struct entity_algo_table *lt, - unsigned int lt_len, int compclass) + unsigned int lt_len, + enum gprs_sndcp_xid_param_types compclass) { int src_counter = 0; unsigned int len; @@ -1205,15 +1248,34 @@ /* Decode algorithm number (if present) */ if (comp_field->p) { - comp_field->algo = (*src) & 0x1F; + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + comp_field->algo.pcomp = (*src) & 0x1F; + break; + case SNDCP_XID_DATA_COMPRESSION: + comp_field->algo.dcomp = (*src) & 0x1F; + break; + default: + return -EINVAL; + } src_counter++; src++; } /* Alternatively take the information from the lookup table */ - else - comp_field->algo = - lookup_algorithm_identifier(comp_field->entity, lt, - lt_len, compclass); + else { + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + comp_field->algo.pcomp = + lookup_algorithm_identifier_pcomp(comp_field->entity, lt, lt_len); + break; + case SNDCP_XID_DATA_COMPRESSION: + comp_field->algo.dcomp = + lookup_algorithm_identifier_dcomp(comp_field->entity, lt, lt_len); + break; + default: + return -EINVAL; + } + } /* Decode length field */ len = *src; @@ -1234,7 +1296,7 @@ else if (compclass == SNDCP_XID_DATA_COMPRESSION) rc = decode_dcomp_params(comp_field, src, len); else - return -EINVAL; + return SNDCP_XID_INVALID_COMPRESSION; if (rc >= 0) src_counter += rc; @@ -1368,7 +1430,7 @@ { struct gprs_sndcp_comp_field *comp_field; int i = 0; - int rc; + enum gprs_sndcp_xid_param_types compclass; if (!comp_fields) return -EINVAL; @@ -1378,17 +1440,22 @@ memset(lt, 0, sizeof(*lt)); llist_for_each_entry(comp_field, comp_fields, list) { - if (comp_field->algo >= 0) { + compclass = gprs_sndcp_get_compression_class(comp_field); + if (compclass != SNDCP_XID_INVALID_COMPRESSION) { lt[i].entity = comp_field->entity; - lt[i].algo = comp_field->algo; - rc = gprs_sndcp_get_compression_class(comp_field); - - if (rc < 0) { + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + lt[i].algo.pcomp = comp_field->algo.pcomp; + break; + case SNDCP_XID_DATA_COMPRESSION: + lt[i].algo.dcomp = comp_field->algo.dcomp; + break; + default: memset(lt, 0, sizeof(*lt)); return -EINVAL; } - lt[i].compclass = rc; + lt[i].compclass = compclass; i++; } } @@ -1402,7 +1469,10 @@ *comp_field_dst, const struct gprs_sndcp_comp_field *comp_field_src) { - if (comp_field_dst->algo < 0) + enum gprs_sndcp_xid_param_types compclass; + + compclass = gprs_sndcp_get_compression_class(comp_field_dst); + if (compclass == SNDCP_XID_INVALID_COMPRESSION) return -EINVAL; if (comp_field_dst->rfc1144_params && comp_field_src->rfc1144_params) { @@ -1626,7 +1696,7 @@ { int i; - switch (comp_field->algo) { + switch (comp_field->algo.pcomp) { case RFC_1144: if (comp_field->rfc1144_params == NULL) { LOGP(DSNDCP, logl, @@ -1726,7 +1796,7 @@ { int i; - switch (comp_field->algo) { + switch (comp_field->algo.dcomp) { case V42BIS: if (comp_field->v42bis_params == NULL) { LOGP(DSNDCP, logl, @@ -1791,15 +1861,26 @@ { struct gprs_sndcp_comp_field *comp_field; int i; - int compclass; + enum gprs_sndcp_xid_param_types compclass; OSMO_ASSERT(comp_fields); llist_for_each_entry(comp_field, comp_fields, list) { + compclass = gprs_sndcp_get_compression_class(comp_field); LOGP(DSNDCP, logl, "SNDCP-XID:\n"); LOGP(DSNDCP, logl, "struct gprs_sndcp_comp_field {\n"); LOGP(DSNDCP, logl, " entity=%d;\n", comp_field->entity); - LOGP(DSNDCP, logl, " algo=%d;\n", comp_field->algo); + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + LOGP(DSNDCP, logl, " algo=%d;\n", comp_field->algo.pcomp); + break; + case SNDCP_XID_DATA_COMPRESSION: + LOGP(DSNDCP, logl, " algo=%d;\n", comp_field->algo.dcomp); + break; + default: + LOGP(DSNDCP, logl, " algo invalid!\n"); + break; + } LOGP(DSNDCP, logl, " comp_len=%d;\n", comp_field->comp_len); if (comp_field->comp_len == 0) LOGP(DSNDCP, logl, " comp[] = NULL;\n"); @@ -1808,12 +1889,16 @@ comp_field->comp[i]); } - compclass = gprs_sndcp_get_compression_class(comp_field); - - if (compclass == SNDCP_XID_PROTOCOL_COMPRESSION) { + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: dump_pcomp_params(comp_field, logl); - } else if (compclass == SNDCP_XID_DATA_COMPRESSION) { + break; + case SNDCP_XID_DATA_COMPRESSION: dump_dcomp_params(comp_field, logl); + break; + default: + LOGP(DSNDCP, logl, " compression algorithm invalid!\n"); + break; } LOGP(DSNDCP, logl, "}\n"); diff --git a/tests/sndcp_xid/sndcp_xid_test.c b/tests/sndcp_xid/sndcp_xid_test.c index 5ed695c..56b97e3 100644 --- a/tests/sndcp_xid/sndcp_xid_test.c +++ b/tests/sndcp_xid/sndcp_xid_test.c @@ -106,7 +106,7 @@ /* Setup rfc1144 compression field */ rfc1144_comp_field.p = 1; rfc1144_comp_field.entity = 0; - rfc1144_comp_field.algo = RFC_1144; + rfc1144_comp_field.algo.pcomp = RFC_1144; rfc1144_comp_field.comp[RFC1144_PCOMP1] = 1; rfc1144_comp_field.comp[RFC1144_PCOMP2] = 2; rfc1144_comp_field.comp_len = RFC1144_PCOMP_NUM; @@ -126,7 +126,7 @@ /* Setup rfc2507 compression field */ rfc2507_comp_field.p = 1; rfc2507_comp_field.entity = 1; - rfc2507_comp_field.algo = RFC_2507; + rfc2507_comp_field.algo.pcomp = RFC_2507; rfc2507_comp_field.comp[RFC2507_PCOMP1] = 3; rfc2507_comp_field.comp[RFC2507_PCOMP2] = 4; rfc2507_comp_field.comp[RFC2507_PCOMP3] = 5; @@ -173,7 +173,7 @@ /* Setup ROHC compression field */ rohc_comp_field.p = 1; rohc_comp_field.entity = 2; - rohc_comp_field.algo = ROHC; + rohc_comp_field.algo.pcomp = ROHC; rohc_comp_field.comp[ROHC_PCOMP1] = 8; rohc_comp_field.comp[ROHC_PCOMP2] = 9; rohc_comp_field.comp_len = ROHC_PCOMP_NUM; @@ -191,7 +191,7 @@ /* Setup v42bis compression field */ v42bis_comp_field.p = 1; v42bis_comp_field.entity = 3; - v42bis_comp_field.algo = V42BIS; + v42bis_comp_field.algo.dcomp = V42BIS; v42bis_comp_field.comp[V42BIS_DCOMP1] = 10; v42bis_comp_field.comp_len = V42BIS_DCOMP_NUM; v42bis_comp_field.v42bis_params = &v42bis_params; @@ -211,7 +211,7 @@ /* Setup v44 compression field */ v44_comp_field.p = 1; v44_comp_field.entity = 3; - v44_comp_field.algo = V44; + v44_comp_field.algo.dcomp = V44; v44_comp_field.comp[V44_DCOMP1] = 10; v44_comp_field.comp[V44_DCOMP2] = 11; v44_comp_field.comp_len = V44_DCOMP_NUM; -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:54:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 15:54:41 +0000 Subject: Change in osmo-dev[master]: deps: comment out osmo-trx In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11634 to look at the new patch set (#2). Change subject: deps: comment out osmo-trx ...................................................................... deps: comment out osmo-trx osmo-trx shouldn't run with address sanitizer. But omitting --enable-sanitize from osmo-trx breaks 'make check', so then the whole top-level makefile will end in error with sanitize.opts. A user wanting to build osmo-trx can just uncomment that line. Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb --- M 2G.deps M 3G+2G.deps 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/34/11634/2 -- To view, visit https://gerrit.osmocom.org/11634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb Gerrit-Change-Number: 11634 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:54:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 15:54:41 +0000 Subject: Change in osmo-dev[master]: 2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11635 to look at the new patch set (#2). Change subject: 2G.deps: add osmo-sip-connector ...................................................................... 2G.deps: add osmo-sip-connector Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3 --- M 2G.deps 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/35/11635/2 -- To view, visit https://gerrit.osmocom.org/11635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3 Gerrit-Change-Number: 11635 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:55:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 15:55:01 +0000 Subject: Change in osmo-dev[master]: deps: comment out osmo-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11634 ) Change subject: deps: comment out osmo-trx ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb Gerrit-Change-Number: 11634 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 07 Nov 2018 15:55:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:55:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 15:55:27 +0000 Subject: Change in osmo-dev[master]: deps: comment out osmo-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11634 ) Change subject: deps: comment out osmo-trx ...................................................................... deps: comment out osmo-trx osmo-trx shouldn't run with address sanitizer. But omitting --enable-sanitize from osmo-trx breaks 'make check', so then the whole top-level makefile will end in error with sanitize.opts. A user wanting to build osmo-trx can just uncomment that line. Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb --- M 2G.deps M 3G+2G.deps 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/2G.deps b/2G.deps index cf2723a..c49589d 100644 --- a/2G.deps +++ b/2G.deps @@ -10,4 +10,7 @@ osmo-msc libosmo-sccp osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn libosmo-sccp osmo-ggsn osmo-hlr -osmo-trx libosmocore +# osmo-trx can build with --enable-sanitize, but then won't work reliably. +# When omitting --enable-sanitize from osmo-trx only, its 'make check' will fail. +# So if you want osmo-trx, uncomment and use no sanitize.opts, or use LD_PRELOAD for osmo-trx binaries. +#osmo-trx libosmocore diff --git a/3G+2G.deps b/3G+2G.deps index b82e7c9..e5d53fa 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -13,4 +13,7 @@ osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn osmo-iuh osmo-ggsn osmo-hlr osmo-sip-connector libosmocore -osmo-trx libosmocore +# osmo-trx can build with --enable-sanitize, but then won't work reliably. +# When omitting --enable-sanitize from osmo-trx only, its 'make check' will fail. +# So if you want osmo-trx, uncomment and use no sanitize.opts, or use LD_PRELOAD for osmo-trx binaries. +#osmo-trx libosmocore -- To view, visit https://gerrit.osmocom.org/11634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I589f49652f8fa4e5becc7d7e63e6e4bc1a8b33bb Gerrit-Change-Number: 11634 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:55:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 15:55:35 +0000 Subject: Change in osmo-dev[master]: 2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11635 ) Change subject: 2G.deps: add osmo-sip-connector ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3 Gerrit-Change-Number: 11635 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 07 Nov 2018 15:55:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:55:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 15:55:36 +0000 Subject: Change in osmo-dev[master]: 2G.deps: add osmo-sip-connector In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11635 ) Change subject: 2G.deps: add osmo-sip-connector ...................................................................... 2G.deps: add osmo-sip-connector Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3 --- M 2G.deps 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/2G.deps b/2G.deps index c49589d..9ccb1ee 100644 --- a/2G.deps +++ b/2G.deps @@ -10,6 +10,7 @@ osmo-msc libosmo-sccp osmo-mgw libsmpp34 osmo-bsc libosmo-sccp osmo-mgw osmo-sgsn libosmo-sccp osmo-ggsn osmo-hlr +osmo-sip-connector libosmocore # osmo-trx can build with --enable-sanitize, but then won't work reliably. # When omitting --enable-sanitize from osmo-trx only, its 'make check' will fail. # So if you want osmo-trx, uncomment and use no sanitize.opts, or use LD_PRELOAD for osmo-trx binaries. -- To view, visit https://gerrit.osmocom.org/11635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I30e27e2eb0060889f167417a21894e8e411ad1e3 Gerrit-Change-Number: 11635 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:55:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 15:55:51 +0000 Subject: Change in osmo-dev[master]: sanitize.opts: add osmo-sip-connector --enable-sanitize In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11593 ) Change subject: sanitize.opts: add osmo-sip-connector --enable-sanitize ...................................................................... Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 Gerrit-Change-Number: 11593 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 07 Nov 2018 15:55:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 15:55:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 15:55:52 +0000 Subject: Change in osmo-dev[master]: sanitize.opts: add osmo-sip-connector --enable-sanitize In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11593 ) Change subject: sanitize.opts: add osmo-sip-connector --enable-sanitize ...................................................................... sanitize.opts: add osmo-sip-connector --enable-sanitize Otherwise it is not able to link asan-enabled libosmocore in the binaries. Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 --- M sanitize.opts 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/sanitize.opts b/sanitize.opts index 40675be..7d545d2 100644 --- a/sanitize.opts +++ b/sanitize.opts @@ -12,3 +12,4 @@ osmo-msc --enable-sanitize osmo-sgsn --enable-sanitize openbsc --enable-sanitize +osmo-sip-connector --enable-sanitize -- To view, visit https://gerrit.osmocom.org/11593 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5e04ef38982ee6c89110776fc941ee0e2c193196 Gerrit-Change-Number: 11593 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 16:18:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 16:18:24 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11560 to look at the new patch set (#7). Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 432 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/7 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 16:25:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 16:25:43 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11560 to look at the new patch set (#8). Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 432 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/8 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 8 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 16:25:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 16:25:53 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 7: (3 comments) https://gerrit.osmocom.org/#/c/11560/4/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11560/4/src/gits at 68 PS4, Line 68: l: > This seems to work - do you get the same output with your version? [?] my --porcelain --long seems to be identical to just status: ? git status --porcelain --long On branch neels/wip Your branch and 'origin/neels/wip' have diverged, and have 9 and 6 different commits each, respectively. (use "git pull" to merge the remote branch into yours) Untracked files: (use "git add ..." to include in what will be committed) ../d.bsc/ ../m2/ ../make/ ../net/config_mine ../net/config_sip ../net/my_network/ ../net/nitb/ ../net/simcards.csv ../net/sip/ ../net/tmpl_dyn/ ../openbsc/ ../quick_vty_tests.opts nothing added to commit but untracked files present (use "git add" to track) https://gerrit.osmocom.org/#/c/11560/4/src/gits at 359 PS4, Line 359: def cmd_fetch(): > you don't need a shim for every git command, you can just put them in a list and iterate over them: [?] Re: shim: the best for consistent help doc is to just add a shim. Re argparse: I see .. seems to me an awful lot of trouble for just sys.argv[1:]. BTW, one thing I don't like about argparse is that it removes line feeds, i.e. paragraphs, from the doc string. In osmo_interact I did parser = argparse.ArgumentParser(description=doc, formatter_class=argparse.RawDescriptionHelpFormatter) but then you also need to take care of line feeds for option arg docs. All in all it often is more meh than yay to me. That said, if you want to change it to argparse so that it works and looks good, do go ahead in a follow-up patch. ok? https://gerrit.osmocom.org/#/c/11560/5/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11560/5/src/gits at 6 PS5, Line 6: # This program is free software: you can redistribute it and/or modify > Out of curiosity: why not use the shorter SPDX form? [?] because I just copy-paste these things from elsewhere :P -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 07 Nov 2018 16:25:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 16:26:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 16:26:25 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 7: Are we through with this now? -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 07 Nov 2018 16:26:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 16:44:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 7 Nov 2018 16:44:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_paging_resp_unsol In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11604 to look at the new patch set (#2). Change subject: bsc: Introduce test TC_paging_resp_unsol ...................................................................... bsc: Introduce test TC_paging_resp_unsol With this test we want to verify that channels are released if BSC fails to complete an L3 request, for instance because no pending Paging CMD is found for a received Paging Response. Related: OS#3680 Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/11604/2 -- To view, visit https://gerrit.osmocom.org/11604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce Gerrit-Change-Number: 11604 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 17:15:14 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 7 Nov 2018 17:15:14 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11657 Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Add ttcn3-bscnat-test docker image Run the bscnat ttcn3 tests in docker. This uses the osmo-nitb-master image since osmo-bsc_nat is built there as well. Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 --- A ttcn3-bscnat-test/BSCNAT_Tests.cfg A ttcn3-bscnat-test/Dockerfile A ttcn3-bscnat-test/Makefile A ttcn3-bscnat-test/bscs.config A ttcn3-bscnat-test/jenkins.sh A ttcn3-bscnat-test/osmo-bsc-nat.cfg 6 files changed, 183 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/11657/1 diff --git a/ttcn3-bscnat-test/BSCNAT_Tests.cfg b/ttcn3-bscnat-test/BSCNAT_Tests.cfg new file mode 100644 index 0000000..e45061d --- /dev/null +++ b/ttcn3-bscnat-test/BSCNAT_Tests.cfg @@ -0,0 +1,30 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/bsc-nat/BSCNAT_Tests.default" + +[LOGGING] +*.JUnitLogger.testsuite_name := "BSCNAT_Tests" + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +mp_bsc_port := 49999; +mp_bsc_ip := "172.18.11.203"; +mp_msc_port := 5100; +mp_msc_ip := "172.18.11.203"; +mp_nat_port := 5000; +mp_nat_ip := "172.18.11.20"; + +#mp_ipa_mgcp_uses_osmo_ext := true; + +mp_mgcp_uses_udp := true; +mp_callagent_ip := "172.18.11.203"; +mp_callagent_udp_port := 2727; +mp_mgw_ip := "172.18.11.20"; +mp_mgw_udp_port := 2427; + +[MAIN_CONTROLLER] + +[EXECUTE] +BSCNAT_Tests.control +#BSCNAT_Tests.TC_recv_dump diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile new file mode 100644 index 0000000..10acf98 --- /dev/null +++ b/ttcn3-bscnat-test/Dockerfile @@ -0,0 +1,32 @@ +FROM laforge/debian-stretch-titan + +RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git + +RUN cd osmo-ttcn3-hacks && \ + git checkout -f -B master origin/master && \ + make deps + +RUN git config --global user.email docker at dock.er && \ + git config --global user.name "Dock Er" + +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN cd osmo-ttcn3-hacks && \ + git fetch && \ + git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ + make bsc-nat + +VOLUME /data + +RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + +COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg + +CMD cd /data && \ + /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc-nat/BSCNAT_Tests; \ + exit_code=$?; \ + /osmo-ttcn3-hacks/log_merge.sh BSCNAT_Tests --rm; \ + exit $exit_code diff --git a/ttcn3-bscnat-test/Makefile b/ttcn3-bscnat-test/Makefile new file mode 100644 index 0000000..0895788 --- /dev/null +++ b/ttcn3-bscnat-test/Makefile @@ -0,0 +1,2 @@ + +include ../make/Makefile diff --git a/ttcn3-bscnat-test/bscs.config b/ttcn3-bscnat-test/bscs.config new file mode 100644 index 0000000..6afa09b --- /dev/null +++ b/ttcn3-bscnat-test/bscs.config @@ -0,0 +1,19 @@ +nat + bsc 0 + token BSC0 + location_area_code 1 + description bsc + max-endpoints 32 + paging forbidden 0 + bsc 1 + token BSC1 + location_area_code 2 + description bsc + max-endpoints 32 + paging forbidden 0 + bsc 2 + token BSC2 + location_area_code 3 + description bsc + max-endpoints 32 + paging forbidden 0 diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh new file mode 100755 index 0000000..d54a31a --- /dev/null +++ b/ttcn3-bscnat-test/jenkins.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +. ../jenkins-common.sh + +mkdir $VOL_BASE_DIR/bscnat-tester +cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/ + +mkdir $VOL_BASE_DIR/bscnat +cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/ +cp bscs.config $VOL_BASE_DIR/bscnat/ + +network_create 172.18.11.0/24 + +echo Starting container with BSCNAT +docker run --rm \ + --network $NET_NAME --ip 172.18.11.20 \ + -v $VOL_BASE_DIR/bscnat:/data \ + --name ${BUILD_TAG}-bscnat -d \ + $REPO_USER/osmo-nitb-master /usr/local/bin/osmo-bsc_nat -c /data/osmo-bsc-nat.cfg + +echo Starting container with BSCNAT testsuite +docker run --rm \ + --network $NET_NAME --ip 172.18.11.203 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/bscnat-tester:/data \ + --name ${BUILD_TAG}-ttcn3-bscnat-test \ + $REPO_USER/ttcn3-bscnat-test + +echo Stopping containers +docker container kill ${BUILD_TAG}-bscnat + +network_remove +collect_logs diff --git a/ttcn3-bscnat-test/osmo-bsc-nat.cfg b/ttcn3-bscnat-test/osmo-bsc-nat.cfg new file mode 100644 index 0000000..4f02366 --- /dev/null +++ b/ttcn3-bscnat-test/osmo-bsc-nat.cfg @@ -0,0 +1,67 @@ +! +! OsmoBSCNAT (0.12.0.266-2daa9) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging timestamp 1 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level mncc notice + logging level pag notice + logging level meas notice + logging level sccp debug + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level db notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level llc debug + logging level sndcp debug + logging level nat notice + logging level ctrl notice + logging level smpp debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice +! +line vty + no login +! +mgcp + bind ip 172.18.11.20 + bind port 2427 + rtp bts-base 4000 + rtp net-base 16000 + rtp ip-dscp 0 + no rtcp-omit + sdp audio-payload number 126 + sdp audio-payload name AMR/8000 + loop 0 + number endpoints 1 + call-agent ip 172.18.11.203 + rtp transcoder-base 0 + transcoder-remote-base 4000 +nat + msc ip 172.18.11.203 + msc port 5100 + token foo + timeout auth 2 + timeout ping 20 + timeout pong 5 + ip-dscp 0 + bscs-config-file bscs.config + access-list msceven imsi-allow ^[0-9]*[24680]$ + access-list mscodd imsi-allow ^[0-9]*[13579]$ -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 17:31:36 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 7 Nov 2018 17:31:36 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Add ttcn3-bscnat-test docker image Run the bscnat ttcn3 tests in docker. This uses the osmo-nitb-master image since osmo-bsc_nat is built there as well. Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 --- A ttcn3-bscnat-test/BSCNAT_Tests.cfg A ttcn3-bscnat-test/Dockerfile A ttcn3-bscnat-test/Makefile A ttcn3-bscnat-test/bscs.config A ttcn3-bscnat-test/jenkins.sh A ttcn3-bscnat-test/osmo-bsc-nat.cfg 6 files changed, 190 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/11657/2 -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 2 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 19:15:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 7 Nov 2018 19:15:55 +0000 Subject: Change in osmo-bsc[master]: prevent a NULL pointer dereference in debug_candidate() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11630 ) Change subject: prevent a NULL pointer dereference in debug_candidate() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11630/1/src/osmo-bsc/handover_decision_2.c File src/osmo-bsc/handover_decision_2.c: https://gerrit.osmocom.org/#/c/11630/1/src/osmo-bsc/handover_decision_2.c at 844 PS1, Line 844: } AFAICT the logic was already sound. lchan->ts->trx->bts by definition is never NULL, hence we never hit a NULL dereference situation? Where is this coming from, reading code, a coverity warning or actual failure? (If this remains valid, then rather exit-early like if (!candidate->bts) return;) -- To view, visit https://gerrit.osmocom.org/11630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3d672d835bbc136809e593a819a6dda7c84a88e Gerrit-Change-Number: 11630 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 07 Nov 2018 19:15:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 20:54:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 7 Nov 2018 20:54:35 +0000 Subject: Change in libosmocore[master]: GSUP: introduce new InvokeID Information Element In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11633 ) Change subject: GSUP: introduce new InvokeID Information Element ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: If14006b035ff465b73b39ea4cd59e5fd16a4d7ff Gerrit-Change-Number: 11633 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 7 20:56:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 7 Nov 2018 20:56:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: introduce new InvokeID IE In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/11640 ) Change subject: library/GSUP_Types.ttcn: introduce new InvokeID IE ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ib7ed702cb05328dc4d1f459efc93df4fa947d7ae Gerrit-Change-Number: 11640 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 00:05:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 8 Nov 2018 00:05:17 +0000 Subject: Change in osmo-bsc[master]: prevent a NULL pointer dereference in debug_candidate() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11630 ) Change subject: prevent a NULL pointer dereference in debug_candidate() ...................................................................... Patch Set 1: Neels, > Related: CID#188880 -- To view, visit https://gerrit.osmocom.org/11630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3d672d835bbc136809e593a819a6dda7c84a88e Gerrit-Change-Number: 11630 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 08 Nov 2018 00:05:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:56:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:56:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: remove flush from f_expect_chan_rel Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11658 Change subject: bsc: remove flush from f_expect_chan_rel ...................................................................... bsc: remove flush from f_expect_chan_rel When we're expecting release, it can be non-deterministic / timing dependent to flush the RSL queue. Particularly the RR Release message is typically already in the queue when f_expect_chan_rel() is called and would be lost. It turns out that none of the current callers need the flush feature. If a test needs it, we can add a separate f_rsl_flush() function and call that, no need to clutter up the f_expect_chan_rel() argument list. I had such function but found that no caller needs it, so dropped it. Related: OS#3413 Change-Id: Ie1be30c3f109dda8c58c523df508211f8e20aad3 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/11658/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e3ac707..551ffe0 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -824,14 +824,10 @@ setverdict(pass); } -function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, boolean flush := true, +function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, boolean handle_rll_rel := true) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); - if (flush) { - /* Clear the queue, it might still contain stuff like IMMEDIATE ASSIGN */ - IPA_RSL[bts_nr].clear; - } alt { /* ignore DEACTIVATE SACCH (if any) */ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, @@ -912,7 +908,7 @@ /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); - f_expect_chan_rel(0, dt.rsl_chan_nr, true, false); + f_expect_chan_rel(0, dt.rsl_chan_nr, handle_rll_rel := false); setverdict(pass); } @@ -934,7 +930,7 @@ [] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { } } - f_expect_chan_rel(0, dt.rsl_chan_nr, false); + f_expect_chan_rel(0, dt.rsl_chan_nr); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/11658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1be30c3f109dda8c58c523df508211f8e20aad3 Gerrit-Change-Number: 11658 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:56:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:56:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_chan_act_ack_est_ind_noreply: use f_expect_chan_rel Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11659 Change subject: bsc: TC_chan_act_ack_est_ind_noreply: use f_expect_chan_rel ...................................................................... bsc: TC_chan_act_ack_est_ind_noreply: use f_expect_chan_rel Instead of placing an own set of channel release expectations, just use the common f_expect_chan_rel() that exists for exactly this purpose. This will also be in line with upcoming changes to tighten checking of the lchan release messages. Related: OS#3413 Change-Id: Ib7dd886472337e2deb968e6f9de6cecdb7855319 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/11659/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 551ffe0..a2a3378 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -429,15 +429,7 @@ /* expect BSC to disable the channel again if there's no response from MSC */ /* MS waits 20s (T3210) at LU; 10s (T3230) at CM SERV REQ and 5s (T3220) AT detach */ - IPA_RSL[0].clear; - alt { - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(sid, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) -> value rx_rsl_ud { } - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(sid, tr_RSL_REL_REQ(chan_nr, ?))) -> value rx_rsl_ud { - f_ipa_tx(0, ts_RSL_REL_CONF(chan_nr, main_dcch)); - repeat; - } - } - + f_expect_chan_rel(0, chan_nr); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/11659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7dd886472337e2deb968e6f9de6cecdb7855319 Gerrit-Change-Number: 11659 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:56:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:56:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: handle RR Release messages Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11660 Change subject: bsc: handle RR Release messages ...................................................................... bsc: handle RR Release messages Receive RR Release messages if they happen during lchan release. Add RR Release to the alt{}s in both f_expect_chan_rel() to cover a whole bunch of test cases, and in f_tc_ho_out_fail_no_ho_detect() which has its own release expectations. Before this, RR Release messages would typically be lost in the RSL.clear recently removed by Ie1be30c3f109dda8c58c523df508211f8e20aad3. However, I still expect tests to pass after this, since the current osmo-bsc master has a bug that omits RR Release messages (since [1]). By applying this patch, both the buggy osmo-bsc (omitting RR Release) and the fix of that [2] should pass the BSC tests. So far by accepting whatever comes along, and not complaining if it doesn't come along. A subsequent patch will more precisely ensure that exactly the expected messages will be sent by osmo-bsc (Ibc64058f1e214bea585f4e8dcb66f3df8ead3845). [1] osmo-bsc I4fd582b41ba4599af704d670af83651d2450b1db commit 8b818a01b00ea3daad4ad58c162ac52b4f08a5cb "subscr conn: properly forget lchan before release" [2] osmo-bsc I666b3b4f45706d898d664d380bd0fd2b018be358 "fix: send RR Release (e.g. after BSSMAP Clear Cmd" Related: OS#3413 Change-Id: I4e6d266d091b140f56b28312cb3c5d67ffcc3a59 --- M bsc/BSC_Tests.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/11660/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a2a3378..fcccad0 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -820,12 +820,16 @@ boolean handle_rll_rel := true) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); + var octetstring l3_rr_chan_rel := '060D00'O; alt { /* ignore DEACTIVATE SACCH (if any) */ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DEACT_SACCH(rsl_chan_nr))) { repeat; } + [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, l3_rr_chan_rel))) { + repeat; + } /* acknowledge RLL release (if any)*/ [handle_rll_rel] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_REL_REQ(rsl_chan_nr, ?))) { @@ -2441,7 +2445,11 @@ * RR should be released and Clear Request should go to the MSC. */ var MgcpCommand mgcp; + var octetstring l3_rr_chan_rel := '060D00'O; interleave { + [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, l3_rr_chan_rel)) { + log("Got RR Release"); + } [] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) { log("Got RF Chan Rel"); RSL.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr)); -- To view, visit https://gerrit.osmocom.org/11660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4e6d266d091b140f56b28312cb3c5d67ffcc3a59 Gerrit-Change-Number: 11660 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:56:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:56:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: handle Deact SACCH messages Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11661 Change subject: bsc: handle Deact SACCH messages ...................................................................... bsc: handle Deact SACCH messages Allow osmo-bsc sending a Deact SACCH messages in most cases. Prepare the ttcn3-bsc-tests to not break just because of those messages that will soon be sent. When releasing an lchan, it makes sense to Deactivate SACCH on it, if it was ever active. So far osmo-bsc was fairly reluctant to send Deactivate SACCH, but osmo-bsc Id3301df059582da2377ef82feae554e94fa42035 is about to change that. In most test cases, Deact SACCH are still optional, but in one case, the current missing Deact SACCH will introduce a test failure: in the 'interleave' of BSC_Tests.TC_ho_out_fail_no_ho_detect. As soon as abovementioned osmo-bsc patch is merged, the test will pass again. Also, as soon as Ibc64058f1e214bea585f4e8dcb66f3df8ead3845 is merged here, the bsc tests will properly ensure whether Deact SACCH is sent or not in all tests. Change-Id: I27da24dbe3184fa7a076a35f6fa6af457c1db8d2 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/11661/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fcccad0..b1f3a31 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2182,6 +2182,7 @@ /* Check the amount of MGCP transactions is still consistant with the * test expectation */ f_check_mgcp_expectations() + f_sleep(0.5); } testcase TC_ho_int() runs on test_CT { @@ -2447,6 +2448,9 @@ var MgcpCommand mgcp; var octetstring l3_rr_chan_rel := '060D00'O; interleave { + [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) { + log("Got Deact SACCH"); + } [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, l3_rr_chan_rel)) { log("Got RR Release"); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 003813a..07eafc7 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -682,6 +682,9 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected L3 received", l3)); } } + [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) { + repeat; + } [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) { RSL.send(ts_RSL_REL_CONF(st.old_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); repeat; @@ -1043,6 +1046,9 @@ } [st.rr_ho_cmpl_seen] as_Media_ipacc(); [st.rr_ho_cmpl_seen] as_Media_mgw(true); + [st.rr_ho_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) { + repeat; + } [st.rr_ho_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) { RSL.send(ts_RSL_REL_CONF(st.old_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); repeat; -- To view, visit https://gerrit.osmocom.org/11661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I27da24dbe3184fa7a076a35f6fa6af457c1db8d2 Gerrit-Change-Number: 11661 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:56:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:56:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: check channel release message presence Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11662 Change subject: bsc: check channel release message presence ...................................................................... bsc: check channel release message presence Instead of vaguely allowing any release messages to be present or not, exactly pinpoint for each test case the exact release messages expected during lchan release. Related: an osmo-bsc change broke sending of RR Release messages, which was utterly ignored and hence not caught by ttcn tests. That must not happen again. I am not actually sure that these expectations are 100% correct; if errors become apparent, we shall change the expectations in ttcn3 and then fix osmo-bsc according to that. Adjust f_expect_chan_rel() and callers, and the Assignment procedures (as_assignment and f_establish_fully). The current state of the bsc tests should all pass with osmo-bsc Id3301df059582da2377ef82feae554e94fa42035 Related: OS#3413 Change-Id: Ibc64058f1e214bea585f4e8dcb66f3df8ead3845 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 53 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/11662/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b1f3a31..e06f496 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -429,7 +429,7 @@ /* expect BSC to disable the channel again if there's no response from MSC */ /* MS waits 20s (T3210) at LU; 10s (T3230) at CM SERV REQ and 5s (T3220) AT detach */ - f_expect_chan_rel(0, chan_nr); + f_expect_chan_rel(0, chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -450,7 +450,7 @@ BSSAP.send(ts_BSSAP_DISC_req(rx_c_ind.connectionId, 0)); /* expect BSC to disable the channel */ - f_expect_chan_rel(0, chan_nr); + f_expect_chan_rel(0, chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -817,32 +817,38 @@ } function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, - boolean handle_rll_rel := true) runs on test_CT { + boolean expect_deact_sacch := true, + boolean expect_rr_chan_rel := true, + boolean expect_rll_rel_req := true, + boolean handle_rll_rel := true + ) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); var octetstring l3_rr_chan_rel := '060D00'O; + var boolean got_deact_sacch := false; + var boolean got_rr_chan_rel := false; + var boolean got_rll_rel_req := false; + log("f_expect_chan_rel() expecting: expect_deact_sacch=", expect_deact_sacch, " expect_rr_chan_rel=", expect_rr_chan_rel, + " expect_rll_rel_req=", expect_rll_rel_req); alt { - /* ignore DEACTIVATE SACCH (if any) */ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DEACT_SACCH(rsl_chan_nr))) { + got_deact_sacch := true; repeat; } [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, l3_rr_chan_rel))) { + got_rr_chan_rel := true; repeat; } - /* acknowledge RLL release (if any)*/ - [handle_rll_rel] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, + [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_REL_REQ(rsl_chan_nr, ?))) { + got_rll_rel_req := true; /* FIXME: Why are we getting this for LinkID SACCH? */ - f_ipa_tx(0, ts_RSL_REL_CONF(rsl_chan_nr, main_dcch)); + if (handle_rll_rel) { + f_ipa_tx(0, ts_RSL_REL_CONF(rsl_chan_nr, main_dcch)); + } repeat; } - [not handle_rll_rel] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, - tr_RSL_REL_REQ(rsl_chan_nr, ?))) { - /* Do not reply, just continue */ - repeat; - } - /* Expect RF channel release from BSC on Abis */ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) { /* respond with CHAN REL ACK */ @@ -853,6 +859,19 @@ repeat; } } + + log("f_expect_chan_rel() summary: got_deact_sacch=", got_deact_sacch, " got_rr_chan_rel=", got_rr_chan_rel, + " got_rll_rel_req=", got_rll_rel_req); + + if (expect_deact_sacch != got_deact_sacch) { + setverdict(fail, "f_expect_chan_rel(): expect_deact_sacch=", expect_deact_sacch, " got_deact_sacch=", got_deact_sacch); + } + if (expect_rr_chan_rel != got_rr_chan_rel) { + setverdict(fail, "f_expect_chan_rel(): expect_rr_chan_rel=", expect_rr_chan_rel, " got_rr_chan_rel=", got_rr_chan_rel); + } + if (expect_rll_rel_req != got_rll_rel_req) { + setverdict(fail, "f_expect_chan_rel(): expect_rll_rel_req=", expect_rll_rel_req, " got_rll_rel_req=", got_rll_rel_req); + } } /* Test behavior of channel release after hard Clear Command from MSC */ @@ -874,7 +893,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); } - f_expect_chan_rel(0, dt.rsl_chan_nr); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -889,7 +908,7 @@ /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); - f_expect_chan_rel(0, dt.rsl_chan_nr); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -904,7 +923,7 @@ /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); - f_expect_chan_rel(0, dt.rsl_chan_nr, handle_rll_rel := false); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -926,7 +945,7 @@ [] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { } } - f_expect_chan_rel(0, dt.rsl_chan_nr); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 07eafc7..116d7af 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -603,6 +603,8 @@ boolean is_assignment, /* Assignment related bits */ boolean rr_ass_cmpl_seen, + boolean old_lchan_deact_sacch_seen, + boolean old_lchan_rll_rel_req_seen, boolean assignment_done, RslChannelNr old_chan_nr, /* Modify related bits */ @@ -614,6 +616,8 @@ voice_call := false, is_assignment := false, rr_ass_cmpl_seen := false, + old_lchan_deact_sacch_seen := false, + old_lchan_rll_rel_req_seen := false, assignment_done := false, old_chan_nr := -, rr_modify_seen := false, @@ -683,9 +687,11 @@ } } [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) { + st.old_lchan_deact_sacch_seen := true; repeat; } [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) { + st.old_lchan_rll_rel_req_seen := true; RSL.send(ts_RSL_REL_CONF(st.old_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); repeat; } @@ -994,6 +1000,17 @@ } f_check_mgcp_expectations(); + + if (st.is_assignment and st.assignment_done) { + if (not st.old_lchan_deact_sacch_seen) { + setverdict(fail, "f_establish_fully(): Assignment completed, but the old lchan was not", + " released properly: expected a Deact SACCH on the old lchan, but saw none."); + } + if (st.old_lchan_rll_rel_req_seen) { + setverdict(fail, "f_establish_fully(): Assignment completed, but the old lchan was not", + " released properly: saw an RLL Release on the old lchan, but expecting none."); + } + } } type record HandoverState { -- To view, visit https://gerrit.osmocom.org/11662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc64058f1e214bea585f4e8dcb66f3df8ead3845 Gerrit-Change-Number: 11662 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:56:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:56:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: disable tcpdump Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11663 Change subject: disable tcpdump ...................................................................... disable tcpdump Change-Id: I46116df68b2f8c9ca253a9285d0a571904521727 --- M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/11663/1 diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 395941d..0659df1 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -4,6 +4,8 @@ TCPDUMP=/usr/sbin/tcpdump TESTCASE=$1 +exit 0 + if [ "z$TTCN3_PCAP_PATH" = "z" ]; then TTCN3_PCAP_PATH=/tmp fi diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 9404841..15c34cb 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -11,6 +11,8 @@ fi echo +exit 0 + if [ "z$TTCN3_PCAP_PATH" = "z" ]; then TTCN3_PCAP_PATH=/tmp fi -- To view, visit https://gerrit.osmocom.org/11663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I46116df68b2f8c9ca253a9285d0a571904521727 Gerrit-Change-Number: 11663 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:57:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:57:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: disable tcpdump In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/11663 ) Change subject: disable tcpdump ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I46116df68b2f8c9ca253a9285d0a571904521727 Gerrit-Change-Number: 11663 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:58:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:58:20 +0000 Subject: Change in osmo-bsc[master]: fix: send RR Release (e.g. after BSSMAP Clear Cmd) Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11664 Change subject: fix: send RR Release (e.g. after BSSMAP Clear Cmd) ...................................................................... fix: send RR Release (e.g. after BSSMAP Clear Cmd) After commit [1], the code makes sure to disassociate lchan and conn before invoking the lchan release. However, we only send RR Release if a conn is present, which clearly is nonsense after [1]. [1] commit 8b818a01b00ea3daad4ad58c162ac52b4f08a5cb "subscr conn: properly forget lchan before release" Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db Manage sending of RR Release via a flag, set during invoking lchan release. Add do_rr_release arg to lchan_release(), gscon_release_lchans(). In lchan_fsm.c, send RR Release only if do_rr_release was passed true; do not care whether a conn is still associated (because it won't ever be since [1]). That way we can intelligently decide what release process makes sense (whether the lchan terminates the subscriber connection or whether the connection goes on at another lchan), and still disassociate lchan and conn early. BTW, this problem wasn't caught by the stock OsmoBSC TTCN3 tests, because the f_expect_chan_rel() don't care whether an RR Release happens or not. This is being fixed by Ibc64058f1e214bea585f4e8dcb66f3df8ead3845. So far this patch should fix BSC_Tests_LCLS.TC_lcls_connect_clear. Related: OS#3413 Change-Id: I666b3b4f45706d898d664d380bd0fd2b018be358 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M tests/gsm0408/gsm0408_test.c 12 files changed, 32 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/11664/1 diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index d4de1c9..fcdba50 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -71,7 +71,7 @@ struct assignment_request *req); void gscon_change_primary_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan); -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact); +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact, bool do_rr_release); void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7897fea..6ad6fce 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -514,6 +514,7 @@ * flag, so that the lchan will gracefully release at the next sensible junction. */ bool release_requested; bool deact_sacch; + bool do_rr_release; char *last_error; diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index d2e8724..d3315a6 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -49,7 +49,7 @@ void lchan_fsm_init(); void lchan_fsm_alloc(struct gsm_lchan *lchan); -void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, +void lchan_release(struct gsm_lchan *lchan, bool do_deact_sacch, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr); struct lchan_activate_info { diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index bd104ed..ea537fe 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -901,7 +901,7 @@ * the connection will presumably be torn down and lead to an lchan release. During initial * Channel Request from the MS, an lchan has no conn yet, so in that case release now. */ if (!lchan->conn) { - lchan_release(lchan, false, true, *cause_p); + lchan_release(lchan, false, false, true, *cause_p); } else osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_RSL_CONN_FAIL, (void*)cause_p); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 3f553ff..653681e 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -98,7 +98,7 @@ if (conn->assignment.new_lchan) { struct gsm_lchan *lchan = conn->assignment.new_lchan; conn->assignment.new_lchan = NULL; - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); } if (conn->assignment.created_ci_for_msc) { @@ -213,7 +213,7 @@ if (!conn->assignment.fi) { /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan, * the conn will notice that its primary lchan is gone and should clean itself up. */ - lchan_release(conn->lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(conn->lchan, false, true, true, RSL_ERR_EQUIPMENT_FAIL); return; } diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index bca9e1f..8c11521 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -152,7 +152,7 @@ /* Release an lchan in such a way that it doesn't fire events back to the conn. */ static void gscon_release_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan, - bool do_sacch_deact, bool err, enum gsm48_rr_cause cause_rr) + bool do_sacch_deact, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) { if (!lchan || !conn) return; @@ -164,17 +164,17 @@ conn->ho.new_lchan = NULL; if (conn->assignment.new_lchan == lchan) conn->assignment.new_lchan = NULL; - lchan_release(lchan, do_sacch_deact, err, cause_rr); + lchan_release(lchan, do_sacch_deact, do_rr_release, err, cause_rr); } -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact) +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact, bool do_rr_release) { if (conn->ho.fi) handover_end(conn, HO_RESULT_CONN_RELEASE); assignment_reset(conn); - gscon_release_lchan(conn, conn->lchan, do_sacch_deact, false, 0); + gscon_release_lchan(conn, conn->lchan, do_sacch_deact, do_rr_release, false, 0); } static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) @@ -620,7 +620,7 @@ osmo_fsm_inst_dispatch(conn->lchan->fi_rtp, LCHAN_RTP_EV_ESTABLISHED, 0); if (old_lchan && (old_lchan != new_lchan)) - gscon_release_lchan(conn, old_lchan, false, false, 0); + gscon_release_lchan(conn, old_lchan, false, false, false, 0); } void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) @@ -694,7 +694,7 @@ if (conn->fi->state != ST_CLEARING) osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999); LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) after BSSMAP Clear Command\n"); - gscon_release_lchans(conn, true); + gscon_release_lchans(conn, true, true); /* FIXME: Release all terestrial resources in ST_CLEARING */ /* According to 3GPP 48.008 3.1.9.1. "The BSS need not wait for the radio channel * release to be completed or for the guard timer to expire before returning the @@ -770,7 +770,7 @@ } LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) because this conn is terminating\n"); - gscon_release_lchans(conn, false); + gscon_release_lchans(conn, false, true); /* drop pending messages */ gscon_dtap_queue_flush(conn, 0); @@ -784,7 +784,7 @@ switch (fi->T) { case 993210: - gscon_release_lchan(conn, conn->lchan, false, true, RSL_ERR_INTERWORKING); + gscon_release_lchan(conn, conn->lchan, false, true, true, RSL_ERR_INTERWORKING); /* MSC has not responded/confirmed connection with CC, this * could indicate a bad SCCP connection. We now inform the the diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 84752dd..9f42d8a 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4588,7 +4588,7 @@ } vty_out(vty, "%% Asking for release of %s in state %s%s", gsm_lchan_name(lchan), osmo_fsm_inst_state_name(lchan->fi), VTY_NEWLINE); - lchan_release(lchan, false, false, 0); + lchan_release(lchan, false, !!(lchan->conn), false, 0); } return CMD_SUCCESS; diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 4659c1a..c3dd307 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -942,7 +942,7 @@ /* allocate a new connection */ lchan->conn = bsc_subscr_con_allocate(msg->lchan->ts->trx->bts->network); if (!lchan->conn) { - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); return -1; } lchan->conn->lchan = lchan; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 19c2598..b20675a 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -541,7 +541,7 @@ /* FIXME: I have not the slightest idea what move_to_msc() intends to do; during lchan * FSM introduction, I changed this and hope it is the appropriate action. I actually * assume this is unused legacy code for osmo-bsc_nat?? */ - gscon_release_lchans(_conn, false); + gscon_release_lchans(_conn, false, false); return 1; } diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 0107ef0..8076eeb 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -243,7 +243,7 @@ struct mgwep_ci *ci; if (conn->ho.new_lchan) /* New lchan was activated but never passed to a conn */ - lchan_release(conn->ho.new_lchan, true, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(conn->ho.new_lchan, true, false, true, RSL_ERR_EQUIPMENT_FAIL); ci = conn->ho.created_ci_for_msc; if (ci) { @@ -725,7 +725,7 @@ /* 3GPP TS 48.008 3.1.5.3.3 "Abnormal Conditions": if neither MS reports * HO Failure nor the MSC sends a Clear Command, we should release the * dedicated radio resources and send a Clear Request to the MSC. */ - lchan_release(conn->lchan, false, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); + lchan_release(conn->lchan, false, true, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); /* Once the channel release is through, the BSSMAP Clear will follow. */ break; } @@ -756,7 +756,7 @@ /* Detach the new_lchan last, so we can still see it in above logging */ if (ho->new_lchan) { /* Release new lchan, it didn't work out */ - lchan_release(ho->new_lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(ho->new_lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); ho->new_lchan = NULL; } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 915b62a..e15adbe 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -156,14 +156,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->assignment.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no" " assignment ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } osmo_fsm_inst_dispatch(lchan->conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ESTABLISHED, @@ -177,14 +177,14 @@ if (!lchan->conn) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no conn\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->ho.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no" " handover ongoing\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } osmo_fsm_inst_dispatch(lchan->conn->ho.fi, HO_EV_LCHAN_ESTABLISHED, lchan); @@ -720,14 +720,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->assignment.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no" " assignment ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } /* After the Chan Activ Ack, the MS expects to receive an RR Assignment Command. @@ -740,14 +740,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->ho.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no" " handover ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } /* After the Chan Activ Ack of the new lchan, send the MS an RR Handover Command on the @@ -937,7 +937,7 @@ if (lchan->sapis[sapi]) LOG_LCHAN(lchan, LOGL_DEBUG, "SAPI[%d] = %d\n", sapi, lchan->sapis[sapi]); - if (lchan->conn && lchan->sapis[0] != LCHAN_SAPI_UNUSED) + if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) gsm48_send_rr_release(lchan); if (lchan->fi_rtp) @@ -1289,7 +1289,7 @@ } } -void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, +void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) { if (!lchan || !lchan->fi) @@ -1303,6 +1303,7 @@ lchan->release_in_error = err; lchan->rsl_error_cause = cause_rr; lchan->deact_sacch = sacch_deact; + lchan->do_rr_release = do_rr_release; /* States waiting for events will notice the desire to release when done waiting, so it is enough * to mark for release. */ diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index f2b85e4..1e6a097 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -986,7 +986,7 @@ const char *bsc_subscr_name(struct bsc_subscr *bsub) { return NULL; } -void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, +void lchan_release(struct gsm_lchan *lchan, bool do_deact_sacch, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) {} int rsl_data_request(struct msgb *msg, uint8_t link_id) { return 0; } -- To view, visit https://gerrit.osmocom.org/11664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I666b3b4f45706d898d664d380bd0fd2b018be358 Gerrit-Change-Number: 11664 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:58:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:58:21 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: drop unused enum sacch_deact Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11665 Change subject: abis_rsl.c: drop unused enum sacch_deact ...................................................................... abis_rsl.c: drop unused enum sacch_deact Change-Id: I8a1542e92373d2773699744e7b64a08667a4b0f5 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/11665/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index ea537fe..0ec8fbc 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -56,11 +56,6 @@ #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 -enum sacch_deact { - SACCH_NONE, - SACCH_DEACTIVATE, -}; - static void send_lchan_signal(int sig_no, struct gsm_lchan *lchan, struct gsm_meas_rep *resp) { -- To view, visit https://gerrit.osmocom.org/11665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8a1542e92373d2773699744e7b64a08667a4b0f5 Gerrit-Change-Number: 11665 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:58:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:58:21 +0000 Subject: Change in osmo-bsc[master]: lchan: release in error: fix missing messages / events Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11666 Change subject: lchan: release in error: fix missing messages / events ...................................................................... lchan: release in error: fix missing messages / events In the case where there is a release in error and we skip immediately to the RF Release state, send all of Deact SACCH, RR Release messages and also signal the lchan_rtp_fsm as appropriate. Move that code to static lchan_do_release() and call from both lchan_fsm_wait_rll_rtp_released_onenter() in the normal case, as well as lchan_release() when skipping that. When releasing in error, but we're already in LCHAN_ST_WAIT_RLL_RTP_RELEASED, those messages have already been sent and we can skip them. Change-Id: I648a9826ce56b611359f81462ca03e4ab4c736aa --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 18 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/11666/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e15adbe..2cb7c3e 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -927,6 +927,18 @@ } } +static void lchan_do_release(struct gsm_lchan *lchan) +{ + if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) + gsm48_send_rr_release(lchan); + + if (lchan->fi_rtp) + osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_RELEASE, 0); + + if (lchan->deact_sacch && should_sacch_deact(lchan)) + rsl_deact_sacch(lchan); +} + static void lchan_fsm_wait_rll_rtp_released_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { int sapis; @@ -937,14 +949,7 @@ if (lchan->sapis[sapi]) LOG_LCHAN(lchan, LOGL_DEBUG, "SAPI[%d] = %d\n", sapi, lchan->sapis[sapi]); - if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) - gsm48_send_rr_release(lchan); - - if (lchan->fi_rtp) - osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_RELEASE, 0); - - if (lchan->deact_sacch && should_sacch_deact(lchan)) - rsl_deact_sacch(lchan); + lchan_do_release(lchan); sapis = 0; for_each_active_sapi(sapi, 1, lchan) { @@ -1317,10 +1322,11 @@ if (lchan->release_in_error) { switch (lchan->fi->state) { default: - /* Normally we deact SACCH in lchan_fsm_wait_rll_rtp_released_onenter(). When - * skipping that, but asked to SACCH deact, do it now. */ - if (lchan->deact_sacch) - rsl_deact_sacch(lchan); + /* Normally we signal release in lchan_fsm_wait_rll_rtp_released_onenter(). When + * skipping that, do it now. */ + lchan_do_release(lchan); + /* fall thru */ + case LCHAN_ST_WAIT_RLL_RTP_RELEASED: lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK); goto exit_release_handler; case LCHAN_ST_WAIT_TS_READY: -- To view, visit https://gerrit.osmocom.org/11666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I648a9826ce56b611359f81462ca03e4ab4c736aa Gerrit-Change-Number: 11666 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:58:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:58:22 +0000 Subject: Change in osmo-bsc[master]: lchan release: always Deact SACCH Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11667 Change subject: lchan release: always Deact SACCH ...................................................................... lchan release: always Deact SACCH If an lchan is being released and had a SACCH active, there is no reason to omit the Deact SACCH message ever. All of the callers that passed do_deact_sachh = false did so for no good reason. Drop the do_deact_sachh flag everywhere and, when the lchan type matches and SAPI[0] is still active, simply always send a Deact SACCH message. The do_deact_sachh flag was carried over from legacy code, by me, mainly because I never really understood why it was there. I do hope I'm correct now, asserting that having this flag makes no sense. Change-Id: Id3301df059582da2377ef82feae554e94fa42035 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c 13 files changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/11667/1 diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index fcdba50..f5ed7bd 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -71,7 +71,7 @@ struct assignment_request *req); void gscon_change_primary_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan); -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact, bool do_rr_release); +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release); void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 6ad6fce..b257b67 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -513,7 +513,6 @@ /* If an event to release the lchan comes in while still waiting for responses, just mark this * flag, so that the lchan will gracefully release at the next sensible junction. */ bool release_requested; - bool deact_sacch; bool do_rr_release; char *last_error; diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index d3315a6..48cd383 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -49,7 +49,7 @@ void lchan_fsm_init(); void lchan_fsm_alloc(struct gsm_lchan *lchan); -void lchan_release(struct gsm_lchan *lchan, bool do_deact_sacch, bool do_rr_release, +void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr); struct lchan_activate_info { diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 0ec8fbc..c16f044 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -896,7 +896,7 @@ * the connection will presumably be torn down and lead to an lchan release. During initial * Channel Request from the MS, an lchan has no conn yet, so in that case release now. */ if (!lchan->conn) { - lchan_release(lchan, false, false, true, *cause_p); + lchan_release(lchan, false, true, *cause_p); } else osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_RSL_CONN_FAIL, (void*)cause_p); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 653681e..93362f8 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -98,7 +98,7 @@ if (conn->assignment.new_lchan) { struct gsm_lchan *lchan = conn->assignment.new_lchan; conn->assignment.new_lchan = NULL; - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); } if (conn->assignment.created_ci_for_msc) { @@ -213,7 +213,7 @@ if (!conn->assignment.fi) { /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan, * the conn will notice that its primary lchan is gone and should clean itself up. */ - lchan_release(conn->lchan, false, true, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(conn->lchan, true, true, RSL_ERR_EQUIPMENT_FAIL); return; } diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 8c11521..86f8354 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -152,7 +152,7 @@ /* Release an lchan in such a way that it doesn't fire events back to the conn. */ static void gscon_release_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan, - bool do_sacch_deact, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) + bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) { if (!lchan || !conn) return; @@ -164,17 +164,17 @@ conn->ho.new_lchan = NULL; if (conn->assignment.new_lchan == lchan) conn->assignment.new_lchan = NULL; - lchan_release(lchan, do_sacch_deact, do_rr_release, err, cause_rr); + lchan_release(lchan, do_rr_release, err, cause_rr); } -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact, bool do_rr_release) +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) { if (conn->ho.fi) handover_end(conn, HO_RESULT_CONN_RELEASE); assignment_reset(conn); - gscon_release_lchan(conn, conn->lchan, do_sacch_deact, do_rr_release, false, 0); + gscon_release_lchan(conn, conn->lchan, do_rr_release, false, 0); } static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) @@ -620,7 +620,7 @@ osmo_fsm_inst_dispatch(conn->lchan->fi_rtp, LCHAN_RTP_EV_ESTABLISHED, 0); if (old_lchan && (old_lchan != new_lchan)) - gscon_release_lchan(conn, old_lchan, false, false, false, 0); + gscon_release_lchan(conn, old_lchan, false, false, 0); } void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) @@ -694,7 +694,7 @@ if (conn->fi->state != ST_CLEARING) osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999); LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) after BSSMAP Clear Command\n"); - gscon_release_lchans(conn, true, true); + gscon_release_lchans(conn, true); /* FIXME: Release all terestrial resources in ST_CLEARING */ /* According to 3GPP 48.008 3.1.9.1. "The BSS need not wait for the radio channel * release to be completed or for the guard timer to expire before returning the @@ -770,7 +770,7 @@ } LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) because this conn is terminating\n"); - gscon_release_lchans(conn, false, true); + gscon_release_lchans(conn, true); /* drop pending messages */ gscon_dtap_queue_flush(conn, 0); @@ -784,7 +784,7 @@ switch (fi->T) { case 993210: - gscon_release_lchan(conn, conn->lchan, false, true, true, RSL_ERR_INTERWORKING); + gscon_release_lchan(conn, conn->lchan, true, true, RSL_ERR_INTERWORKING); /* MSC has not responded/confirmed connection with CC, this * could indicate a bad SCCP connection. We now inform the the diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 9f42d8a..8eb0692 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4588,7 +4588,7 @@ } vty_out(vty, "%% Asking for release of %s in state %s%s", gsm_lchan_name(lchan), osmo_fsm_inst_state_name(lchan->fi), VTY_NEWLINE); - lchan_release(lchan, false, !!(lchan->conn), false, 0); + lchan_release(lchan, !!(lchan->conn), false, 0); } return CMD_SUCCESS; diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index c3dd307..4659c1a 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -942,7 +942,7 @@ /* allocate a new connection */ lchan->conn = bsc_subscr_con_allocate(msg->lchan->ts->trx->bts->network); if (!lchan->conn) { - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); return -1; } lchan->conn->lchan = lchan; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index b20675a..19c2598 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -541,7 +541,7 @@ /* FIXME: I have not the slightest idea what move_to_msc() intends to do; during lchan * FSM introduction, I changed this and hope it is the appropriate action. I actually * assume this is unused legacy code for osmo-bsc_nat?? */ - gscon_release_lchans(_conn, false, false); + gscon_release_lchans(_conn, false); return 1; } diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 8076eeb..f2836cf 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -243,7 +243,7 @@ struct mgwep_ci *ci; if (conn->ho.new_lchan) /* New lchan was activated but never passed to a conn */ - lchan_release(conn->ho.new_lchan, true, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(conn->ho.new_lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); ci = conn->ho.created_ci_for_msc; if (ci) { @@ -725,7 +725,7 @@ /* 3GPP TS 48.008 3.1.5.3.3 "Abnormal Conditions": if neither MS reports * HO Failure nor the MSC sends a Clear Command, we should release the * dedicated radio resources and send a Clear Request to the MSC. */ - lchan_release(conn->lchan, false, true, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); + lchan_release(conn->lchan, true, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); /* Once the channel release is through, the BSSMAP Clear will follow. */ break; } @@ -756,7 +756,7 @@ /* Detach the new_lchan last, so we can still see it in above logging */ if (ho->new_lchan) { /* Release new lchan, it didn't work out */ - lchan_release(ho->new_lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(ho->new_lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); ho->new_lchan = NULL; } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 2cb7c3e..9964fcf 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -156,14 +156,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->assignment.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no" " assignment ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } osmo_fsm_inst_dispatch(lchan->conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ESTABLISHED, @@ -177,14 +177,14 @@ if (!lchan->conn) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no conn\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->ho.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no" " handover ongoing\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } osmo_fsm_inst_dispatch(lchan->conn->ho.fi, HO_EV_LCHAN_ESTABLISHED, lchan); @@ -720,14 +720,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->assignment.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no" " assignment ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } /* After the Chan Activ Ack, the MS expects to receive an RR Assignment Command. @@ -740,14 +740,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->ho.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no" " handover ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } /* After the Chan Activ Ack of the new lchan, send the MS an RR Handover Command on the @@ -935,7 +935,7 @@ if (lchan->fi_rtp) osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_RELEASE, 0); - if (lchan->deact_sacch && should_sacch_deact(lchan)) + if (should_sacch_deact(lchan)) rsl_deact_sacch(lchan); } @@ -1294,7 +1294,7 @@ } } -void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, bool do_rr_release, +void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) { if (!lchan || !lchan->fi) @@ -1307,7 +1307,6 @@ struct osmo_fsm_inst *fi = lchan->fi; lchan->release_in_error = err; lchan->rsl_error_cause = cause_rr; - lchan->deact_sacch = sacch_deact; lchan->do_rr_release = do_rr_release; /* States waiting for events will notice the desire to release when done waiting, so it is enough diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 1e6a097..d15e149 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -986,7 +986,7 @@ const char *bsc_subscr_name(struct bsc_subscr *bsub) { return NULL; } -void lchan_release(struct gsm_lchan *lchan, bool do_deact_sacch, bool do_rr_release, +void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) {} int rsl_data_request(struct msgb *msg, uint8_t link_id) { return 0; } diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 7cb4086..f728c5b 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -462,6 +462,8 @@ break; case RSL_MT_IPAC_CRCX: break; + case RSL_MT_DEACTIVATE_SACCH: + break; default: printf("unknown rsl message=0x%x\n", dh->c.msg_type); } -- To view, visit https://gerrit.osmocom.org/11667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id3301df059582da2377ef82feae554e94fa42035 Gerrit-Change-Number: 11667 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:58:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:58:22 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan: introduce sub-struct lchan->release.* Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11668 Change subject: cosmetic: lchan: introduce sub-struct lchan->release.* ...................................................................... cosmetic: lchan: introduce sub-struct lchan->release.* Put all lchan release related flags and settings in a sub-struct named 'release' to better indicate what those fields are for. There is no functional change. Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 4 files changed, 53 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/11668/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index b257b67..fb1db80 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -492,6 +492,8 @@ uint8_t nr; char *name; + char *last_error; + struct osmo_fsm_inst *fi; struct osmo_fsm_inst *fi_rtp; struct mgwep_ci *mgw_endpoint_ci_bts; @@ -510,21 +512,21 @@ struct gsm_lchan *re_use_mgw_endpoint_from_lchan; } activate; - /* If an event to release the lchan comes in while still waiting for responses, just mark this - * flag, so that the lchan will gracefully release at the next sensible junction. */ - bool release_requested; - bool do_rr_release; + struct { + /* If an event to release the lchan comes in while still waiting for responses, just mark this + * flag, so that the lchan will gracefully release at the next sensible junction. */ + bool release_requested; + bool do_rr_release; - char *last_error; + /* There is an RSL error cause of value 0, so we need a separate flag. */ + bool release_in_error; + /* RSL error code, RSL_ERR_* */ + uint8_t rsl_error_cause; - /* There is an RSL error cause of value 0, so we need a separate flag. */ - bool release_in_error; - /* RSL error code, RSL_ERR_* */ - uint8_t rsl_error_cause; - - /* If a release event is being handled, ignore other ricocheting release events until that - * release handling has concluded. */ - bool in_release_handler; + /* If a release event is being handled, ignore other ricocheting release events until that + * release handling has concluded. */ + bool in_release_handler; + } release; /* The logical channel type */ enum gsm_chan_t type; diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 86f8354..c0febaa 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -715,8 +715,8 @@ break; case GSCON_EV_RSL_CONN_FAIL: if (conn->lchan) { - conn->lchan->release_in_error = true; - conn->lchan->rsl_error_cause = data ? *(uint8_t*)data : RSL_ERR_IE_ERROR; + conn->lchan->release.release_in_error = true; + conn->lchan->release.rsl_error_cause = data ? *(uint8_t*)data : RSL_ERR_IE_ERROR; } gscon_bssmap_clear(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE); break; diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9964fcf..012239c 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -485,7 +485,7 @@ OSMO_ASSERT(!lchan->conn); OSMO_ASSERT(!lchan->mgw_endpoint_ci_bts); lchan_set_last_error(lchan, NULL); - lchan->release_requested = false; + lchan->release.release_requested = false; lchan->conn = info->for_conn; lchan->activate.activ_for = info->activ_for; @@ -557,7 +557,7 @@ struct gsm_lchan *lchan = lchan_fi_lchan(fi); struct mgwep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); - if (lchan->release_requested) { + if (lchan->release.release_requested) { lchan_fail("Release requested while activating"); return; } @@ -593,7 +593,7 @@ case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: - if (lchan->in_release_handler) { + if (lchan->release.in_release_handler) { /* Already in release, the RTP is not the initial cause of failure. * Just ignore. */ return; @@ -616,7 +616,7 @@ uint8_t ho_ref = 0; struct gsm_lchan *lchan = lchan_fi_lchan(fi); - if (lchan->release_requested) { + if (lchan->release.release_requested) { lchan_fail_to(LCHAN_ST_UNUSED, "Release requested while activating"); return; } @@ -653,12 +653,12 @@ break; case LCHAN_EV_RSL_CHAN_ACTIV_NACK: - lchan->in_release_handler = true; + lchan->release.in_release_handler = true; if (data) { uint32_t next_state; - lchan->rsl_error_cause = *(uint8_t*)data; - lchan->release_in_error = true; - if (lchan->rsl_error_cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) + lchan->release.rsl_error_cause = *(uint8_t*)data; + lchan->release.release_in_error = true; + if (lchan->release.rsl_error_cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) next_state = LCHAN_ST_BORKEN; else /* Taking this over from legacy code: send an RF Chan Release even though @@ -666,18 +666,18 @@ next_state = LCHAN_ST_WAIT_RF_RELEASE_ACK; lchan_fail_to(next_state, "Chan Activ NACK: %s (0x%x)", - rsl_err_name(lchan->rsl_error_cause), lchan->rsl_error_cause); + rsl_err_name(lchan->release.rsl_error_cause), lchan->release.rsl_error_cause); } else { - lchan->rsl_error_cause = RSL_ERR_IE_NONEXIST; - lchan->release_in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_IE_NONEXIST; + lchan->release.release_in_error = true; lchan_fail_to(LCHAN_ST_BORKEN, "Chan Activ NACK without cause IE"); } - lchan->in_release_handler = false; + lchan->release.in_release_handler = false; break; case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: - if (lchan->in_release_handler) { + if (lchan->release.in_release_handler) { /* Already in release, the RTP is not the initial cause of failure. * Just ignore. */ return; @@ -698,7 +698,7 @@ { int rc; struct gsm_lchan *lchan = lchan_fi_lchan(fi); - if (lchan->release_requested) { + if (lchan->release.release_requested) { lchan_fail_to(LCHAN_ST_WAIT_RF_RELEASE_ACK, "Release requested while activating"); return; } @@ -789,7 +789,7 @@ case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: - if (lchan->in_release_handler) { + if (lchan->release.in_release_handler) { /* Already in release, the RTP is not the initial cause of failure. * Just ignore. */ return; @@ -809,7 +809,7 @@ { struct gsm_lchan *lchan = lchan_fi_lchan(fi); - if (lchan->release_requested) { + if (lchan->release.release_requested) { lchan_fail("Release requested while activating"); return; } @@ -896,7 +896,7 @@ case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: - if (lchan->in_release_handler) { + if (lchan->release.in_release_handler) { /* Already in release, the RTP is not the initial cause of failure. * Just ignore. */ return; @@ -929,7 +929,7 @@ static void lchan_do_release(struct gsm_lchan *lchan) { - if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) + if (lchan->release.do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) gsm48_send_rr_release(lchan); if (lchan->fi_rtp) @@ -1025,7 +1025,7 @@ switch (event) { case LCHAN_EV_RSL_RF_CHAN_REL_ACK: - if (lchan->rsl_error_cause) + if (lchan->release.release_in_error) lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); else lchan_fsm_state_chg(LCHAN_ST_UNUSED); @@ -1053,7 +1053,7 @@ case LCHAN_EV_RSL_CHAN_ACTIV_ACK: /* A late Chan Activ ACK? Release. */ - lchan->release_in_error = true; + lchan->release.release_in_error = true; lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK); return; @@ -1064,7 +1064,7 @@ case LCHAN_EV_RSL_RF_CHAN_REL_ACK: /* A late Release ACK? */ - lchan->release_in_error = true; + lchan->release.release_in_error = true; lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); /* TODO: we used to do this only for sysmobts: int do_free = is_sysmobts_v2(ts->trx->bts); @@ -1288,7 +1288,7 @@ return 0; default: - lchan->release_in_error = true; + lchan->release.release_in_error = true; lchan_fail("Timeout"); return 0; } @@ -1300,25 +1300,26 @@ if (!lchan || !lchan->fi) return; - if (lchan->in_release_handler) + if (lchan->release.in_release_handler) return; - lchan->in_release_handler = true; + lchan->release.in_release_handler = true; struct osmo_fsm_inst *fi = lchan->fi; - lchan->release_in_error = err; - lchan->rsl_error_cause = cause_rr; - lchan->do_rr_release = do_rr_release; + + lchan->release.release_in_error = err; + lchan->release.rsl_error_cause = cause_rr; + lchan->release.do_rr_release = do_rr_release; /* States waiting for events will notice the desire to release when done waiting, so it is enough * to mark for release. */ - lchan->release_requested = true; + lchan->release.release_requested = true; /* If we took the RTP over from another lchan, put it back. */ - if (lchan->fi_rtp && lchan->release_in_error) + if (lchan->fi_rtp && lchan->release.release_in_error) osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_ROLLBACK, 0); /* But when in error, don't wait for the next state to pick up release_requested. */ - if (lchan->release_in_error) { + if (lchan->release.release_in_error) { switch (lchan->fi->state) { default: /* Normally we signal release in lchan_fsm_wait_rll_rtp_released_onenter(). When @@ -1343,7 +1344,7 @@ lchan_fsm_state_chg(LCHAN_ST_WAIT_RLL_RTP_RELEASED); exit_release_handler: - lchan->in_release_handler = false; + lchan->release.in_release_handler = false; } void lchan_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index bf73429..dd42fc4 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -256,7 +256,7 @@ int val; struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - if (lchan->release_requested) { + if (lchan->release.release_requested) { lchan_rtp_fail("Release requested while activating"); return; } @@ -324,7 +324,7 @@ struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); const struct mgcp_conn_peer *mgw_rtp; - if (lchan->release_requested) { + if (lchan->release.release_requested) { lchan_rtp_fail("Release requested while activating"); return; } @@ -439,7 +439,7 @@ struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan; - if (lchan->release_requested) { + if (lchan->release.release_requested) { lchan_rtp_fail("Release requested while activating"); return; } @@ -724,7 +724,7 @@ int lchan_rtp_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - lchan->release_in_error = true; + lchan->release.release_in_error = true; lchan_rtp_fail("Timeout"); return 0; } -- To view, visit https://gerrit.osmocom.org/11668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 Gerrit-Change-Number: 11668 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:58:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:58:23 +0000 Subject: Change in osmo-bsc[master]: cosmetic: abis_rsl.c: drop uneccesary braces Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11669 Change subject: cosmetic: abis_rsl.c: drop uneccesary braces ...................................................................... cosmetic: abis_rsl.c: drop uneccesary braces Change-Id: I20a7b160321cf86179cdcece71c8158e76ba4a1b --- M src/osmo-bsc/abis_rsl.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/11669/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index c16f044..6e8d078 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -895,9 +895,9 @@ /* If the lchan is associated with a conn, we shall notify the MSC of the RSL Conn Failure, and * the connection will presumably be torn down and lead to an lchan release. During initial * Channel Request from the MS, an lchan has no conn yet, so in that case release now. */ - if (!lchan->conn) { + if (!lchan->conn) lchan_release(lchan, false, true, *cause_p); - } else + else osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_RSL_CONN_FAIL, (void*)cause_p); return 0; -- To view, visit https://gerrit.osmocom.org/11669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I20a7b160321cf86179cdcece71c8158e76ba4a1b Gerrit-Change-Number: 11669 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 03:58:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 03:58:23 +0000 Subject: Change in osmo-bsc[master]: lchan: set cause for 4 instances of release_in_error = true Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11670 Change subject: lchan: set cause for 4 instances of release_in_error = true ...................................................................... lchan: set cause for 4 instances of release_in_error = true Make sure some RSL cause is set. Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 --- M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/11670/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 012239c..bfcf55d 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1054,6 +1054,7 @@ case LCHAN_EV_RSL_CHAN_ACTIV_ACK: /* A late Chan Activ ACK? Release. */ lchan->release.release_in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK); return; @@ -1065,6 +1066,7 @@ case LCHAN_EV_RSL_RF_CHAN_REL_ACK: /* A late Release ACK? */ lchan->release.release_in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); /* TODO: we used to do this only for sysmobts: int do_free = is_sysmobts_v2(ts->trx->bts); @@ -1289,6 +1291,7 @@ default: lchan->release.release_in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan_fail("Timeout"); return 0; } diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index dd42fc4..b6aa39c 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -725,6 +725,7 @@ { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); lchan->release.release_in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_EQUIPMENT_FAIL; lchan_rtp_fail("Timeout"); return 0; } -- To view, visit https://gerrit.osmocom.org/11670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 Gerrit-Change-Number: 11670 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:08:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 8 Nov 2018 09:08:50 +0000 Subject: Change in osmo-bsc[master]: prevent a NULL pointer dereference in debug_candidate() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11630 ) Change subject: prevent a NULL pointer dereference in debug_candidate() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11630/1/src/osmo-bsc/handover_decision_2.c File src/osmo-bsc/handover_decision_2.c: https://gerrit.osmocom.org/#/c/11630/1/src/osmo-bsc/handover_decision_2.c at 844 PS1, Line 844: } > AFAICT the logic was already sound. [?] This is not about lchan->ts->trx->bts being NULL, it is about candidate->bts being NULL. -- To view, visit https://gerrit.osmocom.org/11630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3d672d835bbc136809e593a819a6dda7c84a88e Gerrit-Change-Number: 11630 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 08 Nov 2018 09:08:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:11:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 09:11:49 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#9) to the change originally created by Neels Hofmeyr. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 434 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/9 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:13:26 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 8 Nov 2018 09:13:26 +0000 Subject: Change in osmo-bsc[master]: prevent a NULL pointer dereference in debug_candidate() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11630 ) Change subject: prevent a NULL pointer dereference in debug_candidate() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11630/1/src/osmo-bsc/handover_decision_2.c File src/osmo-bsc/handover_decision_2.c: https://gerrit.osmocom.org/#/c/11630/1/src/osmo-bsc/handover_decision_2.c at 844 PS1, Line 844: } > This is not about lchan->ts->trx->bts being NULL, it is about candidate->bts being NULL. OK I see that the caller guarantees that it isn't NULL. I'm going to flag this as a false positive in Coverity. -- To view, visit https://gerrit.osmocom.org/11630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3d672d835bbc136809e593a819a6dda7c84a88e Gerrit-Change-Number: 11630 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 08 Nov 2018 09:13:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:14:40 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 8 Nov 2018 09:14:40 +0000 Subject: Change in osmo-bsc[master]: prevent a NULL pointer dereference in debug_candidate() In-Reply-To: References: Message-ID: Stefan Sperling has abandoned this change. ( https://gerrit.osmocom.org/11630 ) Change subject: prevent a NULL pointer dereference in debug_candidate() ...................................................................... Abandoned Flagged as false positive in Coverity. -- To view, visit https://gerrit.osmocom.org/11630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ie3d672d835bbc136809e593a819a6dda7c84a88e Gerrit-Change-Number: 11630 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:21:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 8 Nov 2018 09:21:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9374 to look at the new patch set (#6). Change subject: start implementing the TC_paging() PCU test ...................................................................... start implementing the TC_paging() PCU test Implement a basic paging test for the PCU, which is passing for paging via TMSI (but only if osmo-pcu is started after the test is started). Previously, this test code amounted to a debugging loop which never terminated. Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Related: OS#2404 --- M library/L3_Templates.ttcn M pcu/PCU_Tests.ttcn M pcu/expected-results.xml 3 files changed, 67 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/9374/6 -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:21:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 8 Nov 2018 09:21:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/9374/5/pcu/expected-results.xml File pcu/expected-results.xml: https://gerrit.osmocom.org/#/c/9374/5/pcu/expected-results.xml at 2 PS5, Line 2: > Not 100% sure but I think we got to update number of tests as well. Indeed. Fixed in next patch set. -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 08 Nov 2018 09:21:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:48:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 09:48:36 +0000 Subject: Change in libosmocore[master]: Add helper wrapper for BSSAP TLV parsing In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11655 ) Change subject: Add helper wrapper for BSSAP TLV parsing ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib228368901ce90a02a5664f2510593371c7d29cd Gerrit-Change-Number: 11655 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 08 Nov 2018 09:48:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:50:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 8 Nov 2018 09:50:44 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11521 to look at the new patch set (#4). Change subject: add DLCX command statistics to osmo-mgw ...................................................................... add DLCX command statistics to osmo-mgw Add a counter group for DLCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of DLCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters' While here, rename MGCP_MDCX_FAIL_DEFERRED_BY_POLICY to MGCP_MDCX_DEFERRED_BY_POLICY; we have decided that deferred connections aren't failures, and this keeps names used by DLCX and MDCX in sync. Also remove some allocation failure checks with OSMO_ASSERT(); such checks aren't en vogue anymore. Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Depends: I80d36181600901ae2e0f321dc02b5d54ddc94139I Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 68 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/11521/4 -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:51:56 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 8 Nov 2018 09:51:56 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1573 PS1, Line 1573: > Harald: "We don't use OSMO_ASSERT() on our allocations, do we?" [?] Fine, so it seems Harald has changed his mind, or I misunderstood when we talked months ago. Assertions removed in next patch set. -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 08 Nov 2018 09:51:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 09:57:42 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 8 Nov 2018 09:57:42 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 08 Nov 2018 09:57:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:11:00 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 8 Nov 2018 10:11:00 +0000 Subject: Change in osmo-msc[master]: cosmetic: remove forgotten debug printf Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11671 Change subject: cosmetic: remove forgotten debug printf ...................................................................... cosmetic: remove forgotten debug printf the control interface command subscriber-list-active-v1 contains a stray debug printf, lets remove it. Change-Id: I085cf7b4a45708ccb883f70f71f4fbcfda58d332 --- M src/libmsc/ctrl_commands.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/71/11671/1 diff --git a/src/libmsc/ctrl_commands.c b/src/libmsc/ctrl_commands.c index b0625bb..e37cc94 100644 --- a/src/libmsc/ctrl_commands.c +++ b/src/libmsc/ctrl_commands.c @@ -54,7 +54,6 @@ cmd->reply = talloc_asprintf_append(cmd->reply, "%s,%s\n", vsub->imsi, vsub->msisdn); } - printf("%s\n", cmd->reply); /* <-- what? */ return CTRL_CMD_REPLY; } CTRL_CMD_DEFINE_RO(subscriber_list, "subscriber-list-active-v1"); -- To view, visit https://gerrit.osmocom.org/11671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I085cf7b4a45708ccb883f70f71f4fbcfda58d332 Gerrit-Change-Number: 11671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:32:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:32:20 +0000 Subject: Change in osmo-dev[master]: use argparse Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11672 Change subject: use argparse ...................................................................... use argparse Change-Id: Ib2207346003ffb28432b1cd1bac6250ad8a1a060 --- M src/gits 1 file changed, 40 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/72/11672/1 diff --git a/src/gits b/src/gits index 3528915..316fd03 100755 --- a/src/gits +++ b/src/gits @@ -26,8 +26,6 @@ doc = '''gits: conveniently manage several git subdirectories. Instead of doing the 'cd foo; git status; cd ../bar; git status' dance, this helps to save your time with: status, fetch, rebase, ... - -See 'gits help' ''' re_status_mods = re.compile('^\t(modified|deleted):.*') @@ -223,21 +221,12 @@ print(format_summaries(infos)) -def cmd_status(): - if len(sys.argv) > 2: - error('no arguments allowed') - print_status() - - -def cmd_do(argv=None): - if argv is None: - argv = sys.argv[2:] +def cmd_do(argv): for git_dir in git_dirs(): git(git_dir, *argv, may_fail=True, section_marker=True) -def cmd_sh(): - cmd = sys.argv[2:] +def cmd_sh(cmd): for git_dir in git_dirs(): print('\n===== %s =====' % git_dir) print('+ %s' % cmd_to_str(cmd)) @@ -358,10 +347,6 @@ return orig_branch -def cmd_fetch(): - cmd_do(['fetch'] + sys.argv[2:]) - - def cmd_rebase(): skipped = [] for git_dir in git_dirs(): @@ -385,39 +370,46 @@ print('\nskipped: %s' % ' '.join(skipped)) -commands = { - 'status': (cmd_status, 'Show a branch summary and indicate modifications.'), - 'fetch': (cmd_fetch, "Run 'git fetch' in each clone; useful before `gits rebase`."), - 'rebase': (cmd_rebase, 'Interactively ff-merge master and rebase current branches.'), - 'sh': (cmd_sh, 'Run arbitrary shell command in each clone (`gits sh echo hi`).'), - 'do': (cmd_do, 'Run arbitrary git command in each clone (`gits do clean -dxf`).'), - 'help': (cmd_help, 'List gits commands.'), -} +def parse_args(): + parser = argparse.ArgumentParser(description=doc) + sub = parser.add_subparsers(title="action", dest="action") + sub.required = True -aliases = { - 's': 'status', - 'st': 'status', - 'r': 'rebase', - 're': 'rebase', - 'f': 'fetch', - '-h': 'help', -} + sub.add_parser("status", aliases=["st", "s"], + help="show a branch summary and indicate modifications") + + fetch = sub.add_parser("fetch", aliases=["f"], + help="run 'git fetch' in each clone; useful before `gits rebase`") + fetch.add_argument("remainder", nargs=argparse.REMAINDER, + help="additional arguments to be passed to git fetch") + + sub.add_parser("rebase", aliases=["r", "re"], + help="interactively ff-merge master and rebase current branches") + + sh = sub.add_parser("sh", + help="run arbitrary shell command in each clone (`gits sh echo hi`)") + sh.add_argument("remainder", nargs=argparse.REMAINDER, + help="command to run in each clone") + + do = sub.add_parser("do", + help="run arbitrary git command in each clone (`gits do clean -dxf`)") + do.add_argument("remainder", nargs=argparse.REMAINDER, + help="git command to run in each clone") + + return parser.parse_args() + if __name__ == '__main__': - - if len(sys.argv) < 2: - usage('Pass at least one argument to tell me what to do.') - - command_str = sys.argv[1] - alias_for = aliases.get(command_str) - if alias_for: - command_str = alias_for - command = commands.get(command_str) - - if command: - func, doc = command - func() - else: - error('unknown command: %r\n`gits help` may help' % command_str) + args = parse_args() + if args.action in ["status", "s", "st"]: + print_status() + elif args.action in ["fetch", "f"]: + cmd_do(['fetch'] + args.remainder) + elif args.action in ["rebase", "r"]: + cmd_rebase() + elif args.action == "sh": + cmd_sh(args.remainder) + elif args.action == "do": + cmd_do(args.remainder) # vim: shiftwidth=4 expandtab tabstop=4 -- To view, visit https://gerrit.osmocom.org/11672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2207346003ffb28432b1cd1bac6250ad8a1a060 Gerrit-Change-Number: 11672 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:32:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:32:20 +0000 Subject: Change in osmo-dev[master]: shorten descriptions Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11673 Change subject: shorten descriptions ...................................................................... shorten descriptions Change-Id: I3705f814ad46604777507d8fa9f53f8b02f71c0a --- M src/gits 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/73/11673/1 diff --git a/src/gits b/src/gits index 316fd03..d5c646d 100755 --- a/src/gits +++ b/src/gits @@ -379,20 +379,20 @@ help="show a branch summary and indicate modifications") fetch = sub.add_parser("fetch", aliases=["f"], - help="run 'git fetch' in each clone; useful before `gits rebase`") + help="run 'git fetch' in each clone (use before rebase)") fetch.add_argument("remainder", nargs=argparse.REMAINDER, help="additional arguments to be passed to git fetch") sub.add_parser("rebase", aliases=["r", "re"], - help="interactively ff-merge master and rebase current branches") + help="interactively ff-merge master, rebase current branches") sh = sub.add_parser("sh", - help="run arbitrary shell command in each clone (`gits sh echo hi`)") + help="run shell command in each clone (`gits sh echo hi`)") sh.add_argument("remainder", nargs=argparse.REMAINDER, help="command to run in each clone") do = sub.add_parser("do", - help="run arbitrary git command in each clone (`gits do clean -dxf`)") + help="run git command in each clone (`gits do clean -dxf`)") do.add_argument("remainder", nargs=argparse.REMAINDER, help="git command to run in each clone") -- To view, visit https://gerrit.osmocom.org/11673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3705f814ad46604777507d8fa9f53f8b02f71c0a Gerrit-Change-Number: 11673 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:32:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:32:20 +0000 Subject: Change in osmo-dev[master]: delete obsolete code Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11674 Change subject: delete obsolete code ...................................................................... delete obsolete code Change-Id: I9bc8f47d7a41eca6e8b6076b4e95ba949e47fde2 --- M src/gits 1 file changed, 0 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/74/11674/1 diff --git a/src/gits b/src/gits index d5c646d..2dbb564 100755 --- a/src/gits +++ b/src/gits @@ -40,11 +40,6 @@ exit(1) -def usage(*msgs): - global doc - error(doc, '\n\n', *msgs) - - def cmd_to_str(cmd): return ' '.join(shlex.quote(c) for c in cmd) @@ -186,36 +181,6 @@ return list(sorted(dirs)) -def cmd_help(): - global commands - global aliases - - if len(sys.argv) > 2: - error('no arguments allowed') - - print('gits finds git clones that are immediate subdirs of the current working dir,\n' - 'by looking for folders named .git, and runs actions in each clone:\n') - - lines = [] - - for name, cmd in commands.items(): - - names = [name, ] - - for alias_name, alias_for in aliases.items(): - if alias_for == name: - names.append(alias_name) - - line = ['|'.join(sorted(names)), ] - - func, doc = cmd - line.append(doc) - - lines.append(line) - - print(format_summaries(lines, ': ')) - - def print_status(): infos = [git_branch_summary(git_dir) for git_dir in git_dirs()] print(format_summaries(infos)) -- To view, visit https://gerrit.osmocom.org/11674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9bc8f47d7a41eca6e8b6076b4e95ba949e47fde2 Gerrit-Change-Number: 11674 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:32:21 +0000 Subject: Change in osmo-dev[master]: ask which command to run Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11675 Change subject: ask which command to run ...................................................................... ask which command to run Change-Id: I0bed4195141b1e5a345529f30417f29b5269b1c8 --- M src/gits 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/75/11675/1 diff --git a/src/gits b/src/gits index 2dbb564..dc7308c 100755 --- a/src/gits +++ b/src/gits @@ -192,6 +192,8 @@ def cmd_sh(cmd): + if not cmd: + error("which command do you want to run?") for git_dir in git_dirs(): print('\n===== %s =====' % git_dir) print('+ %s' % cmd_to_str(cmd)) -- To view, visit https://gerrit.osmocom.org/11675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0bed4195141b1e5a345529f30417f29b5269b1c8 Gerrit-Change-Number: 11675 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:32:21 +0000 Subject: Change in osmo-dev[master]: consistent quote signs Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11676 Change subject: consistent quote signs ...................................................................... consistent quote signs Change-Id: I5fa9b90b4206364e8feeef735087f96274db2bb6 --- M src/gits 1 file changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/76/11676/1 diff --git a/src/gits b/src/gits index dc7308c..da9e921 100755 --- a/src/gits +++ b/src/gits @@ -193,7 +193,7 @@ def cmd_sh(cmd): if not cmd: - error("which command do you want to run?") + error('which command do you want to run?') for git_dir in git_dirs(): print('\n===== %s =====' % git_dir) print('+ %s' % cmd_to_str(cmd)) @@ -339,44 +339,44 @@ def parse_args(): parser = argparse.ArgumentParser(description=doc) - sub = parser.add_subparsers(title="action", dest="action") + sub = parser.add_subparsers(title='action', dest='action') sub.required = True - sub.add_parser("status", aliases=["st", "s"], - help="show a branch summary and indicate modifications") + sub.add_parser('status', aliases=['st', 's'], + help='show a branch summary and indicate modifications') - fetch = sub.add_parser("fetch", aliases=["f"], - help="run 'git fetch' in each clone (use before rebase)") - fetch.add_argument("remainder", nargs=argparse.REMAINDER, - help="additional arguments to be passed to git fetch") + fetch = sub.add_parser('fetch', aliases=['f'], + help='run 'git fetch' in each clone (use before rebase)') + fetch.add_argument('remainder', nargs=argparse.REMAINDER, + help='additional arguments to be passed to git fetch') - sub.add_parser("rebase", aliases=["r", "re"], - help="interactively ff-merge master, rebase current branches") + sub.add_parser('rebase', aliases=['r', 're'], + help='interactively ff-merge master, rebase current branches') - sh = sub.add_parser("sh", - help="run shell command in each clone (`gits sh echo hi`)") - sh.add_argument("remainder", nargs=argparse.REMAINDER, - help="command to run in each clone") + sh = sub.add_parser('sh', + help='run shell command in each clone (`gits sh echo hi`)') + sh.add_argument('remainder', nargs=argparse.REMAINDER, + help='command to run in each clone') - do = sub.add_parser("do", - help="run git command in each clone (`gits do clean -dxf`)") - do.add_argument("remainder", nargs=argparse.REMAINDER, - help="git command to run in each clone") + do = sub.add_parser('do', + help='run git command in each clone (`gits do clean -dxf`)') + do.add_argument('remainder', nargs=argparse.REMAINDER, + help='git command to run in each clone') return parser.parse_args() if __name__ == '__main__': args = parse_args() - if args.action in ["status", "s", "st"]: + if args.action in ['status', 's', 'st']: print_status() - elif args.action in ["fetch", "f"]: + elif args.action in ['fetch', 'f']: cmd_do(['fetch'] + args.remainder) - elif args.action in ["rebase", "r"]: + elif args.action in ['rebase', 'r']: cmd_rebase() - elif args.action == "sh": + elif args.action == 'sh': cmd_sh(args.remainder) - elif args.action == "do": + elif args.action == 'do': cmd_do(args.remainder) # vim: shiftwidth=4 expandtab tabstop=4 -- To view, visit https://gerrit.osmocom.org/11676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5fa9b90b4206364e8feeef735087f96274db2bb6 Gerrit-Change-Number: 11676 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:32:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:32:22 +0000 Subject: Change in osmo-dev[master]: flake8 Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11677 Change subject: flake8 ...................................................................... flake8 Change-Id: Ia97d41cb840490115b0facc53cf03e8b63cca973 --- M src/gits 1 file changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/77/11677/1 diff --git a/src/gits b/src/gits index da9e921..b1adc4f 100755 --- a/src/gits +++ b/src/gits @@ -342,27 +342,31 @@ sub = parser.add_subparsers(title='action', dest='action') sub.required = True + # status sub.add_parser('status', aliases=['st', 's'], - help='show a branch summary and indicate modifications') + help='show a branch summary and indicate modifications') + # fetch fetch = sub.add_parser('fetch', aliases=['f'], - help='run 'git fetch' in each clone (use before rebase)') + help="run 'git fetch' in each clone (use before rebase)") fetch.add_argument('remainder', nargs=argparse.REMAINDER, - help='additional arguments to be passed to git fetch') + help='additional arguments to be passed to git fetch') + # rebase sub.add_parser('rebase', aliases=['r', 're'], - help='interactively ff-merge master, rebase current branches') + help='interactively ff-merge master, rebase current branches') + # sh sh = sub.add_parser('sh', - help='run shell command in each clone (`gits sh echo hi`)') + help='run shell command in each clone (`gits sh echo hi`)') sh.add_argument('remainder', nargs=argparse.REMAINDER, - help='command to run in each clone') + help='command to run in each clone') + # do do = sub.add_parser('do', - help='run git command in each clone (`gits do clean -dxf`)') + help='run git command in each clone (`gits do clean -dxf`)') do.add_argument('remainder', nargs=argparse.REMAINDER, - help='git command to run in each clone') - + help='git command to run in each clone') return parser.parse_args() -- To view, visit https://gerrit.osmocom.org/11677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia97d41cb840490115b0facc53cf03e8b63cca973 Gerrit-Change-Number: 11677 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:33:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:33:22 +0000 Subject: Change in osmo-dev[master]: use argparse In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11672 ) Change subject: use argparse ...................................................................... Abandoned forgot to squash and rebase -- To view, visit https://gerrit.osmocom.org/11672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ib2207346003ffb28432b1cd1bac6250ad8a1a060 Gerrit-Change-Number: 11672 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:33:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:33:28 +0000 Subject: Change in osmo-dev[master]: shorten descriptions In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11673 ) Change subject: shorten descriptions ...................................................................... Abandoned forgot to squash and rebase -- To view, visit https://gerrit.osmocom.org/11673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I3705f814ad46604777507d8fa9f53f8b02f71c0a Gerrit-Change-Number: 11673 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:33:32 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:33:32 +0000 Subject: Change in osmo-dev[master]: delete obsolete code In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11674 ) Change subject: delete obsolete code ...................................................................... Abandoned forgot to squash and rebase -- To view, visit https://gerrit.osmocom.org/11674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I9bc8f47d7a41eca6e8b6076b4e95ba949e47fde2 Gerrit-Change-Number: 11674 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:33:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:33:38 +0000 Subject: Change in osmo-dev[master]: ask which command to run In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11675 ) Change subject: ask which command to run ...................................................................... Abandoned forgot to squash and rebase -- To view, visit https://gerrit.osmocom.org/11675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I0bed4195141b1e5a345529f30417f29b5269b1c8 Gerrit-Change-Number: 11675 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:33:42 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:33:42 +0000 Subject: Change in osmo-dev[master]: consistent quote signs In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11676 ) Change subject: consistent quote signs ...................................................................... Abandoned forgot to squash and rebase -- To view, visit https://gerrit.osmocom.org/11676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I5fa9b90b4206364e8feeef735087f96274db2bb6 Gerrit-Change-Number: 11676 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:33:46 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:33:46 +0000 Subject: Change in osmo-dev[master]: flake8 In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11677 ) Change subject: flake8 ...................................................................... Abandoned forgot to squash and rebase -- To view, visit https://gerrit.osmocom.org/11677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia97d41cb840490115b0facc53cf03e8b63cca973 Gerrit-Change-Number: 11677 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:35:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:35:18 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#10) to the change originally created by Neels Hofmeyr. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 397 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/10 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:37:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:37:30 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#11) to the change originally created by Neels Hofmeyr. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 397 insertions(+), 298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/60/11560/11 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:39:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 10:39:03 +0000 Subject: Change in osmo-msc[master]: cosmetic: remove forgotten debug printf In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11671 ) Change subject: cosmetic: remove forgotten debug printf ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I085cf7b4a45708ccb883f70f71f4fbcfda58d332 Gerrit-Change-Number: 11671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 08 Nov 2018 10:39:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:39:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 10:39:05 +0000 Subject: Change in osmo-msc[master]: cosmetic: remove forgotten debug printf In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11671 ) Change subject: cosmetic: remove forgotten debug printf ...................................................................... cosmetic: remove forgotten debug printf the control interface command subscriber-list-active-v1 contains a stray debug printf, lets remove it. Change-Id: I085cf7b4a45708ccb883f70f71f4fbcfda58d332 --- M src/libmsc/ctrl_commands.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/libmsc/ctrl_commands.c b/src/libmsc/ctrl_commands.c index b0625bb..e37cc94 100644 --- a/src/libmsc/ctrl_commands.c +++ b/src/libmsc/ctrl_commands.c @@ -54,7 +54,6 @@ cmd->reply = talloc_asprintf_append(cmd->reply, "%s,%s\n", vsub->imsi, vsub->msisdn); } - printf("%s\n", cmd->reply); /* <-- what? */ return CTRL_CMD_REPLY; } CTRL_CMD_DEFINE_RO(subscriber_list, "subscriber-list-active-v1"); -- To view, visit https://gerrit.osmocom.org/11671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I085cf7b4a45708ccb883f70f71f4fbcfda58d332 Gerrit-Change-Number: 11671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:42:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 10:42:53 +0000 Subject: Change in libosmocore[master]: Update GSM0808_LCLS enums Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11678 Change subject: Update GSM0808_LCLS enums ...................................................................... Update GSM0808_LCLS enums Add values indicating that LCLS control/config/status value has not been received yet. Change-Id: I52dc6a52f5ee043ed2c1625ffecfd495e3c746b1 Related: OS#2487 --- M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/11678/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 8431ace..d8c2665 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -564,6 +564,7 @@ GSM0808_LCLS_CFG_BOTH_WAY_AND_SEND_DL_BLOCK_LOCAL_DL = 0x03, GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL = 0x04, GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL_BLOCK_LOCAL_DL = 0x05, + GSM0808_LCLS_CFG_NA = 0xFF }; /* TS 48.008 3.2.2.117 */ @@ -573,6 +574,7 @@ GSM0808_LCLS_CSC_RELEASE_LCLS = 0x02, GSM0808_LCLS_CSC_BICAST_UL_AT_HANDOVER = 0x03, GSM0808_LCLS_CSC_BICAST_UL_AND_RECV_DL_AT_HANDOVER = 0x04, + GSM0808_LCLS_CSC_NA = 0xFF }; /* TS 48.008 3.2.2.119 */ @@ -582,4 +584,5 @@ GSM0808_LCLS_STS_NO_LONGER_LS = 0x02, GSM0808_LCLS_STS_REQ_LCLS_NOT_SUPP = 0x03, GSM0808_LCLS_STS_LOCALLY_SWITCHED = 0x04, + GSM0808_LCLS_STS_NA = 0xFF }; diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e5c3e30..1085f13 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -1289,6 +1289,7 @@ "Connect both-way, bi-cast UL to CN, send access DL from CN" }, { GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL_BLOCK_LOCAL_DL, "Connect both-way, bi-cast UL to CN, send access DL from CN, block local DL" }, + { GSM0808_LCLS_CFG_NA, "Not available" }, { 0, NULL } }; @@ -1298,6 +1299,7 @@ { GSM0808_LCLS_CSC_RELEASE_LCLS, "Release LCLS" }, { GSM0808_LCLS_CSC_BICAST_UL_AT_HANDOVER, "Bi-cast UL at Handover" }, { GSM0808_LCLS_CSC_BICAST_UL_AND_RECV_DL_AT_HANDOVER, "Bi-cast UL and receive DL at Handover" }, + { GSM0808_LCLS_CSC_NA, "Not available" }, { 0, NULL } }; @@ -1307,6 +1309,7 @@ { GSM0808_LCLS_STS_NO_LONGER_LS, "Call is no longer locally switched" }, { GSM0808_LCLS_STS_REQ_LCLS_NOT_SUPP, "Requested LCLS configuration is not supported" }, { GSM0808_LCLS_STS_LOCALLY_SWITCHED, "Call is locally switched with requested LCLS config" }, + { GSM0808_LCLS_STS_NA, "Not available" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/11678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I52dc6a52f5ee043ed2c1625ffecfd495e3c746b1 Gerrit-Change-Number: 11678 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:46:59 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 8 Nov 2018 10:46:59 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 11: Verified+1 Code-Review+1 > my --porcelain --long seems to be identical to just status: I was wondering if --porcelain --long changed the output to "up-to-date" (with dashes) in your git version as well. But it seemed not to be the case because you did not modify the string to compare against. So I've added the version with dashes too, otherwise "gits status" is broken for me (patchset 9) and removed "--procelain" because it's irritating when it has no effect (patchset 11). > That said, if you want to change it to argparse so that it works and looks good, do go ahead in a follow-up patch. ok? Done in patchset 10. I think it also looks good with argparse now, what do you think? $ ./gits -h usage: gits [-h] {status,st,s,fetch,f,rebase,r,re,sh,do} ... gits: conveniently manage several git subdirectories. Instead of doing the 'cd foo; git status; cd ../bar; git status' dance, this helps to save your time with: status, fetch, rebase, ... optional arguments: -h, --help show this help message and exit action: {status,st,s,fetch,f,rebase,r,re,sh,do} status (st, s) show a branch summary and indicate modifications fetch (f) run 'git fetch' in each clone (use before rebase) rebase (r, re) interactively ff-merge master, rebase current branches sh run shell command in each clone (`gits sh echo hi`) do run git command in each clone (`gits do clean -dxf`) -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 08 Nov 2018 10:46:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 10:57:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 10:57:25 +0000 Subject: Change in libosmocore[master]: Update GSM0808_LCLS enums In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11678 ) Change subject: Update GSM0808_LCLS enums ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52dc6a52f5ee043ed2c1625ffecfd495e3c746b1 Gerrit-Change-Number: 11678 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 08 Nov 2018 10:57:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 11:32:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 11:32:37 +0000 Subject: Change in osmo-bsc[master]: LCLS: explicitly check for mode before closing the loop In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11565 to look at the new patch set (#4). Change subject: LCLS: explicitly check for mode before closing the loop ...................................................................... LCLS: explicitly check for mode before closing the loop Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Related: OS#3659 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/11565/4 -- To view, visit https://gerrit.osmocom.org/11565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Gerrit-Change-Number: 11565 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 11:32:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 11:32:37 +0000 Subject: Change in osmo-bsc[master]: LCLS: move mode check into separate function In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11551 to look at the new patch set (#6). Change subject: LCLS: move mode check into separate function ...................................................................... LCLS: move mode check into separate function Before closing or breaking the loop in LCLS we do preliminary checks. To facilitate adding new LCLS modes it's restructured as follows: * move check into dedicated static function * explicitly check for MGW mode in endpoint check * check for mode mismatch Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Related: OS#3659 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/11551/6 -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 11:42:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 11:42:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log number of expected/seen *CX messages on failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11645 to look at the new patch set (#4). Change subject: BSC: log number of expected/seen *CX messages on failure ...................................................................... BSC: log number of expected/seen *CX messages on failure Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/11645/4 -- To view, visit https://gerrit.osmocom.org/11645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 Gerrit-Change-Number: 11645 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 11:42:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 11:42:54 +0000 Subject: Change in osmo-bsc[master]: LCLS: expand logging to print the name of the mode in use In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11652 ) Change subject: LCLS: expand logging to print the name of the mode in use ...................................................................... LCLS: expand logging to print the name of the mode in use Change-Id: I56b57936ae82984e84896228da5a83115a78bbd7 Related: OS#3659 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/gsm_data.c M src/osmo-bsc/osmo_bsc_lcls.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 18 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 6ca0330..32b161e 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -59,6 +59,13 @@ /* we may later introduce BTS_LOOP here: direct RTP between BTSs */ }; +extern const struct value_string bsc_lcls_mode_names[]; + +static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m) +{ + return get_value_string(bsc_lcls_mode_names, m); +} + /*! /brief Information on a remote MSC for libbsc. */ struct bsc_msc_data { diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 08d5bcb..56eb24e 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -47,6 +47,12 @@ void *tall_bsc_ctx = NULL; +const struct value_string bsc_lcls_mode_names[] = { + { BSC_LCLS_MODE_DISABLED, "disabled" }, + { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" }, + { 0, NULL } +}; + static LLIST_HEAD(bts_models); void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index e642976..a406643 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -240,7 +240,9 @@ { struct mgcp_conn_peer mdcx_info; - LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS\n"); + LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS(%s)\n", + bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); + if (!conn->user_plane.mgw_endpoint_ci_msc) { /* the MGCP FSM has died, e.g. due to some MGCP/SDP parsing error */ LOGPFSML(conn->lcls.fi, LOGL_NOTICE, "Cannot disable LCLS without MSC-side MGCP FSM\n"); @@ -581,7 +583,8 @@ OSMO_ASSERT(conn_other); - LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS\n"); + LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS(%s)\n", + bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); if (!conn->user_plane.mgw_endpoint_ci_msc) { LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without MSC-side MGCP FSM. FIXME\n"); return; diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index f90ad6f..14fd274 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -38,12 +38,6 @@ #define IPA_STR "IP.ACCESS specific\n" -static const struct value_string bsc_lcls_mode_names[] = { - { BSC_LCLS_MODE_DISABLED, "disabled" }, - { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" }, - { 0, NULL } -}; - static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty) { return bsc_gsmnet->bsc_data; -- To view, visit https://gerrit.osmocom.org/11652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I56b57936ae82984e84896228da5a83115a78bbd7 Gerrit-Change-Number: 11652 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 11:47:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 11:47:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 6: Please update comment in PCU_Tests.cfg about TC_paging() as well. -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 08 Nov 2018 11:47:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 12:26:07 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 12:26:07 +0000 Subject: Change in libosmocore[master]: Move msgb_push helpers to public header Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11679 Change subject: Move msgb_push helpers to public header ...................................................................... Move msgb_push helpers to public header Both msgb_wrap_with_TL() and msgb_push_TLV1() are generally useful so it make sense to make the public to facilitate code re-use. Change-Id: I37e91d031fba28cf1c6735b8069b0265746f55e6 --- M include/osmocom/core/msgb.h M src/gsm/gsm0480.c 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/11679/1 diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 8843db0..a4ea7a2 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -366,6 +366,26 @@ osmo_store32be(word, space); } +static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) +{ + uint8_t *data = msgb_push(msgb, 2); + + data[0] = tag; + data[1] = msgb->len - 2; + return data; +} + +static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, + uint8_t value) +{ + uint8_t *data = msgb_push(msgb, 3); + + data[0] = tag; + data[1] = 1; + data[2] = value; + return data; +} + /*! remove (pull) a header from the front of the message buffer * \param[in] msgb message buffer * \param[in] len number of octets to be pulled diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 7756ecb..d399fa7 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -68,26 +68,6 @@ { 0, NULL } }; -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - -static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, - uint8_t value) -{ - uint8_t *data = msgb_push(msgb, 3); - - data[0] = tag; - data[1] = 1; - data[2] = value; - return data; -} - static inline unsigned char *msgb_push_NULL(struct msgb *msgb) { uint8_t *data = msgb_push(msgb, 2); -- To view, visit https://gerrit.osmocom.org/11679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I37e91d031fba28cf1c6735b8069b0265746f55e6 Gerrit-Change-Number: 11679 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:18 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11680 Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS * Allow sending Get Attributes message in abis_nm_get_attr. * Move code handling Get Attribute Response Info part to its own function. * Don't try to decode Get Attribute Response Info for nanoBTS, since it uses a different formatting. Related: OS#3624 Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 --- M src/osmo-bsc/abis_nm.c 1 file changed, 24 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/11680/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index f75470d..eb4bb3f 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -528,29 +528,21 @@ } /* Handle 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info */ -static int abis_nm_rx_get_attr_resp(struct msgb *mb, const struct gsm_bts_trx *trx) +static int parse_attr_resp_info(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { - struct abis_om_hdr *oh = msgb_l2(mb); - struct abis_om_fom_hdr *foh = msgb_l3(mb); - struct e1inp_sign_link *sign_link = mb->dst; - struct gsm_bts *bts = trx ? trx->bts : sign_link->trx->bts; - struct tlv_parsed tp; const uint8_t *data; int i; uint16_t data_len; int rc; struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; - DEBUGPFOH(DNM, foh, "Get Attributes Response for BTS%u\n", bts->nr); - - abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); - if (!TLVP_PRES_LEN(&tp, NM_ATT_GET_ARI, 1)) { + if (!TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: Get Attr Response without Response Info?!\n", bts->nr); return -EINVAL; } - data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), + data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(tp, NM_ATT_GET_ARI), TLVP_LEN(tp, NM_ATT_GET_ARI), &data_len); data = parse_attr_resp_info_manuf_state(trx, data, &data_len); @@ -570,6 +562,26 @@ LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); } + return 0; +} + +/* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response */ +static int abis_nm_rx_get_attr_resp(struct msgb *mb, const struct gsm_bts_trx *trx) +{ + struct abis_om_hdr *oh = msgb_l2(mb); + struct abis_om_fom_hdr *foh = msgb_l3(mb); + struct e1inp_sign_link *sign_link = mb->dst; + struct gsm_bts *bts = trx ? trx->bts : sign_link->trx->bts; + struct tlv_parsed tp; + + DEBUGPFOH(DNM, foh, "Get Attributes Response for BTS%u\n", bts->nr); + + abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); + + /* nanoBTS doesn't send Get Attribute Response Info, uses its own format */ + if (bts->type != GSM_BTS_TYPE_NANOBTS) + parse_attr_resp_info(bts, trx, foh, &tp); + return 0; } @@ -1646,7 +1658,7 @@ struct abis_om_hdr *oh; struct msgb *msg; - if (bts->type != GSM_BTS_TYPE_OSMOBTS) { + if (bts->type != GSM_BTS_TYPE_OSMOBTS && bts->type != GSM_BTS_TYPE_NANOBTS) { LOGPC(DNM, LOGL_NOTICE, "Getting attributes from BTS%d type %s is not supported.\n", bts->nr, btstype2str(bts->type)); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:18 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse some nanoBTS Attribute Response attributes Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11681 Change subject: abis_nm: Add support to parse some nanoBTS Attribute Response attributes ...................................................................... abis_nm: Add support to parse some nanoBTS Attribute Response attributes Related: OS#3624 Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 --- M src/osmo-bsc/abis_nm.c 1 file changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/11681/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index eb4bb3f..61820b8 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -527,6 +527,37 @@ return data + adjust; } +/* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response (with nanoBTS speecific attribute formatting) */ +static int parse_attr_resp_nanobts(struct gsm_bts *bts, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) +{ + const uint8_t* data; + uint16_t len; + uint16_t port; + struct in_addr ia = {0}; + char unit_id[40]; + + + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST, 7)) { + data = TLVP_VAL(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST); + if (NM_ATT_IPACC_PRIM_OML_CFG == *data) { + ia.s_addr = htonl(osmo_load32be(data+1)); + port = osmo_load16be(data+5); + LOGPFOH(DNM, LOGL_INFO, foh, "BTS%u Get Attributes Response: Primary OML IP is %s:%u\n", bts->nr, inet_ntoa(ia), port); + } else { + LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u Get Attributes Response: PRIM_OML_CFG_LIST unexpected format: %s\n", + bts->nr, osmo_hexdump(data, TLVP_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST))); + } + } + + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_UNIT_ID, 1)) { + data = TLVP_VAL(tp, NM_ATT_IPACC_UNIT_ID); + len = TLVP_LEN(tp, NM_ATT_IPACC_UNIT_ID); + osmo_strlcpy(unit_id, (char*)data, OSMO_MIN(len, sizeof(unit_id))); + LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u Get Attributes Response: Unit ID is %s\n", bts->nr, unit_id); + } + return 0; +} + /* Handle 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info */ static int parse_attr_resp_info(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { @@ -581,6 +612,8 @@ /* nanoBTS doesn't send Get Attribute Response Info, uses its own format */ if (bts->type != GSM_BTS_TYPE_NANOBTS) parse_attr_resp_info(bts, trx, foh, &tp); + else + parse_attr_resp_nanobts(bts, foh, &tp); return 0; -- To view, visit https://gerrit.osmocom.org/11681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 Gerrit-Change-Number: 11681 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:19 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Unify Get Attribute Response parsing Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11682 Change subject: abis_nm: Unify Get Attribute Response parsing ...................................................................... abis_nm: Unify Get Attribute Response parsing After a bit more investgiation, it seems nanoBTS actually supports regular formatting. There are a few differences with spec though: * The attributes are directly in the message instead of being inside the Get Attributes Response Info after the unsupported attribute ID list. * The Get Attributes Response info can be at any position in the attribute list, and it only contains the unsupported attribute ID list. As a result, we can split parsing into 3 main parts or functions: * Parsing regular (per spec) Get Attributes Response Info attr and get a pointer to the list of attributes. * A function that parses the list of attributes, called directly in case of nanoBTS, and called by the former parser of Get Attributes Response Info for regular (per spec) OML endpoints. * A function to parse the unsupported attribute ID list, also used in the first function to get a pointer to the list of attributes. Related: OS#3624 Change-Id: I77574579a19f1988f82cdac81b257b8f6871b857 --- M src/osmo-bsc/abis_nm.c 1 file changed, 55 insertions(+), 68 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/11682/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 61820b8..bb2b5e2 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -461,36 +461,41 @@ bts_nr, get_value_string(abis_nm_att_names, ari[i + 1])); /* the data starts right after the list of unreported attributes + space for length of that list */ - *out_len = ari_len - (num_unreported + 2); + if (out_len) + *out_len = ari_len - (num_unreported + 2); return ari + num_unreported + 1; /* we have to account for 1st byte with number of unreported attributes */ } -/* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.30 Manufacturer Id */ -static inline const uint8_t *parse_attr_resp_info_manuf_id(struct gsm_bts *bts, const uint8_t *data, uint16_t *data_len) +/* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response (with nanoBTS speecific attribute formatting) */ +static int parse_attr_resp_info_attr(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { - struct tlv_parsed tp; - uint16_t m_id_len = 0; - uint8_t adjust = 0, i; + const uint8_t* data; + uint16_t len; + uint16_t port; + struct in_addr ia = {0}; + char unit_id[40]; + int i; + int rc; + struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; - abis_nm_tlv_parse(&tp, bts, data, *data_len); - if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_ID, 2)) { - m_id_len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.30 Manufacturer Id */ + if (TLVP_PRES_LEN(tp, NM_ATT_MANUF_ID, 2)) { + len = TLVP_LEN(tp, NM_ATT_MANUF_ID); /* log potential BTS feature vector overflow */ - if (m_id_len > sizeof(bts->_features_data)) + if (len > sizeof(bts->_features_data)) LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: feature vector is truncated to %u bytes\n", bts->nr, MAX_BTS_FEATURES/8); /* check that max. expected BTS attribute is above given feature vector length */ - if (m_id_len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) + if (len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: reported unexpectedly long (%u bytes) " "feature vector - most likely it was compiled against newer BSC headers. " "Consider upgrading your BSC to later version.\n", - bts->nr, m_id_len); + bts->nr, len); - memcpy(bts->_features_data, TLVP_VAL(&tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); - adjust = m_id_len + 3; /* adjust for parsed TL16V struct */ + memcpy(bts->_features_data, TLVP_VAL(tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); for (i = 0; i < _NUM_BTS_FEAT; i++) if (osmo_bts_has_feature(&bts->features, i) != osmo_bts_has_feature(&bts->model->features, i)) @@ -500,42 +505,32 @@ osmo_bts_has_feature(&bts->features, i), osmo_bts_has_feature(&bts->model->features, i)); } - *data_len -= adjust; - - return data + adjust; -} - -/* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.28 Manufacturer Dependent State */ -static inline const uint8_t *parse_attr_resp_info_manuf_state(const struct gsm_bts_trx *trx, const uint8_t *data, uint16_t *data_len) -{ - struct tlv_parsed tp; - const uint8_t *power; - uint8_t adjust = 0; - - if (!trx) /* this attribute does not make sense on BTS level, only on TRX level */ - return data; - - abis_nm_tlv_parse(&tp, trx->bts, data, *data_len); - if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_STATE, 1)) { - power = TLVP_VAL(&tp, NM_ATT_MANUF_STATE); - LOGP(DNM, LOGL_NOTICE, "%s Get Attributes Response: nominal power is %u\n", gsm_trx_name(trx), *power); - adjust = 2; /* adjust for parsed TV struct */ + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.28 Manufacturer Dependent State */ + /* this attribute does not make sense on BTS level, only on TRX level */ + if (trx && TLVP_PRES_LEN(tp, NM_ATT_MANUF_STATE, 1)) { + data = TLVP_VAL(tp, NM_ATT_MANUF_STATE); + LOGPFOH(DNM, LOGL_INFO, foh, "%s Get Attributes Response: nominal power is %u\n", gsm_trx_name(trx), *data); } - *data_len -= adjust; - - return data + adjust; -} - -/* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response (with nanoBTS speecific attribute formatting) */ -static int parse_attr_resp_nanobts(struct gsm_bts *bts, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) -{ - const uint8_t* data; - uint16_t len; - uint16_t port; - struct in_addr ia = {0}; - char unit_id[40]; - + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.61 SW Configuration */ + if (TLVP_PRESENT(tp, NM_ATT_SW_CONFIG)) { + data = TLVP_VAL(tp, NM_ATT_SW_CONFIG); + len = TLVP_LEN(tp, NM_ATT_SW_CONFIG); + /* after parsing manufacturer-specific attributes there's list of replies in form of sw-conf structure: */ + rc = abis_nm_get_sw_conf(data, len, &sw_descr[0], ARRAY_SIZE(sw_descr)); + if (rc > 0) { + for (i = 0; i < rc; i++) { + if (!handle_attr(bts, str2btsattr((const char *)sw_descr[i].file_id), + sw_descr[i].file_version, sw_descr[i].file_version_len)) + LOGPFOH(DNM, LOGL_NOTICE, foh, "BTS%u: ARI reported sw[%d/%d]: %s " + "is %s\n", bts->nr, i, rc, sw_descr[i].file_id, + sw_descr[i].file_version); + } + } else { + LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " + "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); + } + } if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST, 7)) { data = TLVP_VAL(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST); @@ -555,6 +550,14 @@ osmo_strlcpy(unit_id, (char*)data, OSMO_MIN(len, sizeof(unit_id))); LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u Get Attributes Response: Unit ID is %s\n", bts->nr, unit_id); } + + /* nanoBTS provides Get Attribute Response Info at random position and only the unreported part of it. */ + if (TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { + data = TLVP_VAL(tp, NM_ATT_GET_ARI); + len = TLVP_LEN(tp, NM_ATT_GET_ARI); + parse_attr_resp_info_unreported(bts->nr, data, len, NULL); + } + return 0; } @@ -562,10 +565,7 @@ static int parse_attr_resp_info(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { const uint8_t *data; - int i; uint16_t data_len; - int rc; - struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; if (!TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: Get Attr Response without Response Info?!\n", @@ -576,23 +576,10 @@ data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(tp, NM_ATT_GET_ARI), TLVP_LEN(tp, NM_ATT_GET_ARI), &data_len); - data = parse_attr_resp_info_manuf_state(trx, data, &data_len); - data = parse_attr_resp_info_manuf_id(bts, data, &data_len); + /* After parsing unreported part of Response info, there's a TLV of attr, same as per nanoBTS */ + abis_nm_tlv_parse(tp, bts, data, data_len); + parse_attr_resp_info_attr(bts, trx, foh, tp); - /* after parsing manufacturer-specific attributes there's list of replies in form of sw-conf structure: */ - rc = abis_nm_get_sw_conf(data, data_len, &sw_descr[0], ARRAY_SIZE(sw_descr)); - if (rc > 0) { - for (i = 0; i < rc; i++) { - if (!handle_attr(bts, str2btsattr((const char *)sw_descr[i].file_id), - sw_descr[i].file_version, sw_descr[i].file_version_len)) - LOGPFOH(DNM, LOGL_NOTICE, foh, "BTS%u: ARI reported sw[%d/%d]: %s " - "is %s\n", bts->nr, i, rc, sw_descr[i].file_id, - sw_descr[i].file_version); - } - } else { - LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " - "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); - } return 0; } @@ -613,7 +600,7 @@ if (bts->type != GSM_BTS_TYPE_NANOBTS) parse_attr_resp_info(bts, trx, foh, &tp); else - parse_attr_resp_nanobts(bts, foh, &tp); + parse_attr_resp_info_attr(bts, trx, foh, &tp); return 0; -- To view, visit https://gerrit.osmocom.org/11682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I77574579a19f1988f82cdac81b257b8f6871b857 Gerrit-Change-Number: 11682 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:19 +0000 Subject: Change in osmo-bsc[master]: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11683 Change subject: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation ...................................................................... abis_nm: parse_attr_resp_info_unreported: Fix offset calculation Related: OS#3624 Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 --- M src/osmo-bsc/abis_nm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/11683/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index bb2b5e2..ba3801d 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -462,7 +462,7 @@ /* the data starts right after the list of unreported attributes + space for length of that list */ if (out_len) - *out_len = ari_len - (num_unreported + 2); + *out_len = ari_len - (num_unreported + 1); return ari + num_unreported + 1; /* we have to account for 1st byte with number of unreported attributes */ } -- To view, visit https://gerrit.osmocom.org/11683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 Gerrit-Change-Number: 11683 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:19 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11684 Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... abis_nm: Introduce new signal S_NM_GET_ATTR_REP This signal can be used for tools willing to request and parse Attribute Response and do something with the information. Related: OS#3624 Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 --- M include/osmocom/bsc/signal.h M src/osmo-bsc/abis_nm.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/11684/1 diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 1b351aa..62a3d2c 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -72,6 +72,7 @@ S_NM_STATECHG_ADM, /* Administrative State changed */ S_NM_OM2K_CONF_RES, /* OM2K Configuration Result */ S_NM_OPSTART_ACK, /* Received OPSTART ACK, arg is struct msgb *oml_msg */ + S_NM_GET_ATTR_REP, /* Received Get Attributes Response, arg is struct msgb *oml_msg */ }; /* SS_LCHAN signals */ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index ba3801d..94c014c 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -602,6 +602,7 @@ else parse_attr_resp_info_attr(bts, trx, foh, &tp); + osmo_signal_dispatch(SS_NM, S_NM_GET_ATTR_REP, mb); return 0; } -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:19 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix whitespace Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11685 Change subject: ipaccess-config: Fix whitespace ...................................................................... ipaccess-config: Fix whitespace Related: OS#3624 Change-Id: I190752000a73d7600a946c7535661550b1fe3520 --- M src/ipaccess/ipaccess-config.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/11685/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 0fb5ad9..657dad1 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -1044,7 +1044,7 @@ gsm_bts_trx_alloc(bts); gsm_bts_trx_alloc(bts); bts->oml_tei = stream_id; - + osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); osmo_signal_register_handler(SS_IPAC_NWL, nwl_sig_cb, NULL); @@ -1060,7 +1060,7 @@ perror("Error connecting to the BTS"); exit(1); } - + bts->oml_link->ts->sign.delay = 10; bts->c0->rsl_link->ts->sign.delay = 10; while (1) { -- To view, visit https://gerrit.osmocom.org/11685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I190752000a73d7600a946c7535661550b1fe3520 Gerrit-Change-Number: 11685 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:20 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11686 Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID Related: OS#3624 Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 --- M src/ipaccess/ipaccess-config.c 1 file changed, 75 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/11686/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 657dad1..93b934b 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -59,6 +60,7 @@ static int net_listen_testnr; static int restart; +static bool get_attr; static char *prim_oml_ip; static char *bts_ip_addr, *bts_ip_mask, *bts_ip_gw; static char *unit_id; @@ -269,6 +271,45 @@ return 0; } +static int print_attr_rep(struct msgb *mb) +{ + /* Parse using nanoBTS own formatting for Get Attribute Response */ + struct abis_om_hdr *oh = msgb_l2(mb); + struct abis_om_fom_hdr *foh = msgb_l3(mb); + struct e1inp_sign_link *sign_link = mb->dst; + struct gsm_bts_trx *trx = sign_link->trx; + struct gsm_bts *bts = trx->bts; + struct tlv_parsed tp; + const uint8_t* data; + uint16_t len; + struct in_addr ia = {0}; + char oml_ip[20] = {0}; + uint16_t oml_port; + char unit_id[40] = {0}; + + + abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); + + if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST, 7)) { + data = TLVP_VAL(&tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST); + if (NM_ATT_IPACC_PRIM_OML_CFG == *data) { + ia.s_addr = htonl(osmo_load32be(data+1)); + osmo_strlcpy(oml_ip, inet_ntoa(ia), sizeof(oml_ip)); + oml_port = osmo_load16be(data+5); + } + } + + if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_UNIT_ID, 1)) { + data = TLVP_VAL(&tp, NM_ATT_IPACC_UNIT_ID); + len = TLVP_LEN(&tp, NM_ATT_IPACC_UNIT_ID); + osmo_strlcpy(unit_id, (char*)data, OSMO_MIN(len, sizeof(unit_id))); + } + + fprintf(stdout, "{ primary_oml_ip: \"%s\", primary_oml_port: %" PRIu16 ", unit_id: \"%s\" }\n", + oml_ip, oml_port, unit_id); + return 0; +} + static int nm_state_event(int evt, uint8_t obj_class, void *obj, struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, struct abis_om_obj_inst *obj_inst); @@ -278,6 +319,7 @@ { struct ipacc_ack_signal_data *ipacc_data; struct nm_statechg_signal_data *nsd; + struct msgb *oml_msg; switch (signal) { case S_NM_IPACC_NACK: @@ -300,6 +342,11 @@ nm_state_event(signal, nsd->obj_class, nsd->obj, nsd->old_state, nsd->new_state, nsd->obj_inst); break; + case S_NM_GET_ATTR_REP: + fprintf(stderr, "Received SIGNAL S_NM_GET_ATTR_REP\n"); + oml_msg = signal_data; + print_attr_rep(oml_msg); + exit(0); default: break; } @@ -493,18 +540,23 @@ static void bootstrap_om(struct gsm_bts_trx *trx) { - struct msgb *nmsg = msgb_alloc(1024, "nested msgb"); + struct msgb *nmsg_get = msgb_alloc(1024, "nested get msgb"); + struct msgb *nmsg_set = msgb_alloc(1024, "nested set msgb"); int need_to_set_attr = 0; int len; printf("OML link established using TRX %d\n", trx->nr); + if (get_attr) { + msgb_put_u8(nmsg_get, NM_ATT_IPACC_PRIM_OML_CFG); + msgb_put_u8(nmsg_get, NM_ATT_IPACC_UNIT_ID); + } if (unit_id) { len = strlen(unit_id); - if (len > nmsg->data_len-10) + if (len > nmsg_set->data_len-10) goto out_err; printf("setting Unit ID to '%s'\n", unit_id); - nv_put_unit_id(nmsg, unit_id); + nv_put_unit_id(nmsg_set, unit_id); need_to_set_attr = 1; } if (prim_oml_ip) { @@ -517,13 +569,13 @@ } printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia)); - nv_put_prim_oml(nmsg, ntohl(ia.s_addr), 0); + nv_put_prim_oml(nmsg_set, ntohl(ia.s_addr), 0); need_to_set_attr = 1; } if (nv_mask) { printf("setting NV Flags/Mask to 0x%04x/0x%04x\n", nv_flags, nv_mask); - nv_put_flags(nmsg, nv_flags, nv_mask); + nv_put_flags(nmsg_set, nv_flags, nv_mask); need_to_set_attr = 1; } if (bts_ip_addr && bts_ip_mask) { @@ -542,7 +594,7 @@ } printf("setting static IP Address/Mask\n"); - nv_put_ip_if_cfg(nmsg, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr)); + nv_put_ip_if_cfg(nmsg_set, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr)); need_to_set_attr = 1; } if (bts_ip_gw) { @@ -556,12 +608,19 @@ printf("setting static IP Gateway\n"); /* we only set the default gateway with zero addr/mask */ - nv_put_gw_cfg(nmsg, 0, 0, ntohl(ia_gw.s_addr)); + nv_put_gw_cfg(nmsg_set, 0, 0, ntohl(ia_gw.s_addr)); need_to_set_attr = 1; } + if (get_attr) { + fprintf(stderr, "getting Attributes (%d): %s\n", nmsg_get->len, osmo_hexdump(msgb_data(nmsg_get), msgb_length(nmsg_get))); + abis_nm_get_attr(trx->bts, NM_OC_BASEB_TRANSC, 0, trx->nr, 0xff, nmsg_get->head, nmsg_get->len); + oml_state = 1; + } + if (need_to_set_attr) { - abis_nm_ipaccess_set_nvattr(trx, nmsg->head, nmsg->len); + printf("abis_nm_ipaccess_set_nvattr\n"); + abis_nm_ipaccess_set_nvattr(trx, nmsg_set->head, nmsg_set->len); oml_state = 1; } @@ -571,7 +630,8 @@ } out_err: - msgb_free(nmsg); + msgb_free(nmsg_get); + msgb_free(nmsg_set); } static int nm_state_event(int evt, uint8_t obj_class, void *obj, @@ -833,6 +893,7 @@ printf("Commands for writing to the BTS:\n"); printf(" -u --unit-id UNIT_ID\t\tSet the Unit ID of the BTS\n"); printf(" -o --oml-ip IP\t\tSet primary OML IP (IP of your BSC)\n"); + printf(" -G --get-attr\t\tGet several attributes from BTS\n"); printf(" -i --ip-address IP/MASK\tSet static IP address + netmask of BTS\n"); printf(" -g --ip-gateway IP\t\tSet static IP gateway of BTS\n"); printf(" -r --restart\t\t\tRestart the BTS (after other operations)\n"); @@ -910,6 +971,7 @@ unsigned long ul; char *slash; static struct option long_options[] = { + { "get-attr", 0, 0, 'G' }, { "unit-id", 1, 0, 'u' }, { "oml-ip", 1, 0, 'o' }, { "ip-address", 1, 0, 'i' }, @@ -931,13 +993,16 @@ { 0, 0, 0, 0 }, }; - c = getopt_long(argc, argv, "u:o:i:g:rn:S:U:l:L:hs:d:f:wcpH", long_options, + c = getopt_long(argc, argv, "Gu:o:i:g:rn:S:U:l:L:hs:d:f:wcpH", long_options, &option_index); if (c == -1) break; switch (c) { + case 'G': + get_attr = true; + break; case 'u': if (!check_unitid_fmt(optarg)) exit(2); -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:21 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11687 Change subject: ipaccess-config: Use stderr for debug type messages ...................................................................... ipaccess-config: Use stderr for debug type messages This way we want print only a formated output in stdout when using -G. Related: OS#3624 Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e --- M src/ipaccess/ipaccess-config.c 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11687/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 93b934b..3de68aa 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -545,7 +545,7 @@ int need_to_set_attr = 0; int len; - printf("OML link established using TRX %d\n", trx->nr); + fprintf(stderr, "OML link established using TRX %d\n", trx->nr); if (get_attr) { msgb_put_u8(nmsg_get, NM_ATT_IPACC_PRIM_OML_CFG); @@ -555,7 +555,7 @@ len = strlen(unit_id); if (len > nmsg_set->data_len-10) goto out_err; - printf("setting Unit ID to '%s'\n", unit_id); + fprintf(stderr, "setting Unit ID to '%s'\n", unit_id); nv_put_unit_id(nmsg_set, unit_id); need_to_set_attr = 1; } @@ -568,12 +568,12 @@ goto out_err; } - printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia)); + fprintf(stderr, "setting primary OML link IP to '%s'\n", inet_ntoa(ia)); nv_put_prim_oml(nmsg_set, ntohl(ia.s_addr), 0); need_to_set_attr = 1; } if (nv_mask) { - printf("setting NV Flags/Mask to 0x%04x/0x%04x\n", + fprintf(stderr, "setting NV Flags/Mask to 0x%04x/0x%04x\n", nv_flags, nv_mask); nv_put_flags(nmsg_set, nv_flags, nv_mask); need_to_set_attr = 1; @@ -593,7 +593,7 @@ goto out_err; } - printf("setting static IP Address/Mask\n"); + fprintf(stderr, "setting static IP Address/Mask\n"); nv_put_ip_if_cfg(nmsg_set, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr)); need_to_set_attr = 1; } @@ -606,7 +606,7 @@ goto out_err; } - printf("setting static IP Gateway\n"); + fprintf(stderr, "setting static IP Gateway\n"); /* we only set the default gateway with zero addr/mask */ nv_put_gw_cfg(nmsg_set, 0, 0, ntohl(ia_gw.s_addr)); need_to_set_attr = 1; @@ -619,13 +619,13 @@ } if (need_to_set_attr) { - printf("abis_nm_ipaccess_set_nvattr\n"); + fprintf(stderr, "abis_nm_ipaccess_set_nvattr\n"); abis_nm_ipaccess_set_nvattr(trx, nmsg_set->head, nmsg_set->len); oml_state = 1; } if (restart && !prim_oml_ip && !software) { - printf("restarting BTS\n"); + fprintf(stderr, "restarting BTS\n"); abis_nm_ipaccess_restart(trx); } @@ -654,7 +654,7 @@ phys_conf_min, sizeof(phys_conf_min)); else if (software) { int rc; - printf("Attempting software upload with '%s'\n", software); + fprintf(stderr, "Attempting software upload with '%s'\n", software); rc = abis_nm_software_load(trx->bts, trx->nr, software, 19, 0, swload_cbfn, trx); if (rc < 0) { fprintf(stderr, "Failed to start software load\n"); @@ -963,8 +963,8 @@ osmo_init_logging2(tall_ctx_config, &log_info); bts_model_nanobts_init(); - printf("ipaccess-config (C) 2009-2010 by Harald Welte and others\n"); - printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); + fprintf(stderr, "ipaccess-config (C) 2009-2010 by Harald Welte and others\n"); + fprintf(stderr, "This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); while (1) { int c; @@ -1115,7 +1115,7 @@ ipac_nwl_init(); - printf("Trying to connect to ip.access BTS %s...\n", bts_ip); + fprintf(stderr, "Trying to connect to ip.access BTS %s...\n", bts_ip); memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:43:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:43:21 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: cosmetic: Remove unneeded comment with hex values Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11688 Change subject: ipaccess-config: cosmetic: Remove unneeded comment with hex values ...................................................................... ipaccess-config: cosmetic: Remove unneeded comment with hex values Same type of message parsing is already implemented in code, no need to keep them. Related: OS#3624 Change-Id: I715bd9582f9289b5674aaa8d8de1164ebef2fd11 --- M src/ipaccess/ipaccess-config.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/11688/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 3de68aa..12f6957 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -78,11 +78,6 @@ static struct abis_nm_sw_desc *sw_load1 = NULL; static struct abis_nm_sw_desc *sw_load2 = NULL; -/* -static uint8_t prim_oml_attr[] = { 0x95, 0x00, 7, 0x88, 192, 168, 100, 11, 0x00, 0x00 }; -static uint8_t unit_id_attr[] = { 0x91, 0x00, 9, '2', '3', '4', '2', '/' , '0', '/', '0', 0x00 }; -*/ - extern int ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what); extern struct e1inp_line_ops ipaccess_e1inp_line_ops; -- To view, visit https://gerrit.osmocom.org/11688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I715bd9582f9289b5674aaa8d8de1164ebef2fd11 Gerrit-Change-Number: 11688 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 13:50:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 13:50:02 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11686 to look at the new patch set (#2). Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID Related: OS#3624 Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 --- M src/ipaccess/ipaccess-config.c 1 file changed, 75 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/11686/2 -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:03:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 14:03:44 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 08 Nov 2018 14:03:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:03:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 14:03:45 +0000 Subject: Change in osmo-dev[master]: replace src/* git scripts with a single src/gits In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11560 ) Change subject: replace src/* git scripts with a single src/gits ...................................................................... replace src/* git scripts with a single src/gits I keep re-using this functionality in completely unrelated realms, and decided to unify the oddly named scripts in a single 'gits' meta-repos tool, so I can just symlink this script into my ~/bin and use it everywhere. Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 --- M src/README D src/e D src/g D src/git_branch_summary.py A src/gits D src/s D src/st 7 files changed, 397 insertions(+), 298 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve; Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/README b/src/README index a2fbe81..f066561 100644 --- a/src/README +++ b/src/README @@ -11,12 +11,11 @@ Pass a patch number seen on gerrit to fetch the latest patch set into your git clone. See top comment in the script. - ./g run a git command in each source tree - ./e run an arbitrary shell command in each source tree - ./st show a brief branch and local mods status for each source tree - ./s walk through each source tree and use gitk as well as user interaction - to quickly fast-forward / reset changes coming in from upstream. (This - is potentially dangerous, but safe if you only hit enter every time.) + gits Conveniently manage several git clones: + - run a git or shell command in each source tree + - show a brief branch and local mods status for each source tree + - merge / rebase / fast-forward each source tree interactively + See ./gits help Examples: @@ -54,7 +53,7 @@ ----------------------------------------------------------------------------- -./g fetch # run 'git fetch' in each clone = fetch all from upstream +./gits fetch # run 'git fetch' in each clone = fetch all from upstream ===== libasn1c ===== remote: Counting objects: 29, done @@ -90,7 +89,7 @@ ----------------------------------------------------------------------------- -./st # any modifications / updates? (e.g. useful after './g fetch') +./gits st # any modifications / updates? (e.g. useful after './g fetch') # (checks only 'master' and the current checked-out branch) libasn1c master @@ -116,13 +115,13 @@ ----------------------------------------------------------------------------- -./e rm .version # in each source tree, remove the local .version file +./gits sh rm .version # in each source tree, remove the local .version file ----------------------------------------------------------------------------- -./s # interactively try to fast-forward to upstream and/or save - # local modifications. - # If you just hit Enter all the time, nothing will be changed. +./gits rebase # interactively try to fast-forward to upstream and/or save + # local modifications. + # If you just hit Enter all the time, nothing dangerous will happen. libosmocore diff --git a/src/e b/src/e deleted file mode 100755 index 4d32bf1..0000000 --- a/src/e +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python3 -import os -import os.path -import sys -import subprocess - -base_dir = os.getcwd() - -for p in list(os.listdir('.')): - subdir = os.path.join(base_dir, p) - if not os.path.isdir(os.path.join(subdir, '.git')): - continue - print("\n===== %s =====" % p) - os.chdir(subdir) - subprocess.call(sys.argv[1:]) diff --git a/src/g b/src/g deleted file mode 100755 index bb9b693..0000000 --- a/src/g +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python3 - -import sys -import os -import subprocess - -git_subdirs = [] - -for subdir in os.listdir(): - if not os.path.isdir(os.path.join(subdir, '.git')): - continue - - print('\n===== %s =====' % subdir) - sys.stdout.flush() - subprocess.call(['git', '-C', subdir] + sys.argv[1:]) - sys.stdout.flush() - sys.stderr.flush() diff --git a/src/git_branch_summary.py b/src/git_branch_summary.py deleted file mode 100755 index 9d81f8b..0000000 --- a/src/git_branch_summary.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python - -import sys, subprocess, re - -if len(sys.argv) < 2: - print("Usage: %s [...]\nThis is mostly here for helping the 'st' script." % sys.argv[0]) - exit(1) - -interesting_branch_names = [ 'master', 'sysmocom/iu', 'sysmocom/sccp', 'aper-prefix-onto-upstream' ] - -re_branch_name = re.compile('^..([^ ]+) .*') -re_ahead = re.compile('ahead [0-9]+|behind [0-9]+') - -def branch_name(line): - m = re_branch_name.match(line) - return m.group(1) - -interesting = [] - -def do_one_git(git_dir): - global interesting - branch_strs = subprocess.check_output(('git', '-C', git_dir, 'branch', '-vv')).decode('utf-8').splitlines() - interesting_branches = [] - - for line in branch_strs: - name = branch_name(line) - current_branch = False - if line.startswith('*'): - current_branch = True - elif name not in interesting_branch_names: - continue - ahead = re_ahead.findall(line) - if not ahead and not current_branch: - continue - ahead = [x.replace('ahead ', '+').replace('behind ', '-') for x in ahead] - br = (current_branch, name, ahead) - if current_branch: - interesting_branches.insert(0, br) - else: - interesting_branches.append(br) - - status = subprocess.check_output(('git', '-C', git_dir, 'status')).decode() - has_mods = 'modified:' in status - - interesting.append((git_dir, has_mods, interesting_branches)) - - -for git_dir in sys.argv[1:]: - do_one_git(git_dir) - - -first_col = max([len(git_dir) for git_dir, _, _ in interesting]) -first_col_fmt = '%' + str(first_col) + 's' - -for git_dir, has_mods, interesting_branches in interesting: - strs = [first_col_fmt % git_dir,] - if has_mods: - strs.append('MODS') - for current_branch, name, ahead in interesting_branches: - br = [] - br.append(name) - if ahead: - br.append('[%s]' % '|'.join(ahead)) - strs.append(''.join(br)) - - print(' '.join(strs)) - -# vim: shiftwidth=2 expandtab tabstop=2 diff --git a/src/gits b/src/gits new file mode 100755 index 0000000..81083f1 --- /dev/null +++ b/src/gits @@ -0,0 +1,386 @@ +#!/usr/bin/env python3 +# +# (C) 2018 by Neels Hofmeyr +# All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import sys +import subprocess +import re +import argparse +import os +import shlex + +doc = '''gits: conveniently manage several git subdirectories. +Instead of doing the 'cd foo; git status; cd ../bar; git status' dance, this +helps to save your time with: status, fetch, rebase, ... +''' + +re_status_mods = re.compile('^\t(modified|deleted):.*') +re_status_branch_name = re.compile('On branch ([^ ]*)') +re_branch_name = re.compile('^..([^ ]+) .*') +re_ahead_behind = re.compile('ahead [0-9]+|behind [0-9]+') + + +def error(*msgs): + sys.stderr.write(''.join(msgs)) + sys.stderr.write('\n') + exit(1) + + +def cmd_to_str(cmd): + return ' '.join(shlex.quote(c) for c in cmd) + + +def git(git_dir, *args, may_fail=False, section_marker=False, show_cmd=True): + sys.stdout.flush() + sys.stderr.flush() + + if section_marker: + print('\n===== %s =====' % git_dir) + sys.stdout.flush() + + cmd = ['git', '-C', git_dir] + list(args) + if show_cmd: + print('+ %s' % cmd_to_str(cmd)) + sys.stdout.flush() + + rc = subprocess.call(cmd) + if rc and not may_fail: + error('git returned error! command: git -C %r %s' % + (git_dir, ' '.join(repr(arg) for arg in args))) + + +def git_output(git_dir, *args): + return subprocess.check_output(['git', '-C', git_dir, ] + list(args)).decode('utf-8') + + +def git_branch(git_dir): + status = git_output(git_dir, 'status', '--long') + m = re_status_branch_name.find(status) + if not m: + error('No current branch in %r' % git_dir) + return m.group(1) + + +def git_status(git_dir, verbose=False): + status_lines = git_output(git_dir, 'status').splitlines() + if verbose and len(status_lines): + print(status_lines[0]) + + on_branch = None + branch_status_str = None + local_mods = False + + ON_BRANCH = 'On branch ' + STATUS = 'Your branch' + + for l in status_lines: + if l.startswith(ON_BRANCH): + if on_branch: + error('cannot parse status, more than one branch?') + on_branch = l[len(ON_BRANCH):] + elif l.startswith(STATUS): + if 'Your branch is up to date' in l: + branch_status_str = l + elif 'Your branch is up-to-date' in l: + branch_status_str = l + elif 'Your branch is ahead' in l: + branch_status_str = 'ahead: ' + l + elif 'Your branch is behind' in l: + branch_status_str = 'behind: ' + l + elif 'have diverged' in l: + branch_status_str = 'diverged: ' + l + else: + error('unknown status str: %r' % l) + else: + m = re_status_mods.match(l) + if m: + local_mods = True + + if verbose: + print('%s%s' % (branch_status_str, '\nLOCAL MODS' if local_mods else '')) + return (on_branch, branch_status_str, local_mods) + + +def git_branch_summary(git_dir): + '''return a list of strings: [git_dir, branch-info0, branch-info1,...] + infos are are arbitrary strings like "master[-1]"''' + + interesting_branch_names = ('master',) + + strs = [git_dir, ] + + on_branch, branch_status_str, has_mods = git_status(git_dir) + + if has_mods: + strs.append('MODS') + + branch_strs = git_output(git_dir, 'branch', '-vv').splitlines() + + for line in branch_strs: + m = re_branch_name.match(line) + name = m.group(1) + + current_branch = False + if line.startswith('*'): + current_branch = True + elif name not in interesting_branch_names: + continue + ahead_behind = re_ahead_behind.findall(line) + if not ahead_behind and not current_branch: + # skip branches that are "not interesting" + continue + ahead_behind = [ + x.replace('ahead ', '+').replace('behind ', '-') for x in ahead_behind] + + branch_info = name + if ahead_behind: + branch_info = branch_info + ('[%s]' % '|'.join(ahead_behind)) + + strs.append(''.join(branch_info)) + + return strs + + +def format_summaries(summaries, sep0=' ', sep1=' '): + first_col = max([len(row[0]) for row in summaries]) + first_col_fmt = '%' + str(first_col) + 's' + + lines = [] + for row in summaries: + lines.append('%s%s%s' % (first_col_fmt % + row[0], sep0, sep1.join(row[1:]))) + + return '\n'.join(lines) + + +def git_dirs(): + dirs = [] + for sub in os.listdir(): + git_path = os.path.join(sub, '.git') + if not os.path.isdir(git_path): + continue + dirs.append(sub) + + if not dirs: + error('No subdirectories found that are git clones') + + return list(sorted(dirs)) + + +def print_status(): + infos = [git_branch_summary(git_dir) for git_dir in git_dirs()] + print(format_summaries(infos)) + + +def cmd_do(argv): + for git_dir in git_dirs(): + git(git_dir, *argv, may_fail=True, section_marker=True) + + +def cmd_sh(cmd): + if not cmd: + error('which command do you want to run?') + for git_dir in git_dirs(): + print('\n===== %s =====' % git_dir) + print('+ %s' % cmd_to_str(cmd)) + sys.stdout.flush() + subprocess.call(cmd, cwd=git_dir) + sys.stdout.flush() + sys.stderr.flush() + + +class SkipThisRepo(Exception): + pass + + +def ask(git_dir, *question, valid_answers=('*',)): + while True: + print('\n' + '\n '.join(question)) + print(' ' + '\n '.join(( + 's skip this repo', + 't show in tig', + 'g show in gitk', + ))) + + answer = sys.stdin.readline().strip() + if answer == 's': + raise SkipThisRepo() + if answer == 't': + subprocess.call(('tig', '--all'), cwd=git_dir) + continue + if answer == 'g': + subprocess.call(('gitk', '--all'), cwd=git_dir) + continue + + for v in valid_answers: + if v == answer: + return answer + if v == '*': + return answer + if v == '+' and len(answer): + return answer + + +def rebase(git_dir): + orig_branch, branch_status_str, local_mods = git_status( + git_dir, verbose=True) + + if orig_branch is None: + print('Not on a branch: %s' % git_dir) + raise SkipThisRepo() + + if local_mods: + do_commit = ask(git_dir, 'Local mods.', + 'c commit to this branch', + ' commit to new branch', + ' skip') + + if not do_commit: + raise SkipThisRepo() + + if do_commit == 'c': + git(git_dir, 'commit', '-am', 'wip', may_fail=True) + else: + git(git_dir, 'checkout', '-b', do_commit) + git(git_dir, 'commit', '-am', 'wip', may_fail=True) + git(git_dir, 'checkout', orig_branch) + + _, _, local_mods = git_status(git_dir) + + if local_mods: + print('There still are local modifications') + raise SkipThisRepo() + + if branch_status_str is None: + print('there is no upstream branch for %r' % orig_branch) + + elif branch_status_str.startswith('behind'): + if 'and can be fast-forwarded' in branch_status_str: + print('fast-forwarding...') + git(git_dir, 'merge') + else: + do_merge = ask(git_dir, 'Behind. git merge?', + " don't merge", + 'ok git merge', + valid_answers=('', 'ok') + ) + + if do_merge == 'ok': + git(git_dir, 'merge') + + elif branch_status_str.startswith('ahead'): + do_commit = ask(git_dir, 'Ahead. commit to new branch?', + ' no', + ' create new branch', + ) + if do_commit: + git(git_dir, 'checkout', '-b', do_commit) + git(git_dir, 'commit', '-am', 'wip', may_fail=True) + git(git_dir, 'checkout', orig_branch) + + do_reset = ask(git_dir, '%s: git reset --hard origin/%s?' % (orig_branch, orig_branch), + ' no', + 'OK yes (write OK in caps!)', + valid_answers=('', 'OK')) + + if do_reset == 'OK': + git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + + elif branch_status_str.startswith('diverged'): + do_reset = ask(git_dir, 'Diverged.', + '%s: git reset --hard origin/%s?' % ( + orig_branch, orig_branch), + ' no', + 'OK yes (write OK in caps!)', + valid_answers=('', 'OK')) + + if do_reset == 'OK': + git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + + return orig_branch + + +def cmd_rebase(): + skipped = [] + for git_dir in git_dirs(): + try: + print('\n\n===== %s =====' % git_dir) + sys.stdout.flush() + + branch = rebase(git_dir) + if branch != 'master': + git(git_dir, 'checkout', 'master') + rebase(git_dir) + git(git_dir, 'checkout', branch) + + except SkipThisRepo: + print('\nSkipping %r' % git_dir) + skipped.append(git_dir) + + print('\n\n==========\nrebase done.\n') + print_status() + if skipped: + print('\nskipped: %s' % ' '.join(skipped)) + + +def parse_args(): + parser = argparse.ArgumentParser(description=doc) + sub = parser.add_subparsers(title='action', dest='action') + sub.required = True + + # status + sub.add_parser('status', aliases=['st', 's'], + help='show a branch summary and indicate modifications') + + # fetch + fetch = sub.add_parser('fetch', aliases=['f'], + help="run 'git fetch' in each clone (use before rebase)") + fetch.add_argument('remainder', nargs=argparse.REMAINDER, + help='additional arguments to be passed to git fetch') + + # rebase + sub.add_parser('rebase', aliases=['r', 're'], + help='interactively ff-merge master, rebase current branches') + + # sh + sh = sub.add_parser('sh', + help='run shell command in each clone (`gits sh echo hi`)') + sh.add_argument('remainder', nargs=argparse.REMAINDER, + help='command to run in each clone') + + # do + do = sub.add_parser('do', + help='run git command in each clone (`gits do clean -dxf`)') + do.add_argument('remainder', nargs=argparse.REMAINDER, + help='git command to run in each clone') + return parser.parse_args() + + +if __name__ == '__main__': + args = parse_args() + if args.action in ['status', 's', 'st']: + print_status() + elif args.action in ['fetch', 'f']: + cmd_do(['fetch'] + args.remainder) + elif args.action in ['rebase', 'r']: + cmd_rebase() + elif args.action == 'sh': + cmd_sh(args.remainder) + elif args.action == 'do': + cmd_do(args.remainder) + +# vim: shiftwidth=4 expandtab tabstop=4 diff --git a/src/s b/src/s deleted file mode 100755 index f897bc1..0000000 --- a/src/s +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env bash -fastforwards="" - -Git() { - echo "git $@" - git $@ - if [ "$?" != "0" ]; then - echo "GIT RETURNED ERROR!" - exit 1 - fi -} - -Git_may_fail() { - git $@ -} - -Git_branch() { - echo "$(Git -C "$dir" status)" | grep 'On branch' | sed 's/On branch //' -} - - -gitk_start() { - if [ -n "$DISPLAY" ]; then - gitk --all & - gitk_started="1" - fi -} - -status() { - st="$(Git status)" - mods="$(echo "$st" | grep 'modified:')" - - stline="$(echo "$st" | grep '\(behind\|ahead\|up-to-date\|diverged\)')" - - echo "$br" - echo "$stline" -} - -dance() { - echo - echo - br="$(Git_branch)" - - echo "$dir" - cd "$dir" - - status - - if [ -z "$mods" -a -n "$(echo "$stline" | grep up-to-date)" ]; then - return 0 - fi - - gitk_start - - if [ -n "$mods" ]; then - echo "Local mods" - echo "$mods" - echo - echo "commit to new branch? (enter name, empty = no)" - read wipbranch - if [ -n "$wipbranch" ]; then - Git checkout -b "$wipbranch" - Git_may_fail commit -am wip - #Git push --set-upstream origin "$wipbranch" - Git checkout "$br" - else - echo "commit to this branch $br ? (empty = no, 'ok' = yes)" - read ok - if [ "x$ok" = xok ]; then - Git commit -am wip - #Git push - fi - fi - - status - - if [ -n "$mods" ]; then - return 0 - fi - fi - - if [ -n "$(echo "$stline" | grep behind)" ]; then - if [ -n "$(echo "$stline" | grep "and can be fast-forwarded")" ]; then - echo "fast forwarding..." - fastforwards="${fastforwards} $dir/$br:$(Git_may_fail rev-parse --short HEAD)" - ok="ok" - else - echo "Behind. git merge? (empty = no, 'ok' = yes)" - read ok - fi - if [ "x$ok" = xok ]; then - Git merge - fi - elif [ -n "$(echo "$stline" | grep ahead)" ]; then - echo "Ahead. commit to new branch? (enter name, empty = no)" - read wipbranch - if [ -n "$wipbranch" ]; then - Git checkout -b "$wipbranch" - Git_may_fail commit -am wip - #Git push --set-upstream origin "$wipbranch" - Git checkout "$br" - fi - echo "$br: git reset --hard origin/$br ? (empty = no, 'OK' IN CAPS = yes)" - read ok - if [ "x$ok" = xOK ]; then - Git reset --hard "origin/$br" - fi - return 0 - elif [ -n "$(echo "$stline" | grep diverged)" ]; then - echo "Diverged. git reset --hard origin/$br ? (empty = no, 'OK' IN CAPS = yes)" - read ok - if [ "x$ok" = xOK ]; then - wipbranch="neels/wip_$(date +%Y%m%d_%H%M)" - Git checkout -b "$wipbranch" - Git_may_fail commit -am wip - Git checkout "$br" - Git reset --hard "origin/$br" - fi - elif [ -z "$(echo "$stline" | grep up-to-date)" ]; then - echo "Nothing to do." - echo "$st" - fi - -} - -kill_gitk() { - if [ "$gitk_started" = "1" ]; then - kill %1 - gitk_started="0" - fi -} - - -basedir="$(pwd)" -gitk_started="0" -for gitdir in */.git ; do - cd "$basedir" - dir="$(dirname "$gitdir")" - - orig_branch="$(Git_branch)" - - kill_gitk - dance - cd "$basedir" - - if [ "$orig_branch" != master ]; then - kill_gitk - git -C "$dir" checkout master || continue - dance - cd "$basedir" - pwd - git -C "$dir" checkout "$orig_branch" - fi - -# if [ "$dir" = "openbsc" ]; then -# kill_gitk -# Git checkout "sysmocom/iu" -# dance -# fi - - sleep .1 - -done - -kill_gitk - -echo -echo -./st - -if [ -n "$fastforwards" ]; then - echo - echo "FAST-FORWARDED: $fastforwards" -fi - -# vim: shiftwidth=2 expandtab diff --git a/src/st b/src/st deleted file mode 100755 index a47de6b..0000000 --- a/src/st +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -git_dirs() { - for gitdir in */.git ; do - echo "$(dirname "$gitdir")" - done -} - -./git_branch_summary.py $(git_dirs) -# vim: shiftwidth=2 expandtab -- To view, visit https://gerrit.osmocom.org/11560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I579e7af26d76d5c5d83b2349695456bc7b54f5a2 Gerrit-Change-Number: 11560 Gerrit-PatchSet: 11 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:18:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 14:18:56 +0000 Subject: Change in osmo-bsc[master]: LCLS: tighten GCR check Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11689 Change subject: LCLS: tighten GCR check ...................................................................... LCLS: tighten GCR check Use stricter checks for received Global Call Reference. Change-Id: I9690e1b2d14e41471413bb35eb22fa6c4c4d67fd Related: OS#2487 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/11689/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 6b7a682..f03fb6e 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -520,19 +520,20 @@ static void bssmap_handle_ass_req_lcls(struct gsm_subscriber_connection *conn, const struct tlv_parsed *tp) { - const struct tlv_p_entry *tlv; - const uint8_t *config, *control; + const uint8_t *config, *control, *gcr, gcr_len = TLVP_LEN(tp, GSM0808_IE_GLOBAL_CALL_REF); - tlv = TLVP_GET(tp, GSM0808_IE_GLOBAL_CALL_REF); - if (tlv) { - if (tlv->len > sizeof(conn->lcls.global_call_ref)) - LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too long\n", - tlv->len); - else { - LOGPFSM(conn->fi, "Setting GCR to %s\n", osmo_hexdump_nospc(tlv->val, tlv->len)); - memcpy(&conn->lcls.global_call_ref, tlv->val, tlv->len); - conn->lcls.global_call_ref_len = tlv->len; - } + if (gcr_len > sizeof(conn->lcls.global_call_ref)) + LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too long\n", + gcr_len); + else { + gcr = TLVP_VAL_MINLEN(tp, GSM0808_IE_GLOBAL_CALL_REF, 13); + if (gcr) { + LOGPFSM(conn->fi, "Setting GCR to %s\n", osmo_hexdump_nospc(gcr, gcr_len)); + memcpy(&conn->lcls.global_call_ref, gcr, gcr_len); + conn->lcls.global_call_ref_len = gcr_len; + } else + LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too short\n", + gcr_len); } config = TLVP_VAL_MINLEN(tp, GSM0808_IE_LCLS_CONFIG, 1); -- To view, visit https://gerrit.osmocom.org/11689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9690e1b2d14e41471413bb35eb22fa6c4c4d67fd Gerrit-Change-Number: 11689 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:35:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 14:35:50 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11686 ) Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/11686/2/src/ipaccess/ipaccess-config.c File src/ipaccess/ipaccess-config.c: https://gerrit.osmocom.org/#/c/11686/2/src/ipaccess/ipaccess-config.c at 616 PS2, Line 616: fprintf(stderr, "getting Attributes (%d): %s\n", nmsg_get->len, osmo_hexdump(msgb_data(nmsg_get), msgb_length(nmsg_get))); why stderr here? https://gerrit.osmocom.org/#/c/11686/2/src/ipaccess/ipaccess-config.c at 622 PS2, Line 622: printf("abis_nm_ipaccess_set_nvattr\n"); and stdout here? -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:35:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:38:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 14:38:21 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11686 ) Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... Patch Set 2: > (2 comments) See next commits and you'll know :) -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:38:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:38:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 14:38:59 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11686 ) Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11686/2/src/ipaccess/ipaccess-config.c File src/ipaccess/ipaccess-config.c: https://gerrit.osmocom.org/#/c/11686/2/src/ipaccess/ipaccess-config.c at 622 PS2, Line 622: printf("abis_nm_ipaccess_set_nvattr\n"); > and stdout here? Actually, I think I can remove this one. -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:38:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:42:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 14:42:40 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Unify Get Attribute Response parsing In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11682 ) Change subject: abis_nm: Unify Get Attribute Response parsing ...................................................................... Patch Set 1: Could you split this into several patches? You are doing several things at the same time in nearby code and it's difficult to track all changes here. -- To view, visit https://gerrit.osmocom.org/11682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77574579a19f1988f82cdac81b257b8f6871b857 Gerrit-Change-Number: 11682 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:42:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:44:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 14:44:32 +0000 Subject: Change in osmo-bsc[master]: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11683 ) Change subject: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation ...................................................................... Patch Set 1: That's odd - is there some test case which could catch that? Also, describe in commit message what exactly is fixed, what was broken before, how it was tested etc. -- To view, visit https://gerrit.osmocom.org/11683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 Gerrit-Change-Number: 11683 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:44:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:47:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 14:47:24 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid mempcy with NULL src In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, daniel, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11610 to look at the new patch set (#2). Change subject: layer23: Avoid mempcy with NULL src ...................................................................... layer23: Avoid mempcy with NULL src Fixes following ASan warning: git/osmocom-bb/src/host/layer23/src/misc/../common/main.c:146:2: runtime error: null pointer passed as argument 2, which is declared to never be null The warning however is harmless since in that case, app_len = 0 and thus size to copy is 0. Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 --- M src/host/layer23/src/common/main.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/11610/2 -- To view, visit https://gerrit.osmocom.org/11610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 Gerrit-Change-Number: 11610 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:48:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 14:48:44 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11680 ) Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... Patch Set 1: (1 comment) Could you split moving code to separate function and adding support for another BTS type into different patches? You are doing several things at the same time in nearby code and it's difficult to track all changes here. https://gerrit.osmocom.org/#/c/11680/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/11680/1/src/osmo-bsc/abis_nm.c at 531 PS1, Line 531: static int parse_attr_resp_info(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) Can you make *bts const? -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:48:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:49:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 14:49:43 +0000 Subject: Change in osmo-bsc[master]: prevent a NULL pointer dereference in debug_candidate() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11630 ) Change subject: prevent a NULL pointer dereference in debug_candidate() ...................................................................... Patch Set 1: ah now I realize the coverity id, sorry about the noise. I would have just accepted it then -- To view, visit https://gerrit.osmocom.org/11630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3d672d835bbc136809e593a819a6dda7c84a88e Gerrit-Change-Number: 11630 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 08 Nov 2018 14:49:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:50:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 14:50:12 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Unify Get Attribute Response parsing In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11682 ) Change subject: abis_nm: Unify Get Attribute Response parsing ...................................................................... Patch Set 1: I'm more than happy to break it into several patches if you can propose a way of doing so, since all the changes are quite interdependent. I did my best to explain the different new parts in the commit description. -- To view, visit https://gerrit.osmocom.org/11682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I77574579a19f1988f82cdac81b257b8f6871b857 Gerrit-Change-Number: 11682 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:50:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:50:58 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 14:50:58 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11657/2/ttcn3-bscnat-test/Dockerfile File ttcn3-bscnat-test/Dockerfile: https://gerrit.osmocom.org/#/c/11657/2/ttcn3-bscnat-test/Dockerfile at 1 PS2, Line 1: FROM laforge/debian-stretch-titan You sure that's correct? No other Dockerfile uses it this way. -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:50:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 14:54:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 14:54:44 +0000 Subject: Change in osmo-bsc[master]: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11683 ) Change subject: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation ...................................................................... Patch Set 1: > That's odd - is there some test case which could catch that? Also, > describe in commit message what exactly is fixed, what was broken > before, how it was tested etc. No test case, but that +2 doesn't make sense after looking at surrounding code and specs. Have a look at: 3GPP TS 52.021 ?8.11.3 Get Attribute Response 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info -- To view, visit https://gerrit.osmocom.org/11683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 Gerrit-Change-Number: 11683 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 14:54:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 8 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 8 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#301?= In-Reply-To: <465047328.475.1541603407578.JavaMail.jenkins@jenkins.osmocom.org> References: <465047328.475.1541603407578.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1585475007.489.1541689807306.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Nov 8 15:41:16 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 8 Nov 2018 15:41:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11690 Change subject: MSC_Tests: remove unused control interface ...................................................................... MSC_Tests: remove unused control interface MSC_Tests initalizes a control interface (IPA_CTRL) port but none of the test executes control commands, lets remove it as it is not needed. Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Related: OS#3615 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/11690/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c0cd9d3..25d38cf 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -16,10 +16,6 @@ import from SCTPasp_Types all; import from SCTPasp_PortType all; -import from Osmocom_CTRL_Functions all; -import from Osmocom_CTRL_Types all; -import from Osmocom_CTRL_Adapter all; - import from TELNETasp_PortType all; import from Osmocom_VTY_Functions all; @@ -60,7 +56,7 @@ const integer NUM_BSC := 2; type record of BSSAP_Configuration BSSAP_Configurations; -type component MTC_CT extends CTRL_Adapter_CT { +type component MTC_CT { var boolean g_initialized := false; var BSSAP_Adapter g_bssap[NUM_BSC]; @@ -240,7 +236,6 @@ } } - f_ipa_ctrl_start(mp_msc_ip, mp_msc_ctrl_port); f_init_mncc("MSC_Test"); f_init_mgcp("MSC_Test"); f_init_gsup("MSC_Test"); -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 15:48:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 15:48:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 1: Code-Review-1 Let's keep it - I plan to use it for https://osmocom.org/issues/3187 -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 15:48:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 15:54:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 15:54:19 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 1: (8 comments) I would have liked to just accept this, alas, there are some hidden issues in there... https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_comp.c File src/gprs/gprs_sndcp_comp.c: https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_comp.c at 99 PS1, Line 99: OSMO_ASSERT(comp_entity->compclass != SNDCP_XID_INVALID_COMPRESSION); (later on I refer to this "-1") https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c File src/gprs/gprs_sndcp_xid.c: https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 456 PS1, Line 456: OSMO_ASSERT(comp_field->algo.dcomp >= 0 || comp_field->algo.dcomp <= 0x1f); wait a second, the original condition is always true, it should be &&, not ||. Maybe a separate patch should first fix that condition, and then this patch can apply the enum change without functional changes. https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 460 PS1, Line 460: break; /* not reached */ (I think I usually just omit that break, seems to work) https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 538 PS1, Line 538: return SNDCP_XID_INVALID_COMPRESSION; before, there is a comparison " != -1" replaced with " != SNDCP_XID_INVALID_COMPRESSION". Now here I notice that -EINVAL isn't actually -1. So is this also fixing a problem? (preferably applying the enums has absolutely no functional change, and we'd fix the problem in a separate patch, presumably before this one) https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 1299 PS1, Line 1299: return SNDCP_XID_INVALID_COMPRESSION; not sure whether this makes sense. Above and below, -EINVAL is returned or a length when successful. https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 1444 PS1, Line 1444: if (compclass != SNDCP_XID_INVALID_COMPRESSION) { It's a bit awkward to follow this logic, both before and after this patch. Before, if compclass < 0, we would return -EINVAL, now we continue the loop? The causality seems different now, we don't check the comp_field.algo anymore. I'm not sure whether that makes a practical difference, but for the enum patch it would be nicer to not vaguely suspect functional changes. (Are there list entries that should be skipped, or is this plain sanity checking that would be fine either way around? could we also shed all this checking because it is never going to be a problem anyway?) Reading and complexity wise, it would be nicer if there were just one switch() on top, not nested inside if on the same compclass value? https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 1474 PS1, Line 1474: compclass = gprs_sndcp_get_compression_class(comp_field_dst); what is the relation between gprs_sndcp_get_compression_class() and the gprs_sndcp_comp.compclass enum value? Do we have to invoke the nontrivial if cascade inside gprs_sndcp_get_compression_class() all the time? I would kind of assume the compclass member gets assigned once during init, and from there on it can be used directly to decide which algo.* union member applies, without re-evaluating the comp_field->rfc*params items? Or wait, I think I'm mixing up two structs. Anyway, do you see what I mean? https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 1878 PS1, Line 1878: LOGP(DSNDCP, logl, " algo=%d;\n", comp_field->algo.dcomp); heh -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 15:54:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 15:54:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 15:54:24 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 15:54:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:05:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:05:07 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11680 to look at the new patch set (#2). Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS * Allow sending Get Attributes message in abis_nm_get_attr. * Don't try to decode Get Attribute Response Info for nanoBTS, since it uses a different formatting than the one defined in specs. Related: OS#3624 Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 --- M src/osmo-bsc/abis_nm.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/11680/2 -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:05:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:05:07 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse some nanoBTS Attribute Response attributes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11681 to look at the new patch set (#2). Change subject: abis_nm: Add support to parse some nanoBTS Attribute Response attributes ...................................................................... abis_nm: Add support to parse some nanoBTS Attribute Response attributes nanoBTS actually supports regular formatting. There are a few differences with spec though: * The attributes are listed directly in the message instead of being inside the Get Attributes Response Info after the unsupported attribute ID list. * The Get Attributes Response Info can be at any position in the attribute list, and it only contains the unsupported attribute ID list. As a result, we can split parsing into 3 main parts or functions: * Parsing regular (per spec) Get Attributes Response Info attr and get a pointer to the list of attributes. * A function that parses the list of attributes, called directly in case of nanoBTS, and called by the former parser of Get Attributes Response Info for regular (per spec) OML endpoints. * A function to parse the unsupported attribute ID list, also used in the first function to get a pointer to the list of attributes. Related: OS#3624 Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/11681/2 -- To view, visit https://gerrit.osmocom.org/11681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 Gerrit-Change-Number: 11681 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:05:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:05:07 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11684 to look at the new patch set (#2). Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... abis_nm: Introduce new signal S_NM_GET_ATTR_REP This signal can be used for tools willing to request and parse Attribute Response and do something with the information. Related: OS#3624 Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 --- M include/osmocom/bsc/signal.h M src/osmo-bsc/abis_nm.c 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/11684/2 -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:05:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:05:10 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Rename m_id_len to ease review of forecoming patches Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11691 Change subject: abis_nm: Rename m_id_len to ease review of forecoming patches ...................................................................... abis_nm: Rename m_id_len to ease review of forecoming patches This function will be merged into another using a "len" variable. This change makes diffs easier to follow in future patches. Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 --- M src/osmo-bsc/abis_nm.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/11691/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index f75470d..ef61f9e 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -470,27 +470,27 @@ static inline const uint8_t *parse_attr_resp_info_manuf_id(struct gsm_bts *bts, const uint8_t *data, uint16_t *data_len) { struct tlv_parsed tp; - uint16_t m_id_len = 0; + uint16_t len = 0; uint8_t adjust = 0, i; abis_nm_tlv_parse(&tp, bts, data, *data_len); if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_ID, 2)) { - m_id_len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); + len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); /* log potential BTS feature vector overflow */ - if (m_id_len > sizeof(bts->_features_data)) + if (len > sizeof(bts->_features_data)) LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: feature vector is truncated to %u bytes\n", bts->nr, MAX_BTS_FEATURES/8); /* check that max. expected BTS attribute is above given feature vector length */ - if (m_id_len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) + if (len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: reported unexpectedly long (%u bytes) " "feature vector - most likely it was compiled against newer BSC headers. " "Consider upgrading your BSC to later version.\n", - bts->nr, m_id_len); + bts->nr, len); memcpy(bts->_features_data, TLVP_VAL(&tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); - adjust = m_id_len + 3; /* adjust for parsed TL16V struct */ + adjust = len + 3; /* adjust for parsed TL16V struct */ for (i = 0; i < _NUM_BTS_FEAT; i++) if (osmo_bts_has_feature(&bts->features, i) != osmo_bts_has_feature(&bts->model->features, i)) -- To view, visit https://gerrit.osmocom.org/11691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 Gerrit-Change-Number: 11691 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:05:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:05:10 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split handling of Attribute Response Info into its own func Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11692 Change subject: abis_nm: Split handling of Attribute Response Info into its own func ...................................................................... abis_nm: Split handling of Attribute Response Info into its own func In future commits, nanoBTS support will be added, which implements its own format not exactly equal to specs Attribute Response Info. Related: OS#3624 Change-Id: I346dacc58faac70e6d224ca49484f9211cb8a046 --- M src/osmo-bsc/abis_nm.c 1 file changed, 21 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/11692/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index ef61f9e..aec4a58 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -528,29 +528,21 @@ } /* Handle 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info */ -static int abis_nm_rx_get_attr_resp(struct msgb *mb, const struct gsm_bts_trx *trx) +static int parse_attr_resp_info(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { - struct abis_om_hdr *oh = msgb_l2(mb); - struct abis_om_fom_hdr *foh = msgb_l3(mb); - struct e1inp_sign_link *sign_link = mb->dst; - struct gsm_bts *bts = trx ? trx->bts : sign_link->trx->bts; - struct tlv_parsed tp; const uint8_t *data; int i; uint16_t data_len; int rc; struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; - DEBUGPFOH(DNM, foh, "Get Attributes Response for BTS%u\n", bts->nr); - - abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); - if (!TLVP_PRES_LEN(&tp, NM_ATT_GET_ARI, 1)) { + if (!TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: Get Attr Response without Response Info?!\n", bts->nr); return -EINVAL; } - data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), + data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(tp, NM_ATT_GET_ARI), TLVP_LEN(tp, NM_ATT_GET_ARI), &data_len); data = parse_attr_resp_info_manuf_state(trx, data, &data_len); @@ -570,6 +562,24 @@ LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); } + return 0; +} + +/* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response */ +static int abis_nm_rx_get_attr_resp(struct msgb *mb, const struct gsm_bts_trx *trx) +{ + struct abis_om_hdr *oh = msgb_l2(mb); + struct abis_om_fom_hdr *foh = msgb_l3(mb); + struct e1inp_sign_link *sign_link = mb->dst; + struct gsm_bts *bts = trx ? trx->bts : sign_link->trx->bts; + struct tlv_parsed tp; + + DEBUGPFOH(DNM, foh, "Get Attributes Response for BTS%u\n", bts->nr); + + abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); + + parse_attr_resp_info(bts, trx, foh, &tp); + return 0; } -- To view, visit https://gerrit.osmocom.org/11692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I346dacc58faac70e6d224ca49484f9211cb8a046 Gerrit-Change-Number: 11692 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:05:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:05:11 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split attr parsing in Attribute Response Info into its own func Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11693 Change subject: abis_nm: Split attr parsing in Attribute Response Info into its own func ...................................................................... abis_nm: Split attr parsing in Attribute Response Info into its own func nanoBTS uses same format for the attribute list from Attribute Response Info, but without using the later as an evelope. By splitting we can later reuse the code handling the Attribute list. While at it, take the chance to remove functions parse_attr_resp_info_* which expect TLVs following an specific order, which is not mandatory. Related: OS#3624 Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 --- M src/osmo-bsc/abis_nm.c 1 file changed, 39 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/11693/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index aec4a58..20f5156 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -466,16 +466,18 @@ return ari + num_unreported + 1; /* we have to account for 1st byte with number of unreported attributes */ } -/* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.30 Manufacturer Id */ -static inline const uint8_t *parse_attr_resp_info_manuf_id(struct gsm_bts *bts, const uint8_t *data, uint16_t *data_len) +/* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response (with nanoBTS speecific attribute formatting) */ +static int parse_attr_resp_info_attr(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { - struct tlv_parsed tp; - uint16_t len = 0; - uint8_t adjust = 0, i; + const uint8_t* data; + uint16_t len; + int i; + int rc; + struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; - abis_nm_tlv_parse(&tp, bts, data, *data_len); - if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_ID, 2)) { - len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.30 Manufacturer Id */ + if (TLVP_PRES_LEN(tp, NM_ATT_MANUF_ID, 2)) { + len = TLVP_LEN(tp, NM_ATT_MANUF_ID); /* log potential BTS feature vector overflow */ if (len > sizeof(bts->_features_data)) @@ -489,8 +491,7 @@ "Consider upgrading your BSC to later version.\n", bts->nr, len); - memcpy(bts->_features_data, TLVP_VAL(&tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); - adjust = len + 3; /* adjust for parsed TL16V struct */ + memcpy(bts->_features_data, TLVP_VAL(tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); for (i = 0; i < _NUM_BTS_FEAT; i++) if (osmo_bts_has_feature(&bts->features, i) != osmo_bts_has_feature(&bts->model->features, i)) @@ -500,41 +501,41 @@ osmo_bts_has_feature(&bts->features, i), osmo_bts_has_feature(&bts->model->features, i)); } - *data_len -= adjust; - - return data + adjust; -} - -/* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.28 Manufacturer Dependent State */ -static inline const uint8_t *parse_attr_resp_info_manuf_state(const struct gsm_bts_trx *trx, const uint8_t *data, uint16_t *data_len) -{ - struct tlv_parsed tp; - const uint8_t *power; - uint8_t adjust = 0; - - if (!trx) /* this attribute does not make sense on BTS level, only on TRX level */ - return data; - - abis_nm_tlv_parse(&tp, trx->bts, data, *data_len); - if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_STATE, 1)) { - power = TLVP_VAL(&tp, NM_ATT_MANUF_STATE); - LOGP(DNM, LOGL_NOTICE, "%s Get Attributes Response: nominal power is %u\n", gsm_trx_name(trx), *power); - adjust = 2; /* adjust for parsed TV struct */ + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.28 Manufacturer Dependent State */ + /* this attribute does not make sense on BTS level, only on TRX level */ + if (trx && TLVP_PRES_LEN(tp, NM_ATT_MANUF_STATE, 1)) { + data = TLVP_VAL(tp, NM_ATT_MANUF_STATE); + LOGPFOH(DNM, LOGL_INFO, foh, "%s Get Attributes Response: nominal power is %u\n", gsm_trx_name(trx), *data); } - *data_len -= adjust; + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.61 SW Configuration */ + if (TLVP_PRESENT(tp, NM_ATT_SW_CONFIG)) { + data = TLVP_VAL(tp, NM_ATT_SW_CONFIG); + len = TLVP_LEN(tp, NM_ATT_SW_CONFIG); + /* after parsing manufacturer-specific attributes there's list of replies in form of sw-conf structure: */ + rc = abis_nm_get_sw_conf(data, len, &sw_descr[0], ARRAY_SIZE(sw_descr)); + if (rc > 0) { + for (i = 0; i < rc; i++) { + if (!handle_attr(bts, str2btsattr((const char *)sw_descr[i].file_id), + sw_descr[i].file_version, sw_descr[i].file_version_len)) + LOGPFOH(DNM, LOGL_NOTICE, foh, "BTS%u: ARI reported sw[%d/%d]: %s " + "is %s\n", bts->nr, i, rc, sw_descr[i].file_id, + sw_descr[i].file_version); + } + } else { + LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " + "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); + } + } - return data + adjust; + return 0; } /* Handle 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info */ static int parse_attr_resp_info(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { const uint8_t *data; - int i; uint16_t data_len; - int rc; - struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; if (!TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: Get Attr Response without Response Info?!\n", @@ -545,23 +546,10 @@ data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(tp, NM_ATT_GET_ARI), TLVP_LEN(tp, NM_ATT_GET_ARI), &data_len); - data = parse_attr_resp_info_manuf_state(trx, data, &data_len); - data = parse_attr_resp_info_manuf_id(bts, data, &data_len); + /* After parsing unreported part of Response info, there's a TLV of attr, same as per nanoBTS */ + abis_nm_tlv_parse(tp, bts, data, data_len); + parse_attr_resp_info_attr(bts, trx, foh, tp); - /* after parsing manufacturer-specific attributes there's list of replies in form of sw-conf structure: */ - rc = abis_nm_get_sw_conf(data, data_len, &sw_descr[0], ARRAY_SIZE(sw_descr)); - if (rc > 0) { - for (i = 0; i < rc; i++) { - if (!handle_attr(bts, str2btsattr((const char *)sw_descr[i].file_id), - sw_descr[i].file_version, sw_descr[i].file_version_len)) - LOGPFOH(DNM, LOGL_NOTICE, foh, "BTS%u: ARI reported sw[%d/%d]: %s " - "is %s\n", bts->nr, i, rc, sw_descr[i].file_id, - sw_descr[i].file_version); - } - } else { - LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " - "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); - } return 0; } -- To view, visit https://gerrit.osmocom.org/11693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 Gerrit-Change-Number: 11693 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:05:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:05:11 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11694 Change subject: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes ...................................................................... abis_nm: Add support to parse OML IP and Unit Id in Get Attributes Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa --- M src/osmo-bsc/abis_nm.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/11694/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index eabd4b5..f089787 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -473,6 +473,9 @@ uint16_t len; int i; int rc; + uint16_t port; + struct in_addr ia = {0}; + char unit_id[40]; struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.30 Manufacturer Id */ @@ -528,6 +531,25 @@ } } + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST, 7)) { + data = TLVP_VAL(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST); + if (NM_ATT_IPACC_PRIM_OML_CFG == *data) { + ia.s_addr = htonl(osmo_load32be(data+1)); + port = osmo_load16be(data+5); + LOGPFOH(DNM, LOGL_INFO, foh, "BTS%u Get Attributes Response: Primary OML IP is %s:%u\n", bts->nr, inet_ntoa(ia), port); + } else { + LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u Get Attributes Response: PRIM_OML_CFG_LIST unexpected format: %s\n", + bts->nr, osmo_hexdump(data, TLVP_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST))); + } + } + + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_UNIT_ID, 1)) { + data = TLVP_VAL(tp, NM_ATT_IPACC_UNIT_ID); + len = TLVP_LEN(tp, NM_ATT_IPACC_UNIT_ID); + osmo_strlcpy(unit_id, (char*)data, OSMO_MIN(len, sizeof(unit_id))); + LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u Get Attributes Response: Unit ID is %s\n", bts->nr, unit_id); + } + return 0; } -- To view, visit https://gerrit.osmocom.org/11694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa Gerrit-Change-Number: 11694 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:05:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:05:12 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Support parsing nanoBTS format for Get Attributes Info Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11695 Change subject: abis_nm: Support parsing nanoBTS format for Get Attributes Info ...................................................................... abis_nm: Support parsing nanoBTS format for Get Attributes Info * On nanoBTS, the Get Attributes Response info can be at any position in the attribute list, and it only contains the unsupported attribute ID list. Change-Id: I81a613d53bddf432a79fa5cb0bf9d847b4bdee37 --- M src/osmo-bsc/abis_nm.c 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/11695/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index f089787..24b9429 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -461,7 +461,8 @@ bts_nr, get_value_string(abis_nm_att_names, ari[i + 1])); /* the data starts right after the list of unreported attributes + space for length of that list */ - *out_len = ari_len - (num_unreported + 2); + if (out_len) + *out_len = ari_len - (num_unreported + 2); return ari + num_unreported + 1; /* we have to account for 1st byte with number of unreported attributes */ } @@ -550,6 +551,13 @@ LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u Get Attributes Response: Unit ID is %s\n", bts->nr, unit_id); } + /* nanoBTS provides Get Attribute Response Info at random position and only the unreported part of it. */ + if (TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { + data = TLVP_VAL(tp, NM_ATT_GET_ARI); + len = TLVP_LEN(tp, NM_ATT_GET_ARI); + parse_attr_resp_info_unreported(bts->nr, data, len, NULL); + } + return 0; } -- To view, visit https://gerrit.osmocom.org/11695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I81a613d53bddf432a79fa5cb0bf9d847b4bdee37 Gerrit-Change-Number: 11695 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:06:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:06:04 +0000 Subject: Change in osmo-bts[master]: prevent potential NULL dereference in virtbts's tx_tchh_fn In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11632 ) Change subject: prevent potential NULL dereference in virtbts's tx_tchh_fn ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11632/1/src/osmo-bts-virtual/scheduler_virtbts.c File src/osmo-bts-virtual/scheduler_virtbts.c: https://gerrit.osmocom.org/#/c/11632/1/src/osmo-bts-virtual/scheduler_virtbts.c at 463 PS1, Line 463: if (msg_facch) { > Can tx_tch_common return msg_facch==NULL and msg_tch==NULL at the > same time? yep, looking at the code it clearly can: either both msg1 and msg2 are not present, or the " /* check validity of message */" if-statement clears msg_facch back to NULL. Or above, in this function, msg_facch gets cleared back to NULL in the "check for FACCH alignment"-if. They aren't common cases but can arise from outside data. I actually wonder why above "/* no message at all */" check includes the '!chan_state->dl_ongoing_facch' condition. This change seems to me to be a proper fix of a possible NULLpointer dereference. Could also make sense to instead remove the '&& !chan_state->dl_ongoing_facch' above? (but I don't know the semantics) Also very interesting in this function is that all code paths return NULL in the end... -- To view, visit https://gerrit.osmocom.org/11632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf5584396c5b925d55ca9380dd4f869ae5d72da3 Gerrit-Change-Number: 11632 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 08 Nov 2018 16:06:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:08:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:08:25 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11686 to look at the new patch set (#4). Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID Related: OS#3624 Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 --- M src/ipaccess/ipaccess-config.c 1 file changed, 74 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/11686/4 -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:08:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:08:25 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11687 to look at the new patch set (#4). Change subject: ipaccess-config: Use stderr for debug type messages ...................................................................... ipaccess-config: Use stderr for debug type messages This way we want print only a formated output in stdout when using -G. Related: OS#3624 Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e --- M src/ipaccess/ipaccess-config.c 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11687/4 -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:09:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:09:36 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Unify Get Attribute Response parsing In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/11682 ) Change subject: abis_nm: Unify Get Attribute Response parsing ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I77574579a19f1988f82cdac81b257b8f6871b857 Gerrit-Change-Number: 11682 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:10:37 +0000 Subject: Change in osmo-bsc[master]: check return value of gsm48_multirate_config() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11629 ) Change subject: check return value of gsm48_multirate_config() ...................................................................... Patch Set 1: Code-Review+2 (2 comments) https://gerrit.osmocom.org/#/c/11629/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11629/1//COMMIT_MSG at 13 PS1, Line 13: Because the VTY parsier limits the AMR mode range to 0-7 this "Le Parsier, Sur La Tour Eiffel" https://gerrit.osmocom.org/#/c/11629/1/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11629/1/src/osmo-bsc/bsc_vty.c at 4512 PS1, Line 4512: "Invalid AMR multirate configuration (%s, amr mode %d, ms) - check parameters%s", ("what, milliseconds?" -- maybe rather write in caps: MS and BTS; or maybe "Invalid AMR multirate config for MS") -- To view, visit https://gerrit.osmocom.org/11629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I61153a44e8b7a38332bf38718397be9b339d5f25 Gerrit-Change-Number: 11629 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 08 Nov 2018 16:10:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:13:21 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 16:13:21 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Rename m_id_len to ease review of forecoming patches In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11691 ) Change subject: abis_nm: Rename m_id_len to ease review of forecoming patches ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 Gerrit-Change-Number: 11691 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 16:13:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:13:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 16:13:40 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix whitespace In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11685 ) Change subject: ipaccess-config: Fix whitespace ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I190752000a73d7600a946c7535661550b1fe3520 Gerrit-Change-Number: 11685 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 16:13:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:17:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 16:17:44 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11680 ) Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 16:17:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:24:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:24:41 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 4: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at a1510 PS4, Line 1510: rate_ctr_group_alloc() may return NULL also for invalid naming, so I would rather keep these. https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 116 PS4, Line 116: [MGCP_DLCX_FAIL_NO_RTP] = {"dlcx:no_rtp", "no rtp stream associated with connection."}, I don't think this makes sense from a user perspective ... it's more of an internal error that some part of the endpoint isn't configured properly ... (continuing to comment where it is used) https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 1356 PS4, Line 1356: num_conns, ENDPOINT_NUMBER(endp)); this above change is completely orthogonal. I'd argue to keep it in a separate patch, by general principle. Well, ok, just keep it in mind next time... (says the guy with a recurring tradition of dropping humungous code bombs) https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 1372 PS4, Line 1372: rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_NO_RTP]); IIUC when we don't have this kind of conn, then the endpoint shouldn't exist. MGCP wise: after CRCX, a conn exists right away. After the DLCX on the last conn, the endpoint is gone. So if this happens it's an internal error, more like FAIL_NO_CONN. In practice it will never count up. Right, dexter? -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 08 Nov 2018 16:24:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:29:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:29:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/9374/5/pcu/expected-results.xml File pcu/expected-results.xml: https://gerrit.osmocom.org/#/c/9374/5/pcu/expected-results.xml at 2 PS5, Line 2: > Indeed. Fixed in next patch set. in terms of compare_results.sh, the number of tests is completely ignored. It's a cosmetic feat to keep it aligned, no use bothering really. -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 16:29:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:36:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:36:20 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Rename m_id_len to ease review of forecoming patches In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11691 ) Change subject: abis_nm: Rename m_id_len to ease review of forecoming patches ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11691/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11691/1//COMMIT_MSG at 7 PS1, Line 7: abis_nm: Rename m_id_len to ease review of forecoming patches interesting word creation, like something that is coming, but before this :) https://www.merriam-webster.com/dictionary/forecoming = 404 -- To view, visit https://gerrit.osmocom.org/11691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 Gerrit-Change-Number: 11691 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 16:36:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:38:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:38:38 +0000 Subject: Change in docker-playground[master]: bsc: osmo-bsc.cfg: Use extended timestamp Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11696 Change subject: bsc: osmo-bsc.cfg: Use extended timestamp ...................................................................... bsc: osmo-bsc.cfg: Use extended timestamp It allows for easier matching against pcap files. Change-Id: Ida71bdd8b3ca0f8bd3f2888e10e72f2872d2e62a --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/96/11696/1 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 21ef4b9..26d062e 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -8,6 +8,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level rll notice logging level cc notice -- To view, visit https://gerrit.osmocom.org/11696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ida71bdd8b3ca0f8bd3f2888e10e72f2872d2e62a Gerrit-Change-Number: 11696 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:42:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 16:42:04 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11601 ) Change subject: Support cipher mode reject with extended cause ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 08 Nov 2018 16:42:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:42:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 16:42:06 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 16:42:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:43:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 16:43:25 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Rename m_id_len to ease review of forecoming patches In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11691 ) Change subject: abis_nm: Rename m_id_len to ease review of forecoming patches ...................................................................... Patch Set 1: > (1 comment) Of course I meant forthcoming :P https://www.merriam-webster.com/dictionary/forthcoming -- To view, visit https://gerrit.osmocom.org/11691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 Gerrit-Change-Number: 11691 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 08 Nov 2018 16:43:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:51:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:51:05 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split attr parsing in Attribute Response Info into its own func In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11693 ) Change subject: abis_nm: Split attr parsing in Attribute Response Info into its own func ...................................................................... Patch Set 1: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/11693/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11693/1//COMMIT_MSG at 14 PS1, Line 14: which expect TLVs following an specific order, which is not mandatory. well, now I'm confused which is what. Next time a separate patch plz https://gerrit.osmocom.org/#/c/11693/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/11693/1/src/osmo-bsc/abis_nm.c at 469 PS1, Line 469: /* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response (with nanoBTS speecific attribute formatting) */ speeecific https://gerrit.osmocom.org/#/c/11693/1/src/osmo-bsc/abis_nm.c at 508 PS1, Line 508: LOGPFOH(DNM, LOGL_INFO, foh, "%s Get Attributes Response: nominal power is %u\n", gsm_trx_name(trx), *data); changing from NOTICE to INFO? didn't see that in the commit log https://gerrit.osmocom.org/#/c/11693/1/src/osmo-bsc/abis_nm.c at 530 PS1, Line 530: what with the 'return data + adjust' stuff before this patch ... useless cruft? remove separately and/or explain in commit log https://gerrit.osmocom.org/#/c/11693/1/src/osmo-bsc/abis_nm.c at 549 PS1, Line 549: /* After parsing unreported part of Response info, there's a TLV of attr, same as per nanoBTS */ I don't understand "a TLV of attr", what kind of attr / what for? -- To view, visit https://gerrit.osmocom.org/11693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 Gerrit-Change-Number: 11693 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 16:51:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:51:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:51:22 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split handling of Attribute Response Info into its own func In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11692 ) Change subject: abis_nm: Split handling of Attribute Response Info into its own func ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11692/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/11692/1/src/osmo-bsc/abis_nm.c at 581 PS1, Line 581: parse_attr_resp_info(bts, trx, foh, &tp); evaluate return val, to preserve the 'return -EINVAL' we had before. Heck, you could just 'return parse_attr_resp_info(...)' https://gerrit.osmocom.org/#/c/11692/1/src/osmo-bsc/abis_nm.c at 582 PS1, Line 582: (whitespace) -- To view, visit https://gerrit.osmocom.org/11692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I346dacc58faac70e6d224ca49484f9211cb8a046 Gerrit-Change-Number: 11692 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 16:51:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:52:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:52:53 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11680 ) Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 16:52:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:56:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 8 Nov 2018 16:56:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 1: > Let's keep it - I plan to use it for https://osmocom.org/issues/3187 I see. If you plan to access the control interface from within a test function (e.g. private function f_tc_my_testcase(...) runs on BSC_ConnHdlr) it won't work. Currently only the MTC_CT componant may use the control interface which is not very helpful anyway because one can only perform control interface actions before and after the cactual test, but not while the test is running. The problem here is that apparently one can only have one instance of the control interface at a time. The next patch will introduce the control interface on BSC_ConnHdlr -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 08 Nov 2018 16:56:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:56:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 16:56:30 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse some nanoBTS Attribute Response attributes In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11681 ) Change subject: abis_nm: Add support to parse some nanoBTS Attribute Response attributes ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11681/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11681/2//COMMIT_MSG at 23 PS2, Line 23: first function to get a pointer to the list of attributes. this last bit seems to belong to a different patch? All I see in this patch is that you're directly parsing the attribute ID list without the Get Attributes Response Info. -- To view, visit https://gerrit.osmocom.org/11681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 Gerrit-Change-Number: 11681 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 16:56:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:57:10 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 8 Nov 2018 16:57:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11690 to look at the new patch set (#2). Change subject: MSC_Tests: remove unused control interface ...................................................................... MSC_Tests: remove unused control interface MSC_Tests initalizes a control interface (IPA_CTRL) port but none of the test executes control commands, lets remove it as it is not needed. (The background of this patch is the need of the control interface directly inside the BSC_ConnectionHandler, however apparently it is not possible to have two control interfaces active at the same time.) Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Related: OS#3615 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/11690/2 -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:57:11 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 8 Nov 2018 16:57:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11697 Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... BSC_ConnectionHandler: introduce ctrl interface There are some upcommint tast which require to access the control interface while the actual test is running. Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Related: OS#3615 Related: OS#3187 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11697/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index bf7a6d2..d390053 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -31,6 +31,11 @@ import from SMPP_Emulation all; +import from IPA_Emulation all; +import from Osmocom_CTRL_Functions all; +import from Osmocom_CTRL_Types all; +import from Osmocom_CTRL_Adapter all; + /* this component represents a single subscriber connection */ type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr { var BSC_ConnHdlrPars g_pars; @@ -57,7 +62,9 @@ BSSMAP_IE_ClassmarkInformationType3 cm3 optional, AuthVector vec optional, BSC_ConnHdlrNetworkPars net, - boolean send_early_cm + boolean send_early_cm, + charstring ipa_ctrl_ip, + integer ipa_ctrl_port }; /* get a one-octet bitmaks of supported algorithms based on Classmark information */ diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 25d38cf..6eda680 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -56,6 +56,9 @@ const integer NUM_BSC := 2; type record of BSSAP_Configuration BSSAP_Configurations; +import from Osmocom_CTRL_Functions all; +import from Osmocom_CTRL_Types all; + type component MTC_CT { var boolean g_initialized := false; -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 16:57:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 8 Nov 2018 16:57:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 08 Nov 2018 16:57:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:00:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:00:43 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11694 ) Change subject: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11694/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/11694/1/src/osmo-bsc/abis_nm.c at 541 PS1, Line 541: LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u Get Attributes Response: PRIM_OML_CFG_LIST unexpected format: %s\n", "has unexpected..."? https://gerrit.osmocom.org/#/c/11694/1/src/osmo-bsc/abis_nm.c at 542 PS1, Line 542: bts->nr, osmo_hexdump(data, TLVP_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST))); (is the indenting skew or is it just gerrit) https://gerrit.osmocom.org/#/c/11694/1/src/osmo-bsc/abis_nm.c at 550 PS1, Line 550: LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u Get Attributes Response: Unit ID is %s\n", bts->nr, unit_id); that's not an error -- To view, visit https://gerrit.osmocom.org/11694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa Gerrit-Change-Number: 11694 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 17:00:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:02:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 17:02:58 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse some nanoBTS Attribute Response attributes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11681 ) Change subject: abis_nm: Add support to parse some nanoBTS Attribute Response attributes ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11681/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11681/2//COMMIT_MSG at 23 PS2, Line 23: first function to get a pointer to the list of attributes. > this last bit seems to belong to a different patch? All I see in this patch is that you're directly [?] Yes, this is implemented (after re-splitting) in a previous patch (prior to this one). I still wanted to leave the entire comment here to make it easier to understand current code parts and how it is used. I could re-write it as "As a result, parsing is currently split into 3 main parts or functions". -- To view, visit https://gerrit.osmocom.org/11681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 Gerrit-Change-Number: 11681 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 08 Nov 2018 17:02:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:04:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:04:01 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Support parsing nanoBTS format for Get Attributes Info In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11695 ) Change subject: abis_nm: Support parsing nanoBTS format for Get Attributes Info ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11695/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11695/1//COMMIT_MSG at 10 PS1, Line 10: attribute list, and it only contains the unsupported attribute ID list. ah, here it is https://gerrit.osmocom.org/#/c/11695/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/11695/1/src/osmo-bsc/abis_nm.c at 554 PS1, Line 554: /* nanoBTS provides Get Attribute Response Info at random position and only the unreported part of it. */ I don't understand "the unreported part". Maybe it's just me. Should this happen conditionally, only for nanobts? is it already? -- To view, visit https://gerrit.osmocom.org/11695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I81a613d53bddf432a79fa5cb0bf9d847b4bdee37 Gerrit-Change-Number: 11695 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 17:04:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:05:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:05:23 +0000 Subject: Change in osmo-bsc[master]: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11683 ) Change subject: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation ...................................................................... Patch Set 2: Code-Review+1 > Patch Set 1: > > > That's odd - is there some test case which could catch that? Also, > > describe in commit message what exactly is fixed, what was broken > > before, how it was tested etc. > > No test case, but that +2 doesn't make sense after looking at surrounding code and specs. Have a look at: > 3GPP TS 52.021 ?8.11.3 Get Attribute Response > 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info how about adding this to the commit log plz -- To view, visit https://gerrit.osmocom.org/11683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 Gerrit-Change-Number: 11683 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 17:05:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:09:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:09:07 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11684/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11684/2//COMMIT_MSG at 10 PS2, Line 10: and do something with the information. with no-one using it, this patch adds dead code. Either squash the user in here, or refer to a change-id that will add a user. https://gerrit.osmocom.org/#/c/11684/2/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/11684/2/src/osmo-bsc/abis_nm.c at 605 PS2, Line 605: osmo_signal_dispatch(SS_NM, S_NM_GET_ATTR_REP, mb); (would it make sense to instead pass the already parsed attributes somehow? Maybe even in a form of msgb->foo pointer ... just thinking) -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 17:09:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:09:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:09:22 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix whitespace In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11685 ) Change subject: ipaccess-config: Fix whitespace ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I190752000a73d7600a946c7535661550b1fe3520 Gerrit-Change-Number: 11685 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 17:09:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:12:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:12:02 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11686 ) Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... Patch Set 4: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11686/4/src/ipaccess/ipaccess-config.c File src/ipaccess/ipaccess-config.c: https://gerrit.osmocom.org/#/c/11686/4/src/ipaccess/ipaccess-config.c at 306 PS4, Line 306: } that looks familiar. Any chance of re-using the code from osmo-bsc instead? https://gerrit.osmocom.org/#/c/11686/4/src/ipaccess/ipaccess-config.c at 895 PS4, Line 895: printf(" -G --get-attr\t\tGet several attributes from BTS\n"); lol "several" -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Thu, 08 Nov 2018 17:12:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:14:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:14:21 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Use stderr for debug type messages ...................................................................... Patch Set 4: Code-Review-1 (1 comment) I see the reason / use for -G, but I disagree that the usual output of version and progress should go to stderr. Rather, I guess, -G should switch off all other output, or there should be a separate -q quiet option, like wget et al https://gerrit.osmocom.org/#/c/11687/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11687/4//COMMIT_MSG at 9 PS4, Line 9: This way we want print only a formated output in stdout when using -G. "we print only formatted" -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 17:14:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:15:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:15:27 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: cosmetic: Remove unneeded comment with hex values In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11688 ) Change subject: ipaccess-config: cosmetic: Remove unneeded comment with hex values ...................................................................... Patch Set 4: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11688/4/src/ipaccess/ipaccess-config.c File src/ipaccess/ipaccess-config.c: https://gerrit.osmocom.org/#/c/11688/4/src/ipaccess/ipaccess-config.c at a84 PS4, Line 84: hey, this was my secret place to remember my credit card pin number! -- To view, visit https://gerrit.osmocom.org/11688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I715bd9582f9289b5674aaa8d8de1164ebef2fd11 Gerrit-Change-Number: 11688 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 17:15:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:16:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 8 Nov 2018 17:16:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 08 Nov 2018 17:16:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:16:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:16:56 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid mempcy with NULL src In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11610 ) Change subject: layer23: Avoid mempcy with NULL src ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 Gerrit-Change-Number: 11610 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 08 Nov 2018 17:16:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:17:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:17:42 +0000 Subject: Change in docker-playground[master]: bsc: osmo-bsc.cfg: Use extended timestamp In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11696 ) Change subject: bsc: osmo-bsc.cfg: Use extended timestamp ...................................................................... Patch Set 1: Code-Review+2 I also have a couple of tweaks I could apply... -- To view, visit https://gerrit.osmocom.org/11696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida71bdd8b3ca0f8bd3f2888e10e72f2872d2e62a Gerrit-Change-Number: 11696 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 17:17:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:18:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 17:18:22 +0000 Subject: Change in docker-playground[master]: bsc: osmo-bsc.cfg: Use extended timestamp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11696 ) Change subject: bsc: osmo-bsc.cfg: Use extended timestamp ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida71bdd8b3ca0f8bd3f2888e10e72f2872d2e62a Gerrit-Change-Number: 11696 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 08 Nov 2018 17:18:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:18:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 17:18:24 +0000 Subject: Change in docker-playground[master]: bsc: osmo-bsc.cfg: Use extended timestamp In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11696 ) Change subject: bsc: osmo-bsc.cfg: Use extended timestamp ...................................................................... bsc: osmo-bsc.cfg: Use extended timestamp It allows for easier matching against pcap files. Change-Id: Ida71bdd8b3ca0f8bd3f2888e10e72f2872d2e62a --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 21ef4b9..26d062e 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -8,6 +8,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level rll notice logging level cc notice -- To view, visit https://gerrit.osmocom.org/11696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ida71bdd8b3ca0f8bd3f2888e10e72f2872d2e62a Gerrit-Change-Number: 11696 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:18:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 8 Nov 2018 17:18:32 +0000 Subject: Change in osmocom-bb[master]: layer23: Avoid mempcy with NULL src In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11610 ) Change subject: layer23: Avoid mempcy with NULL src ...................................................................... layer23: Avoid mempcy with NULL src Fixes following ASan warning: git/osmocom-bb/src/host/layer23/src/misc/../common/main.c:146:2: runtime error: null pointer passed as argument 2, which is declared to never be null The warning however is harmless since in that case, app_len = 0 and thus size to copy is 0. Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 --- M src/host/layer23/src/common/main.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 693b10e..2920cd9 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -143,7 +143,8 @@ *option = talloc_zero_array(l23_ctx, struct option, len + app_len + 1); memcpy(*option, long_options, sizeof(long_options)); - memcpy(*option + len, app_opp, app_len * sizeof(struct option)); + if (app_opp) + memcpy(*option + len, app_opp, app_len * sizeof(struct option)); } static void handle_options(int argc, char **argv) -- To view, visit https://gerrit.osmocom.org/11610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 Gerrit-Change-Number: 11610 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:29:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:29:17 +0000 Subject: Change in osmo-bsc[master]: paging: Make default T3113 timeout dynamic In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Make default T3113 timeout dynamic ...................................................................... Patch Set 1: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11654/1/src/osmo-bsc/paging.c File src/osmo-bsc/paging.c: https://gerrit.osmocom.org/#/c/11654/1/src/osmo-bsc/paging.c at 300 PS1, Line 300: return d->val; what if the user wants a fixed value == the default val? maybe a vty option like 'dynamic-T3113' / 'no dynamic-T3113' would be better https://gerrit.osmocom.org/#/c/11654/1/src/osmo-bsc/paging.c at 312 PS1, Line 312: to = (to_us + 999999) / 1000000 + d->default_val; maybe using user supplied d->val would be better? https://gerrit.osmocom.org/#/c/11654/1/src/osmo-bsc/paging.c at 313 PS1, Line 313: LOGP(DPAG, LOGL_DEBUG, "(bts=%d) Paging request calculated T3113 expires in %u seconds\n", sprinkle colons: "Paging request: calculated T3113: expires in %u seconds" (if you agree with above vty config option, maybe s/calculated/dynamic) Actually, I would rather log that below, where the timer actually gets fired. It's a common pattern of utility functions like this, maybe they get used for just quickly taking a look or somesuch, and then they log as if it was the real thing. https://gerrit.osmocom.org/#/c/11654/1/src/osmo-bsc/paging.c at 348 PS1, Line 348: int t3113_timeout_s = calculate_timer_3113(bts); I know, but in our coding style we declare vars at top. I'd drop that rule, but here we are. (rather stick to unsigned int? Or instead int above? well whatever) -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 08 Nov 2018 17:29:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 17:37:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 8 Nov 2018 17:37:28 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 4: > I think you should also update TODO-RELEASE file Do I need to edit TODO-RELEASE for added API? I thought that would just apply for API breakages? I've never done that before. -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 08 Nov 2018 17:37:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 8 19:00:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 8 Nov 2018 19:00:52 +0000 Subject: Change in osmo-bsc[master]: re-order condition checks for clarity Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11698 Change subject: re-order condition checks for clarity ...................................................................... re-order condition checks for clarity Coverity points out that conditional checks in set_net_timezone() depend on each other: The value of 'override' depends on 'hourstr' being non-NULL. Nest these conditional checks such that this dependency becomes obvious. No functional change. Change-Id: I10dece1e1d9e039fb9f03be89b3a202cb077b026 Related: CID#148208 --- M src/osmo-bsc/osmo_bsc_ctrl.c 1 file changed, 9 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/11698/1 diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index a4a9a36..80699f8 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -512,8 +512,9 @@ static int set_net_timezone(struct ctrl_cmd *cmd, void *data) { char *saveptr, *hourstr, *minstr, *dststr, *tmp = 0; - int override; + int override = 0; struct gsm_network *net = (struct gsm_network*)cmd->node; + struct gsm_tz *tz = &net->tz; tmp = talloc_strdup(cmd, cmd->value); if (!tmp) @@ -523,19 +524,17 @@ minstr = strtok_r(NULL, ",", &saveptr); dststr = strtok_r(NULL, ",", &saveptr); - override = 0; - - if (hourstr != NULL) + if (hourstr != NULL) { override = strcasecmp(hourstr, "off") != 0; + if (override) { + tz->hr = atol(hourstr); + tz->mn = minstr ? atol(minstr) : 0; + tz->dst = dststr ? atol(dststr) : 0; + } + } - struct gsm_tz *tz = &net->tz; tz->override = override; - if (override) { - tz->hr = hourstr ? atol(hourstr) : 0; - tz->mn = minstr ? atol(minstr) : 0; - tz->dst = dststr ? atol(dststr) : 0; - } talloc_free(tmp); tmp = NULL; -- To view, visit https://gerrit.osmocom.org/11698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I10dece1e1d9e039fb9f03be89b3a202cb077b026 Gerrit-Change-Number: 11698 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 02:00:26 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 02:00:26 +0000 Subject: Change in osmo-ci[master]: ansible: Wrap distro version number as string for ansible In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11648 ) Change subject: ansible: Wrap distro version number as string for ansible ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58591ee37c6ec1479778c3f90ed8004a7e2adf1e Gerrit-Change-Number: 11648 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 09 Nov 2018 02:00:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 02:00:47 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 02:00:47 +0000 Subject: Change in osmo-ci[master]: ansible: Wrap distro version number as string for ansible In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11648 ) Change subject: ansible: Wrap distro version number as string for ansible ...................................................................... ansible: Wrap distro version number as string for ansible Change-Id: I58591ee37c6ec1479778c3f90ed8004a7e2adf1e --- M ansible/roles/osmocom-jenkins-slave/tasks/debian.yml M ansible/roles/osmocom-jenkins-slave/tasks/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 3 files changed, 4 insertions(+), 4 deletions(-) Approvals: Holger Freyther: Looks good to me, approved; Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml index 87a616c..30e4ece 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml @@ -40,4 +40,4 @@ install_recommends: no with_items: - openjdk-8-jre-headless - when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9' diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index 98cae55..36bc424 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -27,7 +27,7 @@ - name: install ttcn3 dependencies include_tasks: ttcn3-slave.yml - when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version >= '9' - name: copy .gitconfig copy: diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 16e72ed..b2a2f2b 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -105,7 +105,7 @@ install_recommends: no with_items: - liblua5.3-dev - when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9' - name: install liblimesuite-dev for stretch or later apt: @@ -115,4 +115,4 @@ install_recommends: no with_items: - liblimesuite-dev - when: ansible_distribution == 'Debian' and ansible_distribution_version >= 9 + when: ansible_distribution == 'Debian' and ansible_distribution_version >= '9' -- To view, visit https://gerrit.osmocom.org/11648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I58591ee37c6ec1479778c3f90ed8004a7e2adf1e Gerrit-Change-Number: 11648 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 04:47:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 04:47:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add inter-bsc ho incoming failure tests Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11699 Change subject: bsc: add inter-bsc ho incoming failure tests ...................................................................... bsc: add inter-bsc ho incoming failure tests Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe --- M bsc/BSC_Tests.ttcn 1 file changed, 348 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/11699/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e06f496..6bc6258 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2578,6 +2578,348 @@ vc_conn.done; } +private function f_tc_ho_in_fail_msc_clears(charstring id) runs on MSC_ConnHdlr { + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. In this case, the MS + * reports a Handover Failure to the old BSS, which forwards a BSSMAP + * Handover Failure to the MSC. The procedure according to 3GPP TS + * 48.008 3.1.5.3.2 "Handover Failure" is then that the MSC sends a + * BSSMAP Clear Command: */ + + var myBSSMAP_Cause cause_val := GSM0808_CAUSE_RADIO_INTERFACE_FAILURE_REVERSION; + var BssmapCause cause := enum2int(cause_val); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); + + setverdict(pass); +} +testcase TC_ho_in_fail_msc_clears() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_in_fail_msc_clears), pars); + vc_conn.done; +} + +private function f_tc_ho_in_fail_msc_clears_after_ho_detect(charstring id) runs on MSC_ConnHdlr { + /* Hack: the proper way would be to wait for the BSSMAP Handover Request ACK and extract the + * actual assigned chan_nr from its L3 (RR Handover Command) message. But osmo-bsc starts acting + * on the lchan even before we get a chance to evaluate the BSSMAP Handover Request ACK. So we + * need to assume that osmo-bsc will activate TS 1 and already set up this lchan's RSL emulation + * before we get started. */ + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. Here comes the new MS on + * the new lchan with a Handover RACH: */ + + /* send handover detect */ + + RSL.send(ts_RSL_HANDO_DET(new_chan_nr)); + + BSSAP.receive(tr_BSSMAP_HandoverDetect); + + /* The MSC chooses to clear the connection now, maybe we got the + * Handover RACH on the new cell but the MS still signaled Handover + * Failure to the old BSS? */ + + var myBSSMAP_Cause cause_val := GSM0808_CAUSE_RADIO_INTERFACE_FAILURE_REVERSION; + var BssmapCause cause := enum2int(cause_val); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_in_fail_msc_clears_after_ho_detect() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_in_fail_msc_clears_after_ho_detect), pars); + vc_conn.done; +} + +/* The new BSS's lchan times out before the MSC decides that handover failed. */ +private function f_tc_ho_in_fail_no_detect(charstring id) runs on MSC_ConnHdlr { + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. But the MS never shows up + * on the new lchan. */ + + BSSAP.receive(tr_BSSMAP_HandoverFailure); + + /* Did osmo-bsc also send a Clear Request? */ + timer T := 0.5; + T.start; + alt { + [] BSSAP.receive(tr_BSSMAP_ClearRequest); + [] T.timeout { } + } + + /* MSC plays along with a Clear Command (no matter whether osmo-bsc + * asked for it, this is a Handover Failure after all). */ + + var myBSSMAP_Cause cause_val := GSM0808_CAUSE_RADIO_INTERFACE_FAILURE_REVERSION; + var BssmapCause cause := enum2int(cause_val); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); + + setverdict(pass); +} +testcase TC_ho_in_fail_no_detect() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_in_fail_no_detect), pars); + vc_conn.done; +} + +/* Same as f_tc_ho_in_fail_no_detect, but MSC fails to send a Clear Command */ +private function f_tc_ho_in_fail_no_detect2(charstring id) runs on MSC_ConnHdlr { + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. But the MS never shows up + * on the new lchan. */ + + BSSAP.receive(tr_BSSMAP_HandoverFailure); + + /* MSC plays dumb and sends no Clear Command */ + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var PDU_BSSAP rx_clear_request; + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearRequest) -> value rx_clear_request { + var BssmapCause cause := bit2int(rx_clear_request.pdu.bssmap.clearRequest.cause.causeValue); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + }; + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_in_fail_no_detect2() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_in_fail_no_detect2), pars); + vc_conn.done; +} /* OS#3041: Open and close N connections in a normal fashion, and expect no * BSSMAP Reset just because of that. */ @@ -3080,11 +3422,17 @@ execute( TC_err_84_unknown_msg() ); execute( TC_ho_int() ); + execute( TC_ho_out_of_this_bsc() ); execute( TC_ho_out_fail_no_msc_response() ); execute( TC_ho_out_fail_rr_ho_failure() ); execute( TC_ho_out_fail_no_ho_detect() ); + execute( TC_ho_into_this_bsc() ); + execute( TC_ho_in_fail_msc_clears() ); + execute( TC_ho_in_fail_msc_clears_after_ho_detect() ); + execute( TC_ho_in_fail_no_detect() ); + execute( TC_ho_in_fail_no_detect2() ); execute( TC_bssap_rlsd_does_not_cause_bssmap_reset() ); execute( TC_bssmap_clear_does_not_cause_bssmap_reset() ); -- To view, visit https://gerrit.osmocom.org/11699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe Gerrit-Change-Number: 11699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 04:49:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 04:49:40 +0000 Subject: Change in osmo-bsc[master]: always directly send BSSMAP Clear Request Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11700 Change subject: always directly send BSSMAP Clear Request ...................................................................... always directly send BSSMAP Clear Request When a gscon wants to send a BSSMAP Clear Request, it makes no sense to do it conditionally depending on the current conn state. Just send it: don't call gscon_sigtran_send(), directly go for osmo_bsc_sigtran_send(). In particular, if an incoming inter-BSC handover ends in failure, the gscon state is still ST_INIT, but if the MSC fails to give us a Clear Command, we may want to ask with a BSSMAP Clear Request. Change-Id: I39fae24260a4bb7a6af704ebe760f93fff566536 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/11700/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index bca9e1f..2202ecf 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -134,7 +134,14 @@ enum gsm0808_cause cause) { struct msgb *resp = gsm0808_create_clear_rqst(cause); - gscon_sigtran_send(conn, resp); + int rc; + if (!resp) { + LOGPFSML(conn->fi, LOGL_ERROR, "Unable to compose BSSMAP Clear Request message\n"); + return; + } + rc = osmo_bsc_sigtran_send(conn, resp); + if (rc < 0) + LOGPFSML(conn->fi, LOGL_ERROR, "Unable to deliver BSSMAP Clear Request message\n"); } /* forward MO DTAP from RSL side to BSSAP side */ -- To view, visit https://gerrit.osmocom.org/11700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I39fae24260a4bb7a6af704ebe760f93fff566536 Gerrit-Change-Number: 11700 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 06:16:53 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 06:16:53 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Fix subject in the header In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11649 ) Change subject: ms_driver: Fix subject in the header ...................................................................... ms_driver: Fix subject in the header Change-Id: I47e688b9fe3aef6679e3c82c641393ab041cbec3 --- M src/osmo_ms_driver/location_update_test.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index 010c278..dfa33c3 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -1,4 +1,4 @@ -# osmo_ms_driver: Locationg Update Test +# osmo_ms_driver: Location Update Test # Create MS's and wait for the Location Update to succeed. # # Copyright (C) 2018 by Holger Hans Peter Freyther -- To view, visit https://gerrit.osmocom.org/11649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I47e688b9fe3aef6679e3c82c641393ab041cbec3 Gerrit-Change-Number: 11649 Gerrit-PatchSet: 1 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 06:18:27 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 06:18:27 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11596 ) Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11596/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11596/3//COMMIT_MSG at 11 PS3, Line 11: direcyly (e.g. need a LD_LIBRARY_PATH to be applied). > still contains the typo. Missed that comment. fixed. -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 06:18:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 06:19:08 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 06:19:08 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11596 to look at the new patch set (#4). Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... ms_driver: Allow to specify env and binary name/path For the proper trial/suite integration we can't assume that the virtphy/mobile are in the PATH and that they can be executed directly (e.g. need a LD_LIBRARY_PATH to be applied). Introduce BinaryOptions to pass the name/path of the two executables and the env to use. Default this to virtphy/mobile and an empty environment. Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 4 files changed, 27 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/96/11596/4 -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 4 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 06:19:08 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 06:19:08 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Switch to process.Process from subprocess In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11597 to look at the new patch set (#3). Change subject: ms_driver: Switch to process.Process from subprocess ...................................................................... ms_driver: Switch to process.Process from subprocess Use a single tmp/rundir for all these instances. In the next step we can create separate directories. Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 4 files changed, 27 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/11597/3 -- To view, visit https://gerrit.osmocom.org/11597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 Gerrit-Change-Number: 11597 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 06:19:08 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 06:19:08 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Consult the suite to get the binaries In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11599 to look at the new patch set (#3). Change subject: ms_driver: Consult the suite to get the binaries ...................................................................... ms_driver: Consult the suite to get the binaries Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/99/11599/3 -- To view, visit https://gerrit.osmocom.org/11599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 Gerrit-Change-Number: 11599 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 06:19:08 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 06:19:08 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10687 to look at the new patch set (#10). Change subject: suits: Add an initial test for the ms_driver ...................................................................... suits: Add an initial test for the ms_driver Things to make configurable: * IMSI and matching MSISDN ranges (start + count) * Timeouts and number of MS (which should be related) Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 --- A suites/nitb_netreg_mass/register_default_mass.py A suites/nitb_netreg_mass/suite.conf 2 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/87/10687/10 -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 10 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 06:19:08 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Fri, 9 Nov 2018 06:19:08 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: use the util.Dir and create one dir per instance In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11598 to look at the new patch set (#3). Change subject: ms_driver: use the util.Dir and create one dir per instance ...................................................................... ms_driver: use the util.Dir and create one dir per instance Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/starter.py 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/98/11598/3 -- To view, visit https://gerrit.osmocom.org/11598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 Gerrit-Change-Number: 11598 Gerrit-PatchSet: 3 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 09:51:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 09:51:54 +0000 Subject: Change in osmo-bsc[master]: re-order condition checks for clarity In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11698 ) Change subject: re-order condition checks for clarity ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10dece1e1d9e039fb9f03be89b3a202cb077b026 Gerrit-Change-Number: 11698 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 09:51:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 09:54:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 09:54:22 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11596 ) Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 4 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 09:54:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 09:55:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 09:55:11 +0000 Subject: Change in osmo-gsm-tester[master]: suits: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/10687 ) Change subject: suits: Add an initial test for the ms_driver ...................................................................... Patch Set 10: (1 comment) https://gerrit.osmocom.org/#/c/10687/10//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/10687/10//COMMIT_MSG at 7 PS10, Line 7: suits: Add an initial test for the ms_driver The Legendary Typo -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 10 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 09:55:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 10:05:09 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 10:05:09 +0000 Subject: Change in osmo-bsc[master]: re-order condition checks for clarity In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11698 ) Change subject: re-order condition checks for clarity ...................................................................... re-order condition checks for clarity Coverity points out that conditional checks in set_net_timezone() depend on each other: The value of 'override' depends on 'hourstr' being non-NULL. Nest these conditional checks such that this dependency becomes obvious. No functional change. Change-Id: I10dece1e1d9e039fb9f03be89b3a202cb077b026 Related: CID#148208 --- M src/osmo-bsc/osmo_bsc_ctrl.c 1 file changed, 9 insertions(+), 10 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index a4a9a36..80699f8 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -512,8 +512,9 @@ static int set_net_timezone(struct ctrl_cmd *cmd, void *data) { char *saveptr, *hourstr, *minstr, *dststr, *tmp = 0; - int override; + int override = 0; struct gsm_network *net = (struct gsm_network*)cmd->node; + struct gsm_tz *tz = &net->tz; tmp = talloc_strdup(cmd, cmd->value); if (!tmp) @@ -523,19 +524,17 @@ minstr = strtok_r(NULL, ",", &saveptr); dststr = strtok_r(NULL, ",", &saveptr); - override = 0; - - if (hourstr != NULL) + if (hourstr != NULL) { override = strcasecmp(hourstr, "off") != 0; + if (override) { + tz->hr = atol(hourstr); + tz->mn = minstr ? atol(minstr) : 0; + tz->dst = dststr ? atol(dststr) : 0; + } + } - struct gsm_tz *tz = &net->tz; tz->override = override; - if (override) { - tz->hr = hourstr ? atol(hourstr) : 0; - tz->mn = minstr ? atol(minstr) : 0; - tz->dst = dststr ? atol(dststr) : 0; - } talloc_free(tmp); tmp = NULL; -- To view, visit https://gerrit.osmocom.org/11698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I10dece1e1d9e039fb9f03be89b3a202cb077b026 Gerrit-Change-Number: 11698 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 10:15:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 10:15:35 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split attr parsing in Attribute Response Info into its own func In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11693 ) Change subject: abis_nm: Split attr parsing in Attribute Response Info into its own func ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11693/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/11693/1/src/osmo-bsc/abis_nm.c at 530 PS1, Line 530: > what with the 'return data + adjust' stuff before this patch ... [?] It's part of the old functions expecting TLVs in a specific order, that's why it can be removed because all that is wrong an useless. -- To view, visit https://gerrit.osmocom.org/11693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 Gerrit-Change-Number: 11693 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 10:15:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 10:16:12 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 10:16:12 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at a1510 PS4, Line 1510: > rate_ctr_group_alloc() may return NULL also for invalid naming, so I would rather keep these. Seriously, you want me to change this _again_? Have you read the previous discussion? It seems this entire patch is getting hung up just because we won't agree on something as basic as how to check for allocation failures in osmocom. I'd rather keep it as it is now instead of bringing this question back up with Pau and Harald all over again. The code it would likely crash in talloc_set_destructor() on the next line anyway. By the way, shouldn't rate_ctr_group_alloc() allow its caller to differentiate between memory allocation failures and an invalid counter group description? -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 09 Nov 2018 10:16:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 10:17:57 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 9 Nov 2018 10:17:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Hello daniel, Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11697 to look at the new patch set (#3). Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... BSC_ConnectionHandler: introduce ctrl interface There are some upcommint tast which require to access the control interface while the actual test is running. Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Related: OS#3615 Related: OS#3187 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11697/3 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 10:19:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 10:19:47 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 1372 PS4, Line 1372: rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_NO_RTP]); > IIUC when we don't have this kind of conn, then the endpoint shouldn't exist. [?] I don't believe dexter is reading along, so he might not be aware of your question to him. I have added him as a reviewer now. -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 09 Nov 2018 10:19:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 10:33:00 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 9 Nov 2018 10:33:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11701 Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... BSC_ConnectionHandler: make VTY interface available The BSC_ConnectionHandler currently has no access to the VTY interface. Lets make it available so that upcoming tests can use the VTY interface to trigger actions (e.g. Paging) Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Related: OS#3615 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/11701/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index ea09f82..e22d507 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -36,10 +36,15 @@ import from Osmocom_CTRL_Types all; import from Osmocom_CTRL_Adapter all; +import from TELNETasp_PortType all; +import from Osmocom_VTY_Functions all; + /* this component represents a single subscriber connection */ type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT { var BSC_ConnHdlrPars g_pars; timer g_Tguard := 60.0; + port TELNETasp_PT MSCVTY; + var boolean g_vty_initialized := false; } type record BSC_ConnHdlrNetworkPars { @@ -131,6 +136,13 @@ f_create_smpp_expect(hex2str(pars.msisdn)); f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port); + + if (not g_vty_initialized) { + map(self:MSCVTY, system:MSCVTY); + f_vty_set_prompts(MSCVTY); + f_vty_transceive(MSCVTY, "enable"); + g_vty_initialized := true; + } } -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 10:53:42 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 10:53:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 3: (1 comment) It's unclear from the description - are we accessing MSC' ctrl interface or BSC' or? https://gerrit.osmocom.org/#/c/11697/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11697/3//COMMIT_MSG at 9 PS3, Line 9: There are some upcommint tast which require to access the control typo -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 09 Nov 2018 10:53:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 11:01:19 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 9 Nov 2018 11:01:19 +0000 Subject: Change in osmo-bsc[master]: gsm_data: make cgi_for_msc available for other modules In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11527 ) Change subject: gsm_data: make cgi_for_msc available for other modules ...................................................................... gsm_data: make cgi_for_msc available for other modules The function cgi_for_msc() provides an easy way to get a cell global id for an msc/bts combination. This function is currently statically defined in gsm_08_08.c. Lets move it to gsm_data.c and make it publicly available. Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d Related: OS#3645 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/gsm_data.c 3 files changed, 18 insertions(+), 16 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7897fea..1be9ae8 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1614,4 +1614,6 @@ int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); +struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts); + #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 19c2598..062c878 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -58,22 +58,6 @@ static bool complete_layer3(struct gsm_subscriber_connection *conn, struct msgb *msg, struct bsc_msc_data *msc); -static struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts) -{ - static struct osmo_cell_global_id cgi; - cgi.lai.plmn = msc->network->plmn; - if (msc->core_plmn.mcc != GSM_MCC_MNC_INVALID) - cgi.lai.plmn.mcc = msc->core_plmn.mcc; - if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) { - cgi.lai.plmn.mnc = msc->core_plmn.mnc; - cgi.lai.plmn.mnc_3_digits = msc->core_plmn.mnc_3_digits; - } - cgi.lai.lac = (msc->core_lac != -1) ? msc->core_lac : bts->location_area_code; - cgi.cell_identity = (msc->core_ci != -1) ? msc->core_ci : bts->cell_identity; - - return &cgi; -} - static void bsc_maybe_lu_reject(struct gsm_subscriber_connection *conn, int con_type, int cause) { struct msgb *msg; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 56eb24e..15853fb 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1688,3 +1688,19 @@ OSMO_VALUE_STRING(FOR_VTY), {} }; + +struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts) +{ + static struct osmo_cell_global_id cgi; + cgi.lai.plmn = msc->network->plmn; + if (msc->core_plmn.mcc != GSM_MCC_MNC_INVALID) + cgi.lai.plmn.mcc = msc->core_plmn.mcc; + if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) { + cgi.lai.plmn.mnc = msc->core_plmn.mnc; + cgi.lai.plmn.mnc_3_digits = msc->core_plmn.mnc_3_digits; + } + cgi.lai.lac = (msc->core_lac != -1) ? msc->core_lac : bts->location_area_code; + cgi.cell_identity = (msc->core_ci != -1) ? msc->core_ci : bts->cell_identity; + + return &cgi; +} -- To view, visit https://gerrit.osmocom.org/11527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d Gerrit-Change-Number: 11527 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 11:11:42 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 9 Nov 2018 11:11:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Hello daniel, Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11697 to look at the new patch set (#4). Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... BSC_ConnectionHandler: introduce ctrl interface There are some upcomming tests which require to access the control interface of the MSC while the actual test is running. Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Related: OS#3615 Related: OS#3187 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11697/4 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 11:11:42 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 9 Nov 2018 11:11:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11701 to look at the new patch set (#2). Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... BSC_ConnectionHandler: make VTY interface available The BSC_ConnectionHandler currently has no access to the VTY interface. Lets make it available so that upcoming tests can use the VTY interface to trigger actions (e.g. Paging) Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Related: OS#3615 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/11701/2 -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 11:11:44 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 9 Nov 2018 11:11:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: extend SGSAP testcases Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11702 Change subject: WIP: MSC_Tests: extend SGSAP testcases ...................................................................... WIP: MSC_Tests: extend SGSAP testcases Change-Id: I38ea0de12b4350fa525d483e4744f6ea23db790b --- M msc/MSC_Tests.ttcn 1 file changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/11702/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 0c400dc..e2be6d9 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -111,6 +111,7 @@ charstring mp_smpp_system_id := "msc_tester"; charstring mp_smpp_password := "osmocom1"; charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; + charstring mp_vlr_name := "mmec02.mmegi0002.mme.epc.mnc070.mcc901.3gppnetwork.org"; BSSAP_Configurations mp_bssap_cfg := { { @@ -2911,6 +2912,59 @@ vc_conn.done; } +private function f_tc_sgsap_paging(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + f_sgs_perform_lu(); + f_sleep(1.0); + var CtrlValue ctrltest; + + + var octetstring vlr_name := f_enc_dns_hostname(mp_vlr_name); + var template PDU_SGsAP exp_resp := tr_SGsAP_PAGING_REQ(g_pars.imsi, vlr_name, CS_call_indicator, omit); + var template LocationAreaId exp_lai := ts_SGsAP_IE_Lai(valueof(ts_SGsAP_LAI('901'H, '70'H, 2342))); + exp_resp.sGsAP_PAGING_REQUEST.locationAreaId := exp_lai; + + /* Initiate paging via VTY */ + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + alt { + [] SGsAP.receive(exp_resp) { + setverdict(pass); + } + [] SGsAP.receive { + setverdict(fail, "Received unexpected message on SGs"); + } + } + + /* Now reject the paging */ + SGsAP.send(ts_SGsAP_PAGING_REJ(g_pars.imsi, IMSI_unknown)); + + /* FIXME: We need to check if the SGs association changed to NULL + * we might consider to query the state via the control interface */ + + + log("==========================================="); + ctrltest := f_ctrl_get(IPA_CTRL, "fsm.SGs-UE.id.imsi:262420000000010.state"); + log("==========================================="); + log(ctrltest); + log("==========================================="); + + + +// f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:262420000000010.state", "SGs-NULL"); + + + +} +testcase TC_sgsap_paging() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_sgsap_paging), 10); + vc_conn.done; + +} + + @@ -2991,6 +3045,7 @@ execute( TC_sgsap_lu_imsi_reject() ); execute( TC_sgsap_expl_imsi_det_eps() ); execute( TC_sgsap_expl_imsi_det_noneps() ); + execute( TC_sgsap_paging() ); /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); -- To view, visit https://gerrit.osmocom.org/11702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I38ea0de12b4350fa525d483e4744f6ea23db790b Gerrit-Change-Number: 11702 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 11:18:15 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 9 Nov 2018 11:18:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 4: The naming of the connection handler is always opposite because it is always the other role, a bit confusing but logical. Note: In case you need an example on how to query the control interface, see: https://gerrit.osmocom.org/11702 This requests the state of an osmo-fsm via ctrl interface. -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 09 Nov 2018 11:18:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 11:36:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 11:36:06 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11703 Change subject: LCLS: add 48.008 parameter structure ...................................................................... LCLS: add 48.008 parameter structure It's convenient to hold all LCLS-related parameters from 3GPP TS 48.008 in a single structure. Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Related: OS#2487 --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/11703/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index f70dbdb..e8343cb 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -57,6 +57,14 @@ unsigned int id_list_len; }; +/*! LCLS-related parameters from 3GPP TS 48.008 */ +struct osmo_lcls { + enum gsm0808_lcls_config config; /* ?3.2.2.116 Configuration */ + enum gsm0808_lcls_control control; /* ?3.2.2.117 Connection Status Control */ + struct gsm0808_gcr *gcr; /* ?3.2.2.115 Global Call Reference */ + bool corr_needed; /* ?3.2.2.118 Correlation-Not-Needed */ +}; + extern const struct value_string gsm0808_cell_id_discr_names[]; static inline const char *gsm0808_cell_id_discr_name(enum CELL_IDENT id_discr) { return get_value_string(gsm0808_cell_id_discr_names, id_discr); } -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Rename m_id_len to ease review of forthcoming patches In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11691 to look at the new patch set (#2). Change subject: abis_nm: Rename m_id_len to ease review of forthcoming patches ...................................................................... abis_nm: Rename m_id_len to ease review of forthcoming patches This function will be merged into another using a "len" variable. This change makes diffs easier to follow in future patches. Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 --- M src/osmo-bsc/abis_nm.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/11691/2 -- To view, visit https://gerrit.osmocom.org/11691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 Gerrit-Change-Number: 11691 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split reported attr list parsing from Attribute Response Inf... In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11693 to look at the new patch set (#2). Change subject: abis_nm: Split reported attr list parsing from Attribute Response Info into its own func ...................................................................... abis_nm: Split reported attr list parsing from Attribute Response Info into its own func nanoBTS uses same format for the attribute list from Attribute Response Info, but without using the later as an evelope. By splitting we can later reuse the code handling the Attribute list. While at it, take the chance to remove functions parse_attr_resp_info_* which expect TLVs following an specific order, which is not mandatory. Related: OS#3624 Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 --- M src/osmo-bsc/abis_nm.c 1 file changed, 41 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/11693/2 -- To view, visit https://gerrit.osmocom.org/11693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 Gerrit-Change-Number: 11693 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split handling of Attribute Response Info into its own func In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11692 to look at the new patch set (#2). Change subject: abis_nm: Split handling of Attribute Response Info into its own func ...................................................................... abis_nm: Split handling of Attribute Response Info into its own func In future commits, nanoBTS support will be added, which implements its own format not exactly equal to specs Attribute Response Info. Related: OS#3624 Change-Id: I346dacc58faac70e6d224ca49484f9211cb8a046 --- M src/osmo-bsc/abis_nm.c 1 file changed, 19 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/11692/2 -- To view, visit https://gerrit.osmocom.org/11692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I346dacc58faac70e6d224ca49484f9211cb8a046 Gerrit-Change-Number: 11692 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11680 to look at the new patch set (#3). Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS * Allow sending Get Attributes message in abis_nm_get_attr. * Don't try to decode Get Attribute Response Info for nanoBTS, since it uses a different formatting than the one defined in specs. Related: OS#3624 Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 --- M src/osmo-bsc/abis_nm.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/11680/3 -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Support parsing nanoBTS format for Get Attributes Info In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11695 to look at the new patch set (#2). Change subject: abis_nm: Support parsing nanoBTS format for Get Attributes Info ...................................................................... abis_nm: Support parsing nanoBTS format for Get Attributes Info Spec compliant format is defined in: * 3GPP TS 52.021 ?8.11.3 "Get Attribute Response" * 3GPP TS 52.021 ?9.4.64 "Get Attribute Response Info". On nanoBTS, however, reported attribute list is provided directly inside/after the foh header instead of being enveloped inside the Get Attributes Response Info. Furthermore, The Get Attributes Response Info can still appear and be at any position in the reported attribute list, and it only contains the unreported attribute ID list inside. Change-Id: I81a613d53bddf432a79fa5cb0bf9d847b4bdee37 --- M src/osmo-bsc/abis_nm.c 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/11695/2 -- To view, visit https://gerrit.osmocom.org/11695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I81a613d53bddf432a79fa5cb0bf9d847b4bdee37 Gerrit-Change-Number: 11695 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11694 to look at the new patch set (#2). Change subject: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes ...................................................................... abis_nm: Add support to parse OML IP and Unit Id in Get Attributes Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa --- M include/osmocom/bsc/abis_nm.h M src/osmo-bsc/abis_nm.c 2 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/11694/2 -- To view, visit https://gerrit.osmocom.org/11694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa Gerrit-Change-Number: 11694 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse some nanoBTS Attribute Response attributes In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11681 to look at the new patch set (#3). Change subject: abis_nm: Add support to parse some nanoBTS Attribute Response attributes ...................................................................... abis_nm: Add support to parse some nanoBTS Attribute Response attributes nanoBTS actually supports regular formatting. There are a few differences with spec though: * The attributes are listed directly in the message instead of being inside the Get Attributes Response Info after the unsupported attribute ID list. * The Get Attributes Response Info can be at any position in the attribute list, and it only contains the unsupported attribute ID list. As a result, parsing is currently split into 3 main parts or functions: * Parsing regular (per spec) Get Attributes Response Info attr and get a pointer to the list of attributes. * A function that parses the list of attributes, called directly in case of nanoBTS, and called by the former parser of Get Attributes Response Info for regular (per spec) OML endpoints. * A function to parse the unsupported attribute ID list, also used in the first function to get a pointer to the list of attributes. Related: OS#3624 Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/11681/3 -- To view, visit https://gerrit.osmocom.org/11681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 Gerrit-Change-Number: 11681 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11683 to look at the new patch set (#3). Change subject: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation ...................................................................... abis_nm: parse_attr_resp_info_unreported: Fix offset calculation See following specs for related information: * 3GPP TS 52.021 ?8.11.3 Get Attribute Response * 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info Related: OS#3624 Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 --- M src/osmo-bsc/abis_nm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/11683/3 -- To view, visit https://gerrit.osmocom.org/11683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 Gerrit-Change-Number: 11683 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11686 to look at the new patch set (#5). Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID Related: OS#3624 Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 --- M src/ipaccess/ipaccess-config.c 1 file changed, 62 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/11686/5 -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11684 to look at the new patch set (#3). Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... abis_nm: Introduce new signal S_NM_GET_ATTR_REP This signal can be used for tools willing to request and parse Attribute Response and do something with the information. ipaccess-config tool will use this signal in later patches. Related: OS#3624 Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 --- M include/osmocom/bsc/signal.h M src/osmo-bsc/abis_nm.c 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/11684/3 -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:08:26 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11687 to look at the new patch set (#5). Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... ipaccess-config: Use stderr for debug type messages when using -G This way only formated output is pinted to stdout when using -G. Related: OS#3624 Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e --- M src/ipaccess/ipaccess-config.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11687/5 -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:09:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 12:09:58 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11703 ) Change subject: LCLS: add 48.008 parameter structure ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11703/1/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/11703/1/include/osmocom/gsm/gsm0808_utils.h at 61 PS1, Line 61: struct osmo_lcls { Please explain and reference where is this to be used. -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 12:09:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:16:13 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 9 Nov 2018 12:16:13 +0000 Subject: Change in osmo-ci[master]: ansible: Wrap distro version number as string for ansible In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/11648 ) Change subject: ansible: Wrap distro version number as string for ansible ...................................................................... Patch Set 2: why is this needed? which version of ansible are you using? -- To view, visit https://gerrit.osmocom.org/11648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58591ee37c6ec1479778c3f90ed8004a7e2adf1e Gerrit-Change-Number: 11648 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 09 Nov 2018 12:16:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:53:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 12:53:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 09 Nov 2018 12:53:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:56:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 12:56:36 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Rename m_id_len to ease review of forthcoming patches In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11691 ) Change subject: abis_nm: Rename m_id_len to ease review of forthcoming patches ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 Gerrit-Change-Number: 11691 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 12:56:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 12:57:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 12:57:23 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11680 ) Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 12:57:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:04:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 13:04:19 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Fri, 09 Nov 2018 13:04:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:09:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:09:21 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... Patch Set 5: Code-Review+1 (1 comment) +2 yourself if you're sure https://gerrit.osmocom.org/#/c/11687/5/src/ipaccess/ipaccess-config.c File src/ipaccess/ipaccess-config.c: https://gerrit.osmocom.org/#/c/11687/5/src/ipaccess/ipaccess-config.c at 531 PS5, Line 531: fprintf(get_attr ? stderr : stdout, "OML link established using TRX %d\n", trx->nr); IMHO would make more sense to name the global variable 'quiet' or something and completely omit the other output, but ok if you really think this makes sense -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 13:09:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:10:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:10:04 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Rename m_id_len to ease review of forthcoming patches In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11691 ) Change subject: abis_nm: Rename m_id_len to ease review of forthcoming patches ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 Gerrit-Change-Number: 11691 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:10:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:10:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:10:43 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split handling of Attribute Response Info into its own func In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11692 ) Change subject: abis_nm: Split handling of Attribute Response Info into its own func ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I346dacc58faac70e6d224ca49484f9211cb8a046 Gerrit-Change-Number: 11692 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 13:10:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:11:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:11:53 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split reported attr list parsing from Attribute Response Inf... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11693 ) Change subject: abis_nm: Split reported attr list parsing from Attribute Response Info into its own func ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 Gerrit-Change-Number: 11693 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:11:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:12:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:12:31 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11680 ) Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 13:12:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:13:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:13:02 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse some nanoBTS Attribute Response attributes In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11681 ) Change subject: abis_nm: Add support to parse some nanoBTS Attribute Response attributes ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 Gerrit-Change-Number: 11681 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:13:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:16:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:16:39 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11694 ) Change subject: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes ...................................................................... Patch Set 2: Code-Review+2 for a moment there I thought gerrit was broken, but you moved it to separate functions, nice -- To view, visit https://gerrit.osmocom.org/11694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa Gerrit-Change-Number: 11694 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 13:16:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:24:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:24:25 +0000 Subject: Change in osmo-bsc[master]: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11683 ) Change subject: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 Gerrit-Change-Number: 11683 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Fri, 09 Nov 2018 13:24:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:25:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:25:22 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... Patch Set 5: quiet (-q) as in wget doesn't make sense here, because quiet mean no output on stdout at all, while in here I want to print some formatted output to stdout. -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:25:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:27:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:27:28 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11686 ) Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Fri, 09 Nov 2018 13:27:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:27:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:27:59 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11684/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11684/3//COMMIT_MSG at 11 PS3, Line 11: this signal in later patches. I still see no change-id? -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 13:27:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:29:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:29:56 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11684/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11684/3//COMMIT_MSG at 11 PS3, Line 11: this signal in later patches. > I still see no change-id? Why do you really need a Change-id of a later patch? just look 1-2 patches later, that's it. -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:29:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:34:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:34:11 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Add support for dev-args cfg parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11622 ) Change subject: osmo-trx: Add support for dev-args cfg parameter ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cff225e378e187779bf2b0c7d65bd6b97217104 Gerrit-Change-Number: 11622 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:34:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:34:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:34:13 +0000 Subject: Change in osmo-gsm-tester[master]: resurces.conf.prod: Add UmTRX device In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11623 ) Change subject: resurces.conf.prod: Add UmTRX device ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I11f3275bddcc1c0c5bcd75e6a32f040a8f7c1174 Gerrit-Change-Number: 11623 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:34:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:34:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:34:15 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Add tests for UmTRX In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11624 ) Change subject: default-suites: Add tests for UmTRX ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0d0fe17676550a96d9bcf795faf43f7e6b82fb1a Gerrit-Change-Number: 11624 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:34:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:34:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:34:18 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-trx: Add support for dev-args cfg parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11622 ) Change subject: osmo-trx: Add support for dev-args cfg parameter ...................................................................... osmo-trx: Add support for dev-args cfg parameter Change-Id: I3cff225e378e187779bf2b0c7d65bd6b97217104 --- M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 6898926..e71f4cd 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -74,6 +74,7 @@ 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF, 'bts[].osmo_trx.trx_ip': schema.IPV4, 'bts[].osmo_trx.remote_user': schema.STR, + 'bts[].osmo_trx.dev_args': schema.STR, 'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl index ede1902..edfc0ea 100644 --- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl @@ -24,6 +24,9 @@ %else: multi-arfcn disable %endif +%if osmo_trx.get('dev_args', False): + dev-args ${osmo_trx.dev_args} +%endif tx-sps 4 rx-sps 4 clock-ref ${osmo_trx.clock_reference} -- To view, visit https://gerrit.osmocom.org/11622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3cff225e378e187779bf2b0c7d65bd6b97217104 Gerrit-Change-Number: 11622 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:34:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:34:19 +0000 Subject: Change in osmo-gsm-tester[master]: resurces.conf.prod: Add UmTRX device In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11623 ) Change subject: resurces.conf.prod: Add UmTRX device ...................................................................... resurces.conf.prod: Add UmTRX device Change-Id: I11f3275bddcc1c0c5bcd75e6a32f040a8f7c1174 --- M example/resources.conf.prod A example/scenarios/trx-umtrx.conf 2 files changed, 18 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 0cab84f..35704ff 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -34,6 +34,20 @@ clock_reference: external multi_arfcn: true +- label: UmTRX + type: osmo-bts-trx + ipa_unit_id: 12 + addr: 10.42.42.54 + band: GSM-1800 + ciphers: [a5_0, a5_1] + osmo_trx: + type: uhd + launch_trx: true + remote_user: jenkins + trx_ip: 10.42.42.118 + dev_args: addr=10.42.42.130,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345 + clock_reference: internal + - label: LimeSDR-USB type: osmo-bts-trx ipa_unit_id: 11 diff --git a/example/scenarios/trx-umtrx.conf b/example/scenarios/trx-umtrx.conf new file mode 100644 index 0000000..c13fa49 --- /dev/null +++ b/example/scenarios/trx-umtrx.conf @@ -0,0 +1,4 @@ +resources: + bts: + - label: UmTRX + type: osmo-bts-trx -- To view, visit https://gerrit.osmocom.org/11623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I11f3275bddcc1c0c5bcd75e6a32f040a8f7c1174 Gerrit-Change-Number: 11623 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:34:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:34:19 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Add tests for UmTRX In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11624 ) Change subject: default-suites: Add tests for UmTRX ...................................................................... default-suites: Add tests for UmTRX Change-Id: I0d0fe17676550a96d9bcf795faf43f7e6b82fb1a --- M example/default-suites.conf 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 26a42a6..df79232 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -54,6 +54,26 @@ - dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr-any - dynts:trx-sysmocell5000+mod-bts0-dynts67-osmo +- nitb_sms:trx-umtrx +- sms:trx-umtrx +- nitb_ussd:trx-umtrx +- ussd:trx-umtrx +- voice:trx-umtrx+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:trx-umtrx+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:trx-umtrx+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:trx-umtrx+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:trx-umtrx+mod-bts0-ts-tchh+cfg-codec-hr3 +- voice:trx-umtrx+mod-bts0-dynts-ipa+cfg-codec-fr-any +- voice:trx-umtrx+mod-bts0-dynts-osmo +- voice:trx-umtrx+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- gprs:trx-umtrx +- gprs:trx-umtrx+mod-bts0-egprs +- gprs:trx-umtrx+mod-bts0-dynts-ipa +- gprs:trx-umtrx+mod-bts0-dynts-osmo +- gprs:trx-umtrx+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- dynts:trx-umtrx+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:trx-umtrx+mod-bts0-dynts67-osmo + - nitb_sms:nanobts - sms:nanobts+band-1900 - nitb_ussd:nanobts+band-1900 -- To view, visit https://gerrit.osmocom.org/11624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0d0fe17676550a96d9bcf795faf43f7e6b82fb1a Gerrit-Change-Number: 11624 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:34:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:34:58 +0000 Subject: Change in osmo-gsm-tester[master]: WIP: HACK to integrate suite_run in osmo_ms_driver In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/11517 ) Change subject: WIP: HACK to integrate suite_run in osmo_ms_driver ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic84a549f2fbe5fc0700f501a5e08dbaa9f5cbb78 Gerrit-Change-Number: 11517 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:35:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 13:35:10 +0000 Subject: Change in osmo-gsm-tester[master]: Integrate mass LU test to run fine under osmo-gsm-tester In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/11516 ) Change subject: Integrate mass LU test to run fine under osmo-gsm-tester ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9 Gerrit-Change-Number: 11516 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:48:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:48:16 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11684/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11684/3//COMMIT_MSG at 11 PS3, Line 11: this signal in later patches. > Why do you really need a Change-id of a later patch? just look 1-2 patches later, that's it. because when future readers go through the log, they want to know what is going on. Actually, if it is in the same repos, why not squash those two commits to begin with? Then the user of the signal is right there. -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:48:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:53:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:53:13 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Support parsing nanoBTS format for Get Attributes Info In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11695 ) Change subject: abis_nm: Support parsing nanoBTS format for Get Attributes Info ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11695/1/src/osmo-bsc/abis_nm.c File src/osmo-bsc/abis_nm.c: https://gerrit.osmocom.org/#/c/11695/1/src/osmo-bsc/abis_nm.c at 554 PS1, Line 554: if (rc > 0) { > I don't understand "the unreported part". Maybe it's just me. [?] irc: neels, maybe other BTS also do it, and it doesn't hurt doing the costless check, so I think it's fine the way it is now -- To view, visit https://gerrit.osmocom.org/11695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I81a613d53bddf432a79fa5cb0bf9d847b4bdee37 Gerrit-Change-Number: 11695 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 13:53:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:54:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:54:03 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... Patch Set 5: > Patch Set 5: > > quiet (-q) as in wget doesn't make sense here, because quiet mean no output on stdout at all, while in here I want to print some formatted output to stdout. Ok I meant `wget -q -O -` -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:54:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:56:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:56:05 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... Patch Set 5: anyway, I think it makes more sense to print or not print, instead of printing either here or there. And then the name of the flag that changes printing should indicate what it does, not some other obscure cause why it should do what it does. But none of this is really very important -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 13:56:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 13:57:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 13:57:53 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 1: > Patch Set 1: > > Would be nice to see in commit message how the update was actually done. Is it somehow autogenerated or manual? Is this documented somewhere? How often/when this shall be done? etc. how: see the README in osmo-gsm-manuals. when: manually. -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 13:57:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:03:00 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 14:03:00 +0000 Subject: Change in libosmo-sccp[master]: return error code from xua_srv_conn_cb() if conn is freed Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11704 Change subject: return error code from xua_srv_conn_cb() if conn is freed ...................................................................... return error code from xua_srv_conn_cb() if conn is freed Allow callers of xua_srv_conn_cb() to tell whether conn was freed by returning an error code. I arbitrarily chose ECONNABORTED as the error code to report in this case. This is necessary because xua_srv_conn_cb(0 might be running inside of a loop which checks for read and then write events on the connection. If the connection is freed by xua_srv_conn_cb() as part of processing a read event, callers should avoid further processing of events. But if we don't return an error we are leaving callers none the wiser and with a dangling conn pointer. Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Related: OS#3685 --- M src/osmo_ss7.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/04/11704/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 9805b3b..7c548bb 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1424,9 +1424,11 @@ __func__, rc, flags); if (rc < 0) { osmo_stream_srv_destroy(conn); + rc = -ECONNABORTED; goto out; } else if (rc == 0) { osmo_stream_srv_destroy(conn); + rc = -ECONNABORTED; goto out; } else { msgb_put(msg, rc); @@ -1440,16 +1442,18 @@ switch (notif->sn_header.sn_type) { case SCTP_SHUTDOWN_EVENT: osmo_stream_srv_destroy(conn); + rc = -ECONNABORTED; break; case SCTP_ASSOC_CHANGE: if (notif->sn_assoc_change.sac_state == SCTP_RESTART) xua_asp_send_xlm_prim_simple(asp, OSMO_XLM_PRIM_M_SCTP_RESTART, PRIM_OP_INDICATION); + rc = 0; break; default: + rc = 0; break; } - rc = 0; goto out; } -- To view, visit https://gerrit.osmocom.org/11704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Gerrit-Change-Number: 11704 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:06:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 14:06:51 +0000 Subject: Change in libosmo-netif[master]: detect freed connections in osmo_stream_srv_read() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11705 Change subject: detect freed connections in osmo_stream_srv_read() ...................................................................... detect freed connections in osmo_stream_srv_read() While we are processing a read event, the connection's callback might free the connection. Check for this and don't attempt to process further events on an already freed connection. Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Related: OS#3685 Depends: g#11704 (for libosmo-sccp) --- M src/stream.c 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/05/11705/1 diff --git a/src/stream.c b/src/stream.c index 6eb2313..7fa69ca 100644 --- a/src/stream.c +++ b/src/stream.c @@ -784,19 +784,21 @@ int flags; }; -static void osmo_stream_srv_read(struct osmo_stream_srv *conn) +static int osmo_stream_srv_read(struct osmo_stream_srv *conn) { + int rc = 0; + LOGP(DLINP, LOGL_DEBUG, "message received\n"); if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) { LOGP(DLINP, LOGL_DEBUG, "Connection is being flushed and closed; ignoring received message\n"); - return; + return 0; } if (conn->cb) - conn->cb(conn); + rc = conn->cb(conn); - return; + return rc; } static void osmo_stream_srv_write(struct osmo_stream_srv *conn) @@ -845,10 +847,14 @@ static int osmo_stream_srv_cb(struct osmo_fd *ofd, unsigned int what) { struct osmo_stream_srv *conn = ofd->data; + int rc; LOGP(DLINP, LOGL_DEBUG, "connected read/write\n"); - if (what & BSC_FD_READ) - osmo_stream_srv_read(conn); + if (what & BSC_FD_READ) { + rc = osmo_stream_srv_read(conn); + if (rc < 0) + return rc; + } if (what & BSC_FD_WRITE) osmo_stream_srv_write(conn); -- To view, visit https://gerrit.osmocom.org/11705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Gerrit-Change-Number: 11705 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:16:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 14:16:19 +0000 Subject: Change in libosmo-netif[master]: detect freed connections in osmo_stream_srv_read() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11705 ) Change subject: detect freed connections in osmo_stream_srv_read() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11705/1/src/stream.c File src/stream.c: https://gerrit.osmocom.org/#/c/11705/1/src/stream.c at 855 PS1, Line 855: if (rc < 0) In all places I know of, we use -EBADF as an indicator that the osmo_fd struct was freed and should not keep being used, since usually having any error parsing some message doesn't mean you want to stop from writing on the socket. See for instance: libosmo-abis/src/input/ipaccess.c:401 libosmo-abis/src/input/ipa.c:138 libosmo-abis/src/input/ipa.c:384 libosmocore/src/write_queue.c And grep for "-EBADF" in general. -- To view, visit https://gerrit.osmocom.org/11705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Gerrit-Change-Number: 11705 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 14:16:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:22:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 9 Nov 2018 14:22:23 +0000 Subject: Change in osmo-dev[master]: gits: use git plumbing commands Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11706 Change subject: gits: use git plumbing commands ...................................................................... gits: use git plumbing commands Instead of 'git status' and 'git branch', which change their output depending on the git version and locale, use the low-level plumbing commands. 'gits status' output is exactly the same, 'gits rebase' output is a bit less redundant now (that was easier to implement). Change-Id: I42544313d14db126c99e2d9a02b8f63031944947 --- M src/gits 1 file changed, 92 insertions(+), 92 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/06/11706/1 diff --git a/src/gits b/src/gits index 81083f1..8b75278 100755 --- a/src/gits +++ b/src/gits @@ -18,7 +18,6 @@ import sys import subprocess -import re import argparse import os import shlex @@ -28,11 +27,6 @@ helps to save your time with: status, fetch, rebase, ... ''' -re_status_mods = re.compile('^\t(modified|deleted):.*') -re_status_branch_name = re.compile('On branch ([^ ]*)') -re_branch_name = re.compile('^..([^ ]+) .*') -re_ahead_behind = re.compile('ahead [0-9]+|behind [0-9]+') - def error(*msgs): sys.stderr.write(''.join(msgs)) @@ -67,52 +61,69 @@ return subprocess.check_output(['git', '-C', git_dir, ] + list(args)).decode('utf-8') -def git_branch(git_dir): - status = git_output(git_dir, 'status', '--long') - m = re_status_branch_name.find(status) - if not m: - error('No current branch in %r' % git_dir) - return m.group(1) +def git_bool(git_dir, *args): + try: + subprocess.check_output(['git', '-C', git_dir, ] + list(args)) + return True + except subprocess.CalledProcessError as e: + return False -def git_status(git_dir, verbose=False): - status_lines = git_output(git_dir, 'status').splitlines() - if verbose and len(status_lines): - print(status_lines[0]) +def git_branch_exists(git_dir, branch='origin/master'): + return git_bool(git_dir, 'rev-parse', '--quiet', '--verify', branch) - on_branch = None - branch_status_str = None - local_mods = False - ON_BRANCH = 'On branch ' - STATUS = 'Your branch' +def git_ahead_behind(git_dir, branch='master', remote='origin'): + ''' Count revisions ahead/behind of the remote branch. + returns: (ahead, behind) (e.g. (0, 5)) ''' - for l in status_lines: - if l.startswith(ON_BRANCH): - if on_branch: - error('cannot parse status, more than one branch?') - on_branch = l[len(ON_BRANCH):] - elif l.startswith(STATUS): - if 'Your branch is up to date' in l: - branch_status_str = l - elif 'Your branch is up-to-date' in l: - branch_status_str = l - elif 'Your branch is ahead' in l: - branch_status_str = 'ahead: ' + l - elif 'Your branch is behind' in l: - branch_status_str = 'behind: ' + l - elif 'have diverged' in l: - branch_status_str = 'diverged: ' + l - else: - error('unknown status str: %r' % l) - else: - m = re_status_mods.match(l) - if m: - local_mods = True + # Missing remote branch + if not git_branch_exists(git_dir, remote + '/' + branch): + return (0, 0) - if verbose: - print('%s%s' % (branch_status_str, '\nLOCAL MODS' if local_mods else '')) - return (on_branch, branch_status_str, local_mods) + behind = git_output(git_dir, 'rev-list', '--count', '%s..%s/%s' % (branch, remote, branch)) + ahead = git_output(git_dir, 'rev-list', '--count', '%s/%s..%s' % (remote, branch, branch)) + return (int(ahead.rstrip()), int(behind.rstrip())) + + +def git_branches(git_dir, obj='refs/heads'): + ret = git_output(git_dir, 'for-each-ref', obj, '--format', '%(refname:short)') + return ret.splitlines() + + +def git_branch_current(git_dir): + ret = git_output(git_dir, 'rev-parse', '--abbrev-ref', 'HEAD').rstrip() + if ret == 'HEAD': + return None + return ret + + +def git_has_modifications(git_dir): + return not git_bool(git_dir, 'diff-index', '--quiet', 'HEAD') + + +def git_can_fast_forward(git_dir, branch='master', remote='origin'): + return git_bool(git_dir, 'merge-base', '--is-ancestor', 'HEAD', remote + '/' + branch) + + +def format_branch_ahead_behind(branch, ahead, behind): + ''' branch: string like "master" + ahead, behind: integers like 5, 3 + returns: string like "master", "master[+5]", "master[-3]", "master[+5|-3]" ''' + # Just the branch + if not ahead and not behind: + return branch + + # Suffix with ahead/behind + ret = branch + '[' + if ahead: + ret += '+' + str(ahead) + if behind: + ret += '|' + if behind: + ret += '-' + str(behind) + ret += ']' + return ret def git_branch_summary(git_dir): @@ -122,36 +133,22 @@ interesting_branch_names = ('master',) strs = [git_dir, ] - - on_branch, branch_status_str, has_mods = git_status(git_dir) - - if has_mods: + if git_has_modifications(git_dir): strs.append('MODS') - branch_strs = git_output(git_dir, 'branch', '-vv').splitlines() - - for line in branch_strs: - m = re_branch_name.match(line) - name = m.group(1) - - current_branch = False - if line.startswith('*'): - current_branch = True - elif name not in interesting_branch_names: + branch_current = git_branch_current(git_dir) + for branch in git_branches(git_dir): + is_current = (branch == branch_current) + if not is_current and branch not in interesting_branch_names: continue - ahead_behind = re_ahead_behind.findall(line) - if not ahead_behind and not current_branch: + + ahead, behind = git_ahead_behind(git_dir, branch) + if not ahead and not behind and not is_current: # skip branches that are "not interesting" continue - ahead_behind = [ - x.replace('ahead ', '+').replace('behind ', '-') for x in ahead_behind] - branch_info = name - if ahead_behind: - branch_info = branch_info + ('[%s]' % '|'.join(ahead_behind)) - - strs.append(''.join(branch_info)) - + # Branch with ahead/behind origin info ("master[+1|-5]") + strs.append(format_branch_ahead_behind(branch, ahead, behind)) return strs @@ -236,14 +233,15 @@ def rebase(git_dir): - orig_branch, branch_status_str, local_mods = git_status( - git_dir, verbose=True) - + orig_branch = git_branch_current(git_dir) if orig_branch is None: print('Not on a branch: %s' % git_dir) raise SkipThisRepo() - if local_mods: + print('Rebasing branch: ' + orig_branch) + ahead, behind = git_ahead_behind(git_dir, orig_branch) + + if git_has_modifications(git_dir): do_commit = ask(git_dir, 'Local mods.', 'c commit to this branch', ' commit to new branch', @@ -259,17 +257,29 @@ git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - _, _, local_mods = git_status(git_dir) - - if local_mods: + if git_has_modifications(git_dir): print('There still are local modifications') raise SkipThisRepo() - if branch_status_str is None: + # Missing upstream branch + if not git_branch_exists(git_dir, 'origin/' + orig_branch): print('there is no upstream branch for %r' % orig_branch) - elif branch_status_str.startswith('behind'): - if 'and can be fast-forwarded' in branch_status_str: + # Diverged + elif ahead and behind: + do_reset = ask(git_dir, 'Diverged.', + '%s: git reset --hard origin/%s?' % ( + orig_branch, orig_branch), + ' no', + 'OK yes (write OK in caps!)', + valid_answers=('', 'OK')) + + if do_reset == 'OK': + git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + + # Behind + elif behind: + if git_can_fast_forward(git_dir, orig_branch): print('fast-forwarding...') git(git_dir, 'merge') else: @@ -282,7 +292,8 @@ if do_merge == 'ok': git(git_dir, 'merge') - elif branch_status_str.startswith('ahead'): + # Ahead + elif ahead: do_commit = ask(git_dir, 'Ahead. commit to new branch?', ' no', ' create new branch', @@ -300,17 +311,6 @@ if do_reset == 'OK': git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) - elif branch_status_str.startswith('diverged'): - do_reset = ask(git_dir, 'Diverged.', - '%s: git reset --hard origin/%s?' % ( - orig_branch, orig_branch), - ' no', - 'OK yes (write OK in caps!)', - valid_answers=('', 'OK')) - - if do_reset == 'OK': - git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) - return orig_branch -- To view, visit https://gerrit.osmocom.org/11706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I42544313d14db126c99e2d9a02b8f63031944947 Gerrit-Change-Number: 11706 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:24:29 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 9 Nov 2018 14:24:29 +0000 Subject: Change in osmo-dev[master]: gits: use git plumbing commands In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11706 ) Change subject: gits: use git plumbing commands ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42544313d14db126c99e2d9a02b8f63031944947 Gerrit-Change-Number: 11706 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 09 Nov 2018 14:24:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:30:23 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 14:30:23 +0000 Subject: Change in libosmo-sccp[master]: return error code from xua_srv_conn_cb() if conn is freed In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11704 to look at the new patch set (#2). Change subject: return error code from xua_srv_conn_cb() if conn is freed ...................................................................... return error code from xua_srv_conn_cb() if conn is freed Allow callers of xua_srv_conn_cb() to tell whether conn was freed by returning error code EBADF, which is also used elsewhere in osmocom programs for this purpose. This is necessary because xua_srv_conn_cb(0 might be running inside of a loop which checks for read and then write events on the connection. If the connection is freed by xua_srv_conn_cb() as part of processing a read event, callers should avoid further processing of events. But if we don't return an error we are leaving callers none the wiser and with a dangling conn pointer. Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Related: OS#3685 --- M src/osmo_ss7.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/04/11704/2 -- To view, visit https://gerrit.osmocom.org/11704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Gerrit-Change-Number: 11704 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:40:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 14:40:06 +0000 Subject: Change in libosmo-sccp[master]: return error code from xua_srv_conn_cb() if conn is freed In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11704 ) Change subject: return error code from xua_srv_conn_cb() if conn is freed ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11704/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11704/2//COMMIT_MSG at 13 PS2, Line 13: This is necessary because xua_srv_conn_cb(0 might be running typo (0 -- To view, visit https://gerrit.osmocom.org/11704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Gerrit-Change-Number: 11704 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 14:40:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 14:43:19 +0000 Subject: Change in libosmo-netif[master]: detect freed connections in osmo_stream_srv_read() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11705 to look at the new patch set (#2). Change subject: detect freed connections in osmo_stream_srv_read() ...................................................................... detect freed connections in osmo_stream_srv_read() While we are processing a read event, the connection's callback might free the connection. Check for this and don't attempt to process further events on an already freed connection. Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Related: OS#3685 Depends: g#11704 (for libosmo-sccp) --- M src/stream.c 1 file changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/05/11705/2 -- To view, visit https://gerrit.osmocom.org/11705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Gerrit-Change-Number: 11705 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:43:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 14:43:49 +0000 Subject: Change in libosmo-sccp[master]: return error code from xua_srv_conn_cb() if conn is freed In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11704 to look at the new patch set (#3). Change subject: return error code from xua_srv_conn_cb() if conn is freed ...................................................................... return error code from xua_srv_conn_cb() if conn is freed Allow callers of xua_srv_conn_cb() to tell whether conn was freed by returning error code EBADF, which is also used elsewhere in osmocom programs for this purpose. This is necessary because xua_srv_conn_cb() might be running inside of a loop which checks for read and then write events on the connection. If the connection is freed by xua_srv_conn_cb() as part of processing a read event, callers should avoid further processing of events. But if we don't return an error we are leaving callers none the wiser and with a dangling conn pointer. Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Related: OS#3685 --- M src/osmo_ss7.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/04/11704/3 -- To view, visit https://gerrit.osmocom.org/11704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Gerrit-Change-Number: 11704 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 14:44:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 14:44:43 +0000 Subject: Change in libosmo-netif[master]: detect freed connections in osmo_stream_srv_read() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11705 ) Change subject: detect freed connections in osmo_stream_srv_read() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11705/1/src/stream.c File src/stream.c: https://gerrit.osmocom.org/#/c/11705/1/src/stream.c at 855 PS1, Line 855: if (rc != -EBADF && (what & BSC_FD_WRITE)) > In all places I know of, we use -EBADF as an indicator that the osmo_fd struct was freed and should [?] Indeed, using EBADF is more consistent with other code. Thanks for hint. -- To view, visit https://gerrit.osmocom.org/11705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Gerrit-Change-Number: 11705 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 09 Nov 2018 14:44:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:03:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 15:03:36 +0000 Subject: Change in libosmo-sccp[master]: Make pointcode width function public Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11709 Change subject: Make pointcode width function public ...................................................................... Make pointcode width function public Adjust function caller types accordingly. Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/09/11709/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 414606a..a97e236 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -113,6 +113,8 @@ struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst); +uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt); + /*********************************************************************** * MTP Users (Users of MTP, such as SCCP or ISUP) ***********************************************************************/ diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index e7cbd03..dd48b2a 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -179,17 +179,17 @@ } /* get the total width (in bits) of the point-codes in this ss7_instance */ -static unsigned int get_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt) +uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt) { return pc_fmt->component_len[0] + pc_fmt->component_len[1] + pc_fmt->component_len[2]; } /* get the number of bits we must shift the given component of a point * code in this ss7_instance */ -static unsigned int get_pc_comp_shift(const struct osmo_ss7_pc_fmt *pc_fmt, +static uint8_t get_pc_comp_shift(const struct osmo_ss7_pc_fmt *pc_fmt, unsigned int comp_num) { - uint32_t pc_width = get_pc_width(pc_fmt); + uint8_t pc_width = osmo_ss7_pc_width(pc_fmt); switch (comp_num) { case 0: return pc_width - pc_fmt->component_len[0]; @@ -206,7 +206,7 @@ static uint32_t pc_comp_shift_and_mask(const struct osmo_ss7_pc_fmt *pc_fmt, unsigned int comp_num, uint32_t pc) { - unsigned int shift = get_pc_comp_shift(pc_fmt, comp_num); + uint8_t shift = get_pc_comp_shift(pc_fmt, comp_num); uint32_t mask = (1 << pc_fmt->component_len[comp_num]) - 1; return (pc >> shift) & mask; @@ -288,7 +288,7 @@ int osmo_ss7_pointcode_parse_mask_or_len(struct osmo_ss7_instance *inst, const char *in) { - unsigned int width = get_pc_width(inst ? &inst->cfg.pc_fmt : &default_pc_fmt); + unsigned int width = osmo_ss7_pc_width(inst ? &inst->cfg.pc_fmt : &default_pc_fmt); if (in[0] == '/') { /* parse mask by length */ -- To view, visit https://gerrit.osmocom.org/11709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf Gerrit-Change-Number: 11709 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:03:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 15:03:35 +0000 Subject: Change in libosmo-sccp[master]: Log ip:port for created SS7 server Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11708 Change subject: Log ip:port for created SS7 server ...................................................................... Log ip:port for created SS7 server Change-Id: If2ae093175d64000490a2be31ecfea265ca3853d --- M src/osmo_ss7.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/08/11708/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index c493672..e7cbd03 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1826,6 +1826,9 @@ osmo_stream_srv_link_set_port(oxs->server, oxs->cfg.local.port); osmo_stream_srv_link_set_proto(oxs->server, asp_proto_to_ip_proto(proto)); + LOGP(DLSS7, LOGL_INFO, "Created %s server on %s:%u\n", + get_value_string(osmo_ss7_asp_protocol_vals, proto), local_host, local_port); + oxs->inst = inst; llist_add_tail(&oxs->list, &inst->xua_servers); -- To view, visit https://gerrit.osmocom.org/11708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If2ae093175d64000490a2be31ecfea265ca3853d Gerrit-Change-Number: 11708 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:03:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 15:03:34 +0000 Subject: Change in libosmo-sccp[master]: SS7: safeguard against wrong number of pointcode component Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11707 Change subject: SS7: safeguard against wrong number of pointcode component ...................................................................... SS7: safeguard against wrong number of pointcode component Previously internal function get_pc_comp_shift() returned negative error code when called with wrong component number despite unsinged return value which wasn't checked for error anyway. Fix this by using explicit assert in the error path. This should not affect external users because this function always called with constant component argument. Change-Id: Ib24cdbcf614bad68f3cfa9776a451c5c1e45ae6e --- M src/osmo_ss7.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/07/11707/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 9805b3b..c493672 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -198,7 +198,8 @@ case 2: return 0; default: - return -EINVAL; + /* Invalid number of components */ + OSMO_ASSERT(false); } } -- To view, visit https://gerrit.osmocom.org/11707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib24cdbcf614bad68f3cfa9776a451c5c1e45ae6e Gerrit-Change-Number: 11707 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:06:20 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 9 Nov 2018 15:06:20 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Add ttcn3-bscnat-test docker image Run the bscnat ttcn3 tests in docker. This uses the osmo-nitb-master image since osmo-bsc_nat is built there as well. Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 --- A ttcn3-bscnat-test/BSCNAT_Tests.cfg A ttcn3-bscnat-test/Dockerfile A ttcn3-bscnat-test/Makefile A ttcn3-bscnat-test/bscs.config A ttcn3-bscnat-test/jenkins.sh A ttcn3-bscnat-test/osmo-bsc-nat.cfg 6 files changed, 190 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/11657/3 -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:09:18 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 15:09:18 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 1: Which README? Top-level directory of osmo-gsm-manuals doesn't have it, neither OsmoMSC. I'd really love to see commit message which allows to reproduce this update when necessary. -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 09 Nov 2018 15:09:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 9 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 9 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#302?= In-Reply-To: <1585475007.489.1541689807306.JavaMail.jenkins@jenkins.osmocom.org> References: <1585475007.489.1541689807306.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1796724913.504.1541776207369.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:18:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:18:07 +0000 Subject: Change in libosmo-netif[master]: detect freed connections in osmo_stream_srv_read() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11705 ) Change subject: detect freed connections in osmo_stream_srv_read() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Gerrit-Change-Number: 11705 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 09 Nov 2018 15:18:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:19:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:19:21 +0000 Subject: Change in libosmo-sccp[master]: return error code from xua_srv_conn_cb() if conn is freed In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11704 ) Change subject: return error code from xua_srv_conn_cb() if conn is freed ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Gerrit-Change-Number: 11704 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 09 Nov 2018 15:19:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:35:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 15:35:28 +0000 Subject: Change in libosmo-sccp[master]: return error code from xua_srv_conn_cb() if conn is freed In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11704 ) Change subject: return error code from xua_srv_conn_cb() if conn is freed ...................................................................... return error code from xua_srv_conn_cb() if conn is freed Allow callers of xua_srv_conn_cb() to tell whether conn was freed by returning error code EBADF, which is also used elsewhere in osmocom programs for this purpose. This is necessary because xua_srv_conn_cb() might be running inside of a loop which checks for read and then write events on the connection. If the connection is freed by xua_srv_conn_cb() as part of processing a read event, callers should avoid further processing of events. But if we don't return an error we are leaving callers none the wiser and with a dangling conn pointer. Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Related: OS#3685 --- M src/osmo_ss7.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 9805b3b..f97876c 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1424,9 +1424,11 @@ __func__, rc, flags); if (rc < 0) { osmo_stream_srv_destroy(conn); + rc = -EBADF; goto out; } else if (rc == 0) { osmo_stream_srv_destroy(conn); + rc = -EBADF; goto out; } else { msgb_put(msg, rc); @@ -1440,16 +1442,18 @@ switch (notif->sn_header.sn_type) { case SCTP_SHUTDOWN_EVENT: osmo_stream_srv_destroy(conn); + rc = -EBADF; break; case SCTP_ASSOC_CHANGE: if (notif->sn_assoc_change.sac_state == SCTP_RESTART) xua_asp_send_xlm_prim_simple(asp, OSMO_XLM_PRIM_M_SCTP_RESTART, PRIM_OP_INDICATION); + rc = 0; break; default: + rc = 0; break; } - rc = 0; goto out; } -- To view, visit https://gerrit.osmocom.org/11704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7359667b2f25d6c45acc70049b2a4ee2f376a1df Gerrit-Change-Number: 11704 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:35:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 9 Nov 2018 15:35:30 +0000 Subject: Change in libosmo-netif[master]: detect freed connections in osmo_stream_srv_read() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11705 ) Change subject: detect freed connections in osmo_stream_srv_read() ...................................................................... detect freed connections in osmo_stream_srv_read() While we are processing a read event, the connection's callback might free the connection. Check for this and don't attempt to process further events on an already freed connection. Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Related: OS#3685 Depends: g#11704 (for libosmo-sccp) --- M src/stream.c 1 file changed, 10 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/stream.c b/src/stream.c index 6eb2313..4548414 100644 --- a/src/stream.c +++ b/src/stream.c @@ -784,19 +784,21 @@ int flags; }; -static void osmo_stream_srv_read(struct osmo_stream_srv *conn) +static int osmo_stream_srv_read(struct osmo_stream_srv *conn) { + int rc = 0; + LOGP(DLINP, LOGL_DEBUG, "message received\n"); if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) { LOGP(DLINP, LOGL_DEBUG, "Connection is being flushed and closed; ignoring received message\n"); - return; + return 0; } if (conn->cb) - conn->cb(conn); + rc = conn->cb(conn); - return; + return rc; } static void osmo_stream_srv_write(struct osmo_stream_srv *conn) @@ -845,14 +847,15 @@ static int osmo_stream_srv_cb(struct osmo_fd *ofd, unsigned int what) { struct osmo_stream_srv *conn = ofd->data; + int rc = 0; LOGP(DLINP, LOGL_DEBUG, "connected read/write\n"); if (what & BSC_FD_READ) - osmo_stream_srv_read(conn); - if (what & BSC_FD_WRITE) + rc = osmo_stream_srv_read(conn); + if (rc != -EBADF && (what & BSC_FD_WRITE)) osmo_stream_srv_write(conn); - return 0; + return rc; } /*! \brief Create a Stream Server inside the specified link -- To view, visit https://gerrit.osmocom.org/11705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0a9c7d8e3263c73440f7084dbb1792a4ca5038f0 Gerrit-Change-Number: 11705 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:41:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:41:27 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11654 to look at the new patch set (#2). Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... paging: Add VTY options to calculate T3113 timeout dynamically The idea is to have a base static value which is set like before "timer t3113 [seconds]", but now have a part of this timeout calculated dynamically based on BTS channel configuration and channel load. This patch only implements initial support to calculate based on channel configuration, but doesn't include code to calculate based on channel load. To implement the later part, we probably need to keep track of BTS paging queues per paging group, which we don't do nowadays. Dynamic calculation is enabled by default, and default static base value is decreased accordingly. This way, in a typical setup were the default 10 seconds were used, now the calculated final value is 11 seconds. That's intended because it was observed experimentally in osmo-gsm-tester with a similar channel setup that sometimes paging response can arrive slightly later than 10 seconds. Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/gsm_timers.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/gsm_timers_vty.c M src/osmo-bsc/net_init.c M src/osmo-bsc/paging.c 7 files changed, 83 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11654/2 -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:41:28 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11710 Change subject: osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init ...................................................................... osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init Otherwise any use of functions in gsm_timers_vty.c will fail because g_vty_T_defs is never set (so it is NULL). Change-Id: Ieeb27fdb06c965fa6b70aeb0f3b3f5169b1f2012 --- M src/osmo-bsc/gsm_timers_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/11710/1 diff --git a/src/osmo-bsc/gsm_timers_vty.c b/src/osmo-bsc/gsm_timers_vty.c index 8a13259..de61e24 100644 --- a/src/osmo-bsc/gsm_timers_vty.c +++ b/src/osmo-bsc/gsm_timers_vty.c @@ -102,6 +102,7 @@ /* Install GSM timer configuration commands in the VTY. */ void T_defs_vty_init(struct T_def *T_defs, int cfg_parent_node) { + g_vty_T_defs = T_defs; install_element_ve(&show_timer_cmd); install_element(cfg_parent_node, &cfg_timer_cmd); } -- To view, visit https://gerrit.osmocom.org/11710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ieeb27fdb06c965fa6b70aeb0f3b3f5169b1f2012 Gerrit-Change-Number: 11710 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:47:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:47:23 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11654 to look at the new patch set (#3). Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... paging: Add VTY options to calculate T3113 timeout dynamically The idea is to have a base static value which is set like before "timer t3113 [seconds]", but now have a part of this timeout calculated dynamically based on BTS channel configuration and channel load. This patch only implements initial support to calculate based on channel configuration, but doesn't include code to calculate based on channel load. To implement the later part, we probably need to keep track of BTS paging queues per paging group, which we don't do nowadays. Dynamic calculation is enabled by default, and default static base value is decreased accordingly. This way, in a typical setup were the default 10 seconds were used, now the calculated final value is 11 seconds. That's intended because it was observed experimentally in osmo-gsm-tester with a similar channel setup that sometimes paging response can arrive slightly later than 10 seconds. Related: OS#3680 Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/gsm_timers.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/gsm_timers_vty.c M src/osmo-bsc/net_init.c M src/osmo-bsc/paging.c 7 files changed, 83 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11654/3 -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:50:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:50:44 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Rename m_id_len to ease review of forthcoming patches In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11691 ) Change subject: abis_nm: Rename m_id_len to ease review of forthcoming patches ...................................................................... abis_nm: Rename m_id_len to ease review of forthcoming patches This function will be merged into another using a "len" variable. This change makes diffs easier to follow in future patches. Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 --- M src/osmo-bsc/abis_nm.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index f75470d..ef61f9e 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -470,27 +470,27 @@ static inline const uint8_t *parse_attr_resp_info_manuf_id(struct gsm_bts *bts, const uint8_t *data, uint16_t *data_len) { struct tlv_parsed tp; - uint16_t m_id_len = 0; + uint16_t len = 0; uint8_t adjust = 0, i; abis_nm_tlv_parse(&tp, bts, data, *data_len); if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_ID, 2)) { - m_id_len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); + len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); /* log potential BTS feature vector overflow */ - if (m_id_len > sizeof(bts->_features_data)) + if (len > sizeof(bts->_features_data)) LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: feature vector is truncated to %u bytes\n", bts->nr, MAX_BTS_FEATURES/8); /* check that max. expected BTS attribute is above given feature vector length */ - if (m_id_len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) + if (len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) LOGP(DNM, LOGL_NOTICE, "BTS%u Get Attributes Response: reported unexpectedly long (%u bytes) " "feature vector - most likely it was compiled against newer BSC headers. " "Consider upgrading your BSC to later version.\n", - bts->nr, m_id_len); + bts->nr, len); memcpy(bts->_features_data, TLVP_VAL(&tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); - adjust = m_id_len + 3; /* adjust for parsed TL16V struct */ + adjust = len + 3; /* adjust for parsed TL16V struct */ for (i = 0; i < _NUM_BTS_FEAT; i++) if (osmo_bts_has_feature(&bts->features, i) != osmo_bts_has_feature(&bts->model->features, i)) -- To view, visit https://gerrit.osmocom.org/11691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1be03e31901ccf284e31237a04bb7448d1f22c07 Gerrit-Change-Number: 11691 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:50:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:50:45 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split handling of Attribute Response Info into its own func In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11692 ) Change subject: abis_nm: Split handling of Attribute Response Info into its own func ...................................................................... abis_nm: Split handling of Attribute Response Info into its own func In future commits, nanoBTS support will be added, which implements its own format not exactly equal to specs Attribute Response Info. Related: OS#3624 Change-Id: I346dacc58faac70e6d224ca49484f9211cb8a046 --- M src/osmo-bsc/abis_nm.c 1 file changed, 19 insertions(+), 12 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index ef61f9e..17c987b 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -528,29 +528,21 @@ } /* Handle 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info */ -static int abis_nm_rx_get_attr_resp(struct msgb *mb, const struct gsm_bts_trx *trx) +static int parse_attr_resp_info(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { - struct abis_om_hdr *oh = msgb_l2(mb); - struct abis_om_fom_hdr *foh = msgb_l3(mb); - struct e1inp_sign_link *sign_link = mb->dst; - struct gsm_bts *bts = trx ? trx->bts : sign_link->trx->bts; - struct tlv_parsed tp; const uint8_t *data; int i; uint16_t data_len; int rc; struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; - DEBUGPFOH(DNM, foh, "Get Attributes Response for BTS%u\n", bts->nr); - - abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); - if (!TLVP_PRES_LEN(&tp, NM_ATT_GET_ARI, 1)) { + if (!TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: Get Attr Response without Response Info?!\n", bts->nr); return -EINVAL; } - data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), + data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(tp, NM_ATT_GET_ARI), TLVP_LEN(tp, NM_ATT_GET_ARI), &data_len); data = parse_attr_resp_info_manuf_state(trx, data, &data_len); @@ -570,10 +562,25 @@ LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); } - return 0; } +/* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response */ +static int abis_nm_rx_get_attr_resp(struct msgb *mb, const struct gsm_bts_trx *trx) +{ + struct abis_om_hdr *oh = msgb_l2(mb); + struct abis_om_fom_hdr *foh = msgb_l3(mb); + struct e1inp_sign_link *sign_link = mb->dst; + struct gsm_bts *bts = trx ? trx->bts : sign_link->trx->bts; + struct tlv_parsed tp; + + DEBUGPFOH(DNM, foh, "Get Attributes Response for BTS%u\n", bts->nr); + + abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); + + return parse_attr_resp_info(bts, trx, foh, &tp); +} + /* 3GPP TS 52.021 ?6.2.5 */ static int abis_nm_rx_sw_act_req(struct msgb *mb) { -- To view, visit https://gerrit.osmocom.org/11692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I346dacc58faac70e6d224ca49484f9211cb8a046 Gerrit-Change-Number: 11692 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:50:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:50:45 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Split reported attr list parsing from Attribute Response Inf... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11693 ) Change subject: abis_nm: Split reported attr list parsing from Attribute Response Info into its own func ...................................................................... abis_nm: Split reported attr list parsing from Attribute Response Info into its own func nanoBTS uses same format for the attribute list from Attribute Response Info, but without using the later as an evelope. By splitting we can later reuse the code handling the Attribute list. While at it, take the chance to remove functions parse_attr_resp_info_* which expect TLVs following an specific order, which is not mandatory. Related: OS#3624 Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 --- M src/osmo-bsc/abis_nm.c 1 file changed, 41 insertions(+), 53 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 17c987b..828d567 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -466,16 +466,18 @@ return ari + num_unreported + 1; /* we have to account for 1st byte with number of unreported attributes */ } -/* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.30 Manufacturer Id */ -static inline const uint8_t *parse_attr_resp_info_manuf_id(struct gsm_bts *bts, const uint8_t *data, uint16_t *data_len) +/* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response (with nanoBTS specific attribute formatting) */ +static int parse_attr_resp_info_attr(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { - struct tlv_parsed tp; - uint16_t len = 0; - uint8_t adjust = 0, i; + const uint8_t* data; + uint16_t len; + int i; + int rc; + struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; - abis_nm_tlv_parse(&tp, bts, data, *data_len); - if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_ID, 2)) { - len = TLVP_LEN(&tp, NM_ATT_MANUF_ID); + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.30 Manufacturer Id */ + if (TLVP_PRES_LEN(tp, NM_ATT_MANUF_ID, 2)) { + len = TLVP_LEN(tp, NM_ATT_MANUF_ID); /* log potential BTS feature vector overflow */ if (len > sizeof(bts->_features_data)) @@ -489,8 +491,7 @@ "Consider upgrading your BSC to later version.\n", bts->nr, len); - memcpy(bts->_features_data, TLVP_VAL(&tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); - adjust = len + 3; /* adjust for parsed TL16V struct */ + memcpy(bts->_features_data, TLVP_VAL(tp, NM_ATT_MANUF_ID), sizeof(bts->_features_data)); for (i = 0; i < _NUM_BTS_FEAT; i++) if (osmo_bts_has_feature(&bts->features, i) != osmo_bts_has_feature(&bts->model->features, i)) @@ -500,41 +501,41 @@ osmo_bts_has_feature(&bts->features, i), osmo_bts_has_feature(&bts->model->features, i)); } - *data_len -= adjust; - - return data + adjust; -} - -/* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.28 Manufacturer Dependent State */ -static inline const uint8_t *parse_attr_resp_info_manuf_state(const struct gsm_bts_trx *trx, const uint8_t *data, uint16_t *data_len) -{ - struct tlv_parsed tp; - const uint8_t *power; - uint8_t adjust = 0; - - if (!trx) /* this attribute does not make sense on BTS level, only on TRX level */ - return data; - - abis_nm_tlv_parse(&tp, trx->bts, data, *data_len); - if (TLVP_PRES_LEN(&tp, NM_ATT_MANUF_STATE, 1)) { - power = TLVP_VAL(&tp, NM_ATT_MANUF_STATE); - LOGP(DNM, LOGL_NOTICE, "%s Get Attributes Response: nominal power is %u\n", gsm_trx_name(trx), *power); - adjust = 2; /* adjust for parsed TV struct */ + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.28 Manufacturer Dependent State */ + /* this attribute does not make sense on BTS level, only on TRX level */ + if (trx && TLVP_PRES_LEN(tp, NM_ATT_MANUF_STATE, 1)) { + data = TLVP_VAL(tp, NM_ATT_MANUF_STATE); + LOGPFOH(DNM, LOGL_NOTICE, foh, "%s Get Attributes Response: nominal power is %u\n", gsm_trx_name(trx), *data); } - *data_len -= adjust; + /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.61 SW Configuration */ + if (TLVP_PRESENT(tp, NM_ATT_SW_CONFIG)) { + data = TLVP_VAL(tp, NM_ATT_SW_CONFIG); + len = TLVP_LEN(tp, NM_ATT_SW_CONFIG); + /* after parsing manufacturer-specific attributes there's list of replies in form of sw-conf structure: */ + rc = abis_nm_get_sw_conf(data, len, &sw_descr[0], ARRAY_SIZE(sw_descr)); + if (rc > 0) { + for (i = 0; i < rc; i++) { + if (!handle_attr(bts, str2btsattr((const char *)sw_descr[i].file_id), + sw_descr[i].file_version, sw_descr[i].file_version_len)) + LOGPFOH(DNM, LOGL_NOTICE, foh, "BTS%u: ARI reported sw[%d/%d]: %s " + "is %s\n", bts->nr, i, rc, sw_descr[i].file_id, + sw_descr[i].file_version); + } + } else { + LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " + "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); + } + } - return data + adjust; + return 0; } /* Handle 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info */ static int parse_attr_resp_info(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { const uint8_t *data; - int i; uint16_t data_len; - int rc; - struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; if (!TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: Get Attr Response without Response Info?!\n", @@ -545,24 +546,11 @@ data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(tp, NM_ATT_GET_ARI), TLVP_LEN(tp, NM_ATT_GET_ARI), &data_len); - data = parse_attr_resp_info_manuf_state(trx, data, &data_len); - data = parse_attr_resp_info_manuf_id(bts, data, &data_len); - - /* after parsing manufacturer-specific attributes there's list of replies in form of sw-conf structure: */ - rc = abis_nm_get_sw_conf(data, data_len, &sw_descr[0], ARRAY_SIZE(sw_descr)); - if (rc > 0) { - for (i = 0; i < rc; i++) { - if (!handle_attr(bts, str2btsattr((const char *)sw_descr[i].file_id), - sw_descr[i].file_version, sw_descr[i].file_version_len)) - LOGPFOH(DNM, LOGL_NOTICE, foh, "BTS%u: ARI reported sw[%d/%d]: %s " - "is %s\n", bts->nr, i, rc, sw_descr[i].file_id, - sw_descr[i].file_version); - } - } else { - LOGPFOH(DNM, LOGL_ERROR, foh, "BTS%u: failed to parse SW-Config part of " - "Get Attribute Response Info: %s\n", bts->nr, strerror(-rc)); - } - return 0; + /* After parsing unreported attribute id list inside Response info, + there's a list of reported attribute ids and their values, in a TLV + list form. */ + abis_nm_tlv_parse(tp, bts, data, data_len); + return parse_attr_resp_info_attr(bts, trx, foh, tp); } /* Handle 3GPP TS 52.021 ?8.11.3 Get Attribute Response */ -- To view, visit https://gerrit.osmocom.org/11693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iec7a6e4d27639d0e5adc0d9a01cd3c3e7a46f558 Gerrit-Change-Number: 11693 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:50:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:50:45 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Allow sending and receiving Get Attributes (Response) agains... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11680 ) Change subject: abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS ...................................................................... abis_nm: Allow sending and receiving Get Attributes (Response) against nanoBTS * Allow sending Get Attributes message in abis_nm_get_attr. * Don't try to decode Get Attribute Response Info for nanoBTS, since it uses a different formatting than the one defined in specs. Related: OS#3624 Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 --- M src/osmo-bsc/abis_nm.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 828d567..76fba59 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -566,7 +566,10 @@ abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); - return parse_attr_resp_info(bts, trx, foh, &tp); + /* nanoBTS doesn't send Get Attribute Response Info, uses its own format */ + if (bts->type != GSM_BTS_TYPE_NANOBTS) + return parse_attr_resp_info(bts, trx, foh, &tp); + return 0; } /* 3GPP TS 52.021 ?6.2.5 */ @@ -1641,7 +1644,7 @@ struct abis_om_hdr *oh; struct msgb *msg; - if (bts->type != GSM_BTS_TYPE_OSMOBTS) { + if (bts->type != GSM_BTS_TYPE_OSMOBTS && bts->type != GSM_BTS_TYPE_NANOBTS) { LOGPC(DNM, LOGL_NOTICE, "Getting attributes from BTS%d type %s is not supported.\n", bts->nr, btstype2str(bts->type)); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/11680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I53d01e73791cf5450aa34b1ac8f051730e3a70f9 Gerrit-Change-Number: 11680 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:50:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:50:46 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse some nanoBTS Attribute Response attributes In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11681 ) Change subject: abis_nm: Add support to parse some nanoBTS Attribute Response attributes ...................................................................... abis_nm: Add support to parse some nanoBTS Attribute Response attributes nanoBTS actually supports regular formatting. There are a few differences with spec though: * The attributes are listed directly in the message instead of being inside the Get Attributes Response Info after the unsupported attribute ID list. * The Get Attributes Response Info can be at any position in the attribute list, and it only contains the unsupported attribute ID list. As a result, parsing is currently split into 3 main parts or functions: * Parsing regular (per spec) Get Attributes Response Info attr and get a pointer to the list of attributes. * A function that parses the list of attributes, called directly in case of nanoBTS, and called by the former parser of Get Attributes Response Info for regular (per spec) OML endpoints. * A function to parse the unsupported attribute ID list, also used in the first function to get a pointer to the list of attributes. Related: OS#3624 Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 76fba59..005c417 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -569,7 +569,8 @@ /* nanoBTS doesn't send Get Attribute Response Info, uses its own format */ if (bts->type != GSM_BTS_TYPE_NANOBTS) return parse_attr_resp_info(bts, trx, foh, &tp); - return 0; + else + return parse_attr_resp_info_attr(bts, trx, foh, &tp); } /* 3GPP TS 52.021 ?6.2.5 */ -- To view, visit https://gerrit.osmocom.org/11681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I52e9f177c14fec1ec3f5c4ddb244594409008357 Gerrit-Change-Number: 11681 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:50:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:50:46 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11694 ) Change subject: abis_nm: Add support to parse OML IP and Unit Id in Get Attributes ...................................................................... abis_nm: Add support to parse OML IP and Unit Id in Get Attributes Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa --- M include/osmocom/bsc/abis_nm.h M src/osmo-bsc/abis_nm.c 2 files changed, 49 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/abis_nm.h b/include/osmocom/bsc/abis_nm.h index ef9e4f5..45bbe2c 100644 --- a/include/osmocom/bsc/abis_nm.h +++ b/include/osmocom/bsc/abis_nm.h @@ -67,6 +67,8 @@ extern int abis_nm_rcvmsg(struct msgb *msg); int abis_nm_tlv_parse(struct tlv_parsed *tp, struct gsm_bts *bts, const uint8_t *buf, int len); +int abis_nm_tlv_attr_primary_oml(struct tlv_parsed *tp, struct in_addr *ia, uint16_t *oml_port); +int abis_nm_tlv_attr_unit_id(struct tlv_parsed *tp, char* unit_id, size_t buf_len); int abis_nm_rx(struct msgb *msg); int abis_nm_opstart(struct gsm_bts *bts, uint8_t obj_class, uint8_t i0, uint8_t i1, uint8_t i2); int abis_nm_chg_adm_state(struct gsm_bts *bts, uint8_t obj_class, uint8_t i0, diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 005c417..89a6d82 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -64,6 +64,39 @@ return tlv_parse(tp, &bts->model->nm_att_tlvdef, buf, len, 0, 0); } +/* Parse OML Primary IP and port from tlv_parsed containing list of Reported Attributes */ +int abis_nm_tlv_attr_primary_oml(struct tlv_parsed *tp, struct in_addr *ia, uint16_t *oml_port) +{ + const uint8_t* data; + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST, 7)) { + data = TLVP_VAL(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST); + if (NM_ATT_IPACC_PRIM_OML_CFG == *data) { + ia->s_addr = htonl(osmo_load32be(data+1)); + *oml_port = osmo_load16be(data+5); + return 0; + }else { + LOGP(DNM, LOGL_ERROR, + "Get Attributes Response: PRIM_OML_CFG_LIST has unexpected format: %s\n", + osmo_hexdump(data, TLVP_LEN(tp, NM_ATT_IPACC_PRIM_OML_CFG_LIST))); + } + } + return -1; +} + +/* Parse OML Primary IP and port from tlv_parsed containing list of Reported Attributes */ +int abis_nm_tlv_attr_unit_id(struct tlv_parsed *tp, char* unit_id, size_t buf_len) +{ + const uint8_t* data; + uint16_t len; + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_UNIT_ID, 1)) { + data = TLVP_VAL(tp, NM_ATT_IPACC_UNIT_ID); + len = TLVP_LEN(tp, NM_ATT_IPACC_UNIT_ID); + osmo_strlcpy(unit_id, (char*)data, OSMO_MIN(len, buf_len)); + return 0; + } + return -1; +} + static int is_in_arr(enum abis_nm_msgtype mt, const enum abis_nm_msgtype *arr, int size) { int i; @@ -473,6 +506,9 @@ uint16_t len; int i; int rc; + uint16_t port; + struct in_addr ia = {0}; + char unit_id[40]; struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; /* Parse Attribute Response Info content for 3GPP TS 52.021 ?9.4.30 Manufacturer Id */ @@ -528,6 +564,17 @@ } } + if (abis_nm_tlv_attr_primary_oml(tp, &ia, &port) == 0) { + LOGPFOH(DNM, LOGL_NOTICE, foh, + "BTS%u Get Attributes Response: Primary OML IP is %s:%u\n", + bts->nr, inet_ntoa(ia), port); + } + + if (abis_nm_tlv_attr_unit_id(tp, unit_id, sizeof(unit_id)) == 0) { + LOGPFOH(DNM, LOGL_NOTICE, foh, "BTS%u Get Attributes Response: Unit ID is %s\n", + bts->nr, unit_id); + } + return 0; } -- To view, visit https://gerrit.osmocom.org/11694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia05e0b8fe3e28aaf2b2253d018f0614e83e23caa Gerrit-Change-Number: 11694 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:50:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:50:47 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Support parsing nanoBTS format for Get Attributes Info In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11695 ) Change subject: abis_nm: Support parsing nanoBTS format for Get Attributes Info ...................................................................... abis_nm: Support parsing nanoBTS format for Get Attributes Info Spec compliant format is defined in: * 3GPP TS 52.021 ?8.11.3 "Get Attribute Response" * 3GPP TS 52.021 ?9.4.64 "Get Attribute Response Info". On nanoBTS, however, reported attribute list is provided directly inside/after the foh header instead of being enveloped inside the Get Attributes Response Info. Furthermore, The Get Attributes Response Info can still appear and be at any position in the reported attribute list, and it only contains the unreported attribute ID list inside. Change-Id: I81a613d53bddf432a79fa5cb0bf9d847b4bdee37 --- M src/osmo-bsc/abis_nm.c 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 89a6d82..d147606 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -494,7 +494,8 @@ bts_nr, get_value_string(abis_nm_att_names, ari[i + 1])); /* the data starts right after the list of unreported attributes + space for length of that list */ - *out_len = ari_len - (num_unreported + 2); + if (out_len) + *out_len = ari_len - (num_unreported + 2); return ari + num_unreported + 1; /* we have to account for 1st byte with number of unreported attributes */ } @@ -575,6 +576,13 @@ bts->nr, unit_id); } + /* nanoBTS provides Get Attribute Response Info at random position and only the unreported part of it. */ + if (TLVP_PRES_LEN(tp, NM_ATT_GET_ARI, 1)) { + data = TLVP_VAL(tp, NM_ATT_GET_ARI); + len = TLVP_LEN(tp, NM_ATT_GET_ARI); + parse_attr_resp_info_unreported(bts->nr, data, len, NULL); + } + return 0; } -- To view, visit https://gerrit.osmocom.org/11695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I81a613d53bddf432a79fa5cb0bf9d847b4bdee37 Gerrit-Change-Number: 11695 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:50:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:50:47 +0000 Subject: Change in osmo-bsc[master]: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11683 ) Change subject: abis_nm: parse_attr_resp_info_unreported: Fix offset calculation ...................................................................... abis_nm: parse_attr_resp_info_unreported: Fix offset calculation See following specs for related information: * 3GPP TS 52.021 ?8.11.3 Get Attribute Response * 3GPP TS 52.021 ?9.4.64 Get Attribute Response Info Related: OS#3624 Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 --- M src/osmo-bsc/abis_nm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index d147606..8f5a514 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -495,7 +495,7 @@ /* the data starts right after the list of unreported attributes + space for length of that list */ if (out_len) - *out_len = ari_len - (num_unreported + 2); + *out_len = ari_len - (num_unreported + 1); return ari + num_unreported + 1; /* we have to account for 1st byte with number of unreported attributes */ } -- To view, visit https://gerrit.osmocom.org/11683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie61d70bc28427d5d879638516a36f590ce98bdc7 Gerrit-Change-Number: 11683 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 15:54:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 15:54:47 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11684 to look at the new patch set (#4). Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... abis_nm: Introduce new signal S_NM_GET_ATTR_REP This signal can be used for tools willing to request and parse Attribute Response and do something with the information. ipaccess-config tool will use this signal in later patch Change-Id 3f3281bf45a22020225ba15610de4003bc506601. Related: OS#3624 Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 --- M include/osmocom/bsc/signal.h M src/osmo-bsc/abis_nm.c 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/11684/4 -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 16:13:47 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 9 Nov 2018 16:13:47 +0000 Subject: Change in osmo-msc[master]: vty: add command to show all known BSC Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11711 Change subject: vty: add command to show all known BSC ...................................................................... vty: add command to show all known BSC Change-Id: I247fdce00f43072b0a2a0122b80bd40cdd9e0128 --- M src/libmsc/msc_vty.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/11711/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index a16cec8..840559a 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -31,6 +31,8 @@ #include #include +#include + #include #include #include @@ -47,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -467,6 +470,19 @@ return CMD_SUCCESS; } +DEFUN(show_bsc, show_bsc_cmd, + "show bsc", SHOW_STR "BSC\n") +{ + struct bsc_context *bsc_ctx; + struct osmo_ss7_instance *ss7 = osmo_ss7_instance_find(gsmnet->a.cs7_instance); + + llist_for_each_entry(bsc_ctx, &gsmnet->a.bscs, list) { + vty_out(vty, "BSC %s%s", osmo_sccp_addr_name(ss7, &bsc_ctx->bsc_addr), VTY_NEWLINE); + } + + return CMD_SUCCESS; +} + static void vty_conn_hdr(struct vty *vty) { vty_out(vty, "--ConnId ------------Subscriber RAN --LAC Use --Tokens C A5 State%s", @@ -1446,6 +1462,7 @@ install_element_ve(&show_subscr_cmd); install_element_ve(&show_subscr_cache_cmd); + install_element_ve(&show_bsc_cmd); install_element_ve(&show_msc_conn_cmd); install_element_ve(&show_msc_transaction_cmd); -- To view, visit https://gerrit.osmocom.org/11711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I247fdce00f43072b0a2a0122b80bd40cdd9e0128 Gerrit-Change-Number: 11711 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 16:45:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 9 Nov 2018 16:45:38 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Fix parsing of incorrect json from iperf3 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11712 Change subject: iperf3: Fix parsing of incorrect json from iperf3 ...................................................................... iperf3: Fix parsing of incorrect json from iperf3 Change-Id: I759d99857c17de061e6d7c1ae1c38f6b15172131 --- M src/osmo_gsm_tester/iperf3.py 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/12/11712/1 diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index 8141fea..e1ed6ff 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -24,6 +24,17 @@ DEFAULT_SRV_PORT = 5003 + +def iperf3_result_to_json(file): + with open(file) as f: + # Sometimes iperf3 provides 2 dictionaries, the 2nd one being an error about being interrupted (by us). + # json parser doesn't support (raises exception) parsing several dictionaries at a time (not a valid json object). + # We are only interested in the first dictionary, the regular results one: + d = f.read().split("\n}\n")[0] + "\n}\n" + data = json.loads(d) + return data + + class IPerf3Server(log.Origin): def __init__(self, suite_run, ip_address): @@ -55,9 +66,7 @@ self.suite_run.stop_process(self.process) def get_results(self): - with open(self.log_file) as f: - data = json.load(f) - return data + return iperf3_result_to_json(self.log_file) def addr(self): return self.ip_address.get('addr') @@ -100,8 +109,6 @@ return self.get_results() def get_results(self): - with open(self.log_file) as f: - data = json.load(f) - return data + return iperf3_result_to_json(self.log_file) # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/11712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I759d99857c17de061e6d7c1ae1c38f6b15172131 Gerrit-Change-Number: 11712 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 22:55:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 22:55:08 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm_cleanup: drop redundant 'forget_lchan' call Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11713 Change subject: lchan_fsm_cleanup: drop redundant 'forget_lchan' call ...................................................................... lchan_fsm_cleanup: drop redundant 'forget_lchan' call Right below this call, we invoke lchan_reset(), and the first thing it does is gscon_forget_lchan(). Drop this redundant invocation. Change-Id: I503efceb6d34c8df0cdfef3dfc83fa1e61271c47 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/11713/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 915b62a..0046f59 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1343,8 +1343,6 @@ void lchan_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); - if (lchan->conn) - gscon_forget_lchan(lchan->conn, lchan); lchan_reset(lchan); if (lchan->last_error) { talloc_free(lchan->last_error); -- To view, visit https://gerrit.osmocom.org/11713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I503efceb6d34c8df0cdfef3dfc83fa1e61271c47 Gerrit-Change-Number: 11713 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 22:55:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 22:55:10 +0000 Subject: Change in osmo-bsc[master]: lchan: rf release: make sure conn is NULL Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11714 Change subject: lchan: rf release: make sure conn is NULL ...................................................................... lchan: rf release: make sure conn is NULL lchan_fsm_wait_rf_release_ack_onenter() calls gscon_forget_lchan(). At the point where the conn has no lchan, the lchan must not have a conn. Make sure that conn is NULL after gscon_forget_lchan(). I hope this fixes OS#3686, it is the only situation I could find where the disassociation is potentially one-sided. I get the feeling that this should be hardcoded in gscon_forget_lchan(), but I dimly remember other situations that are less trivial, where it doesn't necessarily make sense to forget reciprocically. So only fixing this one now. Related: OS#3686 Change-Id: If0c6e495e419b9dbb44443c3fc3f54dd4b714aa5 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/11714/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 0046f59..d95620f 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1005,8 +1005,10 @@ /* For planned releases, a conn has already forgotten about the lchan. And later on, in * lchan_reset(), we make sure it does. But in case of releases from error handling, the * conn might as well notice now already that its lchan is becoming unusable. */ - if (lchan->conn) + if (lchan->conn) { gscon_forget_lchan(lchan->conn, lchan); + lchan_forget_conn(lchan); + } rc = rsl_tx_rf_chan_release(lchan); if (rc) -- To view, visit https://gerrit.osmocom.org/11714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If0c6e495e419b9dbb44443c3fc3f54dd4b714aa5 Gerrit-Change-Number: 11714 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 9 22:55:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 9 Nov 2018 22:55:10 +0000 Subject: Change in osmo-bsc[master]: dbug log: verbosely detach conn<->lchan Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11715 Change subject: dbug log: verbosely detach conn<->lchan ...................................................................... dbug log: verbosely detach conn<->lchan When reading the log of OS#3686, I wished for explicit logging of when exactly an lchan disassociates from a conn. Here is the debug logging I would have liked to see. I'm not sure whether we really need to merge this patch... Change-Id: I97558b899e7f2578ba98287e7352dc072d02ce44 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_fsm.c 2 files changed, 38 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/15/11715/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index bca9e1f..4d6521f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -651,14 +651,36 @@ /* An lchan was deallocated. */ void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) { + const char *detach_label = NULL; + if (!conn) + return; if (!lchan) return; - if (conn->assignment.new_lchan == lchan) + + if (conn->assignment.new_lchan == lchan) { conn->assignment.new_lchan = NULL; - if (conn->ho.new_lchan == lchan) + detach_label = "assignment.new_lchan"; + } + if (conn->ho.new_lchan == lchan) { conn->ho.new_lchan = NULL; - if (conn->lchan == lchan) + detach_label = "ho.new_lchan"; + } + if (conn->lchan == lchan) { conn->lchan = NULL; + detach_label = "primary lchan"; + } + + /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ + if (detach_label) { + if (conn->fi) + LOGPFSML(conn->fi, LOGL_DEBUG, "conn detaches lchan %s\n", + lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); + + if (lchan->fi) + LOGPFSML(lchan->fi, LOGL_DEBUG, "conn %s detaches lchan (%s)\n", + conn->fi? osmo_fsm_inst_name(conn->fi) : "(conn without FSM)", + detach_label); + } if (conn->fi->state != ST_CLEARING && !conn->lchan diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index d95620f..726a5bb 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1356,8 +1356,21 @@ /* The conn is deallocating, just forget all about it */ void lchan_forget_conn(struct gsm_lchan *lchan) { + struct gsm_subscriber_connection *conn; if (!lchan) return; + + conn = lchan->conn; + if (conn) { + /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ + if (lchan->fi) + LOGPFSML(lchan->fi, LOGL_DEBUG, "lchan detaches from conn %s\n", + conn->fi? osmo_fsm_inst_name(conn->fi) : "(conn without FSM)"); + if (conn->fi) + LOGPFSML(conn->fi, LOGL_DEBUG, "lchan %s detaches from conn\n", + lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); + } + lchan_forget_mgw_endpoint(lchan); lchan->conn = NULL; } -- To view, visit https://gerrit.osmocom.org/11715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I97558b899e7f2578ba98287e7352dc072d02ce44 Gerrit-Change-Number: 11715 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:48:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:48:00 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm_cleanup: drop redundant 'forget_lchan' call In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11713 ) Change subject: lchan_fsm_cleanup: drop redundant 'forget_lchan' call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I503efceb6d34c8df0cdfef3dfc83fa1e61271c47 Gerrit-Change-Number: 11713 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 10 Nov 2018 06:48:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:48:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:48:20 +0000 Subject: Change in osmo-bsc[master]: lchan: rf release: make sure conn is NULL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11714 ) Change subject: lchan: rf release: make sure conn is NULL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If0c6e495e419b9dbb44443c3fc3f54dd4b714aa5 Gerrit-Change-Number: 11714 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 10 Nov 2018 06:48:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:48:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:48:43 +0000 Subject: Change in osmo-bsc[master]: dbug log: verbosely detach conn<->lchan In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11715 ) Change subject: dbug log: verbosely detach conn<->lchan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I97558b899e7f2578ba98287e7352dc072d02ce44 Gerrit-Change-Number: 11715 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 10 Nov 2018 06:48:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:48:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:48:45 +0000 Subject: Change in osmo-bsc[master]: lchan_fsm_cleanup: drop redundant 'forget_lchan' call In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11713 ) Change subject: lchan_fsm_cleanup: drop redundant 'forget_lchan' call ...................................................................... lchan_fsm_cleanup: drop redundant 'forget_lchan' call Right below this call, we invoke lchan_reset(), and the first thing it does is gscon_forget_lchan(). Drop this redundant invocation. Change-Id: I503efceb6d34c8df0cdfef3dfc83fa1e61271c47 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 915b62a..0046f59 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1343,8 +1343,6 @@ void lchan_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct gsm_lchan *lchan = lchan_fi_lchan(fi); - if (lchan->conn) - gscon_forget_lchan(lchan->conn, lchan); lchan_reset(lchan); if (lchan->last_error) { talloc_free(lchan->last_error); -- To view, visit https://gerrit.osmocom.org/11713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I503efceb6d34c8df0cdfef3dfc83fa1e61271c47 Gerrit-Change-Number: 11713 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:48:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:48:45 +0000 Subject: Change in osmo-bsc[master]: lchan: rf release: make sure conn is NULL In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11714 ) Change subject: lchan: rf release: make sure conn is NULL ...................................................................... lchan: rf release: make sure conn is NULL lchan_fsm_wait_rf_release_ack_onenter() calls gscon_forget_lchan(). At the point where the conn has no lchan, the lchan must not have a conn. Make sure that conn is NULL after gscon_forget_lchan(). I hope this fixes OS#3686, it is the only situation I could find where the disassociation is potentially one-sided. I get the feeling that this should be hardcoded in gscon_forget_lchan(), but I dimly remember other situations that are less trivial, where it doesn't necessarily make sense to forget reciprocically. So only fixing this one now. Related: OS#3686 Change-Id: If0c6e495e419b9dbb44443c3fc3f54dd4b714aa5 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 0046f59..d95620f 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1005,8 +1005,10 @@ /* For planned releases, a conn has already forgotten about the lchan. And later on, in * lchan_reset(), we make sure it does. But in case of releases from error handling, the * conn might as well notice now already that its lchan is becoming unusable. */ - if (lchan->conn) + if (lchan->conn) { gscon_forget_lchan(lchan->conn, lchan); + lchan_forget_conn(lchan); + } rc = rsl_tx_rf_chan_release(lchan); if (rc) -- To view, visit https://gerrit.osmocom.org/11714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If0c6e495e419b9dbb44443c3fc3f54dd4b714aa5 Gerrit-Change-Number: 11714 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:48:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:48:45 +0000 Subject: Change in osmo-bsc[master]: dbug log: verbosely detach conn<->lchan In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11715 ) Change subject: dbug log: verbosely detach conn<->lchan ...................................................................... dbug log: verbosely detach conn<->lchan When reading the log of OS#3686, I wished for explicit logging of when exactly an lchan disassociates from a conn. Here is the debug logging I would have liked to see. I'm not sure whether we really need to merge this patch... Change-Id: I97558b899e7f2578ba98287e7352dc072d02ce44 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_fsm.c 2 files changed, 38 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index bca9e1f..4d6521f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -651,14 +651,36 @@ /* An lchan was deallocated. */ void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) { + const char *detach_label = NULL; + if (!conn) + return; if (!lchan) return; - if (conn->assignment.new_lchan == lchan) + + if (conn->assignment.new_lchan == lchan) { conn->assignment.new_lchan = NULL; - if (conn->ho.new_lchan == lchan) + detach_label = "assignment.new_lchan"; + } + if (conn->ho.new_lchan == lchan) { conn->ho.new_lchan = NULL; - if (conn->lchan == lchan) + detach_label = "ho.new_lchan"; + } + if (conn->lchan == lchan) { conn->lchan = NULL; + detach_label = "primary lchan"; + } + + /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ + if (detach_label) { + if (conn->fi) + LOGPFSML(conn->fi, LOGL_DEBUG, "conn detaches lchan %s\n", + lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); + + if (lchan->fi) + LOGPFSML(lchan->fi, LOGL_DEBUG, "conn %s detaches lchan (%s)\n", + conn->fi? osmo_fsm_inst_name(conn->fi) : "(conn without FSM)", + detach_label); + } if (conn->fi->state != ST_CLEARING && !conn->lchan diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index d95620f..726a5bb 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1356,8 +1356,21 @@ /* The conn is deallocating, just forget all about it */ void lchan_forget_conn(struct gsm_lchan *lchan) { + struct gsm_subscriber_connection *conn; if (!lchan) return; + + conn = lchan->conn; + if (conn) { + /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ + if (lchan->fi) + LOGPFSML(lchan->fi, LOGL_DEBUG, "lchan detaches from conn %s\n", + conn->fi? osmo_fsm_inst_name(conn->fi) : "(conn without FSM)"); + if (conn->fi) + LOGPFSML(conn->fi, LOGL_DEBUG, "lchan %s detaches from conn\n", + lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); + } + lchan_forget_mgw_endpoint(lchan); lchan->conn = NULL; } -- To view, visit https://gerrit.osmocom.org/11715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I97558b899e7f2578ba98287e7352dc072d02ce44 Gerrit-Change-Number: 11715 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:48:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:48:59 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Fix parsing of incorrect json from iperf3 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11712 ) Change subject: iperf3: Fix parsing of incorrect json from iperf3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I759d99857c17de061e6d7c1ae1c38f6b15172131 Gerrit-Change-Number: 11712 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 10 Nov 2018 06:48:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:51:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:51:07 +0000 Subject: Change in osmo-msc[master]: vty: add command to show all known BSC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11711 ) Change subject: vty: add command to show all known BSC ...................................................................... Patch Set 1: Code-Review+1 the next logical step would be to show more information but just the SCCP address. This would include e.g. * the location areas that we associate with this BSC * the state of the BSC (e.g. reset fsm) * the number of active SCCP connections from this BSC * whatever else we have in terms of state that may be useful to expose to the user Compare this e.g. with "show bts" in the BSC. -- To view, visit https://gerrit.osmocom.org/11711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I247fdce00f43072b0a2a0122b80bd40cdd9e0128 Gerrit-Change-Number: 11711 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sat, 10 Nov 2018 06:51:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:52:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:52:11 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 10 Nov 2018 06:52:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:52:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:52:19 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix whitespace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11685 ) Change subject: ipaccess-config: Fix whitespace ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I190752000a73d7600a946c7535661550b1fe3520 Gerrit-Change-Number: 11685 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 10 Nov 2018 06:52:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:52:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:52:40 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11686 ) Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max Gerrit-Comment-Date: Sat, 10 Nov 2018 06:52:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 06:52:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 10 Nov 2018 06:52:49 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: cosmetic: Remove unneeded comment with hex values In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11688 ) Change subject: ipaccess-config: cosmetic: Remove unneeded comment with hex values ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I715bd9582f9289b5674aaa8d8de1164ebef2fd11 Gerrit-Change-Number: 11688 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 10 Nov 2018 06:52:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 08:48:56 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Sat, 10 Nov 2018 08:48:56 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#4). ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Add ttcn3-bscnat-test docker image Run the bscnat ttcn3 tests in docker. This uses the osmo-nitb-master image since osmo-bsc_nat is built there as well. Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 --- A ttcn3-bscnat-test/BSCNAT_Tests.cfg A ttcn3-bscnat-test/Dockerfile A ttcn3-bscnat-test/Makefile A ttcn3-bscnat-test/bscs.config A ttcn3-bscnat-test/jenkins.sh A ttcn3-bscnat-test/osmo-bsc-nat.cfg 6 files changed, 191 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/11657/4 -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 10 08:51:49 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Sat, 10 Nov 2018 08:51:49 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11657/2/ttcn3-bscnat-test/Dockerfile File ttcn3-bscnat-test/Dockerfile: https://gerrit.osmocom.org/#/c/11657/2/ttcn3-bscnat-test/Dockerfile at 1 PS2, Line 1: FROM laforge/debian-stretch-titan > You sure that's correct? No other Dockerfile uses it this way. Thanks, this was recently changed by Oliver to handle docker image dependencies better. I changed it now to be in line with other images. -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-CC: Max Gerrit-Comment-Date: Sat, 10 Nov 2018 08:51:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Nov 10 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 10 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#303?= In-Reply-To: <1796724913.504.1541776207369.JavaMail.jenkins@jenkins.osmocom.org> References: <1796724913.504.1541776207369.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <157893740.522.1541862607433.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Nov 10 22:52:58 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sat, 10 Nov 2018 22:52:58 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11716 Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. Allows dialing of numbers with GSM340_PLAN_UNKNOWN, for example a number beginning with '*' Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 --- M src/mncc.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/16/11716/1 diff --git a/src/mncc.c b/src/mncc.c index 976a671..174dda6 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -397,9 +397,9 @@ static int continue_setup(struct mncc_connection *conn, const struct gsm_mncc *mncc) { - if (mncc->called.plan != GSM340_PLAN_ISDN) { + if (mncc->called.plan != GSM340_PLAN_UNKNOWN && mncc->called.plan != GSM340_PLAN_ISDN) { LOGP(DMNCC, LOGL_ERROR, - "leg(%u) has non(%d) ISDN dial plan. not supported.\n", + "leg(%u) has non(%d) UNKNOWN/ISDN dial plan. not supported.\n", mncc->callref, mncc->called.plan); return 0; } -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 11:36:57 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sun, 11 Nov 2018 11:36:57 +0000 Subject: Change in osmo-ci[master]: ansible: Wrap distro version number as string for ansible In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/11648 ) Change subject: ansible: Wrap distro version number as string for ansible ...................................................................... Patch Set 2: > why is this needed? which version of ansible are you using? ansible 2.4.6.0 config file = None configured module search path = [ '/usr/local/share/py36-ansible/plugins/modules'] ansible python module location = /usr/local/lib/python3.6/site-packages/ansible executable location = /usr/local/bin/ansible python version = 3.6.7 (default, Oct 30 2018, 23:02:44) [GCC 4.2.1 Compatible FreeBSD Clang 3.4.1 (tags/RELEASE_34/dot1-final 208032)] Error summary (full error below): AnsibleUnsafeText $OP int The examples I found also compared it as string and it seems to work for the debian9 and limesuite case. Full error: fatal: [build2-deb9build-ansible]: FAILED! => {"failed": true, "msg": "The conditional check 'ansible_distribution == 'Debian' and ansible_distribution_version >= 9' failed. The error was: Unexpected templating type error occurred on ({% if ansible_distribution == 'Debian' and ansible_distribution_version >= 9 %} True {% else %} False {% endif %}): '>=' not supported between instances of 'AnsibleUnsafeText' and 'int'\n\nThe error appears to have been in '/root/git/osmo-ci/ansible/roles/osmocom-jenkins-slave/tasks/debian.yml': line 35, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n\n- name: install java for stretch or later\n ^ here\n"} -- To view, visit https://gerrit.osmocom.org/11648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58591ee37c6ec1479778c3f90ed8004a7e2adf1e Gerrit-Change-Number: 11648 Gerrit-PatchSet: 2 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 11 Nov 2018 11:36:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 14:04:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 11 Nov 2018 14:04:29 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11716 ) Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11716/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/11716/1/src/mncc.c at 400 PS1, Line 400: if (mncc->called.plan != GSM340_PLAN_UNKNOWN && mncc->called.plan != GSM340_PLAN_ISDN) { Maybe, using a switch statement would be better here? -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 11 Nov 2018 14:04:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Nov 11 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 11 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#304?= In-Reply-To: <157893740.522.1541862607433.JavaMail.jenkins@jenkins.osmocom.org> References: <157893740.522.1541862607433.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <270745315.540.1541949007632.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.81 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Nov 11 19:54:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 11 Nov 2018 19:54:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11717 Change subject: BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions ...................................................................... BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions This would allow to submit an SMS message using f_mo_sms_submit() and wait for RP-ACK using f_mo_sms_wait_rp_ack() separately in the follow-up changes for SMS over GSUP. Change-Id: I5b35206286ae8add8b5bd34b0ab41ba7862c28e4 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 28 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/11717/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index bf7a6d2..96f522c 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -806,17 +806,13 @@ } } -/* Submit a MO-SMS over an already existing (and authenticated, ...) DTAP connection */ -function f_mo_sms(inout SmsParameters spars) +/* Submit a MO-SMS over an already existing DTAP connection */ +function f_mo_sms_submit(inout SmsParameters spars) runs on BSC_ConnHdlr { var template (value) TPDU_RP_DATA_MS_SGSN tp_mo; var template (value) RPDU_MS_SGSN rp_mo; var template (value) PDU_ML3_MS_NW l3_mo; - var template TPDU_RP_DATA_SGSN_MS tp_mt; - var template RPDU_SGSN_MS rp_mt; - var template PDU_ML3_NW_MS l3_mt; - var default d := activate(as_other_sms()); /* just in case this is routed to SMPP.. */ @@ -830,6 +826,24 @@ /* receive CP-ACK for CP-DATA above */ BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_ACK_MT), spars.dlci)); + deactivate(d); + setverdict(pass); +} + +/* Wait RP-ACK for MO-SMS on an already existing DTAP connection */ +function f_mo_sms_wait_rp_ack(inout SmsParameters spars) +runs on BSC_ConnHdlr { + var template (value) PDU_ML3_MS_NW l3_mo; + + var template TPDU_RP_DATA_SGSN_MS tp_mt; + var template RPDU_SGSN_MS rp_mt; + var template PDU_ML3_NW_MS l3_mt; + + var default d := activate(as_other_sms()); + + /* just in case this is routed to SMPP.. */ + f_create_smpp_expect(hex2str(spars.tp.da.tP_DA_NoPad.tP_DAValue)); + if (ispresent(spars.exp_rp_err)) { /* expect an RP-ERROR message from MSC with given cause */ rp_mt := tr_RP_ERROR_MT(spars.rp.msg_ref, spars.exp_rp_err); @@ -847,10 +861,18 @@ l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_ACK_MO); BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); } + deactivate(d); setverdict(pass); } +/* Submit and wait a MO-SMS over an already existing (and authenticated, ...) DTAP connection */ +function f_mo_sms(inout SmsParameters spars) +runs on BSC_ConnHdlr { + f_mo_sms_submit(spars); + f_mo_sms_wait_rp_ack(spars); +} + /* receive MT-SMS delivered from the MSC/SMSC over an already existing DTAP connection */ function f_mt_sms(inout SmsParameters spars) runs on BSC_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/11717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5b35206286ae8add8b5bd34b0ab41ba7862c28e4 Gerrit-Change-Number: 11717 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 19:54:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 11 Nov 2018 19:54:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11718 Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mo_sms for MO SMS over GSUP Change-Id: Id14bbd8bd51558cdacefea0fe042769cd69ed5c8 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/11718/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c0cd9d3..4db5b29 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2022,6 +2022,67 @@ f_vty_config2(MSCVTY, { "smpp", "esme msc_tester"}, "no default-route"); } +/* Test MO-SMS from MS/BTS/BSC towards HLR (via GSUP) */ +private function f_tc_gsup_mo_sms(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var GSUP_PDU gsup_msg_rx; + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Send CM Service Request for SMS */ + f_establish_fully(EST_TYPE_MO_SMS); + + var template GSUP_PDU mo_forwardSM := tr_GSUP_MO_FORWARD_SM_REQ( + imsi := g_pars.imsi, + sid := ?, state := ?, + sm_rp_mr := spars.rp.msg_ref, + /* FIXME: extract SM-RP-DA from spars.rp.dest */ + sm_rp_da := tr_GSUP_SM_RP_DA_SMSC_ADDR(?), + sm_rp_oa := tr_GSUP_SM_RP_OA_NULL, + /* FIXME: define coding rules for SmsParametersTp, and use 'decmatch spars.tp' */ + sm_rp_ui := '052305002143F5000000'O + ); + + /* Submit an SMS on DTAP and expect MO-forwardSM-Req on GSUP */ + f_mo_sms_submit(spars); + alt { + [] GSUP.receive(mo_forwardSM) -> value gsup_msg_rx { + log("RX MO-forwardSM-Req"); + log(gsup_msg_rx); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + /* Trigger RP-ACK by sending MO-forwardSM-Res */ + GSUP.send(valueof(ts_GSUP_MO_FORWARD_SM_RES( + imsi := g_pars.imsi, + sid := gsup_msg_rx.ies[1].val.session_id, + state := gsup_msg_rx.ies[2].val.session_state, + sm_rp_mr := gsup_msg_rx.ies[3].val.sm_rp_mr))); + /* Expect RP-ACK on DTAP */ + f_mo_sms_wait_rp_ack(spars); + + f_expect_clear(); +} +testcase TC_gsup_mo_sms() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_gsup_mo_sms), 88); + vc_conn.done; +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -2777,6 +2838,8 @@ execute( TC_smpp_mo_sms() ); execute( TC_smpp_mt_sms() ); + execute( TC_gsup_mo_sms() ); + execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); execute( TC_lu_and_mo_ussd_during_mt_call() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 8d9180f..f8e7eb3 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -63,6 +63,7 @@ + -- To view, visit https://gerrit.osmocom.org/11718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id14bbd8bd51558cdacefea0fe042769cd69ed5c8 Gerrit-Change-Number: 11718 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 21:44:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 11 Nov 2018 21:44:45 +0000 Subject: Change in libosmocore[master]: Streamline glibc version check Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11719 Change subject: Streamline glibc version check ...................................................................... Streamline glibc version check * use macro for version check * report glibc version upon detection Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 --- M src/gsm/gsm_utils.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/11719/1 diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 7e6c794..be35cd4 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -95,11 +95,12 @@ #include #include #include +#include #include "../../config.h" -/* FIXME: this can be removed once we bump glibc requirements to 2.25: */ -#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 25) +/* FIXME: this can be removed once we bump glibc requirements to 2.25:*/ +#if __GNUC_PREREQ (2,25) #include #elif HAVE_DECL_SYS_GETRANDOM #include @@ -131,6 +132,8 @@ if (!gnutls_check_version("3.3.0")) gnutls_global_deinit(); } +#else +#pragma message ("glibc " OSMO_STRINGIFY_VAL(__GLIBC__) "." OSMO_STRINGIFY_VAL(__GLIBC_MINOR__) " random detected") #endif /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet -- To view, visit https://gerrit.osmocom.org/11719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia54f0b7a861f955be65bb0cf06eb10af9372d062 Gerrit-Change-Number: 11719 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 21:44:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 11 Nov 2018 21:44:45 +0000 Subject: Change in libosmocore[master]: Automatically disable GnuTLS fallback Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11720 Change subject: Automatically disable GnuTLS fallback ...................................................................... Automatically disable GnuTLS fallback Disable GnuTLS fallback if sufficient glibc version detected. Previously GnuTLS fallback was used regardless of getrandom() availability in glibc. Fix this by automatically disabling it when not needed. This does not affect the ability to manually disable it unconditionally. Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe --- M src/gsm/gsm_utils.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/11720/1 diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index be35cd4..7e1f487 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -102,6 +102,7 @@ /* FIXME: this can be removed once we bump glibc requirements to 2.25:*/ #if __GNUC_PREREQ (2,25) #include +#undef USE_GNUTLS #elif HAVE_DECL_SYS_GETRANDOM #include #ifndef GRND_NONBLOCK -- To view, visit https://gerrit.osmocom.org/11720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe2117afc050261668a4d5a590044aabcd08aefe Gerrit-Change-Number: 11720 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 21:46:18 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 11 Nov 2018 21:46:18 +0000 Subject: Change in osmo-bsc[master]: vty: add command to show TRX selectively Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11721 Change subject: vty: add command to show TRX selectively ...................................................................... vty: add command to show TRX selectively Add following commands showing only TRX with appropriate RSL link status: * show trx connected * show trx disconnected This simplifies troubleshooting of complex setup with multiple BTS with several TRX each. Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a --- M src/osmo-bsc/bsc_vty.c 1 file changed, 54 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/11721/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 410cdac..cf361bf 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1073,8 +1073,14 @@ return CMD_SUCCESS; } -static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx) +static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx, bool print_rsl, bool show_connected) { + if (show_connected && !trx->rsl_link) + return; + + if (!show_connected && trx->rsl_link) + return; + vty_out(vty, "TRX %u of BTS %u is on ARFCN %u%s", trx->nr, trx->bts->nr, trx->arfcn, VTY_NEWLINE); vty_out(vty, "Description: %s%s", @@ -1085,7 +1091,8 @@ trx->nominal_power - trx->max_power_red, VTY_NEWLINE); vty_out(vty, " NM State: "); net_dump_nmstate(vty, &trx->mo.nm_state); - vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); + if (print_rsl) + vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); vty_out(vty, " Baseband Transceiver NM State: "); net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); if (is_ipaccess_bts(trx->bts)) { @@ -1097,11 +1104,17 @@ } } +static void trx_dump_vty_all(struct vty *vty, struct gsm_bts_trx *trx) +{ + trx_dump_vty(vty, trx, true, true); + trx_dump_vty(vty, trx, true, false); +} + static inline void print_all_trx(struct vty *vty, const struct gsm_bts *bts) { uint8_t trx_nr; for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) - trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr)); + trx_dump_vty_all(vty, gsm_bts_trx_num(bts, trx_nr)); } DEFUN(show_trx, @@ -1131,7 +1144,8 @@ VTY_NEWLINE); return CMD_WARNING; } - trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr)); + trx_dump_vty_all(vty, gsm_bts_trx_num(bts, trx_nr)); + return CMD_SUCCESS; } if (bts) { @@ -1146,6 +1160,40 @@ return CMD_SUCCESS; } +static inline void print_all_trx_ext(struct vty *vty, bool show_connected) +{ + struct gsm_network *net = gsmnet_from_vty(vty); + struct gsm_bts *bts = NULL; + uint8_t bts_nr; + for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { + uint8_t trx_nr; + bts = gsm_bts_num(net, bts_nr); + for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) + trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr), false, show_connected); + } +} + +DEFUN(show_trx_con, + show_trx_con_cmd, + "show trx connected", + SHOW_STR "Display information about a TRX\n" + "Show TRX with RSL connected\n") +{ + print_all_trx_ext(vty, true); + + return CMD_SUCCESS; +} + +DEFUN(show_trx_dis, + show_trx_dis_cmd, + "show trx disconnected", + SHOW_STR "Display information about a TRX\n" + "Show TRX with RSL disconnected\n") +{ + print_all_trx_ext(vty, false); + + return CMD_SUCCESS; +} static void ts_dump_vty(struct vty *vty, struct gsm_bts_trx_ts *ts) { @@ -4896,6 +4944,8 @@ install_element_ve(&show_bts_cmd); install_element_ve(&show_rejected_bts_cmd); install_element_ve(&show_trx_cmd); + install_element_ve(&show_trx_con_cmd); + install_element_ve(&show_trx_dis_cmd); install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); -- To view, visit https://gerrit.osmocom.org/11721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a Gerrit-Change-Number: 11721 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 21:51:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 11 Nov 2018 21:51:28 +0000 Subject: Change in osmo-msc[master]: vty: add command to show all known BSC In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11711 ) Change subject: vty: add command to show all known BSC ...................................................................... Patch Set 1: Good points, I've made https://osmocom.org/issues/3687 to track this. -- To view, visit https://gerrit.osmocom.org/11711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I247fdce00f43072b0a2a0122b80bd40cdd9e0128 Gerrit-Change-Number: 11711 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Sun, 11 Nov 2018 21:51:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 21:52:07 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 11 Nov 2018 21:52:07 +0000 Subject: Change in libosmo-sccp[master]: Make pointcode width function public In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11709 ) Change subject: Make pointcode width function public ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf Gerrit-Change-Number: 11709 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 11 Nov 2018 21:52:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 21:52:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 11 Nov 2018 21:52:38 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11552 ) Change subject: LCLS: add bts-loop variant ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 11 Nov 2018 21:52:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 21:52:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 11 Nov 2018 21:52:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: add bts-loop tests In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11559 ) Change subject: BSC LCLS: add bts-loop tests ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e786b430591899c722d99d685db26efa868508 Gerrit-Change-Number: 11559 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 11 Nov 2018 21:52:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 11 23:21:47 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sun, 11 Nov 2018 23:21:47 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11716 ) Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11716/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/11716/1/src/mncc.c at 400 PS1, Line 400: if (mncc->called.plan != GSM340_PLAN_UNKNOWN && mncc->called.plan != GSM340_PLAN_ISDN) { > Maybe, using a switch statement would be better here? It could also be a > greater than (1==GSM340_PLAN_ISDN) test. I don't know. - I don't anticipate ever handling other cases. -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 11 Nov 2018 23:21:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 09:14:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 09:14:19 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Fix parsing of incorrect json from iperf3 In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11712 ) Change subject: iperf3: Fix parsing of incorrect json from iperf3 ...................................................................... iperf3: Fix parsing of incorrect json from iperf3 Change-Id: I759d99857c17de061e6d7c1ae1c38f6b15172131 --- M src/osmo_gsm_tester/iperf3.py 1 file changed, 13 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index 8141fea..e1ed6ff 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -24,6 +24,17 @@ DEFAULT_SRV_PORT = 5003 + +def iperf3_result_to_json(file): + with open(file) as f: + # Sometimes iperf3 provides 2 dictionaries, the 2nd one being an error about being interrupted (by us). + # json parser doesn't support (raises exception) parsing several dictionaries at a time (not a valid json object). + # We are only interested in the first dictionary, the regular results one: + d = f.read().split("\n}\n")[0] + "\n}\n" + data = json.loads(d) + return data + + class IPerf3Server(log.Origin): def __init__(self, suite_run, ip_address): @@ -55,9 +66,7 @@ self.suite_run.stop_process(self.process) def get_results(self): - with open(self.log_file) as f: - data = json.load(f) - return data + return iperf3_result_to_json(self.log_file) def addr(self): return self.ip_address.get('addr') @@ -100,8 +109,6 @@ return self.get_results() def get_results(self): - with open(self.log_file) as f: - data = json.load(f) - return data + return iperf3_result_to_json(self.log_file) # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/11712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I759d99857c17de061e6d7c1ae1c38f6b15172131 Gerrit-Change-Number: 11712 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 09:14:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 12 Nov 2018 09:14:19 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 12 Nov 2018 09:14:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 09:20:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 09:20:22 +0000 Subject: Change in libosmo-sccp[master]: Make pointcode width function public In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11709 ) Change subject: Make pointcode width function public ...................................................................... Patch Set 2: Code-Review-1 Why is it needed to be public? Please state so in the commit description. -- To view, visit https://gerrit.osmocom.org/11709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf Gerrit-Change-Number: 11709 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 09:20:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 09:21:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 09:21:46 +0000 Subject: Change in libosmo-sccp[master]: Log ip:port for created SS7 server In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11708 ) Change subject: Log ip:port for created SS7 server ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11708/2/src/osmo_ss7.c File src/osmo_ss7.c: https://gerrit.osmocom.org/#/c/11708/2/src/osmo_ss7.c at 1828 PS2, Line 1828: LOGP(DLSS7, LOGL_INFO, "Created %s server on %s:%u\n", inttypes.h %u -> %" PRIu16" -- To view, visit https://gerrit.osmocom.org/11708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2ae093175d64000490a2be31ecfea265ca3853d Gerrit-Change-Number: 11708 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 09:21:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 09:28:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 09:28:10 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11716 ) Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11716/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/11716/1/src/mncc.c at 400 PS1, Line 400: if (mncc->called.plan != GSM340_PLAN_UNKNOWN && mncc->called.plan != GSM340_PLAN_ISDN) { > It could also be a > greater than (1==GSM340_PLAN_ISDN) test. [?] switch case seems a good option for me. switch(mncc->called.plan) { case GSM340_PLAN_UNKNOWN: case GSM340_PLAN_ISDN: return 1; default: LOGP() return 0; } -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 09:28:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 09:50:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 09:50:39 +0000 Subject: Change in osmo-bsc[master]: vty: add command to show TRX selectively In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11721 ) Change subject: vty: add command to show TRX selectively ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11721/1/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11721/1/src/osmo-bsc/bsc_vty.c at 1176 PS1, Line 1176: DEFUN(show_trx_con, This command and the one below can be put together: "show trx (connected|disconnected)" -- To view, visit https://gerrit.osmocom.org/11721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a Gerrit-Change-Number: 11721 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 09:50:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:00:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:00:17 +0000 Subject: Change in libosmo-sccp[master]: SS7: safeguard against wrong number of pointcode component In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11707 ) Change subject: SS7: safeguard against wrong number of pointcode component ...................................................................... Patch Set 1: Code-Review-1 (1 comment) This function is static and so only used here. Please change the function to return an int, document it accordingly and change users to check for error if needed. https://gerrit.osmocom.org/#/c/11707/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11707/1//COMMIT_MSG at 10 PS1, Line 10: code when called with wrong component number despite unsinged return typo: unsigned -- To view, visit https://gerrit.osmocom.org/11707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib24cdbcf614bad68f3cfa9776a451c5c1e45ae6e Gerrit-Change-Number: 11707 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:00:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:21:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:21:33 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always exit 1 on a2x error Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11722 Change subject: Makefile.asciidoc.inc: always exit 1 on a2x error ...................................................................... Makefile.asciidoc.inc: always exit 1 on a2x error a2x wraps asciidoc. When a2x fails, we run asciidoc without a2x to print verbose output. Make sure that 'make' fails at this point, even if asciidoc runs through. Change-Id: I30931303ecc6094efaedcb08380433a34211a169 --- M build/Makefile.asciidoc.inc 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/22/11722/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index a28a5bb..ee7a60d 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -57,7 +57,8 @@ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true - a2x $(A2X_OPTS) $< || asciidoc -v $(ASCIIDOC_OPTS) $< + a2x $(A2X_OPTS) $< || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ + asciidoc -v $(ASCIIDOC_OPTS) $<; exit 1) check: $(ASCIIDOC_CHECKS) -- To view, visit https://gerrit.osmocom.org/11722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I30931303ecc6094efaedcb08380433a34211a169 Gerrit-Change-Number: 11722 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:21:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:21:33 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: make clean: also rm *.html Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11723 Change subject: Makefile.asciidoc.inc: make clean: also rm *.html ...................................................................... Makefile.asciidoc.inc: make clean: also rm *.html HTML files get created when a2x fails and asciidoc runs. Change-Id: I4d5e9c36f75141ce88d11b16c89809be4dce87d8 --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/23/11723/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index ee7a60d..a3c95fe 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -31,7 +31,7 @@ ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex.sty CLEAN_FILES += $(ASCIIDOC_NAME:%=%__*.png) $(ASCIIDOC_NAME:%=%__*.svg) $(ASCIIDOC_CHECKS) -CLEAN_FILES += $(ASCIIDOC_PDF) +CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) UPLOAD_FILES += $(ASCIIDOC_PDF) ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -- To view, visit https://gerrit.osmocom.org/11723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4d5e9c36f75141ce88d11b16c89809be4dce87d8 Gerrit-Change-Number: 11723 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:21:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:21:34 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11724 Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... unix-time-to-fmt.py: fix crash without argument Print "unknown" to stdout when unix-time-to-fmt.py was called without an argument, instead of printing a Python stack trace to stderr. It gets called that way when building outside of a git folder. Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 --- M build/unix-time-to-fmt.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/24/11724/1 diff --git a/build/unix-time-to-fmt.py b/build/unix-time-to-fmt.py index d081797..026e55c 100755 --- a/build/unix-time-to-fmt.py +++ b/build/unix-time-to-fmt.py @@ -11,6 +11,10 @@ import sys, time +if len(sys.argv) == 1: + print("unknown") + exit(0) + fmt = '%Y-%b-%d' if len(sys.argv) > 2: fmt = sys.argv[2] -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:21:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:21:34 +0000 Subject: Change in osmo-gsm-manuals[master]: move project specific manuals to their own repos Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11725 Change subject: move project specific manuals to their own repos ...................................................................... move project specific manuals to their own repos * use autotools (so we can "make install" the shared content) * move check-deps from Makefile to standalone script check-depends.sh * build/*: support out-of-tree builds * Makefile.common.inc: new targets: all, check, publish * jenkins.sh: removed --publish, move known hosts to build/known_hosts * add merge_doc.xsl from libosmocore * tests: new folder, builds test pdfs with the shared chapters Related: OS#3385 Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 --- M .gitignore D Makefile A Makefile.am D OsmoBSC/Makefile D OsmoBSC/aoip-mgw-options-docinfo.xml D OsmoBSC/aoip-mgw-options.adoc D OsmoBSC/chapters/control.adoc D OsmoBSC/chapters/counters.adoc D OsmoBSC/chapters/counters_generated.adoc D OsmoBSC/chapters/handover.adoc D OsmoBSC/chapters/handover_inter_bsc.dot D OsmoBSC/chapters/handover_intra_bsc.dot D OsmoBSC/chapters/overview.adoc D OsmoBSC/chapters/running.adoc D OsmoBSC/message-sequences/mo_call-abis_a.msc D OsmoBSC/mgw/classic-bsc.msc D OsmoBSC/mgw/osmo-bsc-new-mgw-e1.msc D OsmoBSC/mgw/osmo-bsc-new-mgw.msc D OsmoBSC/mgw/osmo-bsc-old-sccplite.msc D OsmoBSC/om2000/README D OsmoBSC/om2000/om2k-bts.msc D OsmoBSC/om2000/om2k-mo-cf.msc D OsmoBSC/om2000/om2k-mo-is.msc D OsmoBSC/om2000/om2k-mo-rx.msc D OsmoBSC/om2000/om2k-mo-tf.msc D OsmoBSC/om2000/om2k-mo-trxc.msc D OsmoBSC/om2000/om2k-mo-ts.msc D OsmoBSC/om2000/om2k-mo-tx.msc D OsmoBSC/om2000/om2k-trx.msc D OsmoBSC/osmobsc-usermanual-docinfo.xml D OsmoBSC/osmobsc-usermanual.adoc D OsmoBSC/osmobsc-vty-reference.xml D OsmoBSC/osmux-reference-docinfo.xml D OsmoBSC/osmux-reference.adoc D OsmoBSC/vty/bsc_vty_additions.xml D OsmoBSC/vty/bsc_vty_reference.xml D OsmoBSC/vty/libbsc_vty_additions.xml D OsmoBTS/Makefile D OsmoBTS/abis/abis-startup.msc D OsmoBTS/abis/dyn_ts_ipa_style1.msc D OsmoBTS/abis/dyn_ts_ipa_style2.msc D OsmoBTS/abis/dyn_ts_osmocom_style1.msc D OsmoBTS/abis/dyn_ts_osmocom_style2.msc D OsmoBTS/abis/ipa.adoc D OsmoBTS/abis/oml-mo-bts.msc D OsmoBTS/abis/oml-mo-carrier.msc D OsmoBTS/abis/oml-mo-channel.msc D OsmoBTS/abis/oml-mo-sitemgr.msc D OsmoBTS/abis/oml-mo-transceiver.msc D OsmoBTS/abis/oml-startup.msc D OsmoBTS/abis/oml-startup2.msc D OsmoBTS/abis/oml-startup3.msc D OsmoBTS/abis/oml.adoc D OsmoBTS/abis/rsl-startup-pri.msc D OsmoBTS/abis/rsl-startup-sec.msc D OsmoBTS/abis/rsl-tch-rtp.msc D OsmoBTS/abis/rsl.adoc D OsmoBTS/abis/rtp.adoc D OsmoBTS/chapters/architecture.adoc D OsmoBTS/chapters/bts-models.adoc D OsmoBTS/chapters/configuration.adoc D OsmoBTS/chapters/control.adoc D OsmoBTS/chapters/dynamic-timeslots.adoc D OsmoBTS/chapters/interfaces.adoc D OsmoBTS/chapters/overview.adoc D OsmoBTS/dtx.dot D OsmoBTS/osmobts-abis-docinfo.xml D OsmoBTS/osmobts-abis.adoc D OsmoBTS/osmobts-usermanual-docinfo.xml D OsmoBTS/osmobts-usermanual.adoc D OsmoBTS/osmobts-vty-reference.xml D OsmoBTS/rtp-amr-docinfo.xml D OsmoBTS/rtp-amr.adoc D OsmoBTS/vty/bts_vty_additions.xml D OsmoBTS/vty/bts_vty_reference.xml D OsmoGGSN/Makefile D OsmoGGSN/chapters/configuration.adoc D OsmoGGSN/chapters/overview.adoc D OsmoGGSN/chapters/running.adoc D OsmoGGSN/osmoggsn-usermanual-docinfo.xml D OsmoGGSN/osmoggsn-usermanual.adoc D OsmoGGSN/osmoggsn-vty-reference.xml D OsmoGGSN/vty/ggsn_vty_additions.xml D OsmoGGSN/vty/ggsn_vty_reference.xml D OsmoGSMTester/Makefile D OsmoGSMTester/chapters/config.adoc D OsmoGSMTester/chapters/debugging.adoc D OsmoGSMTester/chapters/install.adoc D OsmoGSMTester/chapters/intro.adoc D OsmoGSMTester/chapters/test_api.adoc D OsmoGSMTester/chapters/trial.adoc D OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml D OsmoGSMTester/osmo-gsm-tester-manual.adoc D OsmoHLR/Makefile D OsmoHLR/chapters/control.adoc D OsmoHLR/chapters/overview.adoc D OsmoHLR/chapters/running.adoc D OsmoHLR/chapters/subscribers.adoc D OsmoHLR/chapters/ussd.adoc D OsmoHLR/example_subscriber_add_update_delete.vty D OsmoHLR/example_subscriber_cs_ps_enabled.ctrl D OsmoHLR/example_subscriber_info.ctrl D OsmoHLR/osmohlr-usermanual-docinfo.xml D OsmoHLR/osmohlr-usermanual.adoc D OsmoHLR/osmohlr-vty-reference.xml D OsmoHLR/vty/hlr_vty_reference.xml D OsmoMGCP/Makefile D OsmoMGCP/osmomgcp-vty-reference.xml D OsmoMGCP/vty/mgcp_vty_additions.xml D OsmoMGCP/vty/mgcp_vty_reference.xml D OsmoMGW/Makefile D OsmoMGW/chapters/configuration.adoc D OsmoMGW/chapters/counters.adoc D OsmoMGW/chapters/counters_generated.adoc D OsmoMGW/chapters/mgcp_extensions.adoc D OsmoMGW/chapters/overview.adoc D OsmoMGW/chapters/running.adoc D OsmoMGW/osmomgw-usermanual-docinfo.xml D OsmoMGW/osmomgw-usermanual.adoc D OsmoMGW/osmomgw-vty-reference.xml D OsmoMGW/vty/mgw_vty_additions.xml D OsmoMGW/vty/mgw_vty_reference.xml D OsmoMSC/Makefile D OsmoMSC/chapters/control.adoc D OsmoMSC/chapters/counters.adoc D OsmoMSC/chapters/counters_generated.adoc D OsmoMSC/chapters/net.adoc D OsmoMSC/chapters/overview.adoc D OsmoMSC/chapters/running.adoc D OsmoMSC/images/sgs-imsi_attach_lu.msc D OsmoMSC/images/sgs-mo_call_no_ps_ho.msc D OsmoMSC/images/sgs-mo_sms_idle.msc D OsmoMSC/images/sgs-mt_call_idle.msc D OsmoMSC/images/sgs-mt_sms_idle.msc D OsmoMSC/osmomsc-usermanual-docinfo.xml D OsmoMSC/osmomsc-usermanual.adoc D OsmoMSC/osmomsc-vty-reference.xml D OsmoMSC/vty/msc_vty_additions.xml D OsmoMSC/vty/msc_vty_reference.xml D OsmoNAT/Makefile D OsmoNAT/osmonat-vty-reference.xml D OsmoNAT/vty/nat_vty_additions.xml D OsmoNAT/vty/nat_vty_reference.xml D OsmoNITB/Makefile D OsmoNITB/chapters/bts-examples.adoc D OsmoNITB/chapters/control.adoc D OsmoNITB/chapters/hlr.adoc D OsmoNITB/chapters/net.adoc D OsmoNITB/chapters/overview.adoc D OsmoNITB/chapters/running.adoc D OsmoNITB/osmonitb-usermanual-docinfo.xml D OsmoNITB/osmonitb-usermanual.adoc D OsmoNITB/osmonitb-vty-reference.xml D OsmoNITB/vty/bsc_vty_additions.xml D OsmoNITB/vty/nitb_vty_additions.xml D OsmoNITB/vty/nitb_vty_reference.xml D OsmoPCU/Makefile D OsmoPCU/chapters/configuration.adoc D OsmoPCU/chapters/counters.adoc D OsmoPCU/chapters/counters_generated.adoc D OsmoPCU/chapters/overview.adoc D OsmoPCU/chapters/running.adoc D OsmoPCU/gb/bssgp.adoc D OsmoPCU/gb/gb-startup.msc D OsmoPCU/gb/ns.adoc D OsmoPCU/osmopcu-gb-docinfo.xml D OsmoPCU/osmopcu-gb.adoc D OsmoPCU/osmopcu-usermanual-docinfo.xml D OsmoPCU/osmopcu-usermanual.adoc D OsmoPCU/osmopcu-vty-reference.xml D OsmoPCU/vty/osmo-pcu_vty_additions.xml D OsmoPCU/vty/osmo-pcu_vty_reference.xml D OsmoSGSN/Makefile D OsmoSGSN/chapters/configuration.adoc D OsmoSGSN/chapters/control.adoc D OsmoSGSN/chapters/counters.adoc D OsmoSGSN/chapters/counters_generated.adoc D OsmoSGSN/chapters/overview.adoc D OsmoSGSN/chapters/running.adoc D OsmoSGSN/osmosgsn-usermanual-docinfo.xml D OsmoSGSN/osmosgsn-usermanual.adoc D OsmoSGSN/osmosgsn-vty-reference.xml D OsmoSGSN/vty/sgsn_vty_additions.xml D OsmoSGSN/vty/sgsn_vty_reference.xml D OsmoSIPConnector/Makefile D OsmoSIPConnector/chapters/configuration.adoc D OsmoSIPConnector/chapters/overview.adoc D OsmoSIPConnector/chapters/running.adoc D OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml D OsmoSIPConnector/osmosipconnector-usermanual.adoc D OsmoSIPConnector/osmosipconnector-vty-reference.xml D OsmoSIPConnector/vty/sipconn_vty_additions.xml D OsmoSIPConnector/vty/sipconn_vty_reference.xml D OsmoSTP/Makefile D OsmoSTP/chapters/overview.adoc D OsmoSTP/osmostp-usermanual-docinfo.xml D OsmoSTP/osmostp-usermanual.adoc D OsmoSTP/osmostp-vty-reference.xml D OsmoSTP/vty/osmo-stp_vty_reference.xml D OsmoTRX/Makefile D OsmoTRX/chapters/code-architecture.adoc D OsmoTRX/chapters/configuration.adoc D OsmoTRX/chapters/control.adoc D OsmoTRX/chapters/counters.adoc D OsmoTRX/chapters/counters_generated.adoc D OsmoTRX/chapters/overview.adoc D OsmoTRX/chapters/running.adoc D OsmoTRX/chapters/trx-architectures.adoc D OsmoTRX/chapters/trx-backends.adoc D OsmoTRX/chapters/trx-devices.adoc D OsmoTRX/osmotrx-usermanual-docinfo.xml D OsmoTRX/osmotrx-usermanual.adoc D OsmoTRX/osmotrx-vty-reference.xml D OsmoTRX/vty/trx_vty_additions.xml D OsmoTRX/vty/trx_vty_reference.xml D OsmocomBB/Makefile D OsmocomBB/chapters/scripting.adoc D OsmocomBB/osmocombb-usermanual-docinfo.xml D OsmocomBB/osmocombb-usermanual.adoc M build/Makefile.asciidoc.inc M build/Makefile.common.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc M build/custom-dblatex.sty A build/known_hosts M build/mscgen-filter.conf M build/python2-filter.conf M build/vty_reference_combine.sh A check-depends.sh M common/chapters/logging.adoc A configure.ac M contrib/jenkins.sh A git-version-gen A merge_doc.xsl A osmo-gsm-manuals.pc.in A tests/Makefile.am A tests/test-usermanual-docinfo.xml A tests/test-vty-reference.xml R tests/vty/test_vty_additions.xml A tests/vty/test_vty_reference.xml 240 files changed, 510 insertions(+), 45,493 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/25/11725/1 -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:23:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:23:05 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11727 Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... merge_doc.xsl: move to osmo-gsm-manuals.git Allows building the manuals without the checked out libosmocore source. Related: OS#3385 Depends: I8e7036fae062ee783cb132b14608827a82c5e7c7 (osmo-gsm-manuals) Change-Id: Idbeda683b288e472c9ede21661b73d6becda0dc4 --- D doc/vty/merge_doc.xsl 1 file changed, 0 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11727/1 diff --git a/doc/vty/merge_doc.xsl b/doc/vty/merge_doc.xsl deleted file mode 100644 index d75c499..0000000 --- a/doc/vty/merge_doc.xsl +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/11727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idbeda683b288e472c9ede21661b73d6becda0dc4 Gerrit-Change-Number: 11727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:25:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:25:58 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always exit 1 on a2x error In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11722 ) Change subject: Makefile.asciidoc.inc: always exit 1 on a2x error ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11722/1/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/11722/1/build/Makefile.asciidoc.inc at 61 PS1, Line 61: asciidoc -v $(ASCIIDOC_OPTS) $<; exit 1) isn't this exit 1 applied only to the subshell created by parenthesis? or parenthesis don't create a subshell? -- To view, visit https://gerrit.osmocom.org/11722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I30931303ecc6094efaedcb08380433a34211a169 Gerrit-Change-Number: 11722 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:25:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:26:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:26:55 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: make clean: also rm *.html In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11723 ) Change subject: Makefile.asciidoc.inc: make clean: also rm *.html ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d5e9c36f75141ce88d11b16c89809be4dce87d8 Gerrit-Change-Number: 11723 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:26:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:28:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:28:40 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: Why is this needed? Where is it called without arguments and why? -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:28:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:29:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:29:22 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: Wouldn't it make more sense to take now() as date or 0? No idea, just asking as I lack context here. -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:29:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:36:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:36:20 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11727 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbeda683b288e472c9ede21661b73d6becda0dc4 Gerrit-Change-Number: 11727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:36:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:36:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:36:55 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11727 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... Patch Set 1: Can you add a link here as a comment to the commit adding this to osmo-gsm-manuals.git? -- To view, visit https://gerrit.osmocom.org/11727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbeda683b288e472c9ede21661b73d6becda0dc4 Gerrit-Change-Number: 11727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:36:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:40:32 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:40:32 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: > Where is it called without arguments and why? https://git.osmocom.org/osmo-gsm-manuals/tree/build/Makefile.asciidoc.inc?id=c3db2aadbfea749d4d10f56722d6113474091ee6#n20 Here, it gets called without arguments when the git command fails. > Why is this needed? I ran into this when building the osmo-msc manuals out-of-tree (with the other related patches applied). It prints the Python stack trace during the build process, which does not stop the build, but is confusing. > Wouldn't it make more sense to take now() as date or 0? No idea, just asking as I lack context here. I would not set it to the current date, otherwise old manual pages can end up with a newer date. -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:40:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:40:59 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:40:59 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always exit 1 on a2x error In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11722 ) Change subject: Makefile.asciidoc.inc: always exit 1 on a2x error ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11722/1/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/11722/1/build/Makefile.asciidoc.inc at 61 PS1, Line 61: asciidoc -v $(ASCIIDOC_OPTS) $<; exit 1) > isn't this exit 1 applied only to the subshell created by parenthesis? or parenthesis don't create a [?] They do create a subshell, but the subshell's exit code is the exit code of the last program it ran (exit 1 in this case). So the overall exit code is 1. This can be reproduced on Debian by *not* installing asciidoc-latex: a2x will fail, but asciidoc will pass unless the exit1 is added like in this commit. -- To view, visit https://gerrit.osmocom.org/11722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I30931303ecc6094efaedcb08380433a34211a169 Gerrit-Change-Number: 11722 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:40:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:43:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:43:37 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11727 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... Patch Set 1: > Can you add a link here as a comment to the commit adding this to osmo-gsm-manuals.git? Sure: https://gerrit.osmocom.org/#/c/osmo-gsm-manuals/+/11725/ -- To view, visit https://gerrit.osmocom.org/11727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbeda683b288e472c9ede21661b73d6becda0dc4 Gerrit-Change-Number: 11727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 10:43:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:52:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:52:08 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: What about fixing the Makefile lines to include -C or whatever when calling git to point to correct directory? -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:52:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:52:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:52:29 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always exit 1 on a2x error In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11722 ) Change subject: Makefile.asciidoc.inc: always exit 1 on a2x error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I30931303ecc6094efaedcb08380433a34211a169 Gerrit-Change-Number: 11722 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 10:52:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:53:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 10:53:19 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11727 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... Patch Set 1: > > Can you add a link here as a comment to the commit adding this to > osmo-gsm-manuals.git? > > Sure: https://gerrit.osmocom.org/#/c/osmo-gsm-manuals/+/11725/ Then definetly that part needs to be split in that commit from osmo-gsm-manuals.git ;) -- To view, visit https://gerrit.osmocom.org/11727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbeda683b288e472c9ede21661b73d6becda0dc4 Gerrit-Change-Number: 11727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 10:53:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:59:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:59:09 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: > What about fixing the Makefile lines to include -C or whatever when calling git to point to correct directory? That would work. Is there always a git directory though? I'm thinking about users downloading tarballs and running the build system from there. -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 10:59:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 11:06:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 11:06:26 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: always exit 1 on a2x error In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11722 ) Change subject: Makefile.asciidoc.inc: always exit 1 on a2x error ...................................................................... Makefile.asciidoc.inc: always exit 1 on a2x error a2x wraps asciidoc. When a2x fails, we run asciidoc without a2x to print verbose output. Make sure that 'make' fails at this point, even if asciidoc runs through. Change-Id: I30931303ecc6094efaedcb08380433a34211a169 --- M build/Makefile.asciidoc.inc 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index a28a5bb..ee7a60d 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -57,7 +57,8 @@ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true - a2x $(A2X_OPTS) $< || asciidoc -v $(ASCIIDOC_OPTS) $< + a2x $(A2X_OPTS) $< || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ + asciidoc -v $(ASCIIDOC_OPTS) $<; exit 1) check: $(ASCIIDOC_CHECKS) -- To view, visit https://gerrit.osmocom.org/11722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I30931303ecc6094efaedcb08380433a34211a169 Gerrit-Change-Number: 11722 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 11:12:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 11:12:15 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: Code-Review+1 > > What about fixing the Makefile lines to include -C or whatever > when calling git to point to correct directory? > > That would work. Is there always a git directory though? I'm > thinking about users downloading tarballs and running the build > system from there. In that case the best would be to store the date into the tarball like we do with "./git-version-gen .tarball-version", then take it from there if git repo is not available. Please note I'm not against this patch, I'm just saying other fixes may also provide better results. We can still merge this one. -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 11:12:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 11:52:57 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 12 Nov 2018 11:52:57 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11728 Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... gsm0808: add message generator for BSSMAP HANDOVER PERFORMED We currently have no generator function that can generate BSSMAP HANDOVER PERFORMED messages. Lets add function for this. Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/11728/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index cdbb273..4d12566 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -168,6 +168,24 @@ }; struct msgb *gsm0808_create_handover_failure(const struct gsm0808_handover_failure *params); +struct gsm0808_handover_performed { + uint16_t cause; + struct osmo_cell_global_id cell; + + bool chosen_channel_present; + uint8_t chosen_channel; + + bool chosen_encr_alg_present; + uint8_t chosen_encr_alg; + + bool speech_version_chosen_present; + uint8_t speech_version_chosen; + + bool speech_codec_chosen_present; + struct gsm0808_speech_codec speech_codec_chosen; +}; +struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_performed *params); + struct msgb *gsm0808_create_dtap(struct msgb *msg, uint8_t link_id); void gsm0808_prepend_dtap_header(struct msgb *msg, uint8_t link_id); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e5c3e30..7246289 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -871,6 +871,56 @@ return msg; } +/*! Create BSSMAP HANDOVER PERFORMED message, 3GPP TS 48.008 3.2.1.25. + * \param[in] params All information to be encoded. + * \returns callee-allocated msgb with BSSMAP HANDOVER PERFORMED message */ +struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_performed *params) +{ + struct msgb *msg; + struct { + uint8_t ident; + struct gsm48_loc_area_id lai; + uint16_t ci; + } __attribute__ ((packed)) lai_ci; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-HANDOVER-PERFORMED"); + if (!msg) + return NULL; + + /* Message Type, 3.2.2.1 */ + msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_PERFORMED); + + /* Cause, 3.2.2.5 */ + msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); + + /* Cell Identifier, 3.2.2.17 */ + lai_ci.ident = CELL_IDENT_WHOLE_GLOBAL; + gsm48_generate_lai2(&lai_ci.lai, ¶ms->cell.lai); + lai_ci.ci = osmo_htons(params->cell.cell_identity); + msgb_tlv_put(msg, GSM0808_IE_CELL_IDENTIFIER, sizeof(lai_ci), (uint8_t *) & lai_ci); + + /* Chosen Channel 3.2.2.33 */ + if (params->chosen_channel_present) + msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, params->chosen_channel); + + /* Chosen Encryption Algorithm 3.2.2.44 */ + if (params->chosen_encr_alg_present) + msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, params->chosen_encr_alg); + + /* Sspeech Version (chosen) 3.2.2.51 */ + if (params->speech_version_chosen_present) + msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, params->speech_version_chosen); + + /* AoIP: Speech Codec (chosen) 3.2.2.104 */ + if (params->speech_codec_chosen_present) + gsm0808_enc_speech_codec(msg, ¶ms->speech_codec_chosen); + + /* prepend header with final length */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + /*! Prepend a DTAP header to given Message Buffer * \param[in] msgb Message Buffer * \param[in] link_id Link Identifier */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 4813e13..34a7ff3 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -178,6 +178,7 @@ gsm0808_create_handover_detect; gsm0808_create_handover_complete; gsm0808_create_handover_failure; +gsm0808_create_handover_performed; gsm0808_prepend_dtap_header; gsm0808_enc_aoip_trasp_addr; gsm0808_dec_aoip_trasp_addr; -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 11:54:09 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 12 Nov 2018 11:54:09 +0000 Subject: Change in osmo-sgsn[master]: fix bogus assertion in encode_comp_field() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11729 Change subject: fix bogus assertion in encode_comp_field() ...................................................................... fix bogus assertion in encode_comp_field() Fix an obvious logic bug in an assertion in encode_comp_field(). Found by: Neels Change-Id: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 --- M src/gprs/gprs_sndcp_xid.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/29/11729/1 diff --git a/src/gprs/gprs_sndcp_xid.c b/src/gprs/gprs_sndcp_xid.c index 8f844b5..09e21f5 100644 --- a/src/gprs/gprs_sndcp_xid.c +++ b/src/gprs/gprs_sndcp_xid.c @@ -443,7 +443,7 @@ OSMO_ASSERT(comp_field->entity <= 0x1f); /* Check if the algorithm number is within bounds */ - OSMO_ASSERT(comp_field->algo >= 0 || comp_field->algo <= 0x1f); + OSMO_ASSERT(comp_field->algo >= 0 && comp_field->algo <= 0x1f); /* Zero out buffer */ memset(dst, 0, dst_maxlen); -- To view, visit https://gerrit.osmocom.org/11729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 Gerrit-Change-Number: 11729 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 12:05:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 12 Nov 2018 12:05:31 +0000 Subject: Change in osmo-sgsn[master]: fix bogus error check in gprs_sndcp_comp_create() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11730 Change subject: fix bogus error check in gprs_sndcp_comp_create() ...................................................................... fix bogus error check in gprs_sndcp_comp_create() The function gprs_sndcp_get_compression_class() returns -EINVAL upon error, not -1, so an existing assertion would never trigger. Instead, check for the values we want first (PROTOCOL_COMP or DATA_COMP) and assert(false) in case the returned value doesn't match either of these. Found by: Neels Change-Id: I8444c1ed052707c76a979fb06cb018ac678defa7 --- M src/gprs/gprs_sndcp_comp.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/30/11730/1 diff --git a/src/gprs/gprs_sndcp_comp.c b/src/gprs/gprs_sndcp_comp.c index 60b15b9..3e02603 100644 --- a/src/gprs/gprs_sndcp_comp.c +++ b/src/gprs/gprs_sndcp_comp.c @@ -92,19 +92,20 @@ * (Protocol or Data compresson ?) */ comp_entity->compclass = gprs_sndcp_get_compression_class(comp_field); - OSMO_ASSERT(comp_entity->compclass != -1); - /* Create an algorithm specific compression context */ if (comp_entity->compclass == SNDCP_XID_PROTOCOL_COMPRESSION) { if (gprs_sndcp_pcomp_init(ctx, comp_entity, comp_field) != 0) { talloc_free(comp_entity); comp_entity = NULL; } - } else { + } else if (comp_entity->compclass == SNDCP_XID_DATA_COMPRESSION) { if (gprs_sndcp_dcomp_init(ctx, comp_entity, comp_field) != 0) { talloc_free(comp_entity); comp_entity = NULL; } + } else { + /* comp_field is somehow invalid */ + OSMO_ASSERT(false); } /* Bail on failure */ -- To view, visit https://gerrit.osmocom.org/11730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8444c1ed052707c76a979fb06cb018ac678defa7 Gerrit-Change-Number: 11730 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 12:06:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 12 Nov 2018 12:06:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing field in tr_BSSMAP_HandoverPerformed te... Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11731 Change subject: BSSMAP_Templates: Add missing field in tr_BSSMAP_HandoverPerformed template ...................................................................... BSSMAP_Templates: Add missing field in tr_BSSMAP_HandoverPerformed template tr_BSSMAP_HandoverPerformed lacks the field speechVersion, lets add it to make the template complete. Change-Id: Id73c0aef5caa0936aa44308faf2aae1c20c7446c Related OS#3645 --- M library/BSSMAP_Templates.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/11731/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index d00a5ab..5b943e9 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -833,6 +833,7 @@ cellIdentifier := ?, chosenChannel := omit, chosenEncryptionAlgorithm := omit, + speechVersion := omit, lSAIdentifier := omit, talkerPriority := omit, codecList := omit, -- To view, visit https://gerrit.osmocom.org/11731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id73c0aef5caa0936aa44308faf2aae1c20c7446c Gerrit-Change-Number: 11731 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 12:06:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 12 Nov 2018 12:06:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed... Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11732 Change subject: BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed template ...................................................................... BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed template tr_BSSMAP_HandoverPerformed matches all optional fields on "omit". This does not make much sense as a safe default. Lets match on "*" instead. (See also other tr_ templates) Related OS#3645 Change-Id: Icd55afdaebdda8ba98431f358148035f7d220b8a --- M library/BSSMAP_Templates.ttcn 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/11732/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 5b943e9..ff151f0 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -831,14 +831,14 @@ messageType := '17'O, cause := ?, cellIdentifier := ?, - chosenChannel := omit, - chosenEncryptionAlgorithm := omit, - speechVersion := omit, - lSAIdentifier := omit, - talkerPriority := omit, - codecList := omit, - speechCodec := omit, - lCLS_BSS_Status := omit + chosenChannel := *, + chosenEncryptionAlgorithm := *, + speechVersion := *, + lSAIdentifier := *, + talkerPriority := *, + codecList := *, + speechCodec := *, + lCLS_BSS_Status := * } } } -- To view, visit https://gerrit.osmocom.org/11732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icd55afdaebdda8ba98431f358148035f7d220b8a Gerrit-Change-Number: 11732 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 12:06:27 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 12 Nov 2018 12:06:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11733 Change subject: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover ...................................................................... BSC_Tests: expect a HANDOVER PERFORMED message on internal handover When an internal handover is performed, the BSC is expected to inform the MSC about the event by sending a BSSMAP HANDOVER PERFORMED message. This feature was missing in the BSC and has now been added. The tests need to be upgraded in order to handle the additional message. - Upgrade f_tc_ho_int so that it expects a HANDOVER PERFORMED message Change-Id: I10f4e578c96a90317939ba49b61b14a3c7e488a7 Depends: osmo-bsc If26e5807280e0f75a423b3b04f8e3c698c82a351 Related: OS#3645 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/11733/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e3ac707..1fc73ef 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2187,6 +2187,10 @@ [] as_handover(hs); } + /* Since this is an internal handover we expect the BSC to inform the + * MSC about the event */ + BSSAP.receive(tr_BSSMAP_HandoverPerformed); + /* Check the amount of MGCP transactions is still consistant with the * test expectation */ f_check_mgcp_expectations() -- To view, visit https://gerrit.osmocom.org/11733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I10f4e578c96a90317939ba49b61b14a3c7e488a7 Gerrit-Change-Number: 11733 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 12:06:42 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 12 Nov 2018 12:06:42 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11734 Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... handover_fsm: send HANDOVER PERFORMED msg on internal ho When an internal handover is done the specification demands to inform the MSC about the event. - Add sending of BSSMAP HANDOVER PERFORMED msg. Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Depends: libosmocore I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M src/osmo-bsc/handover_fsm.c M tests/handover/handover_test.c 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/11734/1 diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 0107ef0..e2b0f06 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -670,6 +670,55 @@ } } +static void send_handover_performed(struct gsm_subscriber_connection *conn) +{ + struct gsm_lchan *lchan = conn->lchan; + struct handover *ho = &conn->ho; + struct osmo_cell_global_id *cell; + struct gsm0808_handover_performed ho_perf_params; + struct msgb *msg; + struct gsm0808_speech_codec sc; + + memset(&ho_perf_params, 0, sizeof(ho_perf_params)); + + /* Cause 3.2.2.5 */ + ho_perf_params.cause = GSM0808_CAUSE_HANDOVER_SUCCESSFUL; + + /* Cell Identifier 3.2.2.17 */ + cell = cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)); + if (!cell) + return; + memcpy(&ho_perf_params.cell, cell, sizeof(ho_perf_params.cell)); + + /* Chosen Channel 3.2.2.33 */ + ho_perf_params.chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->tch_mode); + if (!ho_perf_params.chosen_channel) + return; + ho_perf_params.chosen_channel_present = true; + + /* Chosen Encryption Algorithm 3.2.2.44 */ + ho_perf_params.chosen_encr_alg = lchan->encr.alg_id; + ho_perf_params.chosen_encr_alg_present = true; + + if (ho->new_lchan->activate.requires_voice_stream) { + /* Speech Version (chosen) 3.2.2.51 */ + ho_perf_params.speech_version_chosen = gsm0808_permitted_speech(lchan->type, lchan->tch_mode); + ho_perf_params.speech_version_chosen_present = true; + + /* Speech Codec (chosen) 3.2.2.104 */ + if (gscon_is_aoip(conn)) { + /* Extrapolate speech codec from speech mode */ + gsm0808_speech_codec_from_chan_type(&sc, ho_perf_params.speech_version_chosen); + sc.cfg = conn->assignment.req.s15_s0; + memcpy(&ho_perf_params.speech_codec_chosen, &sc, sizeof(sc)); + ho_perf_params.speech_codec_chosen_present = true; + } + } + + msg = gsm0808_create_handover_performed(&ho_perf_params); + gscon_sigtran_send(conn, msg); +} + /* Notify the handover decision algorithm of failure and clear out any handover state. */ void handover_end(struct gsm_subscriber_connection *conn, enum handover_result result) { @@ -738,6 +787,10 @@ if (result == HO_RESULT_OK) conn->ho.created_ci_for_msc = NULL; + /* If the performed handover was an INTRA BSC HANDOVER, inform the MSC that a handover has happend */ + if (result == HO_RESULT_OK && (ho->scope & HO_INTRA_CELL || ho->scope & HO_INTRA_BSC)) + send_handover_performed(conn); + hdc = handover_decision_callbacks_get(ho->from_hodec_id); if (hdc && hdc->on_handover_end) hdc->on_handover_end(conn, result); diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 7cb4086..c0a2833 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -219,6 +219,8 @@ void create_conn(struct gsm_lchan *lchan) { static struct bsc_msc_data fake_msc_data = {}; + struct gsm_network fake_bsc_gsmnet = {}; + fake_msc_data.network = &fake_bsc_gsmnet; static unsigned int next_imsi = 0; char imsi[sizeof(lchan->conn->bsub->imsi)]; struct gsm_network *net = lchan->ts->trx->bts->network; -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 12:54:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 12:54:28 +0000 Subject: Change in osmo-bts[master]: bts: Allocate TRX for BTS dynamically, deprecate -t Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11735 Change subject: bts: Allocate TRX for BTS dynamically, deprecate -t ...................................................................... bts: Allocate TRX for BTS dynamically, deprecate -t No need to pass -t num_trx anymore to specify number of TRX to use. It is calculated based on dynamic allocation from VTY config. Using parameter -t is flagged as deprecated and is transformed into a NOOP por backward compatibility. As a result, TRX now are allocated after the BTS is allocated and initial config (pre-VTY) is applied. A new function bts_trx_init() is added, to set default config on each TRX during allocation and before setting VTY config on it. A new per BTS model function bts_model_trx_init() is added, to allow per model specific default configuration of each TRX. Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c --- M include/osmo-bts/bts.h M include/osmo-bts/bts_model.h M src/common/bts.c M src/common/main.c M src/common/vty.c M src/osmo-bts-litecell15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c M tests/handover/handover_test.c M tests/meas/meas_test.c M tests/stubs.c M tests/sysmobts/sysmobts_test.c 16 files changed, 118 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/11735/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 34ba956..d7c4bbf 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -27,6 +27,7 @@ extern void *tall_bts_ctx; int bts_init(struct gsm_bts *bts); +int bts_trx_init(struct gsm_bts_trx *trx); void bts_shutdown(struct gsm_bts *bts, const char *reason); struct gsm_bts *create_bts(uint8_t num_trx, char *id); diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h index 7a87d78..f1f6830 100644 --- a/include/osmo-bts/bts_model.h +++ b/include/osmo-bts/bts_model.h @@ -14,6 +14,7 @@ /* BTS model specific functions needed by the common code */ int bts_model_init(struct gsm_bts *bts); +int bts_model_trx_init(struct gsm_bts_trx *trx); int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type, struct tlv_parsed *old_attr, struct tlv_parsed *new_attr, diff --git a/src/common/bts.c b/src/common/bts.c index c251fdd..2ec3d4a 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -109,7 +109,6 @@ * file reading */ int bts_init(struct gsm_bts *bts) { - struct gsm_bts_trx *trx; int rc, i; static int initialized = 0; void *tall_rtp_ctx; @@ -167,26 +166,6 @@ oml_mo_state_init(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_DEPENDENCY); oml_mo_state_init(&bts->gprs.nsvc[1].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); - /* initialize bts data structure */ - llist_for_each_entry(trx, &bts->trx_list, list) { - struct trx_power_params *tpp = &trx->power_params; - int i; - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - int k; - - for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) { - struct gsm_lchan *lchan = &ts->lchan[k]; - INIT_LLIST_HEAD(&lchan->dl_tch_queue); - } - } - /* Default values for the power adjustments */ - tpp->ramp.max_initial_pout_mdBm = to_mdB(0); - tpp->ramp.step_size_mdB = to_mdB(2); - tpp->ramp.step_interval_sec = 1; - } - /* allocate a talloc pool for ORTP to ensure it doesn't have to go back * to the libc malloc all the time */ tall_rtp_ctx = talloc_pool(tall_bts_ctx, 262144); @@ -215,6 +194,36 @@ return rc; } +/* Initialize the BTS (and TRX) data structures, called before config + * file reading */ +int bts_trx_init(struct gsm_bts_trx *trx) +{ + /* initialize bts data structure */ + struct trx_power_params *tpp = &trx->power_params; + int rc, i; + + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + int k; + + for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) { + struct gsm_lchan *lchan = &ts->lchan[k]; + INIT_LLIST_HEAD(&lchan->dl_tch_queue); + } + } + /* Default values for the power adjustments */ + tpp->ramp.max_initial_pout_mdBm = to_mdB(0); + tpp->ramp.step_size_mdB = to_mdB(2); + tpp->ramp.step_interval_sec = 1; + + rc = bts_model_trx_init(trx); + if (rc < 0) { + llist_del(&trx->list); + return rc; + } + return 0; +} + static void shutdown_timer_cb(void *data) { fprintf(stderr, "Shutdown timer expired\n"); diff --git a/src/common/main.c b/src/common/main.c index 9121a2a..f90a4d4 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -59,7 +59,6 @@ static const char *config_file = "osmo-bts.cfg"; static int daemonize = 0; static int rt_prio = -1; -static int trx_num = 1; static char *gsmtap_ip = 0; extern int g_vty_port_num; @@ -76,8 +75,6 @@ " -e --log-level Set a global log-level\n" " -r --realtime PRIO Use SCHED_RR with the specified priority\n" " -i --gsmtap-ip The destination IP used for GSMTAP.\n" - " -t --trx-num Set number of TRX (default=%d)\n", - trx_num ); bts_model_print_help(); } @@ -152,9 +149,8 @@ gsmtap_ip = optarg; break; case 't': - trx_num = atoi(optarg); - if (trx_num < 1) - trx_num = 1; + fprintf(stderr, "Parameter -t is deprecated and does nothing, " + "TRX num is calculated from VTY\n"); break; case '?': case 1: @@ -228,7 +224,7 @@ { struct gsm_bts_trx *trx; struct e1inp_line *line; - int rc, i; + int rc; printf("((*))\n |\n / \\ OsmoBTS\n"); @@ -251,13 +247,7 @@ fprintf(stderr, "Failed to create BTS structure\n"); exit(1); } - for (i = 1; i < trx_num; i++) { - trx = gsm_bts_trx_alloc(bts); - if (!trx) { - fprintf(stderr, "Failed to create TRX structure\n"); - exit(1); - } - } + e1inp_vty_init(); bts_vty_init(bts, &bts_log_info); diff --git a/src/common/vty.c b/src/common/vty.c index f918f57..eaf70ea 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -227,12 +227,22 @@ struct gsm_bts *bts = vty->index; struct gsm_bts_trx *trx; - trx = gsm_bts_trx_num(bts, trx_nr); + + if (trx_nr > bts->num_trx) { + vty_out(vty, "%% The next unused TRX number is %u%s", + bts->num_trx, VTY_NEWLINE); + return CMD_WARNING; + } else if (trx_nr == bts->num_trx) { + /* allocate a new one */ + trx = gsm_bts_trx_alloc(bts); + bts_trx_init(trx); + bts_model_trx_init(trx); + } else + trx = gsm_bts_trx_num(bts, trx_nr); + if (!trx) { - vty_out(vty, "Unknown TRX %u. Available TRX are: 0..%u%s", - trx_nr, bts->num_trx - 1, VTY_NEWLINE); - vty_out(vty, "Hint: Check if commandline option -t matches the" - "number of available transceivers!%s", VTY_NEWLINE); + vty_out(vty, "%% Unable to allocate TRX %u%s", + trx_nr, VTY_NEWLINE); return CMD_WARNING; } diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c index de175e3..e4f9a56 100644 --- a/src/osmo-bts-litecell15/main.c +++ b/src/osmo-bts-litecell15/main.c @@ -79,11 +79,6 @@ exit(1); } - llist_for_each_entry(trx, &bts->trx_list, list) { - trx->nominal_power = 40; - trx->power_params.trx_p_max_out_mdBm = to_mdB(bts->c0->nominal_power); - } - if (stat(LC15BTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); exit(23); @@ -104,6 +99,13 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + trx->nominal_power = 40; + trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power); + return 0; +} + void bts_model_phy_link_set_defaults(struct phy_link *plink) { } diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index 9777c09..574bc72 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -105,11 +105,6 @@ exit(1); } - llist_for_each_entry(trx, &bts->trx_list, list) { - trx->nominal_power = 40; - trx->power_params.trx_p_max_out_mdBm = to_mdB(bts->c0->nominal_power); - } - if (stat(OC2GBTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); exit(23); @@ -130,6 +125,13 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + trx->nominal_power = 40; + trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power); + return 0; +} + void bts_model_phy_link_set_defaults(struct phy_link *plink) { } diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 40d5300..f149c04 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -792,6 +792,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + /*********************************************************************** * handling of messages coming up from PHY ***********************************************************************/ diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 9ade2c6..fa1aaf4 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -179,6 +179,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + void bts_model_print_help() { } diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index b63d07e..221e8e8 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -91,6 +91,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + int bts_model_oml_estab(struct gsm_bts *bts) { return 0; diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 61610f7..98f460e 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -118,6 +118,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + void bts_model_phy_link_set_defaults(struct phy_link *plink) { plink->u.osmotrx.local_ip = talloc_strdup(plink, "127.0.0.1"); diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index b66a3ff..88041fd 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -72,6 +72,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + void bts_model_print_help() { LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index c7bd8f8..b5de142 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -75,14 +75,18 @@ fprintf(stderr, "Failed to create BTS structure\n"); exit(1); } - trx = gsm_bts_trx_alloc(bts); - if (!trx) { - fprintf(stderr, "Failed to TRX structure\n"); + if (bts_init(bts) < 0) { + fprintf(stderr, "unable to to open bts\n"); exit(1); } - if (bts_init(bts) < 0) { - fprintf(stderr, "unable to to open bts\n"); + trx = gsm_bts_trx_alloc(bts); + if (!trx) { + fprintf(stderr, "Failed to alloc TRX structure\n"); + exit(1); + } + if (bts_trx_init(trx) < 0) { + fprintf(stderr, "unable to to init TRX\n"); exit(1); } @@ -268,6 +272,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { return 0; } int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj, uint8_t adm_state) { return 0; } int bts_model_init(struct gsm_bts *bts) { return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) { return 0; } int bts_model_trx_deact_rf(struct gsm_bts_trx *trx) { return 0; } int bts_model_trx_close(struct gsm_bts_trx *trx) { return 0; } void trx_get_hlayer1(void) {} diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index d4f3fe6..b9f1e87 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -519,14 +519,18 @@ fprintf(stderr, "Failed to create BTS structure\n"); exit(1); } - trx = gsm_bts_trx_alloc(bts); - if (!trx) { - fprintf(stderr, "Failed to TRX structure\n"); + if (bts_init(bts) < 0) { + fprintf(stderr, "unable to to open bts\n"); exit(1); } - if (bts_init(bts) < 0) { - fprintf(stderr, "unable to to open bts\n"); + trx = gsm_bts_trx_alloc(bts); + if (!trx) { + fprintf(stderr, "Failed to alloc TRX structure\n"); + exit(1); + } + if (bts_trx_init(trx) < 0) { + fprintf(stderr, "unable to to init TRX\n"); exit(1); } @@ -626,6 +630,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + int bts_model_trx_deact_rf(struct gsm_bts_trx *trx) { return 0; diff --git a/tests/stubs.c b/tests/stubs.c index f969cb3..d6f4d3d 100644 --- a/tests/stubs.c +++ b/tests/stubs.c @@ -13,6 +13,8 @@ { return 0; } int bts_model_init(struct gsm_bts *bts) { return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ return 0; } int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, struct tlv_parsed *new_attr, int kind, void *obj) { return 0; } diff --git a/tests/sysmobts/sysmobts_test.c b/tests/sysmobts/sysmobts_test.c index 02490be..4b01ed7 100644 --- a/tests/sysmobts/sysmobts_test.c +++ b/tests/sysmobts/sysmobts_test.c @@ -198,6 +198,8 @@ int bts_model_init(struct gsm_bts *bts) { return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ return 0; } int bts_model_oml_estab(struct gsm_bts *bts) { return 0; } void bts_model_abis_close(struct gsm_bts *bts) -- To view, visit https://gerrit.osmocom.org/11735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c Gerrit-Change-Number: 11735 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 12:59:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 12:59:34 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 894 PS1, Line 894: msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); I think we recently added some code to generate this cause with 1-2 bytes. @max? https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 897 PS1, Line 897: lai_ci.ident = CELL_IDENT_WHOLE_GLOBAL; should this come from params ptr? -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 12:59:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:00:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:00:21 +0000 Subject: Change in osmo-sgsn[master]: fix bogus assertion in encode_comp_field() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11729 ) Change subject: fix bogus assertion in encode_comp_field() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 Gerrit-Change-Number: 11729 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:00:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:02:10 +0000 Subject: Change in osmo-sgsn[master]: fix bogus error check in gprs_sndcp_comp_create() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11730 ) Change subject: fix bogus error check in gprs_sndcp_comp_create() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11730/1/src/gprs/gprs_sndcp_comp.c File src/gprs/gprs_sndcp_comp.c: https://gerrit.osmocom.org/#/c/11730/1/src/gprs/gprs_sndcp_comp.c at 106 PS1, Line 106: } else { I see there's too SNDCP_XID_VERSION_NUMBER. What about it? We could use a switch statement here btw. -- To view, visit https://gerrit.osmocom.org/11730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8444c1ed052707c76a979fb06cb018ac678defa7 Gerrit-Change-Number: 11730 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:02:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:02:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:02:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11732 ) Change subject: BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed template ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd55afdaebdda8ba98431f358148035f7d220b8a Gerrit-Change-Number: 11732 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:02:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:03:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:03:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing field in tr_BSSMAP_HandoverPerformed te... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11731 ) Change subject: BSSMAP_Templates: Add missing field in tr_BSSMAP_HandoverPerformed template ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id73c0aef5caa0936aa44308faf2aae1c20c7446c Gerrit-Change-Number: 11731 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:03:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:03:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:03:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11732 ) Change subject: BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed template ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd55afdaebdda8ba98431f358148035f7d220b8a Gerrit-Change-Number: 11732 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:03:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:05:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 13:05:48 +0000 Subject: Change in osmo-gsm-manuals[master]: merge_doc.xsl: move from libosmocore.git Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11736 Change subject: merge_doc.xsl: move from libosmocore.git ...................................................................... merge_doc.xsl: move from libosmocore.git Allow building manuals without the libosmocore source. Related: OS#3385 Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c --- M Makefile M build/Makefile.vty-reference.inc A merge_doc.xsl 3 files changed, 49 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/36/11736/1 diff --git a/Makefile b/Makefile index 0ef0942..34c18ad 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -LIBOSMO_DIR ?= ~/source/gsm/libosmocore - all: check-deps cd OsmoBTS; $(MAKE) cd OsmoNITB; $(MAKE) @@ -80,9 +78,6 @@ define check_dep_python2_module @echo "import $(1)" | python2 - >/dev/null 2>&1 || { echo >&2 "Failed to import '$(1)' module, please install $(2)."; exit 1; } endef -define check_dep_dir - @test -d $(1) || { echo >&2 "Directory '$(1)' not found, please set $(2) to the path of your libosmocom source tree: make LIBOSMO_DIR=/path/to/libosmocore"; exit 1; } -endef check-deps: $(call check_dep_bin,mscgen,mscgen) @@ -95,4 +90,3 @@ $(call check_dep_bin,dot,graphviz) $(call check_dep_bin,python2,python2) $(call check_dep_python2_module,pychart,python2-pychart) - $(call check_dep_dir,$(LIBOSMO_DIR),LIBOSMO_DIR) diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 6607ae5..1528d32 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -25,8 +25,7 @@ DOCBOOKS_DEPS = generated/docbook_vty.xml include $(TOPDIR)/build/Makefile.docbook.inc -LIBOSMO_DIR ?= ~/source/gsm/libosmocore -MERGE_DOC = $(shell realpath $(LIBOSMO_DIR)/doc/vty/merge_doc.xsl) +MERGE_DOC = $(shell realpath $(TOPDIR)/merge_doc.xsl) CLEAN_FILES += generated diff --git a/merge_doc.xsl b/merge_doc.xsl new file mode 100644 index 0000000..d75c499 --- /dev/null +++ b/merge_doc.xsl @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/11736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 13:05:49 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile: move dep-check code to check-depends.sh Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11737 Change subject: Makefile: move dep-check code to check-depends.sh ...................................................................... Makefile: move dep-check code to check-depends.sh Make it possible to run the dependency check without the Makefile. This is needed to split up the manual pages into the projects repositories, so we can call check-depends.sh from there. Related: OS#3385 Change-Id: I82a7efd7e9c265c82d1ba8a60856c892a15a7a33 --- M Makefile A check-depends.sh 2 files changed, 31 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/37/11737/1 diff --git a/Makefile b/Makefile index 34c18ad..eb3be75 100644 --- a/Makefile +++ b/Makefile @@ -72,21 +72,5 @@ cd OsmocomBB; $(MAKE) check cd OsmoTRX; $(MAKE) check -define check_dep_bin - @type $(1) >/dev/null 2>&1 || { echo >&2 "Binary '$(1)' not found in path, please install $(2)."; exit 1; } -endef -define check_dep_python2_module - @echo "import $(1)" | python2 - >/dev/null 2>&1 || { echo >&2 "Failed to import '$(1)' module, please install $(2)."; exit 1; } -endef - check-deps: - $(call check_dep_bin,mscgen,mscgen) - $(call check_dep_bin,xsltproc,libxslt) - $(call check_dep_bin,git,git) - $(call check_dep_bin,a2x,asciidoc) - $(call check_dep_bin,asciidoc,asciidoc) - $(call check_dep_bin,dblatex,dblatex) - $(call check_dep_bin,packetdiag,nwdiag) - $(call check_dep_bin,dot,graphviz) - $(call check_dep_bin,python2,python2) - $(call check_dep_python2_module,pychart,python2-pychart) + ./check-depends.sh diff --git a/check-depends.sh b/check-depends.sh new file mode 100755 index 0000000..7845719 --- /dev/null +++ b/check-depends.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# $1: program name, $2: package name +check_dep_bin() { + if ! type "$1" >/dev/null 2>&1; then + echo "Binary '$1' not found in path, please install $2." + exit 1 + fi +} + +# $1: module name, $2: package name +check_dep_python2_module() { + if ! echo "import $1" | python2 - >/dev/null 2>&1; then + echo "Failed to import '$1' module, please install $2." + exit 1 + fi +} + +check_dep_bin mscgen mscgen +check_dep_bin xsltproc libxslt +check_dep_bin git git +check_dep_bin a2x asciidoc +check_dep_bin asciidoc asciidoc +check_dep_bin dblatex dblatex +check_dep_bin packetdiag nwdiag +check_dep_bin dot graphviz +check_dep_bin python2 python2 +check_dep_python2_module pychart python2-pychart + +echo "All dependencies installed!" -- To view, visit https://gerrit.osmocom.org/11737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I82a7efd7e9c265c82d1ba8a60856c892a15a7a33 Gerrit-Change-Number: 11737 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 13:05:49 +0000 Subject: Change in osmo-gsm-manuals[master]: move project specific files to their own repos Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11738 Change subject: move project specific files to their own repos ...................................................................... move project specific files to their own repos Related: OS#3385 Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc --- D OsmoBSC/Makefile D OsmoBSC/aoip-mgw-options-docinfo.xml D OsmoBSC/aoip-mgw-options.adoc D OsmoBSC/chapters/control.adoc D OsmoBSC/chapters/counters.adoc D OsmoBSC/chapters/counters_generated.adoc D OsmoBSC/chapters/handover.adoc D OsmoBSC/chapters/handover_inter_bsc.dot D OsmoBSC/chapters/handover_intra_bsc.dot D OsmoBSC/chapters/overview.adoc D OsmoBSC/chapters/running.adoc D OsmoBSC/message-sequences/mo_call-abis_a.msc D OsmoBSC/mgw/classic-bsc.msc D OsmoBSC/mgw/osmo-bsc-new-mgw-e1.msc D OsmoBSC/mgw/osmo-bsc-new-mgw.msc D OsmoBSC/mgw/osmo-bsc-old-sccplite.msc D OsmoBSC/om2000/README D OsmoBSC/om2000/om2k-bts.msc D OsmoBSC/om2000/om2k-mo-cf.msc D OsmoBSC/om2000/om2k-mo-is.msc D OsmoBSC/om2000/om2k-mo-rx.msc D OsmoBSC/om2000/om2k-mo-tf.msc D OsmoBSC/om2000/om2k-mo-trxc.msc D OsmoBSC/om2000/om2k-mo-ts.msc D OsmoBSC/om2000/om2k-mo-tx.msc D OsmoBSC/om2000/om2k-trx.msc D OsmoBSC/osmobsc-usermanual-docinfo.xml D OsmoBSC/osmobsc-usermanual.adoc D OsmoBSC/osmobsc-vty-reference.xml D OsmoBSC/osmux-reference-docinfo.xml D OsmoBSC/osmux-reference.adoc D OsmoBSC/vty/bsc_vty_additions.xml D OsmoBSC/vty/bsc_vty_reference.xml D OsmoBSC/vty/libbsc_vty_additions.xml D OsmoBTS/Makefile D OsmoBTS/abis/abis-startup.msc D OsmoBTS/abis/dyn_ts_ipa_style1.msc D OsmoBTS/abis/dyn_ts_ipa_style2.msc D OsmoBTS/abis/dyn_ts_osmocom_style1.msc D OsmoBTS/abis/dyn_ts_osmocom_style2.msc D OsmoBTS/abis/ipa.adoc D OsmoBTS/abis/oml-mo-bts.msc D OsmoBTS/abis/oml-mo-carrier.msc D OsmoBTS/abis/oml-mo-channel.msc D OsmoBTS/abis/oml-mo-sitemgr.msc D OsmoBTS/abis/oml-mo-transceiver.msc D OsmoBTS/abis/oml-startup.msc D OsmoBTS/abis/oml-startup2.msc D OsmoBTS/abis/oml-startup3.msc D OsmoBTS/abis/oml.adoc D OsmoBTS/abis/rsl-startup-pri.msc D OsmoBTS/abis/rsl-startup-sec.msc D OsmoBTS/abis/rsl-tch-rtp.msc D OsmoBTS/abis/rsl.adoc D OsmoBTS/abis/rtp.adoc D OsmoBTS/chapters/architecture.adoc D OsmoBTS/chapters/bts-models.adoc D OsmoBTS/chapters/configuration.adoc D OsmoBTS/chapters/control.adoc D OsmoBTS/chapters/dynamic-timeslots.adoc D OsmoBTS/chapters/interfaces.adoc D OsmoBTS/chapters/overview.adoc D OsmoBTS/dtx.dot D OsmoBTS/osmobts-abis-docinfo.xml D OsmoBTS/osmobts-abis.adoc D OsmoBTS/osmobts-usermanual-docinfo.xml D OsmoBTS/osmobts-usermanual.adoc D OsmoBTS/osmobts-vty-reference.xml D OsmoBTS/rtp-amr-docinfo.xml D OsmoBTS/rtp-amr.adoc D OsmoBTS/vty/bts_vty_additions.xml D OsmoBTS/vty/bts_vty_reference.xml D OsmoGGSN/Makefile D OsmoGGSN/chapters/configuration.adoc D OsmoGGSN/chapters/overview.adoc D OsmoGGSN/chapters/running.adoc D OsmoGGSN/osmoggsn-usermanual-docinfo.xml D OsmoGGSN/osmoggsn-usermanual.adoc D OsmoGGSN/osmoggsn-vty-reference.xml D OsmoGGSN/vty/ggsn_vty_additions.xml D OsmoGGSN/vty/ggsn_vty_reference.xml D OsmoGSMTester/Makefile D OsmoGSMTester/chapters/config.adoc D OsmoGSMTester/chapters/debugging.adoc D OsmoGSMTester/chapters/install.adoc D OsmoGSMTester/chapters/intro.adoc D OsmoGSMTester/chapters/test_api.adoc D OsmoGSMTester/chapters/trial.adoc D OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml D OsmoGSMTester/osmo-gsm-tester-manual.adoc D OsmoHLR/Makefile D OsmoHLR/chapters/control.adoc D OsmoHLR/chapters/overview.adoc D OsmoHLR/chapters/running.adoc D OsmoHLR/chapters/subscribers.adoc D OsmoHLR/chapters/ussd.adoc D OsmoHLR/example_subscriber_add_update_delete.vty D OsmoHLR/example_subscriber_cs_ps_enabled.ctrl D OsmoHLR/example_subscriber_info.ctrl D OsmoHLR/osmohlr-usermanual-docinfo.xml D OsmoHLR/osmohlr-usermanual.adoc D OsmoHLR/osmohlr-vty-reference.xml D OsmoHLR/vty/hlr_vty_additions.xml D OsmoHLR/vty/hlr_vty_reference.xml D OsmoMGCP/Makefile D OsmoMGCP/osmomgcp-vty-reference.xml D OsmoMGCP/vty/mgcp_vty_additions.xml D OsmoMGCP/vty/mgcp_vty_reference.xml D OsmoMGW/Makefile D OsmoMGW/chapters/configuration.adoc D OsmoMGW/chapters/counters.adoc D OsmoMGW/chapters/counters_generated.adoc D OsmoMGW/chapters/mgcp_extensions.adoc D OsmoMGW/chapters/overview.adoc D OsmoMGW/chapters/running.adoc D OsmoMGW/osmomgw-usermanual-docinfo.xml D OsmoMGW/osmomgw-usermanual.adoc D OsmoMGW/osmomgw-vty-reference.xml D OsmoMGW/vty/mgw_vty_additions.xml D OsmoMGW/vty/mgw_vty_reference.xml D OsmoMSC/Makefile D OsmoMSC/chapters/control.adoc D OsmoMSC/chapters/counters.adoc D OsmoMSC/chapters/counters_generated.adoc D OsmoMSC/chapters/net.adoc D OsmoMSC/chapters/overview.adoc D OsmoMSC/chapters/running.adoc D OsmoMSC/images/sgs-imsi_attach_lu.msc D OsmoMSC/images/sgs-mo_call_no_ps_ho.msc D OsmoMSC/images/sgs-mo_sms_idle.msc D OsmoMSC/images/sgs-mt_call_idle.msc D OsmoMSC/images/sgs-mt_sms_idle.msc D OsmoMSC/osmomsc-usermanual-docinfo.xml D OsmoMSC/osmomsc-usermanual.adoc D OsmoMSC/osmomsc-vty-reference.xml D OsmoMSC/vty/msc_vty_additions.xml D OsmoMSC/vty/msc_vty_reference.xml D OsmoNAT/Makefile D OsmoNAT/osmonat-vty-reference.xml D OsmoNAT/vty/nat_vty_additions.xml D OsmoNAT/vty/nat_vty_reference.xml D OsmoNITB/Makefile D OsmoNITB/chapters/bts-examples.adoc D OsmoNITB/chapters/control.adoc D OsmoNITB/chapters/hlr.adoc D OsmoNITB/chapters/net.adoc D OsmoNITB/chapters/overview.adoc D OsmoNITB/chapters/running.adoc D OsmoNITB/osmonitb-usermanual-docinfo.xml D OsmoNITB/osmonitb-usermanual.adoc D OsmoNITB/osmonitb-vty-reference.xml D OsmoNITB/vty/bsc_vty_additions.xml D OsmoNITB/vty/nitb_vty_additions.xml D OsmoNITB/vty/nitb_vty_reference.xml D OsmoPCU/Makefile D OsmoPCU/chapters/configuration.adoc D OsmoPCU/chapters/counters.adoc D OsmoPCU/chapters/counters_generated.adoc D OsmoPCU/chapters/overview.adoc D OsmoPCU/chapters/running.adoc D OsmoPCU/gb/bssgp.adoc D OsmoPCU/gb/gb-startup.msc D OsmoPCU/gb/ns.adoc D OsmoPCU/osmopcu-gb-docinfo.xml D OsmoPCU/osmopcu-gb.adoc D OsmoPCU/osmopcu-usermanual-docinfo.xml D OsmoPCU/osmopcu-usermanual.adoc D OsmoPCU/osmopcu-vty-reference.xml D OsmoPCU/vty/osmo-pcu_vty_additions.xml D OsmoPCU/vty/osmo-pcu_vty_reference.xml D OsmoSGSN/Makefile D OsmoSGSN/chapters/configuration.adoc D OsmoSGSN/chapters/control.adoc D OsmoSGSN/chapters/counters.adoc D OsmoSGSN/chapters/counters_generated.adoc D OsmoSGSN/chapters/overview.adoc D OsmoSGSN/chapters/running.adoc D OsmoSGSN/osmosgsn-usermanual-docinfo.xml D OsmoSGSN/osmosgsn-usermanual.adoc D OsmoSGSN/osmosgsn-vty-reference.xml D OsmoSGSN/vty/sgsn_vty_additions.xml D OsmoSGSN/vty/sgsn_vty_reference.xml D OsmoSIPConnector/Makefile D OsmoSIPConnector/chapters/configuration.adoc D OsmoSIPConnector/chapters/overview.adoc D OsmoSIPConnector/chapters/running.adoc D OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml D OsmoSIPConnector/osmosipconnector-usermanual.adoc D OsmoSIPConnector/osmosipconnector-vty-reference.xml D OsmoSIPConnector/vty/sipconn_vty_additions.xml D OsmoSIPConnector/vty/sipconn_vty_reference.xml D OsmoSTP/Makefile D OsmoSTP/chapters/overview.adoc D OsmoSTP/osmostp-usermanual-docinfo.xml D OsmoSTP/osmostp-usermanual.adoc D OsmoSTP/osmostp-vty-reference.xml D OsmoSTP/vty/osmo-stp_vty_reference.xml D OsmoTRX/Makefile D OsmoTRX/chapters/code-architecture.adoc D OsmoTRX/chapters/configuration.adoc D OsmoTRX/chapters/control.adoc D OsmoTRX/chapters/counters.adoc D OsmoTRX/chapters/counters_generated.adoc D OsmoTRX/chapters/overview.adoc D OsmoTRX/chapters/running.adoc D OsmoTRX/chapters/trx-architectures.adoc D OsmoTRX/chapters/trx-backends.adoc D OsmoTRX/chapters/trx-devices.adoc D OsmoTRX/osmotrx-usermanual-docinfo.xml D OsmoTRX/osmotrx-usermanual.adoc D OsmoTRX/osmotrx-vty-reference.xml D OsmoTRX/vty/trx_vty_additions.xml D OsmoTRX/vty/trx_vty_reference.xml D OsmocomBB/Makefile D OsmocomBB/chapters/scripting.adoc D OsmocomBB/osmocombb-usermanual-docinfo.xml D OsmocomBB/osmocombb-usermanual.adoc 217 files changed, 0 insertions(+), 45,333 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/38/11738/1 -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:07:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 13:07:40 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11739 Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... merge_doc.xsl: move to osmo-gsm-manuals.git Allows building the manuals without the checked out libosmocore source. Related: OS#3385 Depends: I8e7036fae062ee783cb132b14608827a82c5e7c7 (osmo-gsm-manuals) Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c --- D doc/vty/merge_doc.xsl 1 file changed, 0 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/11739/1 diff --git a/doc/vty/merge_doc.xsl b/doc/vty/merge_doc.xsl deleted file mode 100644 index d75c499..0000000 --- a/doc/vty/merge_doc.xsl +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/11739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11739 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:08:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:08:35 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11734/1/tests/handover/handover_test.c File tests/handover/handover_test.c: https://gerrit.osmocom.org/#/c/11734/1/tests/handover/handover_test.c at 223 PS1, Line 223: fake_msc_data.network = &fake_bsc_gsmnet; Why is this needed? -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:08:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:09:51 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 13:09:51 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11727 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... Abandoned New version with updated depends ID: https://gerrit.osmocom.org/#/c/libosmocore/+/11739/ (I deleted the change ID by accident, so a new patch was submitted to gerrit) -- To view, visit https://gerrit.osmocom.org/11727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Idbeda683b288e472c9ede21661b73d6becda0dc4 Gerrit-Change-Number: 11727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:09:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:09:58 +0000 Subject: Change in osmo-gsm-manuals[master]: merge_doc.xsl: move from libosmocore.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11736 ) Change subject: merge_doc.xsl: move from libosmocore.git ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 12 Nov 2018 13:09:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:10:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 13:10:14 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11739 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... Patch Set 1: The file gets added here: https://gerrit.osmocom.org/#/c/osmo-gsm-manuals/+/11736/ -- To view, visit https://gerrit.osmocom.org/11739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11739 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 12 Nov 2018 13:10:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:10:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:10:55 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile: move dep-check code to check-depends.sh In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11737 ) Change subject: Makefile: move dep-check code to check-depends.sh ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82a7efd7e9c265c82d1ba8a60856c892a15a7a33 Gerrit-Change-Number: 11737 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:10:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:21:04 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 12 Nov 2018 13:21:04 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11716 to look at the new patch set (#2). Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. Allows dialing of numbers with GSM340_PLAN_UNKNOWN, for example a number beginning with '*' Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 --- M src/mncc.c 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/16/11716/2 -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:28:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:28:42 +0000 Subject: Change in osmo-gsm-manuals[master]: move project specific files to their own repos In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: move project specific files to their own repos ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:28:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:29:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:29:30 +0000 Subject: Change in osmo-gsm-manuals[master]: merge_doc.xsl: move from libosmocore.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11736 ) Change subject: merge_doc.xsl: move from libosmocore.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:29:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:29:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:29:35 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11739 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11739 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 13:29:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:33:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:33:30 +0000 Subject: Change in osmo-msc[master]: move project specific manuals to their own repos In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11726 ) Change subject: move project specific manuals to their own repos ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 13:33:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:36:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 13:36:19 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11716 ) Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11716/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/11716/2/src/mncc.c at 400 PS2, Line 400: switch(mncc->called.plan) { I think we usually use a space between keyword (not functions) and (): switch () I probably did it wrong to in my example in previous patch version, it's one of my usual typos ;) https://gerrit.osmocom.org/#/c/11716/2/src/mncc.c at 406 PS2, Line 406: "leg(%u) has unsupported(%d) dial plan.\n", We usually indent next lines to content, not to the "(" character, so it looks like a space is missing here and in line below. -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 13:36:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 13:43:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 13:43:29 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11716 ) Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/11716/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/11716/2/src/mncc.c at 401 PS2, Line 401: case The 'case' statements are usually not shifted from 'switch', i.e.: switch (var) { case VAL_FOO: tuwat_foo; break; case VAL_ZOO: tuwat_zoo; break; // ... } https://gerrit.osmocom.org/#/c/11716/2/src/mncc.c at 406 PS2, Line 406: "leg(%u) has unsupported(%d) dial plan.\n", > We usually indent next lines to content, not to the "(" character, so it looks like a space is missi [?] Actually, in this file a single tab is used for that. I personally prefer exactly this way, instead of mixing tabs and spaces in order to make it aligned... -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 13:43:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 12 Nov 2018 14:08:07 +0000 Subject: Change in osmo-sgsn[master]: fix bogus assertion in encode_comp_field() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11729 ) Change subject: fix bogus assertion in encode_comp_field() ...................................................................... fix bogus assertion in encode_comp_field() Fix an obvious logic bug in an assertion in encode_comp_field(). Found by: Neels Change-Id: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 --- M src/gprs/gprs_sndcp_xid.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/gprs/gprs_sndcp_xid.c b/src/gprs/gprs_sndcp_xid.c index 8f844b5..09e21f5 100644 --- a/src/gprs/gprs_sndcp_xid.c +++ b/src/gprs/gprs_sndcp_xid.c @@ -443,7 +443,7 @@ OSMO_ASSERT(comp_field->entity <= 0x1f); /* Check if the algorithm number is within bounds */ - OSMO_ASSERT(comp_field->algo >= 0 || comp_field->algo <= 0x1f); + OSMO_ASSERT(comp_field->algo >= 0 && comp_field->algo <= 0x1f); /* Zero out buffer */ memset(dst, 0, dst_maxlen); -- To view, visit https://gerrit.osmocom.org/11729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 Gerrit-Change-Number: 11729 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:12:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 14:12:58 +0000 Subject: Change in osmo-bts[master]: bts: Allocate TRX for BTS dynamically, deprecate -t In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11735 ) Change subject: bts: Allocate TRX for BTS dynamically, deprecate -t ...................................................................... Patch Set 1: Code-Review-1 (7 comments) https://gerrit.osmocom.org/#/c/11735/1/src/common/bts.c File src/common/bts.c: https://gerrit.osmocom.org/#/c/11735/1/src/common/bts.c at 108 PS1, Line 108: (and TRX) It doesn't init TRX instances anymore, right? :) https://gerrit.osmocom.org/#/c/11735/1/src/common/bts.c at 197 PS1, Line 197: the BTS (and TRX) ... but this function does exactly TRX init, not BTS. https://gerrit.osmocom.org/#/c/11735/1/src/common/vty.c File src/common/vty.c: https://gerrit.osmocom.org/#/c/11735/1/src/common/vty.c at 238 PS1, Line 238: bts_trx_init I think here we have possible NULL-pointer dereference. What if gsm_bts_trx_alloc() would fail and return NULL? https://gerrit.osmocom.org/#/c/11735/1/src/common/vty.c at 239 PS1, Line 239: bts_model_trx_init As I can see, it's already being called from bts_trx_init(). https://gerrit.osmocom.org/#/c/11735/1/src/osmo-bts-octphy/l1_if.c File src/osmo-bts-octphy/l1_if.c: https://gerrit.osmocom.org/#/c/11735/1/src/osmo-bts-octphy/l1_if.c at 795 PS1, Line 795: bts_model_trx_init For some reason, most of the 'bts_model_*' functions are here. But I think a better place is 'main.c', do you agree? https://gerrit.osmocom.org/#/c/11735/1/tests/handover/handover_test.c File tests/handover/handover_test.c: https://gerrit.osmocom.org/#/c/11735/1/tests/handover/handover_test.c at 79 PS1, Line 79: open s/open/init/? https://gerrit.osmocom.org/#/c/11735/1/tests/meas/meas_test.c File tests/meas/meas_test.c: https://gerrit.osmocom.org/#/c/11735/1/tests/meas/meas_test.c at 523 PS1, Line 523: open same here... -- To view, visit https://gerrit.osmocom.org/11735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c Gerrit-Change-Number: 11735 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 14:12:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:26:59 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 12 Nov 2018 14:26:59 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c File src/gprs/gprs_sndcp_xid.c: https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 538 PS1, Line 538: return SNDCP_XID_INVALID_COMPRESSION; > before, there is a comparison " != -1" replaced with " != SNDCP_XID_INVALID_COMPRESSION". [?] Good point. See https://gerrit.osmocom.org/c/osmo-sgsn/+/11730 https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 1299 PS1, Line 1299: return SNDCP_XID_INVALID_COMPRESSION; > not sure whether this makes sense. Above and below, -EINVAL is returned or a length when successful. Indeed, that change is wrong. https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 1444 PS1, Line 1444: if (compclass != SNDCP_XID_INVALID_COMPRESSION) { > It's a bit awkward to follow this logic, both before and after this patch. [?] Before this patch, algo was set to -EINVAL on error in gprs_sndcp_get_compression_class(). I believe this is what this condition is supposed to check for. List elements with algo -EINVAL are skipped silently. Elements with an invalid compression class result in an erorr. In the new code, algo is set to INVALID_COMPRESSION instead of -EINVAL upon error. Also, we now need to know the compression class before reading the algorithm, because the algo is now stored in a union and we select union members based on the compression class. But overall, I believe the new code keeps the existing behaviour intact. I will tweak this slightly in the next patch set to avoid nesting the switch-statement inside an if-statement. https://gerrit.osmocom.org/#/c/11656/1/src/gprs/gprs_sndcp_xid.c at 1474 PS1, Line 1474: compclass = gprs_sndcp_get_compression_class(comp_field_dst); > what is the relation between gprs_sndcp_get_compression_class() and the gprs_sndcp_comp. [?] I sort of see what you're getting at but I don't see how to make it any better without blowing up the size of this patch even further. -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 12 Nov 2018 14:26:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:27:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 12 Nov 2018 14:27:41 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11656 to look at the new patch set (#2). Change subject: use enums consistently instead of falling back to int ...................................................................... use enums consistently instead of falling back to int The two existing enums defined in gprs_sndcp_xid.h, for protocol and data compression algorithm numbers respectively, were assigned to 'int' variables when their values were copied to other structures. This prevented the compiler from checking the enum value coverage during switch statements and also tripped up Coverity scans looking for enum value mismatch problems. So instead of copying enums to ints, make use of the enums throughout. Structures which can contain values from both enums now use a union of both, forcing us to be very explicit about which set of values we are dealing with. Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Depends: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 Depends: I8444c1ed052707c76a979fb06cb018ac678defa7 Related: CID#149102 --- M include/osmocom/sgsn/gprs_sndcp_comp.h M include/osmocom/sgsn/gprs_sndcp_xid.h M src/gprs/gprs_sndcp.c M src/gprs/gprs_sndcp_comp.c M src/gprs/gprs_sndcp_dcomp.c M src/gprs/gprs_sndcp_pcomp.c M src/gprs/gprs_sndcp_xid.c M tests/sndcp_xid/sndcp_xid_test.c 8 files changed, 184 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/11656/2 -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:30:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 14:30:09 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.common.inc: add publish target Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11740 Change subject: Makefile.common.inc: add publish target ...................................................................... Makefile.common.inc: add publish target Publishes all generated PDFs to rita.osmocom.org. Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 --- M build/Makefile.common.inc A build/known_hosts 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/40/11740/1 diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index fdef1f0..333bfbe 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -5,6 +5,7 @@ # # Include this file at the end to have the common targets (clean, check etc.) +SSH_COMMAND = ssh -o 'UserKnownHostsFile=$(TOPDIR)/build/known_hosts' -p 48 UPLOAD_PATH ?= generic at sysmocom-downloads:documents CLEAN_FILES += common out @@ -22,3 +23,8 @@ all: $(DOCBOOKS_PDF) $(ASCIIDOC_PDF) check: all $(ASCIIDOC_CHECKS) + +publish: check + mkdir -p out + cp *.pdf out + rsync -avz -e "$(SSH_COMMAND)" ./out/ docs at rita.osmocom.org:web-files/latest/ diff --git a/build/known_hosts b/build/known_hosts new file mode 100644 index 0000000..24075d8 --- /dev/null +++ b/build/known_hosts @@ -0,0 +1,5 @@ +# used by Makefile.common.inc's publish target +[rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 +[rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= +[rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX +|1|O5xYIsE8bHbUW58pmKefGEM6HH8=|j7qxwHHMh+S8ZxFX9sn4N/X3h3M= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:49:43 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 12 Nov 2018 14:49:43 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/11480 ) Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 12 Nov 2018 14:49:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:50:30 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Mon, 12 Nov 2018 14:50:30 +0000 Subject: Change in pysim[master]: pySim-*.py: refactor card reader driver initialization In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/11481 ) Change subject: pySim-*.py: refactor card reader driver initialization ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97 Gerrit-Change-Number: 11481 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: tnt Gerrit-Comment-Date: Mon, 12 Nov 2018 14:50:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:52:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 14:52:44 +0000 Subject: Change in osmo-dev[master]: gitignore: add make/ and net/ (with exceptions) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11741 Change subject: gitignore: add make/ and net/ (with exceptions) ...................................................................... gitignore: add make/ and net/ (with exceptions) Ignore all files and folders that get created when following the README and net/README instructions. Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 --- M .gitignore 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/41/11741/1 diff --git a/.gitignore b/.gitignore index 1f4e0d8..42ba1db 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,16 @@ tags *.pyc make-* +make/ src/* !src/g !src/e !src/st !src/s !src/README +net/* +!net/tmpl_* +!net/config_2g3g +!net/common_* +!net/README +!net/fill_config.py -- To view, visit https://gerrit.osmocom.org/11741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 Gerrit-Change-Number: 11741 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 14:58:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 14:58:48 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.common.inc: add publish target In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: Makefile.common.inc: add publish target ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 14:58:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:04:24 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 15:04:24 +0000 Subject: Change in osmo-bsc[master]: always directly send BSSMAP Clear Request In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11700 ) Change subject: always directly send BSSMAP Clear Request ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39fae24260a4bb7a6af704ebe760f93fff566536 Gerrit-Change-Number: 11700 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 15:04:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:05:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 15:05:50 +0000 Subject: Change in osmo-bts[master]: bts: Allocate TRX for BTS dynamically, deprecate -t In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11735 to look at the new patch set (#2). Change subject: bts: Allocate TRX for BTS dynamically, deprecate -t ...................................................................... bts: Allocate TRX for BTS dynamically, deprecate -t No need to pass -t num_trx anymore to specify number of TRX to use. It is calculated based on dynamic allocation from VTY config. Using parameter -t is flagged as deprecated and is transformed into a NOOP por backward compatibility. As a result, TRX now are allocated after the BTS is allocated and initial config (pre-VTY) is applied. A new function bts_trx_init() is added, to set default config on each TRX during allocation and before setting VTY config on it. A new per BTS model function bts_model_trx_init() is added, to allow per model specific default configuration of each TRX. Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c --- M include/osmo-bts/bts.h M include/osmo-bts/bts_model.h M src/common/bts.c M src/common/main.c M src/common/vty.c M src/osmo-bts-litecell15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c M tests/handover/handover_test.c M tests/meas/meas_test.c M tests/stubs.c M tests/sysmobts/sysmobts_test.c 16 files changed, 118 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/11735/2 -- To view, visit https://gerrit.osmocom.org/11735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c Gerrit-Change-Number: 11735 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:05:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 15:05:53 +0000 Subject: Change in osmo-bts[master]: bts: Allocate TRX for BTS dynamically, deprecate -t In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11735 ) Change subject: bts: Allocate TRX for BTS dynamically, deprecate -t ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11735/1/src/osmo-bts-octphy/l1_if.c File src/osmo-bts-octphy/l1_if.c: https://gerrit.osmocom.org/#/c/11735/1/src/osmo-bts-octphy/l1_if.c at 795 PS1, Line 795: bts_model_trx_init > For some reason, most of the 'bts_model_*' functions are here. [?] Probably, but that's a separate topic and anyway there's no interest in working on octphy related stuff right now. S for now I'm keeping current structure here. -- To view, visit https://gerrit.osmocom.org/11735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c Gerrit-Change-Number: 11735 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 15:05:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:08:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 15:08:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add inter-bsc ho incoming failure tests In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11699 ) Change subject: bsc: add inter-bsc ho incoming failure tests ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11699/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11699/1/bsc/BSC_Tests.ttcn at 2601 PS1, Line 2601: (Whitespace error, there are more below.) -- To view, visit https://gerrit.osmocom.org/11699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe Gerrit-Change-Number: 11699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 15:08:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 12 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 12 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#305?= In-Reply-To: <270745315.540.1541949007632.JavaMail.jenkins@jenkins.osmocom.org> References: <270745315.540.1541949007632.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1749816646.555.1542035407390.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:11:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 15:11:37 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: drop unused enum sacch_deact In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11665 ) Change subject: abis_rsl.c: drop unused enum sacch_deact ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a1542e92373d2773699744e7b64a08667a4b0f5 Gerrit-Change-Number: 11665 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 15:11:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:25:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 15:25:12 +0000 Subject: Change in pysim[master]: pySim/transport: introduce Calypso based reader interface In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11480 ) Change subject: pySim/transport: introduce Calypso based reader interface ...................................................................... pySim/transport: introduce Calypso based reader interface This interface allows to use a Calypso based phone (e.g. Motorola C1XX) as a SIM card reader. It basically implements a few L1CTL messages that are used to interact with the SIM card through the OsmocomBB 'layer1' firmware. Please note, that this is an experimental implementation, and there is a risk that SIM programming would fail. Nevertheless, I've managed to program and read one of my SIMs a few times. Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b --- M pySim/exceptions.py A pySim/transport/calypso.py 2 files changed, 160 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve tnt: Looks good to me, approved diff --git a/pySim/exceptions.py b/pySim/exceptions.py index 403f54c..831b1c9 100644 --- a/pySim/exceptions.py +++ b/pySim/exceptions.py @@ -31,3 +31,6 @@ class ProtocolError(exceptions.Exception): pass + +class ReaderError(exceptions.Exception): + pass diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py new file mode 100644 index 0000000..fd501b5 --- /dev/null +++ b/pySim/transport/calypso.py @@ -0,0 +1,157 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +""" pySim: Transport Link for Calypso bases phones +""" + +# +# Copyright (C) 2018 Vadim Yanitskiy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +from __future__ import absolute_import + +import select +import struct +import socket +import os + +from pySim.transport import LinkBase +from pySim.exceptions import * +from pySim.utils import h2b, b2h + +class L1CTLMessage(object): + + # Every (encoded) L1CTL message has the following structure: + # - msg_length (2 bytes, net order) + # - l1ctl_hdr (packed structure) + # - msg_type + # - flags + # - padding (2 spare bytes) + # - ... payload ... + + def __init__(self, msg_type, flags = 0x00): + # Init L1CTL message header + self.data = struct.pack("BBxx", msg_type, flags) + + def gen_msg(self): + return struct.pack("!H", len(self.data)) + self.data + +class L1CTLMessageReset(L1CTLMessage): + + # L1CTL message types + L1CTL_RESET_REQ = 0x0d + L1CTL_RESET_IND = 0x07 + L1CTL_RESET_CONF = 0x0e + + # Reset types + L1CTL_RES_T_BOOT = 0x00 + L1CTL_RES_T_FULL = 0x01 + L1CTL_RES_T_SCHED = 0x02 + + def __init__(self, type = L1CTL_RES_T_FULL): + super(L1CTLMessageReset, self).__init__(self.L1CTL_RESET_REQ) + self.data += struct.pack("Bxxx", type) + +class L1CTLMessageSIM(L1CTLMessage): + + # SIM related message types + L1CTL_SIM_REQ = 0x16 + L1CTL_SIM_CONF = 0x17 + + def __init__(self, pdu): + super(L1CTLMessageSIM, self).__init__(self.L1CTL_SIM_REQ) + self.data += pdu + +class CalypsoSimLink(LinkBase): + + def __init__(self, sock_path = "/tmp/osmocom_l2"): + # Make sure that a given socket path exists + if not os.path.exists(sock_path): + raise ReaderError("There is no such ('%s') UNIX socket" % sock_path) + + print("Connecting to osmocon at '%s'..." % sock_path) + + # Establish a client connection + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.sock.connect(sock_path) + + def __del__(self): + self.sock.close() + + def wait_for_rsp(self, exp_len = 128): + # Wait for incoming data (timeout is 3 seconds) + s, _, _ = select.select([self.sock], [], [], 3.0) + if not s: + raise ReaderError("Timeout waiting for card response") + + # Receive expected amount of bytes from osmocon + rsp = self.sock.recv(exp_len) + return rsp + + def reset_card(self): + # Request FULL reset + req_msg = L1CTLMessageReset() + self.sock.send(req_msg.gen_msg()) + + # Wait for confirmation + rsp = self.wait_for_rsp() + rsp_msg = struct.unpack_from("!HB", rsp) + if rsp_msg[1] != L1CTLMessageReset.L1CTL_RESET_CONF: + raise ReaderError("Failed to reset Calypso PHY") + + def connect(self): + self.reset_card() + + def disconnect(self): + pass # Nothing to do really ... + + def wait_for_card(self, timeout = None, newcardonly = False): + pass # Nothing to do really ... + + def send_apdu_raw(self, pdu): + """see LinkBase.send_apdu_raw""" + + # Request FULL reset + req_msg = L1CTLMessageSIM(h2b(pdu)) + self.sock.send(req_msg.gen_msg()) + + # Read message length first + rsp = self.wait_for_rsp(struct.calcsize("!H")) + msg_len = struct.unpack_from("!H", rsp)[0] + if msg_len < struct.calcsize("BBxx"): + raise ReaderError("Missing L1CTL header for L1CTL_SIM_CONF") + + # Read the whole message then + rsp = self.sock.recv(msg_len) + + # Verify L1CTL header + hdr = struct.unpack_from("BBxx", rsp) + if hdr[0] != L1CTLMessageSIM.L1CTL_SIM_CONF: + raise ReaderError("Unexpected L1CTL message received") + + # Verify the payload length + offset = struct.calcsize("BBxx") + if len(rsp) <= offset: + raise ProtocolError("Empty response from SIM?!?") + + # Omit L1CTL header + rsp = rsp[offset:] + + # Unpack data and SW + data = rsp[:-2] + sw = rsp[-2:] + + return b2h(data), b2h(sw) -- To view, visit https://gerrit.osmocom.org/11480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iec8101140581bf9e2cf7cf3a0b54bdf1875fc51b Gerrit-Change-Number: 11480 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:25:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 15:25:13 +0000 Subject: Change in pysim[master]: pySim-*.py: refactor card reader driver initialization In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11481 ) Change subject: pySim-*.py: refactor card reader driver initialization ...................................................................... pySim-*.py: refactor card reader driver initialization This would facilitate adding new card reader drivers. Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97 --- M pySim-prog.py M pySim-read.py 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, approved Harald Welte: Looks good to me, but someone else must approve diff --git a/pySim-prog.py b/pySim-prog.py index ae5e482..ba1b783 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -562,13 +562,13 @@ # Parse options opts = parse_options() - # Connect to the card - if opts.pcsc_dev is None: - from pySim.transport.serial import SerialSimLink - sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) - else: + # Init card reader driver + if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + else: # Serial reader is default + from pySim.transport.serial import SerialSimLink + sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) # Create command layer scc = SimCardCommands(transport=sl) diff --git a/pySim-read.py b/pySim-read.py index e807e3e..066b0df 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -70,13 +70,13 @@ # Parse options opts = parse_options() - # Connect to the card - if opts.pcsc_dev is None: - from pySim.transport.serial import SerialSimLink - sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) - else: + # Init card reader driver + if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + else: # Serial reader is default + from pySim.transport.serial import SerialSimLink + sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) # Create command layer scc = SimCardCommands(transport=sl) -- To view, visit https://gerrit.osmocom.org/11481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97 Gerrit-Change-Number: 11481 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:25:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 15:25:14 +0000 Subject: Change in pysim[master]: pySim-*.py: add command line option for Calypso reader In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11482 ) Change subject: pySim-*.py: add command line option for Calypso reader ...................................................................... pySim-*.py: add command line option for Calypso reader Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df --- M pySim-prog.py M pySim-read.py 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/pySim-prog.py b/pySim-prog.py index ba1b783..d6d7ad5 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -58,6 +58,10 @@ help="Which PC/SC reader number for SIM access", default=None, ) + parser.add_option("--osmocon", dest="osmocon_sock", metavar="PATH", + help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)", + default=None, + ) parser.add_option("-t", "--type", dest="type", help="Card type (user -t list to view) [default: %default]", default="auto", @@ -566,6 +570,9 @@ if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + elif opts.osmocon_sock is not None: + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock) else: # Serial reader is default from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) diff --git a/pySim-read.py b/pySim-read.py index 066b0df..4356453 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -56,6 +56,10 @@ help="Which PC/SC reader number for SIM access", default=None, ) + parser.add_option("--osmocon", dest="osmocon_sock", metavar="PATH", + help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)", + default=None, + ) (options, args) = parser.parse_args() @@ -74,6 +78,9 @@ if opts.pcsc_dev is not None: from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) + elif opts.osmocon_sock is not None: + from pySim.transport.calypso import CalypsoSimLink + sl = CalypsoSimLink(sock_path=opts.osmocon_sock) else: # Serial reader is default from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) -- To view, visit https://gerrit.osmocom.org/11482 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df Gerrit-Change-Number: 11482 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Assignee: tnt Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: tnt -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:40:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 15:40:05 +0000 Subject: Change in osmo-bsc[master]: coverity: gscon_forget_lchan: squelch forward-null Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11742 Change subject: coverity: gscon_forget_lchan: squelch forward-null ...................................................................... coverity: gscon_forget_lchan: squelch forward-null conn->fi should actually never be NULL, they are allocated and discarded simultaneously. So check its null from the start and remove some conditions below, to remove the coverity warning. The warning was introduced in recent 946d1fb5c7f4a593567b407222c9235f8fac7a59 Related: CID 189671 Change-Id: I62354aa998832131c86535f39a29294000114adc --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/11742/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 4d6521f..3a4ae7e 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -652,7 +652,7 @@ void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) { const char *detach_label = NULL; - if (!conn) + if (!conn || !conn->fi) return; if (!lchan) return; @@ -672,13 +672,12 @@ /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ if (detach_label) { - if (conn->fi) - LOGPFSML(conn->fi, LOGL_DEBUG, "conn detaches lchan %s\n", - lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); + LOGPFSML(conn->fi, LOGL_DEBUG, "conn detaches lchan %s\n", + lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); if (lchan->fi) LOGPFSML(lchan->fi, LOGL_DEBUG, "conn %s detaches lchan (%s)\n", - conn->fi? osmo_fsm_inst_name(conn->fi) : "(conn without FSM)", + osmo_fsm_inst_name(conn->fi) : "(conn without FSM)", detach_label); } -- To view, visit https://gerrit.osmocom.org/11742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I62354aa998832131c86535f39a29294000114adc Gerrit-Change-Number: 11742 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:50:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 15:50:59 +0000 Subject: Change in osmo-bts[master]: bts: Allocate TRX for BTS dynamically, deprecate -t In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11735 to look at the new patch set (#3). Change subject: bts: Allocate TRX for BTS dynamically, deprecate -t ...................................................................... bts: Allocate TRX for BTS dynamically, deprecate -t No need to pass -t num_trx anymore to specify number of TRX to use. It is calculated based on dynamic allocation from VTY config. Using parameter -t is flagged as deprecated and is transformed into a NOOP por backward compatibility. As a result, TRX now are allocated after the BTS is allocated and initial config (pre-VTY) is applied. A new function bts_trx_init() is added, to set default config on each TRX during allocation and before setting VTY config on it. A new per BTS model function bts_model_trx_init() is added, to allow per model specific default configuration of each TRX. Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c --- M include/osmo-bts/bts.h M include/osmo-bts/bts_model.h M src/common/bts.c M src/common/main.c M src/common/vty.c M src/osmo-bts-litecell15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c M tests/handover/handover_test.c M tests/meas/meas_test.c M tests/stubs.c M tests/sysmobts/sysmobts_test.c 16 files changed, 119 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/11735/3 -- To view, visit https://gerrit.osmocom.org/11735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c Gerrit-Change-Number: 11735 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 15:52:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 15:52:11 +0000 Subject: Change in osmo-bts[master]: bts: Allocate TRX for BTS dynamically, deprecate -t In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11735 ) Change subject: bts: Allocate TRX for BTS dynamically, deprecate -t ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c Gerrit-Change-Number: 11735 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 15:52:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:06:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 12 Nov 2018 16:06:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: support odd-length calling MSISDN in MSC tests Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11743 Change subject: support odd-length calling MSISDN in MSC tests ...................................................................... support odd-length calling MSISDN in MSC tests MSC tests were unable to match odd-length digit strings in a CallingPartyBCD_Number template created by tr_Calling(). This happens because the raw encoder for CallingPartyBCD_Number pads odd-length digits with 1-bits ('F'H). Do the same when constructing such a template in our own code to ensure that we'll match the actual data received. Change-Id: I34439c8750f588802a5403375e2a3d6e74dae70c Related: OS#2930 --- M library/L3_Templates.ttcn M msc/MSC_Tests.ttcn 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/11743/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 52d4a2a..e109fde 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -838,11 +838,20 @@ digits := digits } +private function f_pad_digits(hexstring digits) return hexstring { + if (lengthof(digits) mod 2 != 0) { + /* Add trailing nibble of 1-bit padding, like the CallingPartyBCD_Number encoder would do. + * Otherwise our template won't match the data received (see OS#2930). */ + return digits & 'F'H; + } + return digits; +} + template CallingPartyBCD_Number tr_Calling(template hexstring digits) := { elementIdentifier := '5C'O, lengthIndicator := ?, oct3 := ?, - digits := digits + digits := f_pad_digits(valueof(digits)) } type integer SpeechVer; diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c0cd9d3..2a6c034 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1722,8 +1722,7 @@ /* LU followed by MT call (including paging) */ private function f_tc_lu_and_mt_call(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { f_init_handler(pars); - //FIXME: odd digits var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); - var CallParameters cpars := valueof(t_CallParams('123456'H, 0)); + var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); cpars.bss_rtp_port := 1110; cpars.mgcp_connection_id_bss := '10004'H; cpars.mgcp_connection_id_mss := '10005'H; @@ -1845,8 +1844,7 @@ /* LU followed by MT call (including paging) */ private function f_tc_lu_and_mt_call_no_dlcx_resp(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { f_init_handler(pars); - //FIXME: odd digits var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); - var CallParameters cpars := valueof(t_CallParams('123456'H, 0)); + var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); cpars.bss_rtp_port := 1110; cpars.mgcp_connection_id_bss := '10004'H; cpars.mgcp_connection_id_mss := '10005'H; -- To view, visit https://gerrit.osmocom.org/11743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I34439c8750f588802a5403375e2a3d6e74dae70c Gerrit-Change-Number: 11743 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:07:13 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 12 Nov 2018 16:07:13 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11716 to look at the new patch set (#3). Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. Allows dialing of numbers with GSM340_PLAN_UNKNOWN, for example a number beginning with '*' Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 --- M src/mncc.c 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/16/11716/3 -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:12:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 16:12:38 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11716 ) Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 16:12:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:16:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 12 Nov 2018 16:16:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Fix DTE by requesting the correct type In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11637 ) Change subject: hlr: Fix DTE by requesting the correct type ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5075b17a810762651e0c7d638cc4c35c58436cd9 Gerrit-Change-Number: 11637 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 16:16:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:17:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 16:17:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Fix DTE by requesting the correct type In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11637 ) Change subject: hlr: Fix DTE by requesting the correct type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5075b17a810762651e0c7d638cc4c35c58436cd9 Gerrit-Change-Number: 11637 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 16:17:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:17:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 16:17:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: hlr: Fix DTE by requesting the correct type In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11637 ) Change subject: hlr: Fix DTE by requesting the correct type ...................................................................... hlr: Fix DTE by requesting the correct type Previous commit d686a8a54873eb61fae7d55cb001378dae3fbd7d from Vadim introduced a copy and paste error. Change-Id: I5075b17a810762651e0c7d638cc4c35c58436cd9 --- M hlr/HLR_EUSE.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hlr/HLR_EUSE.ttcn b/hlr/HLR_EUSE.ttcn index 93eb8f4..fbb496c 100644 --- a/hlr/HLR_EUSE.ttcn +++ b/hlr/HLR_EUSE.ttcn @@ -58,7 +58,7 @@ var SS_FacilityInformation dec_fac, rsp_fac; var octetstring ss_rsp; - f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, state_ie); + f_gsup_find_ie(rx_pdu, OSMO_GSUP_SESSION_STATE_IE, state_ie); var GSUP_SessionState ss_state := state_ie.session_state; f_gsup_find_ie(rx_pdu, OSMO_GSUP_SS_INFO_IE, ss_ie); -- To view, visit https://gerrit.osmocom.org/11637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5075b17a810762651e0c7d638cc4c35c58436cd9 Gerrit-Change-Number: 11637 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:19:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 16:19:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: support odd-length calling MSISDN in MSC tests In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11743 ) Change subject: support odd-length calling MSISDN in MSC tests ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11743/1/library/L3_Templates.ttcn File library/L3_Templates.ttcn: https://gerrit.osmocom.org/#/c/11743/1/library/L3_Templates.ttcn at 841 PS1, Line 841: private function f_pad_digits(hexstring digits) return hexstring { Could you please share this function somewhere? I think we can use it at least in the current GSUP_Types.ttcn, and in the upcoming SMS related patches... -- To view, visit https://gerrit.osmocom.org/11743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34439c8750f588802a5403375e2a3d6e74dae70c Gerrit-Change-Number: 11743 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 16:19:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:22:07 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 12 Nov 2018 16:22:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: support odd-length calling MSISDN in MSC tests In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11743 ) Change subject: support odd-length calling MSISDN in MSC tests ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11743/1/library/L3_Templates.ttcn File library/L3_Templates.ttcn: https://gerrit.osmocom.org/#/c/11743/1/library/L3_Templates.ttcn at 841 PS1, Line 841: private function f_pad_digits(hexstring digits) return hexstring { > Could you please share this function somewhere? [?] Sure we can. Would it be enough to do that in a separate patch, if this one gets merged? -- To view, visit https://gerrit.osmocom.org/11743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34439c8750f588802a5403375e2a3d6e74dae70c Gerrit-Change-Number: 11743 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 16:22:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:24:47 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 16:24:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: support odd-length calling MSISDN in MSC tests In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11743 ) Change subject: support odd-length calling MSISDN in MSC tests ...................................................................... Patch Set 1: Sure, thanks! -- To view, visit https://gerrit.osmocom.org/11743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34439c8750f588802a5403375e2a3d6e74dae70c Gerrit-Change-Number: 11743 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 16:24:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:27:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 16:27:00 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Log domain and fix strings without endl char Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11744 Change subject: osmo_ortp: Log domain and fix strings without endl char ...................................................................... osmo_ortp: Log domain and fix strings without endl char Change-Id: Ib6df0df04cd6ba342753c84398274d04917ace40 --- M src/trau/osmo_ortp.c 1 file changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/44/11744/1 diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index d8f4abf..0eb1661 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -102,8 +102,35 @@ #endif OrtpLogLevel lev, const char *fmt, va_list args) { + /* Some strings coming from ortp are not endline terminated and mangle + * the output. Make sure all strings are endl terminated before + * printing. + */ + int needs_endl; + const char *domain_str; + char *str; + size_t fmt_len = strlen(fmt); +#if HAVE_ORTP_LOG_DOMAIN + /* domain can be NULL, found experimentally */ + domain_str = domain ? : ""; +#else + domain_str = ""; +#endif + size_t domain_len = strlen(domain_str); + + if (fmt_len == 0) + return; + + needs_endl = fmt[fmt_len - 1] != '\n' ? 1 : 0; + + str = osmo_ortp_malloc(domain_len + 2 /*": "*/ + fmt_len + needs_endl + 1); + sprintf(str, "%s%s%s%s", domain_str, domain_len ? ": " : "", fmt, needs_endl ? "\n" : ""); + osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0, - 0, fmt, args); + 0, str, args); + + osmo_ortp_free(str); + } /* ORTP signal callbacks */ -- To view, visit https://gerrit.osmocom.org/11744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6df0df04cd6ba342753c84398274d04917ace40 Gerrit-Change-Number: 11744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:36:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 16:36:03 +0000 Subject: Change in osmo-bsc[master]: coverity: gscon_forget_lchan: squelch forward-null In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11742 ) Change subject: coverity: gscon_forget_lchan: squelch forward-null ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11742/1/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/#/c/11742/1/src/osmo-bsc/bsc_subscr_conn_fsm.c at 655 PS1, Line 655: if (!conn || !conn->fi) Do we really then need this check at all if they are allocated and removed at the same time? "if (!conn)" should be enough right? -- To view, visit https://gerrit.osmocom.org/11742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62354aa998832131c86535f39a29294000114adc Gerrit-Change-Number: 11742 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 16:36:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:37:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 16:37:42 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11716 ) Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 16:37:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 16:58:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 16:58:48 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 894 PS1, Line 894: msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); > I think we recently added some code to generate this cause with 1-2 bytes. [?] I'm also not so sure whether this is identical on both big- and little-endian. a uint16_t isn't necessarily == a uint8_t[2]...? https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 897 PS1, Line 897: lai_ci.ident = CELL_IDENT_WHOLE_GLOBAL; > should this come from params ptr? Yes, please let the caller decide on the specific cell identity type (add a struct gsm0808_cell_id to params), and please use gsm0808_enc_cell_id(). -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 16:58:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:00:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 17:00:39 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Enable tests for LimeSDR-USB Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11745 Change subject: default-suites: Enable tests for LimeSDR-USB ...................................................................... default-suites: Enable tests for LimeSDR-USB Change-Id: I896ea76f1d2847ec014a62c87220d184b95d1dd2 --- M example/default-suites.conf 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/45/11745/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index df79232..07b8a5f 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -74,6 +74,26 @@ - dynts:trx-umtrx+mod-bts0-dynts67-ipa+cfg-codec-fr-any - dynts:trx-umtrx+mod-bts0-dynts67-osmo +- nitb_sms:trx-lms +- sms:trx-lms +- nitb_ussd:trx-lms +- ussd:trx-lms +- voice:trx-lms+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:trx-lms+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:trx-lms+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:trx-lms+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:trx-lms+mod-bts0-ts-tchh+cfg-codec-hr3 +- voice:trx-lms+mod-bts0-dynts-ipa+cfg-codec-fr-any +- voice:trx-lms+mod-bts0-dynts-osmo +- voice:trx-lms+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- gprs:trx-lms +- gprs:trx-lms+mod-bts0-egprs +- gprs:trx-lms+mod-bts0-dynts-ipa +- gprs:trx-lms+mod-bts0-dynts-osmo +- gprs:trx-lms+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- dynts:trx-lms+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:trx-lms+mod-bts0-dynts67-osmo + - nitb_sms:nanobts - sms:nanobts+band-1900 - nitb_ussd:nanobts+band-1900 -- To view, visit https://gerrit.osmocom.org/11745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I896ea76f1d2847ec014a62c87220d184b95d1dd2 Gerrit-Change-Number: 11745 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:14:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:14:19 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 1: Code-Review+1 (4 comments) patch looks good, but only +1 to wait for passing the complete gsm0808_cell_id in params, as noted in the other patch, 11728 https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 678 PS1, Line 678: struct gsm0808_handover_performed ho_perf_params; "perf" to me reads as "performance test" :P ... whatever https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 688 PS1, Line 688: cell = cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)); (cgi_for_msc is a weird name, my fault; note to self to rename it) https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 791 PS1, Line 791: if (result == HO_RESULT_OK && (ho->scope & HO_INTRA_CELL || ho->scope & HO_INTRA_BSC)) && (ho->scope & (HO_INTRA_CELL | HO_INTRA_BSC)) ... the more I look at it the more I believe using a bit field instead of a plain enum was a mistake. note to self to tweak that. https://gerrit.osmocom.org/#/c/11734/1/tests/handover/handover_test.c File tests/handover/handover_test.c: https://gerrit.osmocom.org/#/c/11734/1/tests/handover/handover_test.c at 223 PS1, Line 223: fake_msc_data.network = &fake_bsc_gsmnet; > Why is this needed? we're in a test; and probably something dereferences a struct msc_data->network that isn't critical for the test, so this avoids a segfault. -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 17:14:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:16:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:16:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11733 ) Change subject: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11733/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11733/1/bsc/BSC_Tests.ttcn at 2192 PS1, Line 2192: BSSAP.receive(tr_BSSMAP_HandoverPerformed); will we *always* send a handover performed, or only when the codec changed? IIUC the MSC need not be bothered with it if the RTP remains identical. -- To view, visit https://gerrit.osmocom.org/11733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10f4e578c96a90317939ba49b61b14a3c7e488a7 Gerrit-Change-Number: 11733 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 12 Nov 2018 17:16:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:17:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:17:27 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 792 PS1, Line 792: send_handover_performed(conn); should we *always* send a handover performed, or only when the codec changed? IIUC the MSC need not be bothered with it if the RTP remains identical. -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 17:17:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:22:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 12 Nov 2018 17:22:26 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11746 Change subject: Store subscriber's cell identity ...................................................................... Store subscriber's cell identity It's defined similar to LAC and could be potentially useful for constructing GCR for LCLS. Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Related: OS#2487 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface_bssap.c M src/libmsc/iucs.c M src/libmsc/subscr_conn.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_tests.c 7 files changed, 18 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/11746/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 085248c..213ee02 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -127,7 +127,8 @@ /* connected via 2G or 3G? */ enum ran_type via_ran; - uint16_t lac; + uint16_t lac; /* 3GPP TS 24.008 ?10.5.1.3 */ + uint16_t ci; /* 3GPP TS 24.008 ?10.5.1.1 */ struct gsm_encr encr; /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 3ffb65c..e0b4f46 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -48,7 +48,7 @@ }; struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network *network, - enum ran_type via_ran, uint16_t lac); + enum ran_type via_ran, uint16_t lac, uint16_t ci); void msc_subscr_conn_update_id(struct gsm_subscriber_connection *conn, enum complete_layer3_type from, const char *id); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 282fd73..5e7db63 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -48,13 +48,14 @@ /* Allocate a new subscriber connection */ static struct gsm_subscriber_connection *subscr_conn_allocate_a(const struct a_conn_info *a_conn_info, struct gsm_network *network, - uint16_t lac, struct osmo_sccp_user *scu, int conn_id) + uint16_t lac, uint16_t ci, + struct osmo_sccp_user *scu, int conn_id) { struct gsm_subscriber_connection *conn; - LOGP(DMSC, LOGL_DEBUG, "Allocating A-Interface subscriber conn: lac %i, conn_id %i\n", lac, conn_id); + LOGP(DMSC, LOGL_DEBUG, "Allocating A-Interface subscriber conn: lac %i, ci %i, conn_id %i\n", lac, ci, conn_id); - conn = msc_subscr_conn_alloc(network, RAN_GERAN_A, lac); + conn = msc_subscr_conn_alloc(network, RAN_GERAN_A, lac, ci); if (!conn) return NULL; @@ -257,7 +258,7 @@ struct msgb *msg, struct tlv_parsed *tp) { struct gsm0808_cell_id_list2 cil; - uint16_t lac = 0; + uint16_t lac = 0, ci = 0; uint8_t data_length; const uint8_t *data; int rc; @@ -296,11 +297,13 @@ return -EINVAL; } lac = id->lai.lac; + ci = id->cell_identity; break; } case CELL_IDENT_LAC_AND_CI: { const struct osmo_lac_and_ci_id *id = &cil.id_list[0].lac_and_ci; lac = id->lac; + ci = id->ci; break; } case CELL_IDENT_LAI_AND_LAC: { @@ -317,7 +320,8 @@ lac = cil.id_list[0].lac; break; - case CELL_IDENT_CI: + case CELL_IDENT_CI: /* FIXME: why LAC is mandatory is we have CI? */ + ci = cil.id_list[0].ci; case CELL_IDENT_NO_CELL: case CELL_IDENT_BSS: LOGP(DBSSAP, LOGL_ERROR, @@ -342,7 +346,7 @@ } /* Create new subscriber context */ - conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id); + conn = subscr_conn_allocate_a(a_conn_info, network, lac, ci, scu, a_conn_info->conn_id); /* Handover location update to the MSC code */ rc = msc_compl_l3(conn, msg, 0); diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index a3092f8..0fe7e78 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -57,7 +57,7 @@ DEBUGP(DIUCS, "Allocating IuCS subscriber conn: lac %d, conn_id %" PRIx32 "\n", lac, ue->conn_id); - conn = msc_subscr_conn_alloc(network, RAN_UTRAN_IU, lac); + conn = msc_subscr_conn_alloc(network, RAN_UTRAN_IU, lac, 0); /* FIXME: is there equivalent for CI? */ if (!conn) return NULL; diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index e6fa7e1..6bbbeed 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -628,7 +628,7 @@ * conn. As long as the FSM is waiting for responses from the subscriber, it will itself hold a use count * on the conn. */ struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network *network, - enum ran_type via_ran, uint16_t lac) + enum ran_type via_ran, uint16_t lac, uint16_t ci) { struct gsm_subscriber_connection *conn; struct osmo_fsm_inst *fi; @@ -649,6 +649,7 @@ .network = network, .via_ran = via_ran, .lac = lac, + .ci = ci, .fi = fi, }; diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index 247e7ae..5a50420 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -31,7 +31,7 @@ EXPECT_ACCEPTED(false); btw("freshly allocated conn"); - g_conn = msc_subscr_conn_alloc(net, RAN_GERAN_A, 123); + g_conn = msc_subscr_conn_alloc(net, RAN_GERAN_A, 123, 0); EXPECT_ACCEPTED(false); btw("conn_fsm present, in state NEW"); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 1192cf2..f887837 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -191,7 +191,7 @@ struct gsm_subscriber_connection *conn_new(void) { struct gsm_subscriber_connection *conn; - conn = msc_subscr_conn_alloc(net, rx_from_ran, 23); + conn = msc_subscr_conn_alloc(net, rx_from_ran, 23, 0); if (conn->via_ran == RAN_UTRAN_IU) { struct ranap_ue_conn_ctx *ue_ctx = talloc_zero(conn, struct ranap_ue_conn_ctx); *ue_ctx = (struct ranap_ue_conn_ctx){ -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:23:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:23:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 4: Code-Review+2 (1 comment) though I'm not familiar I'm going to assume this is correct https://gerrit.osmocom.org/#/c/11697/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11697/4//COMMIT_MSG at 9 PS4, Line 9: There are some upcomming tests which require to access the control it's "upcoming", but nevermind -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 12 Nov 2018 17:23:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:25:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:25:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 4: added bonus if you include the change-id of a patch using this in the commit log -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 12 Nov 2018 17:25:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:25:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:25:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11701 ) Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... Patch Set 2: Code-Review+2 added bonus if you include the change-id of a patch using this in the commit log -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 12 Nov 2018 17:25:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:27:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:27:34 +0000 Subject: Change in osmo-msc[master]: vlr: use unused is_ps parameter in vlr_subscr_req_lu() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11563 ) Change subject: vlr: use unused is_ps parameter in vlr_subscr_req_lu() ...................................................................... Patch Set 1: Code-Review-1 let's rather drop the argument and always use vlr->cfg.is_ps directly. There is no situation where these could possibly differ. -- To view, visit https://gerrit.osmocom.org/11563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idfc925f2cb254d192e86568958b5ecb68fac09da Gerrit-Change-Number: 11563 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 12 Nov 2018 17:27:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:30:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:30:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 2: Code-Review-1 Then the test startup should be able to decide which handler has a CTRL interface and which doesn't. Also related, I remember the VTY implementation in ttcn also first had this limitation, and fairly recently was extended to be able to work with multiple VTY at the same time. Please take a look whether that can be applied to CTRL as well, it's both essentially telnet, after all. -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 12 Nov 2018 17:30:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:30:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:30:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 4: Code-Review+1 removing my +2 again to resolve the conflict between MSC and BSC handlers' ctrl interface usage first. -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 12 Nov 2018 17:30:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:33:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:33:36 +0000 Subject: Change in osmo-dev[master]: gits: use git plumbing commands In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11706 ) Change subject: gits: use git plumbing commands ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42544313d14db126c99e2d9a02b8f63031944947 Gerrit-Change-Number: 11706 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 17:33:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:33:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:33:37 +0000 Subject: Change in osmo-dev[master]: gits: use git plumbing commands In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11706 ) Change subject: gits: use git plumbing commands ...................................................................... gits: use git plumbing commands Instead of 'git status' and 'git branch', which change their output depending on the git version and locale, use the low-level plumbing commands. 'gits status' output is exactly the same, 'gits rebase' output is a bit less redundant now (that was easier to implement). Change-Id: I42544313d14db126c99e2d9a02b8f63031944947 --- M src/gits 1 file changed, 92 insertions(+), 92 deletions(-) Approvals: osmith: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/gits b/src/gits index 81083f1..8b75278 100755 --- a/src/gits +++ b/src/gits @@ -18,7 +18,6 @@ import sys import subprocess -import re import argparse import os import shlex @@ -28,11 +27,6 @@ helps to save your time with: status, fetch, rebase, ... ''' -re_status_mods = re.compile('^\t(modified|deleted):.*') -re_status_branch_name = re.compile('On branch ([^ ]*)') -re_branch_name = re.compile('^..([^ ]+) .*') -re_ahead_behind = re.compile('ahead [0-9]+|behind [0-9]+') - def error(*msgs): sys.stderr.write(''.join(msgs)) @@ -67,52 +61,69 @@ return subprocess.check_output(['git', '-C', git_dir, ] + list(args)).decode('utf-8') -def git_branch(git_dir): - status = git_output(git_dir, 'status', '--long') - m = re_status_branch_name.find(status) - if not m: - error('No current branch in %r' % git_dir) - return m.group(1) +def git_bool(git_dir, *args): + try: + subprocess.check_output(['git', '-C', git_dir, ] + list(args)) + return True + except subprocess.CalledProcessError as e: + return False -def git_status(git_dir, verbose=False): - status_lines = git_output(git_dir, 'status').splitlines() - if verbose and len(status_lines): - print(status_lines[0]) +def git_branch_exists(git_dir, branch='origin/master'): + return git_bool(git_dir, 'rev-parse', '--quiet', '--verify', branch) - on_branch = None - branch_status_str = None - local_mods = False - ON_BRANCH = 'On branch ' - STATUS = 'Your branch' +def git_ahead_behind(git_dir, branch='master', remote='origin'): + ''' Count revisions ahead/behind of the remote branch. + returns: (ahead, behind) (e.g. (0, 5)) ''' - for l in status_lines: - if l.startswith(ON_BRANCH): - if on_branch: - error('cannot parse status, more than one branch?') - on_branch = l[len(ON_BRANCH):] - elif l.startswith(STATUS): - if 'Your branch is up to date' in l: - branch_status_str = l - elif 'Your branch is up-to-date' in l: - branch_status_str = l - elif 'Your branch is ahead' in l: - branch_status_str = 'ahead: ' + l - elif 'Your branch is behind' in l: - branch_status_str = 'behind: ' + l - elif 'have diverged' in l: - branch_status_str = 'diverged: ' + l - else: - error('unknown status str: %r' % l) - else: - m = re_status_mods.match(l) - if m: - local_mods = True + # Missing remote branch + if not git_branch_exists(git_dir, remote + '/' + branch): + return (0, 0) - if verbose: - print('%s%s' % (branch_status_str, '\nLOCAL MODS' if local_mods else '')) - return (on_branch, branch_status_str, local_mods) + behind = git_output(git_dir, 'rev-list', '--count', '%s..%s/%s' % (branch, remote, branch)) + ahead = git_output(git_dir, 'rev-list', '--count', '%s/%s..%s' % (remote, branch, branch)) + return (int(ahead.rstrip()), int(behind.rstrip())) + + +def git_branches(git_dir, obj='refs/heads'): + ret = git_output(git_dir, 'for-each-ref', obj, '--format', '%(refname:short)') + return ret.splitlines() + + +def git_branch_current(git_dir): + ret = git_output(git_dir, 'rev-parse', '--abbrev-ref', 'HEAD').rstrip() + if ret == 'HEAD': + return None + return ret + + +def git_has_modifications(git_dir): + return not git_bool(git_dir, 'diff-index', '--quiet', 'HEAD') + + +def git_can_fast_forward(git_dir, branch='master', remote='origin'): + return git_bool(git_dir, 'merge-base', '--is-ancestor', 'HEAD', remote + '/' + branch) + + +def format_branch_ahead_behind(branch, ahead, behind): + ''' branch: string like "master" + ahead, behind: integers like 5, 3 + returns: string like "master", "master[+5]", "master[-3]", "master[+5|-3]" ''' + # Just the branch + if not ahead and not behind: + return branch + + # Suffix with ahead/behind + ret = branch + '[' + if ahead: + ret += '+' + str(ahead) + if behind: + ret += '|' + if behind: + ret += '-' + str(behind) + ret += ']' + return ret def git_branch_summary(git_dir): @@ -122,36 +133,22 @@ interesting_branch_names = ('master',) strs = [git_dir, ] - - on_branch, branch_status_str, has_mods = git_status(git_dir) - - if has_mods: + if git_has_modifications(git_dir): strs.append('MODS') - branch_strs = git_output(git_dir, 'branch', '-vv').splitlines() - - for line in branch_strs: - m = re_branch_name.match(line) - name = m.group(1) - - current_branch = False - if line.startswith('*'): - current_branch = True - elif name not in interesting_branch_names: + branch_current = git_branch_current(git_dir) + for branch in git_branches(git_dir): + is_current = (branch == branch_current) + if not is_current and branch not in interesting_branch_names: continue - ahead_behind = re_ahead_behind.findall(line) - if not ahead_behind and not current_branch: + + ahead, behind = git_ahead_behind(git_dir, branch) + if not ahead and not behind and not is_current: # skip branches that are "not interesting" continue - ahead_behind = [ - x.replace('ahead ', '+').replace('behind ', '-') for x in ahead_behind] - branch_info = name - if ahead_behind: - branch_info = branch_info + ('[%s]' % '|'.join(ahead_behind)) - - strs.append(''.join(branch_info)) - + # Branch with ahead/behind origin info ("master[+1|-5]") + strs.append(format_branch_ahead_behind(branch, ahead, behind)) return strs @@ -236,14 +233,15 @@ def rebase(git_dir): - orig_branch, branch_status_str, local_mods = git_status( - git_dir, verbose=True) - + orig_branch = git_branch_current(git_dir) if orig_branch is None: print('Not on a branch: %s' % git_dir) raise SkipThisRepo() - if local_mods: + print('Rebasing branch: ' + orig_branch) + ahead, behind = git_ahead_behind(git_dir, orig_branch) + + if git_has_modifications(git_dir): do_commit = ask(git_dir, 'Local mods.', 'c commit to this branch', ' commit to new branch', @@ -259,17 +257,29 @@ git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - _, _, local_mods = git_status(git_dir) - - if local_mods: + if git_has_modifications(git_dir): print('There still are local modifications') raise SkipThisRepo() - if branch_status_str is None: + # Missing upstream branch + if not git_branch_exists(git_dir, 'origin/' + orig_branch): print('there is no upstream branch for %r' % orig_branch) - elif branch_status_str.startswith('behind'): - if 'and can be fast-forwarded' in branch_status_str: + # Diverged + elif ahead and behind: + do_reset = ask(git_dir, 'Diverged.', + '%s: git reset --hard origin/%s?' % ( + orig_branch, orig_branch), + ' no', + 'OK yes (write OK in caps!)', + valid_answers=('', 'OK')) + + if do_reset == 'OK': + git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + + # Behind + elif behind: + if git_can_fast_forward(git_dir, orig_branch): print('fast-forwarding...') git(git_dir, 'merge') else: @@ -282,7 +292,8 @@ if do_merge == 'ok': git(git_dir, 'merge') - elif branch_status_str.startswith('ahead'): + # Ahead + elif ahead: do_commit = ask(git_dir, 'Ahead. commit to new branch?', ' no', ' create new branch', @@ -300,17 +311,6 @@ if do_reset == 'OK': git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) - elif branch_status_str.startswith('diverged'): - do_reset = ask(git_dir, 'Diverged.', - '%s: git reset --hard origin/%s?' % ( - orig_branch, orig_branch), - ' no', - 'OK yes (write OK in caps!)', - valid_answers=('', 'OK')) - - if do_reset == 'OK': - git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) - return orig_branch -- To view, visit https://gerrit.osmocom.org/11706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I42544313d14db126c99e2d9a02b8f63031944947 Gerrit-Change-Number: 11706 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:35:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:35:09 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.common.inc: add publish target In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: Makefile.common.inc: add publish target ...................................................................... Patch Set 1: I'm confused, don't we already publish the manuals automatically?! -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Mon, 12 Nov 2018 17:35:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:45:49 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 12 Nov 2018 17:45:49 +0000 Subject: Change in osmo-sip-connector[master]: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11716 ) Change subject: Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. ...................................................................... Allow GSM340_PLAN_UNKNOWN on MNCC originated leg. Allows dialing of numbers with GSM340_PLAN_UNKNOWN, for example a number beginning with '*' Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 --- M src/mncc.c 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index 976a671..ea6a9fc 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -397,14 +397,16 @@ static int continue_setup(struct mncc_connection *conn, const struct gsm_mncc *mncc) { - if (mncc->called.plan != GSM340_PLAN_ISDN) { + switch (mncc->called.plan) { + case GSM340_PLAN_UNKNOWN: + case GSM340_PLAN_ISDN: + return 1; + default: LOGP(DMNCC, LOGL_ERROR, - "leg(%u) has non(%d) ISDN dial plan. not supported.\n", + "leg(%u) has unsupported(%d) dial plan.\n", mncc->callref, mncc->called.plan); return 0; } - - return 1; } /* Check + Process MNCC_SETUP_IND (MO call) */ -- To view, visit https://gerrit.osmocom.org/11716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8d71cac5b169e3b19675b9b9626e6993f3acd979 Gerrit-Change-Number: 11716 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:46:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 17:46:41 +0000 Subject: Change in osmo-gsm-tester[master]: process: Move standalone run_local_sync as method of Process Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11747 Change subject: process: Move standalone run_local_sync as method of Process ...................................................................... process: Move standalone run_local_sync as method of Process Change-Id: Ib2b3fd39db5400a93a8caabae367dac3e3250247 --- M src/osmo_gsm_tester/iperf3.py M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/process.py 3 files changed, 20 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/47/11747/1 diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index e1ed6ff..894b10f 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -105,7 +105,7 @@ self.process = process.NetNSProcess(self.name(), self.run_dir, netns, popen_args, env={}) else: self.process = process.Process(self.name(), self.run_dir, popen_args, env={}) - process.run_proc_sync(self.process) + self.process.launch_sync() return self.get_results() def get_results(self): diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py index d35933a..5106702 100644 --- a/src/osmo_gsm_tester/modem.py +++ b/src/osmo_gsm_tester/modem.py @@ -636,7 +636,7 @@ def run_netns_wait(self, name, popen_args): proc = process.NetNSProcess(name, self.run_dir.new_dir(name), self.netns(), popen_args, env={}) - process.run_proc_sync(proc) + proc.launch_sync() def setup_context_data_plane(self, ctx_id): self.dbg('setup_context_data', path=ctx_id) diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index a845f7f..40d0cc1 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -77,6 +77,21 @@ self.set_name(self.name_str, pid=self.process_obj.pid) self.log('Launched') + def launch_sync(self): + ''' + calls launch() method and block waiting for it to finish, serving the + mainloop meanwhile. + ''' + try: + self.launch() + self.wait() + except Exception as e: + self.terminate() + raise e + if self.result != 0: + log.ctx(self) + raise log.Error('Exited in error') + def respawn(self): self.dbg('respawn') assert not self.is_running() @@ -255,31 +270,20 @@ run_local_netns_sync(self.run_dir, self.name()+"-kill", self.netns, kill_cmd) -def run_proc_sync(proc): - try: - proc.launch() - proc.wait() - except Exception as e: - proc.terminate() - raise e - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') - def run_local_sync(run_dir, name, popen_args): run_dir =run_dir.new_dir(name) proc = Process(name, run_dir, popen_args) - run_proc_sync(proc) + proc.launch_sync() def run_local_netns_sync(run_dir, name, netns, popen_args): run_dir =run_dir.new_dir(name) proc = NetNSProcess(name, run_dir, netns, popen_args) - run_proc_sync(proc) + proc.launch_sync() def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None): run_dir = run_dir.new_dir(name) proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args) - run_proc_sync(proc) + proc.launch_sync() def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path): run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path))) -- To view, visit https://gerrit.osmocom.org/11747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2b3fd39db5400a93a8caabae367dac3e3250247 Gerrit-Change-Number: 11747 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:46:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 17:46:42 +0000 Subject: Change in osmo-gsm-tester[master]: process: launch_sync: allow non success return Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11748 Change subject: process: launch_sync: allow non success return ...................................................................... process: launch_sync: allow non success return Change-Id: I0617335b594ba565cf2e5ffd0edfb8bffa398c48 --- M src/osmo_gsm_tester/process.py 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/48/11748/1 diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 40d0cc1..b1769f8 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -77,7 +77,7 @@ self.set_name(self.name_str, pid=self.process_obj.pid) self.log('Launched') - def launch_sync(self): + def launch_sync(self, raise_nonsuccess=True): ''' calls launch() method and block waiting for it to finish, serving the mainloop meanwhile. @@ -88,9 +88,10 @@ except Exception as e: self.terminate() raise e - if self.result != 0: + if raise_nonsuccess and self.result != 0: log.ctx(self) - raise log.Error('Exited in error') + raise log.Error('Exited in error %d' % self.result) + return self.result def respawn(self): self.dbg('respawn') -- To view, visit https://gerrit.osmocom.org/11748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0617335b594ba565cf2e5ffd0edfb8bffa398c48 Gerrit-Change-Number: 11748 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:46:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 17:46:42 +0000 Subject: Change in osmo-gsm-tester[master]: nanobts: ipacces-config: Use process.launch_sync helper Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11749 Change subject: nanobts: ipacces-config: Use process.launch_sync helper ...................................................................... nanobts: ipacces-config: Use process.launch_sync helper Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9 --- M src/osmo_gsm_tester/bts_nanobts.py 1 file changed, 3 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/49/11749/1 diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index bec2433..ab75b16 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -253,7 +253,7 @@ self.bts_ip = bts_ip self.env = {} - def launch_process(self, binary_name, *args): + def create_process(self, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -261,7 +261,6 @@ proc = process.Process(binary_name, run_dir, (binary,) + args, env=self.env) - proc.launch() return proc def run(self, name_suffix, *args): @@ -269,13 +268,8 @@ self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bsc'))) lib = self.inst.child('lib') self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc = self.launch_process(IpAccessConfig.BIN_IPACCESS_CONFIG, *args) - try: - MainLoop.wait(self, self.proc.terminated) - except Exception as e: - self.proc.terminate() - raise e - return self.proc.result + self.proc = self.create_process(IpAccessConfig.BIN_IPACCESS_CONFIG, *args) + return self.proc.launch_sync(raise_nonsuccess=False) def set_unit_id(self, unitid, trx_num, restart=False): uid_str = '%d/0/%d' % (unitid, trx_num) -- To view, visit https://gerrit.osmocom.org/11749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9 Gerrit-Change-Number: 11749 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:46:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 12 Nov 2018 17:46:43 +0000 Subject: Change in osmo-gsm-tester[master]: nanobts: Use -G parameter of ipaccess-config to avoid need to restart... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11750 Change subject: nanobts: Use -G parameter of ipaccess-config to avoid need to restart nanoBTS ...................................................................... nanobts: Use -G parameter of ipaccess-config to avoid need to restart nanoBTS If OML IP doesn't need to be changed because it's the one already configured, then there's no need to set + restart the nanoBTS, which means we can speed up a test running a nanoBTS by aprox 2 minutes per nanoBTS used. Change-Id: I2871dee3de11512250445127f0b807a8990fd4c6 --- M src/osmo_gsm_tester/bts_nanobts.py 1 file changed, 33 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/50/11750/1 diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index ab75b16..80f65f4 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -19,6 +19,7 @@ import os import re +import json from . import log, config, util, process, pcap_recorder, bts, pcu from . import powersupply from .event_loop import MainLoop @@ -122,24 +123,30 @@ ipfind.stop() ipconfig = IpAccessConfig(self.suite_run, self.run_dir, bts_trx_ip) + running_oml_ip = ipconfig.get_oml_ip() + if running_unitid != unitid or running_trx != trx_i: if not ipconfig.set_unit_id(unitid, trx_i, False): raise log.Error('Failed configuring unit id %d trx %d' % (unitid, trx_i)) - # Apply OML IP and restart nanoBTS as it is required to apply the changes. - if not ipconfig.set_oml_ip(self.bsc.addr(), True): - raise log.Error('Failed configuring OML IP %s' % bts_trx_ip) - # Let some time for BTS to restart. It takes much more than 20 secs, and - # this way we make sure we don't catch responses in abisip-find prior to - # BTS restarting. - MainLoop.sleep(self, 20) + if running_oml_ip != self.bsc.addr(): + # Apply OML IP and restart nanoBTS as it is required to apply the changes. + if not ipconfig.set_oml_ip(self.bsc.addr(), True): + raise log.Error('Failed configuring OML IP %s' % bts_trx_ip) - self.log('Starting to connect id %d trx %d to' % (unitid, trx_i), self.bsc) - ipfind = AbisIpFind(self.suite_run, self.run_dir, local_bind_ip, 'postconf') - ipfind.start() - ipfind.wait_bts_ready(bts_trx_ip) - self.log('nanoBTS id %d trx %d configured and running' % (unitid, trx_i)) - ipfind.stop() + # Let some time for BTS to restart. It takes much more than 20 secs, and + # this way we make sure we don't catch responses in abisip-find prior to + # BTS restarting. + MainLoop.sleep(self, 20) + + self.log('Starting to connect id %d trx %d to' % (unitid, trx_i), self.bsc) + ipfind = AbisIpFind(self.suite_run, self.run_dir, local_bind_ip, 'postconf') + ipfind.start() + ipfind.wait_bts_ready(bts_trx_ip) + self.log('nanoBTS id %d trx %d configured and running' % (unitid, trx_i)) + ipfind.stop() + else: + self.log('nanoBTS id %d trx %d no need to change OML IP and restart' % (unitid, trx_i)) MainLoop.wait(self, self.bsc.bts_is_connected, self, timeout=600) self.log('nanoBTS connected to BSC') @@ -274,20 +281,28 @@ def set_unit_id(self, unitid, trx_num, restart=False): uid_str = '%d/0/%d' % (unitid, trx_num) if restart: - retcode = self.run('unitid', '--restart', '--unit-id', '%s' % uid_str, self.bts_ip) + retcode = self.run('setunitid', '--restart', '--unit-id', '%s' % uid_str, self.bts_ip) else: - retcode = self.run('unitid', '--unit-id', '%s' % uid_str, self.bts_ip) + retcode = self.run('setunitid', '--unit-id', '%s' % uid_str, self.bts_ip) if retcode != 0: - log.err('ipaccess-config --unit-id %s returned error code %d' % (uid_str, retcode)) + self.err('ipaccess-config --unit-id %s returned error code %d' % (uid_str, retcode)) return retcode == 0 def set_oml_ip(self, omlip, restart=False): if restart: - retcode = self.run('oml', '--restart', '--oml-ip', omlip, self.bts_ip) + retcode = self.run('setoml', '--restart', '--oml-ip', omlip, self.bts_ip) else: - retcode = self.run('oml', '--oml-ip', omlip, self.bts_ip) + retcode = self.run('setoml', '--oml-ip', omlip, self.bts_ip) if retcode != 0: self.error('ipaccess-config --oml-ip %s returned error code %d' % (omlip, retcode)) return retcode == 0 + def get_oml_ip(self): + retcode = self.run('getoml', '-G', self.bts_ip) + if retcode != 0: + raise log.Error('ipaccess-config -G %s returned error code %d' % (self.bts_ip, retcode)) + output = self.proc.get_stdout() + json_data = json.loads(output) + return json_data['primary_oml_ip'] + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/11750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2871dee3de11512250445127f0b807a8990fd4c6 Gerrit-Change-Number: 11750 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:46:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:46:56 +0000 Subject: Change in osmo-dev[master]: gitignore: add make/ and net/ (with exceptions) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11741 ) Change subject: gitignore: add make/ and net/ (with exceptions) ...................................................................... Patch Set 1: Code-Review+2 (2 comments) https://gerrit.osmocom.org/#/c/11741/1/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/11741/1/.gitignore at 6 PS1, Line 6: make/ (should this be 'make/*' ? I'm not sure...) https://gerrit.osmocom.org/#/c/11741/1/.gitignore at 8 PS1, Line 8: !src/g ah we should drop these since 'gits' is here instead -- To view, visit https://gerrit.osmocom.org/11741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 Gerrit-Change-Number: 11741 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 12 Nov 2018 17:46:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:48:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:48:51 +0000 Subject: Change in osmo-gsm-manuals[master]: move project specific files to their own repos In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: move project specific files to their own repos ...................................................................... Patch Set 3: Code-Review+2 it might be a bit much to ask, but code management wise it would make huge sense to include the commit-ids in the commit log, of the corresponding patches that add the files in separate repositories. -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 17:48:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:54:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:54:31 +0000 Subject: Change in osmo-msc[master]: move project specific manuals to their own repos In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11726 ) Change subject: move project specific manuals to their own repos ...................................................................... Patch Set 1: Code-Review+1 (3 comments) I associate 'man' with the unix manpages. IIUC we are generating / going to generate manpages from this, but IMHO this should be called 'manuals'; or rather, just be directly in the doc/ dir, after all, "documentation / manuals" is redundant. https://gerrit.osmocom.org/#/c/11726/1/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/11726/1/.gitignore at 66 PS1, Line 66: *.html Seems that the manuals get generated in the root dir of the {source,build} tree? I would prefer a subdir https://gerrit.osmocom.org/#/c/11726/1/doc/man/chapters/counters_generated.adoc File doc/man/chapters/counters_generated.adoc: https://gerrit.osmocom.org/#/c/11726/1/doc/man/chapters/counters_generated.adoc at 6 PS1, Line 6: .msc - mobile switching center whitespace https://gerrit.osmocom.org/#/c/11726/1/doc/man/chapters/counters_generated.adoc at 37 PS1, Line 37: | msc.active_calls | <> | whitespace -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 17:54:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:55:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:55:05 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11739 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11739 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 17:55:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 17:59:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 17:59:11 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: Code-Review+1 (leaving to Pau to CR) -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 12 Nov 2018 17:59:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 18:00:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 18:00:05 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: make clean: also rm *.html In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11723 ) Change subject: Makefile.asciidoc.inc: make clean: also rm *.html ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d5e9c36f75141ce88d11b16c89809be4dce87d8 Gerrit-Change-Number: 11723 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 12 Nov 2018 18:00:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 19:13:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 19:13:04 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message and IEs Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11751 Change subject: GSUP/SMS: introduce READY-FOR-SM message and IEs ...................................................................... GSUP/SMS: introduce READY-FOR-SM message and IEs According to 3GPP TS 29.002, section 12.4, MAP-READY-FOR-SM is used between the MSC and VLR as well as between the VLR and the HLR to indicate that a subscriber has memory available for SMS. This change replicates this service in GSUP as READY_FOR_SM_*. The only mandatory IE for this service (excluding Invoke ID) is 'Alert Reason' which is replicated as OSMO_GSUP_SM_AL_REAS_IE. Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 --- M include/osmocom/gsm/gsup.h M include/osmocom/gsm/gsup_sms.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 6 files changed, 46 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/11751/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index c4d215a..d67ba07 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -95,6 +95,7 @@ OSMO_GSUP_SM_RP_DA_IE = 0x41, OSMO_GSUP_SM_RP_OA_IE = 0x42, OSMO_GSUP_SM_RP_UI_IE = 0x43, + OSMO_GSUP_SM_AL_REAS_IE = 0x44, }; /*! GSUP message type */ @@ -136,6 +137,10 @@ OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST = 0b00101000, OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR = 0b00101001, OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT = 0b00101010, + + OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST = 0b00101100, + OSMO_GSUP_MSGT_READY_FOR_SM_ERROR = 0b00101101, + OSMO_GSUP_MSGT_READY_FOR_SM_RESULT = 0b00101110, }; #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00) @@ -244,6 +249,8 @@ /*! SM-RP-UI (see 3GPP TS 29.002, 7.6.8.4), SMS TPDU */ const uint8_t *sm_rp_ui; size_t sm_rp_ui_len; + /*! Alert reason (see 3GPP TS 29.002, 7.6.8.8) */ + enum osmo_gsup_sms_sm_al_reas_t sm_al_reas; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/include/osmocom/gsm/gsup_sms.h b/include/osmocom/gsm/gsup_sms.h index 25f1e91..7c579ae 100644 --- a/include/osmocom/gsm/gsup_sms.h +++ b/include/osmocom/gsm/gsup_sms.h @@ -48,4 +48,11 @@ const uint8_t *smsc_addr_enc; }; +/*! Alert reason values, see 7.6.8.8 */ +enum osmo_gsup_sms_sm_al_reas_t { + OSMO_GSUP_SMS_SM_AL_REAS_NONE = 0x00, + OSMO_GSUP_SMS_SM_AL_REAS_MS_PRESENT = 0x01, + OSMO_GSUP_SMS_SM_AL_REAS_MEM_AVAIL = 0x02, +}; + /*! @} */ diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 78b5e7b..64c2e4b 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -86,6 +86,10 @@ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_RESULT), + { 0, NULL } }; @@ -474,6 +478,10 @@ gsup_msg->sm_rp_ui_len = value_len; break; + case OSMO_GSUP_SM_AL_REAS_IE: + gsup_msg->sm_al_reas = *value; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -692,6 +700,11 @@ gsup_msg->sm_rp_ui_len, gsup_msg->sm_rp_ui); } + if ((u8 = gsup_msg->sm_al_reas)) { + msgb_tlv_put(msg, OSMO_GSUP_SM_AL_REAS_IE, + sizeof(u8), &u8); + } + return 0; } diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 75ddfcb..2091f87 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -279,6 +279,15 @@ 0xde, 0xad, 0xbe, 0xef, }; + static const uint8_t send_ready_for_sm_ind[] = { + 0x2c, /* OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST */ + TEST_IMSI_IE, + + /* SM related IEs */ + 0x44, 0x01, /* Alert reason */ + 0x02, /* Memory Available (SMMA) */ + }; + static const struct test { char *name; const uint8_t *data; @@ -324,6 +333,8 @@ send_mt_forward_sm_req, sizeof(send_mt_forward_sm_req)}, {"MO-/MT-ForwardSM (SMSC -> MSC) Response", send_mo_mt_forward_sm_rsp, sizeof(send_mo_mt_forward_sm_rsp)}, + {"ReadyForSM (MSC -> SMSC) Indication", + send_ready_for_sm_ind, sizeof(send_ready_for_sm_ind)}, }; printf("Test GSUP message decoding/encoding\n"); @@ -391,7 +402,7 @@ * FIXME: share the maximal IE value somehow * in order to avoid manual updating of this */ - OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_RP_UI_IE); + OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_AL_REAS_IE); OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2); ie_end = j; diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index f4c832c..43d846a 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -58,6 +58,9 @@ generated message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 43 04 de ad be ef original message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 43 04 de ad be ef IMSI: 123456789012345 + generated message: 2c 01 08 21 43 65 87 09 21 43 f5 44 01 02 + original message: 2c 01 08 21 43 65 87 09 21 43 f5 44 01 02 + IMSI: 123456789012345 message 0: tested 11 truncations, 11 parse failures message 1: tested 14 truncations, 13 parse failures message 2: tested 83 truncations, 81 parse failures @@ -78,6 +81,7 @@ message 17: tested 44 truncations, 38 parse failures message 18: tested 52 truncations, 46 parse failures message 19: tested 29 truncations, 25 parse failures + message 20: tested 14 truncations, 13 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures message 1: tested 3584 modifications, 770 parse failures @@ -99,3 +103,4 @@ message 17: tested 11264 modifications, 2812 parse failures message 18: tested 13312 modifications, 2559 parse failures message 19: tested 7424 modifications, 1546 parse failures + message 20: tested 3584 modifications, 771 parse failures diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok index 4e53527..177cb8b 100644 --- a/tests/gsup/gsup_test.ok +++ b/tests/gsup/gsup_test.ok @@ -39,4 +39,6 @@ MT-ForwardSM (MSC -> SMSC) Request OK Testing MO-/MT-ForwardSM (SMSC -> MSC) Response MO-/MT-ForwardSM (SMSC -> MSC) Response OK + Testing ReadyForSM (MSC -> SMSC) Indication + ReadyForSM (MSC -> SMSC) Indication OK Done. -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 20:05:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 12 Nov 2018 20:05:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: add READY-FOR-SM message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11752 Change subject: library/GSUP_Types.ttcn: add READY-FOR-SM message ...................................................................... library/GSUP_Types.ttcn: add READY-FOR-SM message According to 3GPP TS 29.002, section 12.4, MAP-READY-FOR-SM is used between the MSC and VLR as well as between the VLR and the HLR to indicate that a subscriber has memory available for SMS. This change replicates this service in GSUP as READY_FOR_SM_*. The only mandatory IE for this service (excluding Invoke ID) is 'Alert Reason' which is replicated as OSMO_GSUP_SM_AL_REAS_IE. Change-Id: If2256607527ecfcb10285583332fb8b0515d7c78 --- M library/GSUP_Types.ttcn 1 file changed, 54 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/11752/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index f3d05e5..447dee9 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -49,7 +49,8 @@ OSMO_GSUP_SM_RP_MR_IE ('40'O), OSMO_GSUP_SM_RP_DA_IE ('41'O), OSMO_GSUP_SM_RP_OA_IE ('42'O), - OSMO_GSUP_SM_RP_UI_IE ('43'O) + OSMO_GSUP_SM_RP_UI_IE ('43'O), + OSMO_GSUP_SM_AL_REAS_IE ('44'O) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_MessageType { @@ -89,7 +90,11 @@ OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST ('00101000'B), OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR ('00101001'B), - OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT ('00101010'B) + OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT ('00101010'B), + + OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST ('00101100'B), + OSMO_GSUP_MSGT_READY_FOR_SM_ERROR ('00101101'B), + OSMO_GSUP_MSGT_READY_FOR_SM_RESULT ('00101110'B) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CancelType { @@ -146,6 +151,7 @@ sm_rp_da, tag = OSMO_GSUP_SM_RP_DA_IE; sm_rp_oa, tag = OSMO_GSUP_SM_RP_OA_IE; sm_rp_ui, tag = OSMO_GSUP_SM_RP_UI_IE; + sm_al_reas, tag = OSMO_GSUP_SM_AL_REAS_IE; )" }; @@ -184,7 +190,8 @@ OCT1 sm_rp_mr, GSUP_SM_RP_DA sm_rp_da, GSUP_SM_RP_OA sm_rp_oa, - octetstring sm_rp_ui + octetstring sm_rp_ui, + GSUP_SM_AL_REAS_Type sm_al_reas }; type record GSUP_PDU { @@ -815,6 +822,29 @@ } } +/* SM Alert Reason types, see 7.6.8.8 */ +type enumerated GSUP_SM_AL_REAS_Type { + GSUP_SM_AL_REAS_TYPE_NONE ('00'O), + GSUP_SM_AL_REAS_TYPE_MS_PRESENT ('01'O), + GSUP_SM_AL_REAS_TYPE_MEM_AVAIL ('02'O) +} with { variant "FIELDLENGTH(8)" }; + +/* SM Alert Reason IE (used in READY-FOR-SM), see 7.6.8.8 */ +template (value) GSUP_IE ts_GSUP_IE_SM_AL_REAS(GSUP_SM_AL_REAS_Type reas) := { + tag := OSMO_GSUP_SM_AL_REAS_IE, + len := 0, /* overwritten */ + val := { + sm_al_reas := reas + } +} +template GSUP_IE tr_GSUP_IE_SM_AL_REAS(template GSUP_SM_AL_REAS_Type reas) := { + tag := OSMO_GSUP_SM_AL_REAS_IE, + len := ?, + val := { + sm_al_reas := reas + } +} + template (value) GSUP_IE ts_GSUP_IE_SSInfo(octetstring ss) := { tag := OSMO_GSUP_SS_INFO_IE, len := 0, /* overwritten */ @@ -1154,6 +1184,27 @@ } ); +template (value) GSUP_PDU ts_GSUP_MT_READY_FOR_SM_REQ( + hexstring imsi, + GSUP_SM_AL_REAS_Type reas /* SM Alert Reason, see 7.6.8.8 */ +) := ts_GSUP( + OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST, + { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_SM_AL_REAS(reas)) + } +); +template GSUP_PDU tr_GSUP_MT_READY_FOR_SM_REQ( + template hexstring imsi := ?, + template GSUP_SM_AL_REAS_Type reas := ? /* SM Alert Reason, see 7.6.8.8 */ +) := tr_GSUP( + OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST, + { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_SM_AL_REAS(reas) + } +); + function f_gsup_find_ie(GSUP_PDU msg, GSUP_IEI iei, out GSUP_IeValue ret) return boolean { for (var integer i := 0; i < sizeof(msg.ies); i := i+1) { if (msg.ies[i].tag == iei) { -- To view, visit https://gerrit.osmocom.org/11752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If2256607527ecfcb10285583332fb8b0515d7c78 Gerrit-Change-Number: 11752 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 21:54:20 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 12 Nov 2018 21:54:20 +0000 Subject: Change in osmo-remsim[master]: minor: show USB error message instead of number Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/11754 Change subject: minor: show USB error message instead of number ...................................................................... minor: show USB error message instead of number Change-Id: I272ac1be82b7432934969ea4d204dd20067d9428 --- M src/simtrace2-remsim_client.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/54/11754/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index f033e7d..1cf09a6 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -465,7 +465,7 @@ if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT && rc != LIBUSB_ERROR_INTERRUPTED && rc != LIBUSB_ERROR_IO) { - fprintf(stderr, "BULK IN transfer error; rc=%d\n", rc); + fprintf(stderr, "BULK IN transfer error: %s\n", libusb_error_name(rc)); return; } /* dispatch any incoming data */ -- To view, visit https://gerrit.osmocom.org/11754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I272ac1be82b7432934969ea4d204dd20067d9428 Gerrit-Change-Number: 11754 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 21:54:19 2018 From: gerrit-no-reply at lists.osmocom.org (=?UTF-8?Q?K=C3=A9vin_Redon?=) Date: Mon, 12 Nov 2018 21:54:19 +0000 Subject: Change in osmo-remsim[master]: add ATR as command line argument Message-ID: K?vin Redon has uploaded this change for review. ( https://gerrit.osmocom.org/11753 Change subject: add ATR as command line argument ...................................................................... add ATR as command line argument we could add a function checking the ATR validity also before updating the (conditional) checksum we should check if it is actually present in the ATR Change-Id: Id1084abdf2318e96c22f8e69cc1ef161b12ef5ea --- M src/simtrace2-remsim_client.c 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/53/11753/1 diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 365acb4..f033e7d 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -245,6 +245,7 @@ return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA); } +// FIXME check if the ATR actually includes a checksum static void atr_update_csum(uint8_t *atr, unsigned int atr_len) { uint8_t csum = 0; @@ -617,6 +618,7 @@ "\t-S\t--usb-altsetting ALTSETTING_ID\n" "\t-A\t--usb-address\tADDRESS\n" "\t-H\t--usb-path\tPATH\n" + "\t-a\t--atr\tATR\n" "\n" ); } @@ -636,6 +638,7 @@ { "usb-altsetting", 1, 0, 'S' }, { "usb-address", 1, 0, 'A' }, { "usb-path", 1, 0, 'H' }, + { "atr", 1, 0, 'a' }, { NULL, 0, 0, 0 } }; @@ -652,13 +655,15 @@ int config_id = -1, altsetting = 0, addr = -1; char *bankd_host = "127.0.0.1"; char *path = NULL; + uint8_t atr_data[33] = { 0x3B, 0x00 }; // the shortest simplest ATR possible + uint8_t atr_len = 2; print_welcome(); while (1) { int option_index = 0; - c = getopt_long(argc, argv, "b:p:c:s:hi:V:P:C:I:S:A:H:k", opts, &option_index); + c = getopt_long(argc, argv, "b:p:c:s:hi:V:P:C:I:S:A:H:a:k", opts, &option_index); if (c == -1) break; switch (c) { @@ -705,6 +710,14 @@ case 'H': path = optarg; break; + case 'a': + rc = osmo_hexparse(optarg, atr_data, ARRAY_SIZE(atr_data)); + if (rc < 2 || rc > ARRAY_SIZE(atr_data)) { + fprintf(stderr, "ATR matlformed\n"); + goto do_exit; + } + atr_len = rc; + break; } } @@ -839,9 +852,8 @@ st_modem_sim_select_remote(ci->slot); /* set the ATR */ - uint8_t real_atr[] = { 0x3B, 0x00 }; // the shortest simplest ATR possible - atr_update_csum(real_atr, sizeof(real_atr)); - cardem_request_set_atr(ci, real_atr, sizeof(real_atr)); + //atr_update_csum(real_atr, sizeof(real_atr)); + cardem_request_set_atr(ci, atr_data, atr_len); /* select remote (forwarded) SIM */ st_modem_reset_pulse(ci->slot, 300); -- To view, visit https://gerrit.osmocom.org/11753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id1084abdf2318e96c22f8e69cc1ef161b12ef5ea Gerrit-Change-Number: 11753 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 22:35:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 22:35:52 +0000 Subject: Change in osmo-dev[master]: gits: fix git_can_fast_forward: use arg instead of HEAD Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11755 Change subject: gits: fix git_can_fast_forward: use arg instead of HEAD ...................................................................... gits: fix git_can_fast_forward: use arg instead of HEAD Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca --- M src/gits 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/55/11755/1 diff --git a/src/gits b/src/gits index 8b75278..490a6af 100755 --- a/src/gits +++ b/src/gits @@ -103,7 +103,7 @@ def git_can_fast_forward(git_dir, branch='master', remote='origin'): - return git_bool(git_dir, 'merge-base', '--is-ancestor', 'HEAD', remote + '/' + branch) + return git_bool(git_dir, 'merge-base', '--is-ancestor', branch, remote + '/' + branch) def format_branch_ahead_behind(branch, ahead, behind): -- To view, visit https://gerrit.osmocom.org/11755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca Gerrit-Change-Number: 11755 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 22:35:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 22:35:52 +0000 Subject: Change in osmo-dev[master]: gits: use @{u} to get upstream branch, not origin/%s Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11756 Change subject: gits: use @{u} to get upstream branch, not origin/%s ...................................................................... gits: use @{u} to get upstream branch, not origin/%s git has an internal concept of a branch's upstream branch, and the remote need not be 'origin', and also, the upstream branch name may differ completely. So, use git's {u} keyword to obtain the upstream branch name. This removes all 'origin' strings from gits. Also, git_branch_exists() is no longer needed, drop it. Also remove a couple of default arguments which aren't ever used because we always pass arguments anyway. In the case of git_ahead_behind(), we would have use for a default branch_upstream=None to imply calling git_branch_upstream(), but then during rebase, if no upstream exists, we would invoke it twice to get None a second time. So just call the function explicitly. I thought about returning an empty string instead of None, but it's too convoluted. Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 --- M src/gits 1 file changed, 30 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/56/11756/1 diff --git a/src/gits b/src/gits index 490a6af..681082d 100755 --- a/src/gits +++ b/src/gits @@ -58,7 +58,7 @@ def git_output(git_dir, *args): - return subprocess.check_output(['git', '-C', git_dir, ] + list(args)).decode('utf-8') + return subprocess.check_output(['git', '-C', git_dir, ] + list(args), stderr=subprocess.STDOUT).decode('utf-8') def git_bool(git_dir, *args): @@ -69,20 +69,16 @@ return False -def git_branch_exists(git_dir, branch='origin/master'): - return git_bool(git_dir, 'rev-parse', '--quiet', '--verify', branch) - - -def git_ahead_behind(git_dir, branch='master', remote='origin'): +def git_ahead_behind(git_dir, branch, branch_upstream): ''' Count revisions ahead/behind of the remote branch. returns: (ahead, behind) (e.g. (0, 5)) ''' # Missing remote branch - if not git_branch_exists(git_dir, remote + '/' + branch): + if not branch_upstream: return (0, 0) - behind = git_output(git_dir, 'rev-list', '--count', '%s..%s/%s' % (branch, remote, branch)) - ahead = git_output(git_dir, 'rev-list', '--count', '%s/%s..%s' % (remote, branch, branch)) + behind = git_output(git_dir, 'rev-list', '--count', '%s..%s' % (branch, branch_upstream)) + ahead = git_output(git_dir, 'rev-list', '--count', '%s..%s' % (branch_upstream, branch)) return (int(ahead.rstrip()), int(behind.rstrip())) @@ -98,12 +94,20 @@ return ret +def git_branch_upstream(git_dir, branch_name='HEAD'): + '''Return an upstream branch name, or an None if there is none.''' + try: + return git_output(git_dir, 'rev-parse', '--abbrev-ref', '%s@{u}' % branch_name).rstrip() + except subprocess.CalledProcessError: + return None + + def git_has_modifications(git_dir): return not git_bool(git_dir, 'diff-index', '--quiet', 'HEAD') -def git_can_fast_forward(git_dir, branch='master', remote='origin'): - return git_bool(git_dir, 'merge-base', '--is-ancestor', branch, remote + '/' + branch) +def git_can_fast_forward(git_dir, branch, branch_upstream): + return git_bool(git_dir, 'merge-base', '--is-ancestor', branch, branch_upstream) def format_branch_ahead_behind(branch, ahead, behind): @@ -142,12 +146,14 @@ if not is_current and branch not in interesting_branch_names: continue - ahead, behind = git_ahead_behind(git_dir, branch) + ahead, behind = git_ahead_behind(git_dir, branch, + git_branch_upstream(git_dir, branch)) + if not ahead and not behind and not is_current: # skip branches that are "not interesting" continue - # Branch with ahead/behind origin info ("master[+1|-5]") + # Branch with ahead/behind upstream info ("master[+1|-5]") strs.append(format_branch_ahead_behind(branch, ahead, behind)) return strs @@ -238,8 +244,10 @@ print('Not on a branch: %s' % git_dir) raise SkipThisRepo() - print('Rebasing branch: ' + orig_branch) - ahead, behind = git_ahead_behind(git_dir, orig_branch) + upstream_branch = git_branch_upstream(git_dir, orig_branch) + + print('Rebasing %r onto %r' % (orig_branch, upstream_branch)) + ahead, behind = git_ahead_behind(git_dir, orig_branch, upstream_branch) if git_has_modifications(git_dir): do_commit = ask(git_dir, 'Local mods.', @@ -262,24 +270,24 @@ raise SkipThisRepo() # Missing upstream branch - if not git_branch_exists(git_dir, 'origin/' + orig_branch): + if not upstream_branch: print('there is no upstream branch for %r' % orig_branch) # Diverged elif ahead and behind: do_reset = ask(git_dir, 'Diverged.', - '%s: git reset --hard origin/%s?' % ( - orig_branch, orig_branch), + '%s: git reset --hard %s?' % ( + orig_branch, upstream_branch), ' no', 'OK yes (write OK in caps!)', valid_answers=('', 'OK')) if do_reset == 'OK': - git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + git(git_dir, 'reset', '--hard', upstream_branch) # Behind elif behind: - if git_can_fast_forward(git_dir, orig_branch): + if git_can_fast_forward(git_dir, orig_branch, upstream_branch): print('fast-forwarding...') git(git_dir, 'merge') else: @@ -303,13 +311,13 @@ git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - do_reset = ask(git_dir, '%s: git reset --hard origin/%s?' % (orig_branch, orig_branch), + do_reset = ask(git_dir, '%s: git reset --hard %s?' % (orig_branch, upstream_branch), ' no', 'OK yes (write OK in caps!)', valid_answers=('', 'OK')) if do_reset == 'OK': - git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + git(git_dir, 'reset', '--hard', upstream_branch) return orig_branch -- To view, visit https://gerrit.osmocom.org/11756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 Gerrit-Change-Number: 11756 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 22:35:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 22:35:53 +0000 Subject: Change in osmo-dev[master]: gits: remove code dup: ask_reset_hard() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11757 Change subject: gits: remove code dup: ask_reset_hard() ...................................................................... gits: remove code dup: ask_reset_hard() The diff may look a bit weird, but this really just moves a bit of code that existed twice into a local function. Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a --- M src/gits 1 file changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/57/11757/1 diff --git a/src/gits b/src/gits index 681082d..bd3e3f2 100755 --- a/src/gits +++ b/src/gits @@ -269,12 +269,8 @@ print('There still are local modifications') raise SkipThisRepo() - # Missing upstream branch - if not upstream_branch: - print('there is no upstream branch for %r' % orig_branch) - # Diverged - elif ahead and behind: + def ask_reset_hard(): do_reset = ask(git_dir, 'Diverged.', '%s: git reset --hard %s?' % ( orig_branch, upstream_branch), @@ -285,6 +281,15 @@ if do_reset == 'OK': git(git_dir, 'reset', '--hard', upstream_branch) + + # Missing upstream branch + if not upstream_branch: + print('there is no upstream branch for %r' % orig_branch) + + # Diverged + elif ahead and behind: + ask_reset_hard() + # Behind elif behind: if git_can_fast_forward(git_dir, orig_branch, upstream_branch): @@ -311,13 +316,7 @@ git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - do_reset = ask(git_dir, '%s: git reset --hard %s?' % (orig_branch, upstream_branch), - ' no', - 'OK yes (write OK in caps!)', - valid_answers=('', 'OK')) - - if do_reset == 'OK': - git(git_dir, 'reset', '--hard', upstream_branch) + ask_reset_hard() return orig_branch -- To view, visit https://gerrit.osmocom.org/11757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a Gerrit-Change-Number: 11757 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 22:35:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 12 Nov 2018 22:35:53 +0000 Subject: Change in osmo-dev[master]: gits: when asking for reset --hard, also offer push -f Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11758 Change subject: gits: when asking for reset --hard, also offer push -f ...................................................................... gits: when asking for reset --hard, also offer push -f Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 --- M src/gits 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/58/11758/1 diff --git a/src/gits b/src/gits index bd3e3f2..2c25129 100755 --- a/src/gits +++ b/src/gits @@ -270,16 +270,19 @@ raise SkipThisRepo() - def ask_reset_hard(): + def ask_reset_hard_or_push_f(): do_reset = ask(git_dir, 'Diverged.', '%s: git reset --hard %s?' % ( orig_branch, upstream_branch), ' no', - 'OK yes (write OK in caps!)', - valid_answers=('', 'OK')) + 'OK yes, reset to upstream (write OK in caps!)', + 'P `push -f` to overwrite upstream (P in caps!)', + valid_answers=('', 'OK', 'P')) if do_reset == 'OK': git(git_dir, 'reset', '--hard', upstream_branch) + elif do_reset == 'P': + git(git_dir, 'push', '-f') # Missing upstream branch @@ -288,7 +291,7 @@ # Diverged elif ahead and behind: - ask_reset_hard() + ask_reset_hard_or_push_f() # Behind elif behind: @@ -316,7 +319,7 @@ git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - ask_reset_hard() + ask_reset_hard_or_push_f() return orig_branch -- To view, visit https://gerrit.osmocom.org/11758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 Gerrit-Change-Number: 11758 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 07:44:31 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 13 Nov 2018 07:44:31 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 13 Nov 2018 07:44:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 08:38:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 13 Nov 2018 08:38:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 2: > Then the test startup should be able to decide which handler has a > CTRL interface and which doesn't. Also related, I remember the VTY > implementation in ttcn also first had this limitation, and fairly > recently was extended to be able to work with multiple VTY at the > same time. Please take a look whether that can be applied to CTRL > as well, it's both essentially telnet, after all. I want a second opinion on this. It will take me a lot of effort and time to introduce an infrastructure as we currently have it with the VTY interface.(according to Daniel there is some message routing to be implemented so that the messages are passed back and forward to the right clients) -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 13 Nov 2018 08:38:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:20:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 10:20:14 +0000 Subject: Change in osmo-dev[master]: gits: fix git_can_fast_forward: use arg instead of HEAD In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11755 ) Change subject: gits: fix git_can_fast_forward: use arg instead of HEAD ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca Gerrit-Change-Number: 11755 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 10:20:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:27:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 13 Nov 2018 10:27:34 +0000 Subject: Change in osmo-msc[master]: vty: add command to show all known BSC In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11711 ) Change subject: vty: add command to show all known BSC ...................................................................... Patch Set 1: Somewhat related is gerrit 11746 which saves CI which we could print as well when available. -- To view, visit https://gerrit.osmocom.org/11711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I247fdce00f43072b0a2a0122b80bd40cdd9e0128 Gerrit-Change-Number: 11711 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 13 Nov 2018 10:27:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:31:54 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 13 Nov 2018 10:31:54 +0000 Subject: Change in osmo-sgsn[master]: fix bogus error check in gprs_sndcp_comp_create() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11730 ) Change subject: fix bogus error check in gprs_sndcp_comp_create() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11730/1/src/gprs/gprs_sndcp_comp.c File src/gprs/gprs_sndcp_comp.c: https://gerrit.osmocom.org/#/c/11730/1/src/gprs/gprs_sndcp_comp.c at 106 PS1, Line 106: } else { > I see there's too SNDCP_XID_VERSION_NUMBER. What about it? [?] VERSION_NUMBER is only used later, when the packet is encoded by gprs_sndcp_compile_xid(). So if we encounter it here, it is invalid. The next patch in this series (https://gerrit.osmocom.org/c/osmo-sgsn/+/11656/) transforms this if-else statement into a switch statement. -- To view, visit https://gerrit.osmocom.org/11730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8444c1ed052707c76a979fb06cb018ac678defa7 Gerrit-Change-Number: 11730 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 10:31:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:31:59 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 10:31:59 +0000 Subject: Change in osmo-dev[master]: gits: use @{u} to get upstream branch, not origin/%s In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11756 ) Change subject: gits: use @{u} to get upstream branch, not origin/%s ...................................................................... Patch Set 1: (1 comment) Nice! besides catching the git stderr this looks good to me. https://gerrit.osmocom.org/#/c/11756/1/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11756/1/src/gits at 61 PS1, Line 61: return subprocess.check_output(['git', '-C', git_dir, ] + list(args), stderr=subprocess.STDOUT).decode('utf-8') why is this needed? -- To view, visit https://gerrit.osmocom.org/11756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 Gerrit-Change-Number: 11756 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 10:31:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:36:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 10:36:17 +0000 Subject: Change in osmo-dev[master]: gits: remove code dup: ask_reset_hard() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11757 ) Change subject: gits: remove code dup: ask_reset_hard() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11757/1/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11757/1/src/gits at 273 PS1, Line 273: def ask_reset_hard(): How about moving "def ask_reset_hard()" above "def rebase()" and passing git_dir? That would make it more readable imho. -- To view, visit https://gerrit.osmocom.org/11757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a Gerrit-Change-Number: 11757 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 10:36:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:37:29 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 10:37:29 +0000 Subject: Change in osmo-dev[master]: gits: when asking for reset --hard, also offer push -f In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11758 ) Change subject: gits: when asking for reset --hard, also offer push -f ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 Gerrit-Change-Number: 11758 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 10:37:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:49:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 10:49:16 +0000 Subject: Change in osmo-dev[master]: gitignore: add make/ and net/ (with exceptions) In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11741 to look at the new patch set (#2). Change subject: gitignore: add make/ and net/ (with exceptions) ...................................................................... gitignore: add make/ and net/ (with exceptions) Ignore all files and folders that get created when following the README and net/README instructions. Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 --- M .gitignore 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/41/11741/2 -- To view, visit https://gerrit.osmocom.org/11741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 Gerrit-Change-Number: 11741 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:49:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 10:49:16 +0000 Subject: Change in osmo-dev[master]: gitignore: update src/ whitelist Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11759 Change subject: gitignore: update src/ whitelist ...................................................................... gitignore: update src/ whitelist gits has replaced most shell scripts from src. Add gits and missing scripts. Change-Id: I39ed2d4c16bbd31dea7aca95e7f5a04b87b374c2 --- M .gitignore 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/59/11759/1 diff --git a/.gitignore b/.gitignore index 1f4e0d8..c09c878 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,7 @@ *.pyc make-* src/* -!src/g -!src/e -!src/st -!src/s +!src/fetch-gerrit-patch.sh +!src/gits +!src/osmo-add-gerrit-hooks.sh !src/README -- To view, visit https://gerrit.osmocom.org/11759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I39ed2d4c16bbd31dea7aca95e7f5a04b87b374c2 Gerrit-Change-Number: 11759 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:49:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 10:49:53 +0000 Subject: Change in osmo-dev[master]: gitignore: add make/ and net/ (with exceptions) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11741 ) Change subject: gitignore: add make/ and net/ (with exceptions) ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11741/1/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/11741/1/.gitignore at 6 PS1, Line 6: make/ > (should this be 'make/*' ? I'm not sure... [?] I couldn't find and advantage either way, but I changed it to make/* to have it consistent with src/* and net/*. https://gerrit.osmocom.org/#/c/11741/1/.gitignore at 8 PS1, Line 8: !src/g > ah we should drop these since 'gits' is here instead oh, right! removed here: https://gerrit.osmocom.org/#/c/osmo-dev/+/11759 -- To view, visit https://gerrit.osmocom.org/11741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 Gerrit-Change-Number: 11741 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 10:49:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:51:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 10:51:20 +0000 Subject: Change in osmo-bsc[master]: fix: send RR Release (e.g. after BSSMAP Clear Cmd) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11664 ) Change subject: fix: send RR Release (e.g. after BSSMAP Clear Cmd) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I666b3b4f45706d898d664d380bd0fd2b018be358 Gerrit-Change-Number: 11664 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 10:51:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:51:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 10:51:33 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: drop unused enum sacch_deact In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11665 ) Change subject: abis_rsl.c: drop unused enum sacch_deact ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a1542e92373d2773699744e7b64a08667a4b0f5 Gerrit-Change-Number: 11665 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 10:51:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 10:52:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 10:52:32 +0000 Subject: Change in osmo-sgsn[master]: fix bogus error check in gprs_sndcp_comp_create() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11730 ) Change subject: fix bogus error check in gprs_sndcp_comp_create() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8444c1ed052707c76a979fb06cb018ac678defa7 Gerrit-Change-Number: 11730 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 13 Nov 2018 10:52:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 11:03:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 11:03:14 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/11656/2/include/osmocom/sgsn/gprs_sndcp_comp.h File include/osmocom/sgsn/gprs_sndcp_comp.h: https://gerrit.osmocom.org/#/c/11656/2/include/osmocom/sgsn/gprs_sndcp_comp.h at 47 PS2, Line 47: } algo; /* Algorithm type (see gprs_sndcp_xid.h) */ We have this kind of union twice, once in this file and in next file. I'm wondering whether it makes sense to define the union with a name, instead of creating same anonymous union twice. https://gerrit.osmocom.org/#/c/11656/2/include/osmocom/sgsn/gprs_sndcp_xid.h File include/osmocom/sgsn/gprs_sndcp_xid.h: https://gerrit.osmocom.org/#/c/11656/2/include/osmocom/sgsn/gprs_sndcp_xid.h at 47 PS2, Line 47: What about defining it here? https://gerrit.osmocom.org/#/c/11656/2/include/osmocom/sgsn/gprs_sndcp_xid.h at 61 PS2, Line 61: union { Here duplicate anonymous union. https://gerrit.osmocom.org/#/c/11656/2/src/gprs/gprs_sndcp_xid.c File src/gprs/gprs_sndcp_xid.c: https://gerrit.osmocom.org/#/c/11656/2/src/gprs/gprs_sndcp_xid.c at 45 PS2, Line 45: union { And here it is, same anonymous union 3rd time. -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 11:03:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 11:11:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 11:11:40 +0000 Subject: Change in osmo-bsc[master]: lchan: release in error: fix missing messages / events In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11666 ) Change subject: lchan: release in error: fix missing messages / events ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I648a9826ce56b611359f81462ca03e4ab4c736aa Gerrit-Change-Number: 11666 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 11:11:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 11:15:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 11:15:59 +0000 Subject: Change in osmo-bsc[master]: lchan release: always Deact SACCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11667 ) Change subject: lchan release: always Deact SACCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id3301df059582da2377ef82feae554e94fa42035 Gerrit-Change-Number: 11667 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 11:15:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 11:20:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 11:20:53 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan: introduce sub-struct lchan->release.* In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11668 ) Change subject: cosmetic: lchan: introduce sub-struct lchan->release.* ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h at 495 PS1, Line 495: char *last_error; Isn't this one related to release too? https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h at 518 PS1, Line 518: bool release_requested; Since it's now inside a "release" name, it makes sense to remove the "release_" prefix from this variables: lchan->release.requested lchan->release.in_error https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h at 523 PS1, Line 523: /* RSL error code, RSL_ERR_* */ No enum for RSL_ERR_*? (I know it's not related to this patch). -- To view, visit https://gerrit.osmocom.org/11668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 Gerrit-Change-Number: 11668 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 11:20:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 11:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 11:21:05 +0000 Subject: Change in osmo-bsc[master]: cosmetic: abis_rsl.c: drop uneccesary braces In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11669 ) Change subject: cosmetic: abis_rsl.c: drop uneccesary braces ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I20a7b160321cf86179cdcece71c8158e76ba4a1b Gerrit-Change-Number: 11669 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 11:21:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 11:21:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 11:21:41 +0000 Subject: Change in osmo-bsc[master]: lchan: set cause for 4 instances of release_in_error = true In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11670 ) Change subject: lchan: set cause for 4 instances of release_in_error = true ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 Gerrit-Change-Number: 11670 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 11:21:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 11:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 13 Nov 2018 11:56:14 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11606 ) Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11606/2/src/osmo-bsc/gsm_04_08_rr.c File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/#/c/11606/2/src/osmo-bsc/gsm_04_08_rr.c at 957 PS2, Line 957: /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */ now this comment is not in line with the above. I would have expected the failure to be handled in bsc_compl_l3(), or rather in the subscriber conn FSM. Still need to take a look whether something is missing there. When I look in bsc_compl_l3(), in the end it returns a bool as rc, which is nonsense... so I guess this needs more attention. I'll also take a look later -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 13 Nov 2018 11:56:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:06:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:06:43 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11606 ) Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11606/2/src/osmo-bsc/gsm_04_08_rr.c File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/#/c/11606/2/src/osmo-bsc/gsm_04_08_rr.c at 957 PS2, Line 957: /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */ > now this comment is not in line with the above. [?] returns bool: it's fixed in previous patch in gerrit: https://gerrit.osmocom.org/#/c/osmo-bsc/+/11605/ -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 13 Nov 2018 12:06:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:10:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:10:29 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-pcu: Set log level from dbg to info Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11760 Change subject: templates: osmo-pcu: Set log level from dbg to info ...................................................................... templates: osmo-pcu: Set log level from dbg to info Otherwise there's too much output. With debug enabled, iperf3 test from gprs testsuite generates a 96MB osmo-pcu.log. With log level set to info, size drops to 1.4M, which is a lot less after compressing in an archive. Change-Id: I008234024b9369db42c90ef5d59a013fd2d22718 --- M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/60/11760/1 diff --git a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl index 86cb1a4..da7425c 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl @@ -2,7 +2,7 @@ logging color 1 logging print extended-timestamp 1 logging print category 1 - logging level set-all debug + logging level set-all info pcu pcu-socket ${osmo_pcu.pcu_socket_path} flow-control-interval 10 -- To view, visit https://gerrit.osmocom.org/11760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I008234024b9369db42c90ef5d59a013fd2d22718 Gerrit-Change-Number: 11760 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:10:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:10:42 +0000 Subject: Change in osmo-gsm-tester[master]: process: Move standalone run_local_sync as method of Process In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11747 ) Change subject: process: Move standalone run_local_sync as method of Process ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2b3fd39db5400a93a8caabae367dac3e3250247 Gerrit-Change-Number: 11747 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 12:10:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:10:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:10:44 +0000 Subject: Change in osmo-gsm-tester[master]: process: launch_sync: allow non success return In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11748 ) Change subject: process: launch_sync: allow non success return ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0617335b594ba565cf2e5ffd0edfb8bffa398c48 Gerrit-Change-Number: 11748 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 12:10:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:10:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:10:46 +0000 Subject: Change in osmo-gsm-tester[master]: nanobts: ipacces-config: Use process.launch_sync helper In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11749 ) Change subject: nanobts: ipacces-config: Use process.launch_sync helper ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9 Gerrit-Change-Number: 11749 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 12:10:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:10:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:10:48 +0000 Subject: Change in osmo-gsm-tester[master]: process: Move standalone run_local_sync as method of Process In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11747 ) Change subject: process: Move standalone run_local_sync as method of Process ...................................................................... process: Move standalone run_local_sync as method of Process Change-Id: Ib2b3fd39db5400a93a8caabae367dac3e3250247 --- M src/osmo_gsm_tester/iperf3.py M src/osmo_gsm_tester/modem.py M src/osmo_gsm_tester/process.py 3 files changed, 20 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index e1ed6ff..894b10f 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -105,7 +105,7 @@ self.process = process.NetNSProcess(self.name(), self.run_dir, netns, popen_args, env={}) else: self.process = process.Process(self.name(), self.run_dir, popen_args, env={}) - process.run_proc_sync(self.process) + self.process.launch_sync() return self.get_results() def get_results(self): diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py index d35933a..5106702 100644 --- a/src/osmo_gsm_tester/modem.py +++ b/src/osmo_gsm_tester/modem.py @@ -636,7 +636,7 @@ def run_netns_wait(self, name, popen_args): proc = process.NetNSProcess(name, self.run_dir.new_dir(name), self.netns(), popen_args, env={}) - process.run_proc_sync(proc) + proc.launch_sync() def setup_context_data_plane(self, ctx_id): self.dbg('setup_context_data', path=ctx_id) diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index a845f7f..40d0cc1 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -77,6 +77,21 @@ self.set_name(self.name_str, pid=self.process_obj.pid) self.log('Launched') + def launch_sync(self): + ''' + calls launch() method and block waiting for it to finish, serving the + mainloop meanwhile. + ''' + try: + self.launch() + self.wait() + except Exception as e: + self.terminate() + raise e + if self.result != 0: + log.ctx(self) + raise log.Error('Exited in error') + def respawn(self): self.dbg('respawn') assert not self.is_running() @@ -255,31 +270,20 @@ run_local_netns_sync(self.run_dir, self.name()+"-kill", self.netns, kill_cmd) -def run_proc_sync(proc): - try: - proc.launch() - proc.wait() - except Exception as e: - proc.terminate() - raise e - if proc.result != 0: - log.ctx(proc) - raise log.Error('Exited in error') - def run_local_sync(run_dir, name, popen_args): run_dir =run_dir.new_dir(name) proc = Process(name, run_dir, popen_args) - run_proc_sync(proc) + proc.launch_sync() def run_local_netns_sync(run_dir, name, netns, popen_args): run_dir =run_dir.new_dir(name) proc = NetNSProcess(name, run_dir, netns, popen_args) - run_proc_sync(proc) + proc.launch_sync() def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None): run_dir = run_dir.new_dir(name) proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args) - run_proc_sync(proc) + proc.launch_sync() def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path): run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path))) -- To view, visit https://gerrit.osmocom.org/11747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib2b3fd39db5400a93a8caabae367dac3e3250247 Gerrit-Change-Number: 11747 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:10:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:10:48 +0000 Subject: Change in osmo-gsm-tester[master]: process: launch_sync: allow non success return In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11748 ) Change subject: process: launch_sync: allow non success return ...................................................................... process: launch_sync: allow non success return Change-Id: I0617335b594ba565cf2e5ffd0edfb8bffa398c48 --- M src/osmo_gsm_tester/process.py 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 40d0cc1..b1769f8 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -77,7 +77,7 @@ self.set_name(self.name_str, pid=self.process_obj.pid) self.log('Launched') - def launch_sync(self): + def launch_sync(self, raise_nonsuccess=True): ''' calls launch() method and block waiting for it to finish, serving the mainloop meanwhile. @@ -88,9 +88,10 @@ except Exception as e: self.terminate() raise e - if self.result != 0: + if raise_nonsuccess and self.result != 0: log.ctx(self) - raise log.Error('Exited in error') + raise log.Error('Exited in error %d' % self.result) + return self.result def respawn(self): self.dbg('respawn') -- To view, visit https://gerrit.osmocom.org/11748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0617335b594ba565cf2e5ffd0edfb8bffa398c48 Gerrit-Change-Number: 11748 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:10:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:10:48 +0000 Subject: Change in osmo-gsm-tester[master]: nanobts: ipacces-config: Use process.launch_sync helper In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11749 ) Change subject: nanobts: ipacces-config: Use process.launch_sync helper ...................................................................... nanobts: ipacces-config: Use process.launch_sync helper Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9 --- M src/osmo_gsm_tester/bts_nanobts.py 1 file changed, 3 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index bec2433..ab75b16 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -253,7 +253,7 @@ self.bts_ip = bts_ip self.env = {} - def launch_process(self, binary_name, *args): + def create_process(self, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -261,7 +261,6 @@ proc = process.Process(binary_name, run_dir, (binary,) + args, env=self.env) - proc.launch() return proc def run(self, name_suffix, *args): @@ -269,13 +268,8 @@ self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bsc'))) lib = self.inst.child('lib') self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc = self.launch_process(IpAccessConfig.BIN_IPACCESS_CONFIG, *args) - try: - MainLoop.wait(self, self.proc.terminated) - except Exception as e: - self.proc.terminate() - raise e - return self.proc.result + self.proc = self.create_process(IpAccessConfig.BIN_IPACCESS_CONFIG, *args) + return self.proc.launch_sync(raise_nonsuccess=False) def set_unit_id(self, unitid, trx_num, restart=False): uid_str = '%d/0/%d' % (unitid, trx_num) -- To view, visit https://gerrit.osmocom.org/11749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9 Gerrit-Change-Number: 11749 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:21:22 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 13 Nov 2018 12:21:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11733 ) Change subject: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover ...................................................................... Patch Set 1: > (1 comment) 3GPP TS 48.008 says 3.2.1.25 "This message is sent from the BSS to the MSC in order to indicate that the BSS has performed an internal handover." I suspect that this may be somehow related to location based services. -- To view, visit https://gerrit.osmocom.org/11733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10f4e578c96a90317939ba49b61b14a3c7e488a7 Gerrit-Change-Number: 11733 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 13 Nov 2018 12:21:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:25:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 12:25:44 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.asciidoc.inc: make clean: also rm *.html In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11723 ) Change subject: Makefile.asciidoc.inc: make clean: also rm *.html ...................................................................... Makefile.asciidoc.inc: make clean: also rm *.html HTML files get created when a2x fails and asciidoc runs. Change-Id: I4d5e9c36f75141ce88d11b16c89809be4dce87d8 --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index ee7a60d..a3c95fe 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -31,7 +31,7 @@ ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex.sty CLEAN_FILES += $(ASCIIDOC_NAME:%=%__*.png) $(ASCIIDOC_NAME:%=%__*.svg) $(ASCIIDOC_CHECKS) -CLEAN_FILES += $(ASCIIDOC_PDF) +CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) UPLOAD_FILES += $(ASCIIDOC_PDF) ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -- To view, visit https://gerrit.osmocom.org/11723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4d5e9c36f75141ce88d11b16c89809be4dce87d8 Gerrit-Change-Number: 11723 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:36:36 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 13 Nov 2018 12:36:36 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 1: (3 comments) > (1 comment) See 3GPP TS 48.008, 3.2.1.25. There it says "This message is sent from the BSS to the MSC in order to indicate that the BSS has performed an internal handover." I think this may also be related to location based services / tracking... https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 678 PS1, Line 678: struct gsm0808_handover_performed ho_perf_params; > "perf" to me reads as "performance test" :P ... [?] Done https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 688 PS1, Line 688: cell = cgi_for_msc(conn->sccp.msc, conn_get_bts(conn)); > (cgi_for_msc is a weird name, my fault; note to self to rename it) We should do this in a separate patch https://gerrit.osmocom.org/#/c/11734/1/tests/handover/handover_test.c File tests/handover/handover_test.c: https://gerrit.osmocom.org/#/c/11734/1/tests/handover/handover_test.c at 223 PS1, Line 223: fake_msc_data.network = &fake_bsc_gsmnet; > Why is this needed? This is now needed since the changes in this patch access fields from the network member. (I could check in the code, but you criticized it last time and I think you were right with that.) -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 12:36:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:37:46 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 12:37:46 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: > In that case the best would be to store the date into the tarball like we do with "./git-version-gen .tarball-version", then take it from there if git repo is not available. > > Please note I'm not against this patch, I'm just saying other fixes may also provide better results. We can still merge this one. Yes, it makes sense to do this in the future. > (leaving to Pau to CR) Pau, would you like to add the +2? -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 12:37:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:40:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 12:40:04 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 12:40:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:42:47 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 12:42:47 +0000 Subject: Change in osmo-gsm-manuals[master]: unix-time-to-fmt.py: fix crash without argument In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11724 ) Change subject: unix-time-to-fmt.py: fix crash without argument ...................................................................... unix-time-to-fmt.py: fix crash without argument Print "unknown" to stdout when unix-time-to-fmt.py was called without an argument, instead of printing a Python stack trace to stderr. It gets called that way when building outside of a git folder. Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 --- M build/unix-time-to-fmt.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/build/unix-time-to-fmt.py b/build/unix-time-to-fmt.py index d081797..026e55c 100755 --- a/build/unix-time-to-fmt.py +++ b/build/unix-time-to-fmt.py @@ -11,6 +11,10 @@ import sys, time +if len(sys.argv) == 1: + print("unknown") + exit(0) + fmt = '%Y-%b-%d' if len(sys.argv) > 2: fmt = sys.argv[2] -- To view, visit https://gerrit.osmocom.org/11724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3ba27cc23543e47cc8a1e494c35cc33f1dc8f297 Gerrit-Change-Number: 11724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:42:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 12:42:52 +0000 Subject: Change in osmo-gsm-manuals[master]: merge_doc.xsl: move from libosmocore.git In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11736 ) Change subject: merge_doc.xsl: move from libosmocore.git ...................................................................... merge_doc.xsl: move from libosmocore.git Allow building manuals without the libosmocore source. Related: OS#3385 Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c --- M Makefile M build/Makefile.vty-reference.inc A merge_doc.xsl 3 files changed, 49 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile b/Makefile index 0ef0942..34c18ad 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -LIBOSMO_DIR ?= ~/source/gsm/libosmocore - all: check-deps cd OsmoBTS; $(MAKE) cd OsmoNITB; $(MAKE) @@ -80,9 +78,6 @@ define check_dep_python2_module @echo "import $(1)" | python2 - >/dev/null 2>&1 || { echo >&2 "Failed to import '$(1)' module, please install $(2)."; exit 1; } endef -define check_dep_dir - @test -d $(1) || { echo >&2 "Directory '$(1)' not found, please set $(2) to the path of your libosmocom source tree: make LIBOSMO_DIR=/path/to/libosmocore"; exit 1; } -endef check-deps: $(call check_dep_bin,mscgen,mscgen) @@ -95,4 +90,3 @@ $(call check_dep_bin,dot,graphviz) $(call check_dep_bin,python2,python2) $(call check_dep_python2_module,pychart,python2-pychart) - $(call check_dep_dir,$(LIBOSMO_DIR),LIBOSMO_DIR) diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 6607ae5..1528d32 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -25,8 +25,7 @@ DOCBOOKS_DEPS = generated/docbook_vty.xml include $(TOPDIR)/build/Makefile.docbook.inc -LIBOSMO_DIR ?= ~/source/gsm/libosmocore -MERGE_DOC = $(shell realpath $(LIBOSMO_DIR)/doc/vty/merge_doc.xsl) +MERGE_DOC = $(shell realpath $(TOPDIR)/merge_doc.xsl) CLEAN_FILES += generated diff --git a/merge_doc.xsl b/merge_doc.xsl new file mode 100644 index 0000000..d75c499 --- /dev/null +++ b/merge_doc.xsl @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/11736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:43:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 12:43:08 +0000 Subject: Change in libosmocore[master]: merge_doc.xsl: move to osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11739 ) Change subject: merge_doc.xsl: move to osmo-gsm-manuals.git ...................................................................... merge_doc.xsl: move to osmo-gsm-manuals.git Allows building the manuals without the checked out libosmocore source. Related: OS#3385 Depends: I8e7036fae062ee783cb132b14608827a82c5e7c7 (osmo-gsm-manuals) Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c --- D doc/vty/merge_doc.xsl 1 file changed, 0 insertions(+), 48 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/doc/vty/merge_doc.xsl b/doc/vty/merge_doc.xsl deleted file mode 100644 index d75c499..0000000 --- a/doc/vty/merge_doc.xsl +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To view, visit https://gerrit.osmocom.org/11739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifb81b18422987cdf36b75993d2782abf93b5f48c Gerrit-Change-Number: 11739 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:43:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 12:43:17 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile: move dep-check code to check-depends.sh In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11737 ) Change subject: Makefile: move dep-check code to check-depends.sh ...................................................................... Makefile: move dep-check code to check-depends.sh Make it possible to run the dependency check without the Makefile. This is needed to split up the manual pages into the projects repositories, so we can call check-depends.sh from there. Related: OS#3385 Change-Id: I82a7efd7e9c265c82d1ba8a60856c892a15a7a33 --- M Makefile A check-depends.sh 2 files changed, 31 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile b/Makefile index 34c18ad..eb3be75 100644 --- a/Makefile +++ b/Makefile @@ -72,21 +72,5 @@ cd OsmocomBB; $(MAKE) check cd OsmoTRX; $(MAKE) check -define check_dep_bin - @type $(1) >/dev/null 2>&1 || { echo >&2 "Binary '$(1)' not found in path, please install $(2)."; exit 1; } -endef -define check_dep_python2_module - @echo "import $(1)" | python2 - >/dev/null 2>&1 || { echo >&2 "Failed to import '$(1)' module, please install $(2)."; exit 1; } -endef - check-deps: - $(call check_dep_bin,mscgen,mscgen) - $(call check_dep_bin,xsltproc,libxslt) - $(call check_dep_bin,git,git) - $(call check_dep_bin,a2x,asciidoc) - $(call check_dep_bin,asciidoc,asciidoc) - $(call check_dep_bin,dblatex,dblatex) - $(call check_dep_bin,packetdiag,nwdiag) - $(call check_dep_bin,dot,graphviz) - $(call check_dep_bin,python2,python2) - $(call check_dep_python2_module,pychart,python2-pychart) + ./check-depends.sh diff --git a/check-depends.sh b/check-depends.sh new file mode 100755 index 0000000..7845719 --- /dev/null +++ b/check-depends.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# $1: program name, $2: package name +check_dep_bin() { + if ! type "$1" >/dev/null 2>&1; then + echo "Binary '$1' not found in path, please install $2." + exit 1 + fi +} + +# $1: module name, $2: package name +check_dep_python2_module() { + if ! echo "import $1" | python2 - >/dev/null 2>&1; then + echo "Failed to import '$1' module, please install $2." + exit 1 + fi +} + +check_dep_bin mscgen mscgen +check_dep_bin xsltproc libxslt +check_dep_bin git git +check_dep_bin a2x asciidoc +check_dep_bin asciidoc asciidoc +check_dep_bin dblatex dblatex +check_dep_bin packetdiag nwdiag +check_dep_bin dot graphviz +check_dep_bin python2 python2 +check_dep_python2_module pychart python2-pychart + +echo "All dependencies installed!" -- To view, visit https://gerrit.osmocom.org/11737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I82a7efd7e9c265c82d1ba8a60856c892a15a7a33 Gerrit-Change-Number: 11737 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:43:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 13 Nov 2018 12:43:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Hello daniel, Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11697 to look at the new patch set (#5). Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... BSC_ConnectionHandler: introduce ctrl interface There are some upcomming tests which require to access the control interface of the MSC while the actual test is running. Futer test cases (e.g. Paging, see also Change Id: a6a1a6bd6da1bf46d6d703be495795d3610ca431) will use this. Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Related: OS#3615 Related: OS#3187 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11697/5 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:43:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 13 Nov 2018 12:43:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11701 to look at the new patch set (#3). Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... BSC_ConnectionHandler: make VTY interface available The BSC_ConnectionHandler currently has no access to the VTY interface. Lets make it available so that upcoming tests can use the VTY interface to trigger actions (e.g. Paging, see also Change Id: 6a1a6bd6da1bf46d6d703be495795d3610ca431) Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Related: OS#3615 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/11701/3 -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:44:32 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 13 Nov 2018 12:44:32 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 1: (2 comments) > (2 comments) (making sure all comments get posted) https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 894 PS1, Line 894: msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); > I'm also not so sure whether this is identical on both big- and little-endian. [?] Can you give me some more information on this. If this way is problematic we have a problem in other cases too gsm0808_create_handover_failure() does it the same way. https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 897 PS1, Line 897: lai_ci.ident = CELL_IDENT_WHOLE_GLOBAL; > Yes, please let the caller decide on the specific cell identity type (add a struct gsm0808_cell_id t [?] I oriented myself on gsm0808_create_layer3_2(), which does the encoding the same way. I think there shouldn't be two different encodings for the same parameter type in one API. (I am not sure, the value is populated from cgi_for_msc(), i don't see it yet, probably I then need to transcode the result) -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 12:44:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 12:58:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 13 Nov 2018 12:58:49 +0000 Subject: Change in osmo-msc[master]: vlr: drop unused is_ps parameter in vlr_subscr_req_lu() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11761 Change subject: vlr: drop unused is_ps parameter in vlr_subscr_req_lu() ...................................................................... vlr: drop unused is_ps parameter in vlr_subscr_req_lu() the function vlr_subscr_req_lu() has a parameter is_ps, which is set to vsub->vlr->cfg.is_ps by the only caller in vlr_lu_fsm.c. Inside the function one can see that vsub->vlr->cfg.is_ps is used directly to decide between PS or CS LU, we could also use is_ps there. Presumably the parameter is_ps had been abandonned in an early development stage and was not removed, so lets drop the parameter. Change-Id: Id239721773b90099d122b232dae1ba457be9d255 --- M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/61/11761/1 diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f7572f2..f7ac864 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -616,7 +616,7 @@ } /* VLR internal call to request UpdateLocation from HLR */ -int vlr_subscr_req_lu(struct vlr_subscr *vsub, bool is_ps) +int vlr_subscr_req_lu(struct vlr_subscr *vsub) { struct osmo_gsup_message gsup_msg = {0}; int rc; diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index a6585be..d336b1b 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -5,7 +5,7 @@ struct osmo_gsup_message; const char *vlr_subscr_name(struct vlr_subscr *vsub); -int vlr_subscr_req_lu(struct vlr_subscr *vsub, bool is_ps) __attribute__((warn_unused_result)); +int vlr_subscr_req_lu(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); int vlr_subscr_req_sai(struct vlr_subscr *vsub, const uint8_t *auts, const uint8_t *auts_rand) __attribute__((warn_unused_result)); struct vlr_subscr *vlr_subscr_alloc(struct vlr_instance *vlr); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 717db42..02e49e0 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -79,7 +79,7 @@ OSMO_ASSERT(event == UPD_HLR_VLR_E_START); /* Send UpdateLocation to HLR */ - rc = vlr_subscr_req_lu(vsub, vsub->vlr->cfg.is_ps); + rc = vlr_subscr_req_lu(vsub); if (rc < 0) LOGPFSML(fi, LOGL_ERROR, "Failed to send UpdateLocation to HLR\n"); osmo_fsm_inst_state_chg(fi, UPD_HLR_VLR_S_WAIT_FOR_DATA, -- To view, visit https://gerrit.osmocom.org/11761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id239721773b90099d122b232dae1ba457be9d255 Gerrit-Change-Number: 11761 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 13:00:13 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 13 Nov 2018 13:00:13 +0000 Subject: Change in osmo-msc[master]: vlr: use unused is_ps parameter in vlr_subscr_req_lu() In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/11563 ) Change subject: vlr: use unused is_ps parameter in vlr_subscr_req_lu() ...................................................................... Abandoned Abandonned in favor of a different approach: Id239721773b90099d122b232dae1ba457be9d255 -- To view, visit https://gerrit.osmocom.org/11563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Idfc925f2cb254d192e86568958b5ecb68fac09da Gerrit-Change-Number: 11563 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 13:07:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 13 Nov 2018 13:07:02 +0000 Subject: Change in osmo-msc[master]: move project specific manuals to their own repos In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11726 ) Change subject: move project specific manuals to their own repos ...................................................................... Patch Set 1: (2 comments) > I associate 'man' with the unix manpages. IIUC we are generating / going to generate manpages from this, but IMHO this should be called 'manuals'; or rather, just be directly in the doc/ dir, after all, "documentation / manuals" is redundant. I agree with the name being confusing for manpages, so I welcome suggestions for better folder names. And yes, the plan is to generate manpages eventually. There's a separate issue for this: https://osmocom.org/issues/3386 If we did place the files directly in the doc folder, what about the project repositories that already have files in there? I think it would be good to separate the files that end up in the PDFs from the files that are meant to be read otherwise. Also some doc folders already have Makefile.am inside (see below). My idea was to have this commit a blueprint to how to do it with the other repositories as well, so it would be nice if we could find a solution that works for all projects. How about "doc/manuals" then? Or "doc/pdf"? $ for i in *; do [ -d "$i/doc" ] || continue; echo ":: $i/doc"; ls $i/doc; done :: libosmocore/doc vty :: libosmo-sccp/doc Makefile.am Makefile.in examples :: osmo-bsc/doc BS11-OML.txt assignment-fsm.dot handover-inter-bsc-in.msc lchan.msc mgw-endpoint.msc Makefile e1-data-model.txt handover-inter-bsc-in-fsm.dot lchan-fsm.dot mgw-endpoint-fsm.dot Makefile.am examples handover-inter-bsc-out.msc lchan-rtp-fsm.dot timeslot.msc Makefile.in handover.msc handover-inter-bsc-out-fsm.dot legend_for_fsm_diagrams.dot timeslot-fsm.dot assignment.msc handover.txt handover-intra-bsc-fsm.dot legend_for_ladder_diagrams.msc ts-and-lchan-fsm-lifecycle.msc :: osmo-bts/doc Makefile.am control_interface.txt examples phy_link.txt startup.txt :: osmo-ggsn/doc Compliance.html Makefile.am Makefile.in examples osmo-ggsn.8 sgsnemu.8 :: osmo-hlr/doc Makefile.am Makefile.in examples :: osmo-iuh/doc Makefile.am README hnb_cs_lu.msc hnb_cs_mo_sms.msc hnb_cs_mt_sms.msc hnb_ps_pdp_act.msc Makefile.in examples hnb_cs_mo_call.msc hnb_cs_mt_call.msc hnb_ps_lu.msc protocols_around_hnbgw.txt :: osmo-mgw/doc Makefile.am Makefile.in examples :: osmo-msc/doc Makefile.am Makefile.in examples man :: osmo-sgsn/doc Makefile.am Makefile.in examples :: osmo-sip-connector/doc Makefile.am Makefile.in examples :: osmo-trx/doc Makefile.am Makefile.in examples :: osmo-ttcn3-hacks/doc osmodevcon2018-ttcn3_test_suites.adoc https://gerrit.osmocom.org/#/c/11726/1/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/11726/1/.gitignore at 66 PS1, Line 66: *.html > Seems that the manuals get generated in the root dir of the {source,build} tree? I would prefer a su [?] They get generated in the manuals folder (doc/man currently). Some files also end up in a "generated" subfolder (like it is the case with the current build scripts in osmo-gsm-manuals.git), so doc/man/generated. https://gerrit.osmocom.org/#/c/11726/1/doc/man/chapters/counters_generated.adoc File doc/man/chapters/counters_generated.adoc: https://gerrit.osmocom.org/#/c/11726/1/doc/man/chapters/counters_generated.adoc at 6 PS1, Line 6: .msc - mobile switching center > whitespace It says "// autogenerated by show asciidoc counters" on top and it was copy pasted from osmo-gsm-manuals.git's OsmoMSC folder. Should we change it anyway? -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 13:07:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 13:32:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 13:32:01 +0000 Subject: Change in osmo-msc[master]: vlr: drop unused is_ps parameter in vlr_subscr_req_lu() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11761 ) Change subject: vlr: drop unused is_ps parameter in vlr_subscr_req_lu() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id239721773b90099d122b232dae1ba457be9d255 Gerrit-Change-Number: 11761 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 13:32:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 13:32:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 13:32:58 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-pcu: Set log level from dbg to info In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11760 ) Change subject: templates: osmo-pcu: Set log level from dbg to info ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I008234024b9369db42c90ef5d59a013fd2d22718 Gerrit-Change-Number: 11760 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 13:32:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 13:33:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 13:33:00 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-pcu: Set log level from dbg to info In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11760 ) Change subject: templates: osmo-pcu: Set log level from dbg to info ...................................................................... templates: osmo-pcu: Set log level from dbg to info Otherwise there's too much output. With debug enabled, iperf3 test from gprs testsuite generates a 96MB osmo-pcu.log. With log level set to info, size drops to 1.4M, which is a lot less after compressing in an archive. Change-Id: I008234024b9369db42c90ef5d59a013fd2d22718 --- M src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl index 86cb1a4..da7425c 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl @@ -2,7 +2,7 @@ logging color 1 logging print extended-timestamp 1 logging print category 1 - logging level set-all debug + logging level set-all info pcu pcu-socket ${osmo_pcu.pcu_socket_path} flow-control-interval 10 -- To view, visit https://gerrit.osmocom.org/11760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I008234024b9369db42c90ef5d59a013fd2d22718 Gerrit-Change-Number: 11760 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 13:34:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 13 Nov 2018 13:34:33 +0000 Subject: Change in osmo-bsc[master]: show dynamic timeslot details in 'show timeslot' vty command Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11762 Change subject: show dynamic timeslot details in 'show timeslot' vty command ...................................................................... show dynamic timeslot details in 'show timeslot' vty command The 'show lchan' command already shows details about timeslot state, indicating whether a channel is currently being switched to a different channel type. However, this information was not shown by 'show timeslot' yet. There are TTCN3 BSC tests which use 'show timeslot' and are seeing sporadic failures when 'show timeout' is invoked during a channel type transition. With this change, VTY sessions recorded in pcap files for these tests will contain information about the current channel type transition state. Change-Id: Ib854945756fb54c0e1c7d4212ea7b8746eec0db5 Related: OS#3690 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 34 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/62/11762/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 84752dd..4331ca2 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1151,6 +1151,38 @@ return CMD_SUCCESS; } +/* call vty_out() to print a string like " as TCH/H" for dynamic timeslots. + * Don't do anything if the ts is not dynamic. */ +static void vty_out_dyn_ts_status(struct vty *vty, struct gsm_bts_trx_ts *ts) +{ + enum gsm_phys_chan_config target; + if (ts_is_pchan_switching(ts, &target)) { + vty_out(vty, " switching %s -> %s", gsm_pchan_name(ts->pchan_is), + gsm_pchan_name(target)); + } else if (ts->pchan_is != ts->pchan_on_init) { + vty_out(vty, " as %s", gsm_pchan_name(ts->pchan_is)); + } +} + +static void vty_out_dyn_ts_details(struct vty *vty, struct gsm_bts_trx_ts *ts) +{ + /* show dyn TS details, if applicable */ + switch (ts->pchan_on_init) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + vty_out(vty, " Osmocom Dyn TS:"); + vty_out_dyn_ts_status(vty, ts); + vty_out(vty, VTY_NEWLINE); + break; + case GSM_PCHAN_TCH_F_PDCH: + vty_out(vty, " IPACC Dyn PDCH TS:"); + vty_out_dyn_ts_status(vty, ts); + vty_out(vty, VTY_NEWLINE); + break; + default: + /* no dyn ts */ + break; + } +} static void ts_dump_vty(struct vty *vty, struct gsm_bts_trx_ts *ts) { @@ -1160,6 +1192,7 @@ if (ts->pchan_is != ts->pchan_on_init) vty_out(vty, " (%s mode)", gsm_pchan_name(ts->pchan_is)); vty_out(vty, ", TSC %u%s NM State: ", gsm_ts_tsc(ts), VTY_NEWLINE); + vty_out_dyn_ts_details(vty, ts); net_dump_nmstate(vty, &ts->mo.nm_state); if (!is_ipaccess_bts(ts->trx->bts)) vty_out(vty, " E1 Line %u, Timeslot %u, Subslot %u%s", @@ -1287,19 +1320,6 @@ } -/* call vty_out() to print a string like " as TCH/H" for dynamic timeslots. - * Don't do anything if the ts is not dynamic. */ -static void vty_out_dyn_ts_status(struct vty *vty, struct gsm_bts_trx_ts *ts) -{ - enum gsm_phys_chan_config target; - if (ts_is_pchan_switching(ts, &target)) { - vty_out(vty, " switching %s -> %s", gsm_pchan_name(ts->pchan_is), - gsm_pchan_name(target)); - } else if (ts->pchan_is != ts->pchan_on_init) { - vty_out(vty, " as %s", gsm_pchan_name(ts->pchan_is)); - } -} - static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan) { int idx; @@ -1307,22 +1327,7 @@ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE); - /* show dyn TS details, if applicable */ - switch (lchan->ts->pchan_on_init) { - case GSM_PCHAN_TCH_F_TCH_H_PDCH: - vty_out(vty, " Osmocom Dyn TS:"); - vty_out_dyn_ts_status(vty, lchan->ts); - vty_out(vty, VTY_NEWLINE); - break; - case GSM_PCHAN_TCH_F_PDCH: - vty_out(vty, " IPACC Dyn PDCH TS:"); - vty_out_dyn_ts_status(vty, lchan->ts); - vty_out(vty, VTY_NEWLINE); - break; - default: - /* no dyn ts */ - break; - } + vty_out_dyn_ts_details(vty, lchan->ts); vty_out(vty, " Connection: %u, State: %s%s%s%s", lchan->conn ? 1: 0, lchan_state_name(lchan), lchan->fi && lchan->fi->state == LCHAN_ST_BORKEN ? " Error reason: " : "", -- To view, visit https://gerrit.osmocom.org/11762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib854945756fb54c0e1c7d4212ea7b8746eec0db5 Gerrit-Change-Number: 11762 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:29:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 13 Nov 2018 14:29:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: attempt to fix a race condition in BSC test's f_ts_dyn_mode_get Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11763 Change subject: attempt to fix a race condition in BSC test's f_ts_dyn_mode_get ...................................................................... attempt to fix a race condition in BSC test's f_ts_dyn_mode_get Add two helper functions which retry a VTY command until the result matches a regular expression or a configurable timeout expires. Use these functions in BSC test's f_ts_dyn_mode_get, which has seen sporadic failures due to a race condition during channel reconfiguration, in order to hopefully close this race. Change-Id: I308ddb06e440c165fe1e73fe2c1fb78be2e1d510 Related: OS#3690 --- M bsc/BSC_Tests.ttcn M library/Osmocom_VTY_Functions.ttcn 2 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/11763/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e3ac707..4f5145b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2742,8 +2742,7 @@ runs on test_CT return charstring { var charstring cmd, resp; cmd := "show timeslot "&int2str(bts_nr)&" "&int2str(trx_nr)&" "&int2str(ts_nr); - resp := f_vty_transceive_ret(BSCVTY, cmd); - return regexp(resp, "*\((*)\)*", 0); + return f_vty_transceive_match_regexp_retry(BSCVTY, cmd, "*\((*)\)*", 0, 4, 1.0); } private function f_ts_dyn_mode_assert(integer bts_nr, integer trx_nr, integer ts_nr, diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index 86f58f1..4f795ad 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -1,5 +1,6 @@ module Osmocom_VTY_Functions { import from TELNETasp_PortType all; + import from Osmocom_Types all; modulepar { charstring mp_prompt_prefix := "OpenBSC"; @@ -153,5 +154,27 @@ } } +function f_vty_transceive_match_regex(TELNETasp_PT pt, charstring cmd, charstring regex, integer groupno) return charstring +{ + var charstring resp := f_vty_transceive_ret(pt, cmd); + return regexp(resp, regex, groupno); +} + +function f_vty_transceive_match_regexp_retry(TELNETasp_PT pt, charstring cmd, charstring regex, + integer groupno, integer num_attempts, float retry_delay) return charstring +{ + while (num_attempts > 0) { + var charstring ret := f_vty_transceive_match_regex(pt, cmd, regex, groupno); + if (ret != "") { + return ret; + } + f_sleep(retry_delay); + num_attempts := num_attempts - 1; + } + + setverdict(fail, "No matching VTY response for regular expression '", regex, + "' after ", num_attempts, " attempts." ); + mtc.stop; +} } -- To view, visit https://gerrit.osmocom.org/11763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I308ddb06e440c165fe1e73fe2c1fb78be2e1d510 Gerrit-Change-Number: 11763 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:30:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 14:30:14 +0000 Subject: Change in osmo-bsc[master]: show dynamic timeslot details in 'show timeslot' vty command In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11762 ) Change subject: show dynamic timeslot details in 'show timeslot' vty command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib854945756fb54c0e1c7d4212ea7b8746eec0db5 Gerrit-Change-Number: 11762 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 14:30:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:30:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 14:30:51 +0000 Subject: Change in osmo-bsc[master]: show dynamic timeslot details in 'show timeslot' vty command In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11762 ) Change subject: show dynamic timeslot details in 'show timeslot' vty command ...................................................................... Patch Set 1: I think you should be able to see the changes if you look at osmo-bsc log. -- To view, visit https://gerrit.osmocom.org/11762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib854945756fb54c0e1c7d4212ea7b8746eec0db5 Gerrit-Change-Number: 11762 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 14:30:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:37:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 14:37:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: attempt to fix a race condition in BSC test's f_ts_dyn_mode_get In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11763 ) Change subject: attempt to fix a race condition in BSC test's f_ts_dyn_mode_get ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I308ddb06e440c165fe1e73fe2c1fb78be2e1d510 Gerrit-Change-Number: 11763 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 14:37:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:45:35 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 13 Nov 2018 14:45:35 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 2: I have confirmed that TTCN3 SGSN test results are unaffected by this patch. -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 14:45:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:52:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 14:52:18 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 14:52:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:52:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 14:52:48 +0000 Subject: Change in osmo-sgsn[master]: fix bogus error check in gprs_sndcp_comp_create() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11730 ) Change subject: fix bogus error check in gprs_sndcp_comp_create() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8444c1ed052707c76a979fb06cb018ac678defa7 Gerrit-Change-Number: 11730 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 13 Nov 2018 14:52:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:54:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 14:54:50 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.common.inc: add publish target In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: Makefile.common.inc: add publish target ...................................................................... Patch Set 1: Code-Review+1 > I'm confused, don't we already publish the manuals automatically?! we do publish them, but I guess the details are in the jenkins job rather than here? -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 13 Nov 2018 14:54:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 14:57:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 14:57:41 +0000 Subject: Change in osmo-msc[master]: move project specific manuals to their own repos In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11726 ) Change subject: move project specific manuals to their own repos ...................................................................... Patch Set 1: I agree that 'man' is a bad naming choice. Call it manual, put it straight into the 'doc' directory, whatever. But don't call anything but man-pages related bits 'man', it will just confuse people. -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 13 Nov 2018 14:57:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:06:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:06:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11701 ) Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11701/3/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/#/c/11701/3/msc/BSC_ConnectionHandler.ttcn at 143 PS3, Line 143: if (not g_vty_initialized) { the f_init_handler() function should always be called only once per testcase, no need for this g_vty_initialized here. The remainig other code also doesn't support calling this function multiple times during one testcase. -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 13 Nov 2018 15:06:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:07:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: introduce ctrl interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11697 ) Change subject: BSC_ConnectionHandler: introduce ctrl interface ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Gerrit-Change-Number: 11697 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 13 Nov 2018 15:07:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:10:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:10:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: remove flush from f_expect_chan_rel In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11658 ) Change subject: bsc: remove flush from f_expect_chan_rel ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1be30c3f109dda8c58c523df508211f8e20aad3 Gerrit-Change-Number: 11658 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 13 Nov 2018 15:10:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 13 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 13 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#306?= In-Reply-To: <1749816646.555.1542035407390.JavaMail.jenkins@jenkins.osmocom.org> References: <1749816646.555.1542035407390.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2147306496.571.1542121807514.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:10:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:10:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: handle RR Release messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11660 ) Change subject: bsc: handle RR Release messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e6d266d091b140f56b28312cb3c5d67ffcc3a59 Gerrit-Change-Number: 11660 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 13 Nov 2018 15:10:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:46:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 13 Nov 2018 15:46:01 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: print TRX socket addresses in 'show transceiver' Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11764 Change subject: osmo-bts-trx: print TRX socket addresses in 'show transceiver' ...................................................................... osmo-bts-trx: print TRX socket addresses in 'show transceiver' Change-Id: I081305d730cbdb14b5ce1dbfee18673328225b66 --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/11764/1 diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 1dfc617..d1c58b4 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -66,7 +67,7 @@ llist_for_each_entry(trx, &bts->trx_list, list) { struct phy_instance *pinst = trx_phy_instance(trx); l1h = pinst->u.osmotrx.hdl; - vty_out(vty, "TRX %d%s", trx->nr, VTY_NEWLINE); + vty_out(vty, "TRX %d %s%s", trx->nr, osmo_sock_get_name(NULL, pinst->phy_link->u.osmotrx.trx_ofd_clk.fd), VTY_NEWLINE); vty_out(vty, " %s%s", (l1h->config.poweron) ? "poweron":"poweroff", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/11764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I081305d730cbdb14b5ce1dbfee18673328225b66 Gerrit-Change-Number: 11764 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:51:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:51:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_chan_act_ack_est_ind_noreply: use f_expect_chan_rel In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11659 ) Change subject: bsc: TC_chan_act_ack_est_ind_noreply: use f_expect_chan_rel ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7dd886472337e2deb968e6f9de6cecdb7855319 Gerrit-Change-Number: 11659 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 13 Nov 2018 15:51:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:52:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:52:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: handle Deact SACCH messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11661 ) Change subject: bsc: handle Deact SACCH messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I27da24dbe3184fa7a076a35f6fa6af457c1db8d2 Gerrit-Change-Number: 11661 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 13 Nov 2018 15:52:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:52:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:52:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: check channel release message presence In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11662 ) Change subject: bsc: check channel release message presence ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibc64058f1e214bea585f4e8dcb66f3df8ead3845 Gerrit-Change-Number: 11662 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 13 Nov 2018 15:52:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:53:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:53:52 +0000 Subject: Change in osmo-bsc[master]: fix: send RR Release (e.g. after BSSMAP Clear Cmd) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11664 ) Change subject: fix: send RR Release (e.g. after BSSMAP Clear Cmd) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I666b3b4f45706d898d664d380bd0fd2b018be358 Gerrit-Change-Number: 11664 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 15:53:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:54:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:54:07 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: drop unused enum sacch_deact In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11665 ) Change subject: abis_rsl.c: drop unused enum sacch_deact ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a1542e92373d2773699744e7b64a08667a4b0f5 Gerrit-Change-Number: 11665 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 13 Nov 2018 15:54:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:54:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:54:28 +0000 Subject: Change in osmo-bsc[master]: lchan: release in error: fix missing messages / events In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11666 ) Change subject: lchan: release in error: fix missing messages / events ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I648a9826ce56b611359f81462ca03e4ab4c736aa Gerrit-Change-Number: 11666 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 15:54:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:55:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:55:48 +0000 Subject: Change in osmo-bsc[master]: lchan release: always Deact SACCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11667 ) Change subject: lchan release: always Deact SACCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id3301df059582da2377ef82feae554e94fa42035 Gerrit-Change-Number: 11667 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 15:55:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:56:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:56:31 +0000 Subject: Change in osmo-bsc[master]: cosmetic: abis_rsl.c: drop uneccesary braces In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11669 ) Change subject: cosmetic: abis_rsl.c: drop uneccesary braces ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I20a7b160321cf86179cdcece71c8158e76ba4a1b Gerrit-Change-Number: 11669 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 15:56:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:57:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:57:07 +0000 Subject: Change in osmo-bsc[master]: lchan: set cause for 4 instances of release_in_error = true In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11670 ) Change subject: lchan: set cause for 4 instances of release_in_error = true ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 Gerrit-Change-Number: 11670 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 13 Nov 2018 15:57:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:58:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:58:27 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: print TRX socket addresses in 'show transceiver' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11764 ) Change subject: osmo-bts-trx: print TRX socket addresses in 'show transceiver' ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11764/1/src/osmo-bts-trx/trx_vty.c File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/#/c/11764/1/src/osmo-bts-trx/trx_vty.c at 70 PS1, Line 70: vty_out(vty, "TRX %d %s%s", trx->nr, osmo_sock_get_name(NULL, pinst->phy_link->u.osmotrx.trx_ofd_clk.fd), VTY_NEWLINE); you are leaking memory here, as the function you're calling allocates on the heap... -- To view, visit https://gerrit.osmocom.org/11764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I081305d730cbdb14b5ce1dbfee18673328225b66 Gerrit-Change-Number: 11764 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 13 Nov 2018 15:58:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:58:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 13 Nov 2018 15:58:55 +0000 Subject: Change in osmo-msc[master]: vty: add command to show all known BSC In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11711 ) Change subject: vty: add command to show all known BSC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I247fdce00f43072b0a2a0122b80bd40cdd9e0128 Gerrit-Change-Number: 11711 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 13 Nov 2018 15:58:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 15:59:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 13 Nov 2018 15:59:39 +0000 Subject: Change in osmo-msc[master]: vty: add command to show all known BSC In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11711 ) Change subject: vty: add command to show all known BSC ...................................................................... vty: add command to show all known BSC Change-Id: I247fdce00f43072b0a2a0122b80bd40cdd9e0128 --- M src/libmsc/msc_vty.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index a16cec8..840559a 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -31,6 +31,8 @@ #include #include +#include + #include #include #include @@ -47,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -467,6 +470,19 @@ return CMD_SUCCESS; } +DEFUN(show_bsc, show_bsc_cmd, + "show bsc", SHOW_STR "BSC\n") +{ + struct bsc_context *bsc_ctx; + struct osmo_ss7_instance *ss7 = osmo_ss7_instance_find(gsmnet->a.cs7_instance); + + llist_for_each_entry(bsc_ctx, &gsmnet->a.bscs, list) { + vty_out(vty, "BSC %s%s", osmo_sccp_addr_name(ss7, &bsc_ctx->bsc_addr), VTY_NEWLINE); + } + + return CMD_SUCCESS; +} + static void vty_conn_hdr(struct vty *vty) { vty_out(vty, "--ConnId ------------Subscriber RAN --LAC Use --Tokens C A5 State%s", @@ -1446,6 +1462,7 @@ install_element_ve(&show_subscr_cmd); install_element_ve(&show_subscr_cache_cmd); + install_element_ve(&show_bsc_cmd); install_element_ve(&show_msc_conn_cmd); install_element_ve(&show_msc_transaction_cmd); -- To view, visit https://gerrit.osmocom.org/11711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I247fdce00f43072b0a2a0122b80bd40cdd9e0128 Gerrit-Change-Number: 11711 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 20:10:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 20:10:01 +0000 Subject: Change in osmo-bts[master]: bts-trx: trx_if: Use struct to store CTRL msg parsed responses Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11765 Change subject: bts-trx: trx_if: Use struct to store CTRL msg parsed responses ...................................................................... bts-trx: trx_if: Use struct to store CTRL msg parsed responses Change-Id: Icb84bce0621042afa4301678ba1cc58d8e3662bb --- M src/osmo-bts-trx/trx_if.c 1 file changed, 28 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/11765/1 diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index f3de245..4bcdfc6 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -368,8 +368,13 @@ return trx_ctrl_cmd(l1h, 1, "NOHANDOVER", "%d %d", tn, ss); } -static int parse_rsp(const char *buf_in, size_t len_in, char *cmdname_out, size_t cmdname_len, - char *params_out, size_t params_len, int *status) +struct trx_ctrl_rsp { + char cmd[50]; + char params[100]; + int status; +}; + +static int parse_rsp(const char *buf_in, size_t len_in, struct trx_ctrl_rsp *rsp) { char *p, *k; @@ -380,18 +385,18 @@ if (!(p = strchr(buf_in + 4, ' '))) goto parse_err; - if (p - buf_in >= cmdname_len) { - LOGP(DTRX, LOGL_ERROR, "cmdname buffer too small %lu >= %lu\n", - p - buf_in, cmdname_len); + if (p - buf_in >= sizeof(rsp->cmd)) { + LOGP(DTRX, LOGL_ERROR, "cmd buffer too small %lu >= %lu\n", + p - buf_in, sizeof(rsp->cmd)); goto parse_err; } - cmdname_out[0] = '\0'; - strncat(cmdname_out, buf_in + 4, p - buf_in - 4); + rsp->cmd[0] = '\0'; + strncat(rsp->cmd, buf_in + 4, p - buf_in - 4); /* Now comes the status code of the response */ p++; - if (sscanf(p, "%d", status) != 1) + if (sscanf(p, "%d", &rsp->status) != 1) goto parse_err; /* Now copy back the parameters */ @@ -401,13 +406,13 @@ else k = p + strlen(p); - if (strlen(k) >= params_len) { + if (strlen(k) >= sizeof(rsp->params)) { LOGP(DTRX, LOGL_ERROR, "params buffer too small %lu >= %lu\n", - strlen(k), params_len); + strlen(k), sizeof(rsp->params)); goto parse_err; } - params_out[0] = '\0'; - strcat(params_out, k); + rsp->params[0] = '\0'; + strcat(rsp->params, k); return 0; parse_err: @@ -416,15 +421,15 @@ return -1; } -static bool cmd_matches_rsp(struct trx_ctrl_msg *tcm, char *rspname, char* params) +static bool cmd_matches_rsp(struct trx_ctrl_msg *tcm, struct trx_ctrl_rsp *rsp) { - if (strcmp(tcm->cmd, rspname)) + if (strcmp(tcm->cmd, rsp->cmd)) return false; /* For SETSLOT we also need to check if it's the response for the specific timeslot. For other commands such as SETRXGAIN, it is expected that they can return different values */ - if (strcmp(tcm->cmd, "SETSLOT") == 0 && strcmp(tcm->params, params)) + if (strcmp(tcm->cmd, "SETSLOT") == 0 && strcmp(tcm->params, rsp->params)) return false; return true; @@ -435,8 +440,9 @@ { struct trx_l1h *l1h = ofd->data; struct phy_instance *pinst = l1h->phy_inst; - char buf[1500], cmdname[50], params[100]; - int len, resp; + char buf[1500]; + struct trx_ctrl_rsp rsp; + int len; struct trx_ctrl_msg *tcm; len = recv(ofd->fd, buf, sizeof(buf) - 1, 0); @@ -444,7 +450,7 @@ return len; buf[len] = '\0'; - if (parse_rsp(buf, len, cmdname, sizeof(cmdname), params, sizeof(params), &resp) < 0) + if (parse_rsp(buf, len, &rsp) < 0) return 0; LOGP(DTRX, LOGL_INFO, "Response message: '%s'\n", buf); @@ -456,7 +462,7 @@ /* get command for response message */ if (llist_empty(&l1h->trx_ctrl_list)) { /* RSP from a retransmission, skip it */ - if (l1h->last_acked && cmd_matches_rsp(l1h->last_acked, cmdname, params)) { + if (l1h->last_acked && cmd_matches_rsp(l1h->last_acked, &rsp)) { LOGP(DTRX, LOGL_NOTICE, "Discarding duplicated RSP " "from old CMD '%s'\n", buf); return 0; @@ -469,9 +475,9 @@ list); /* check if response matches command */ - if (!cmd_matches_rsp(tcm, cmdname, params)) { + if (!cmd_matches_rsp(tcm, &rsp)) { /* RSP from a retransmission, skip it */ - if (l1h->last_acked && cmd_matches_rsp(l1h->last_acked, cmdname, params)) { + if (l1h->last_acked && cmd_matches_rsp(l1h->last_acked, &rsp)) { LOGP(DTRX, LOGL_NOTICE, "Discarding duplicated RSP " "from old CMD '%s'\n", buf); return 0; @@ -484,7 +490,7 @@ } /* check for response code */ - if (resp) { + if (rsp.status) { LOGP(DTRX, (tcm->critical) ? LOGL_FATAL : LOGL_NOTICE, "transceiver (%s) rejected TRX command " "with response: '%s'\n", -- To view, visit https://gerrit.osmocom.org/11765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icb84bce0621042afa4301678ba1cc58d8e3662bb Gerrit-Change-Number: 11765 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 20:10:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 20:10:02 +0000 Subject: Change in osmo-bts[master]: bts-trx: setup timer once at creation time Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11766 Change subject: bts-trx: setup timer once at creation time ...................................................................... bts-trx: setup timer once at creation time Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 5 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/11766/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index faff3a0..b4ca54f 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -58,6 +58,14 @@ [GSM_PCHAN_UNKNOWN] = 0, }; +struct trx_l1h *trx_l1h_alloc(void *tall_ctx, struct phy_instance *pinst) +{ + struct trx_l1h *l1h; + l1h = talloc_zero(tall_ctx, struct trx_l1h); + l1h->phy_inst = pinst; + trx_if_init(l1h); + return l1h; +} static void check_transceiver_availability_trx(struct trx_l1h *l1h, int avail) { diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 77c5936..165f9d8 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -64,6 +64,7 @@ struct l1sched_trx l1s; }; +struct trx_l1h *trx_l1h_alloc(void *tall_ctx, struct phy_instance *pinst); int check_transceiver_availability(struct gsm_bts *bts, int avail); int l1if_provision_transceiver_trx(struct trx_l1h *l1h); int l1if_provision_transceiver(struct gsm_bts *bts); diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 61610f7..6e4dd8e 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -134,8 +134,7 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst) { struct trx_l1h *l1h; - l1h = talloc_zero(tall_bts_ctx, struct trx_l1h); - l1h->phy_inst = pinst; + l1h = trx_l1h_alloc(tall_bts_ctx, pinst); pinst->u.osmotrx.hdl = l1h; l1h->config.power_oml = 1; diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 4bcdfc6..b409d51 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -140,8 +140,6 @@ * TRX ctrl socket */ -static void trx_ctrl_timer_cb(void *data); - /* send first ctrl message and start timer */ static void trx_ctrl_send(struct trx_l1h *l1h) { @@ -162,8 +160,6 @@ send(l1h->trx_ofd_ctrl.fd, buf, len+1, 0); /* start timer */ - l1h->trx_ctrl_timer.cb = trx_ctrl_timer_cb; - l1h->trx_ctrl_timer.data = l1h; osmo_timer_schedule(&l1h->trx_ctrl_timer, 2, 0); } @@ -184,6 +180,12 @@ trx_ctrl_send(l1h); } +void trx_if_init(struct trx_l1h *l1h) +{ + l1h->trx_ctrl_timer.cb = trx_ctrl_timer_cb; + l1h->trx_ctrl_timer.data = l1h; +} + /*! Send a new TRX control command. * \param[inout] l1h TRX Layer1 handle to which to send command * \param[in] criticial diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index b161044..206f5e5 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -14,6 +14,7 @@ int critical; }; +void trx_if_init(struct trx_l1h *l1h); int trx_if_cmd_poweroff(struct trx_l1h *l1h); int trx_if_cmd_poweron(struct trx_l1h *l1h); int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc); -- To view, visit https://gerrit.osmocom.org/11766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 Gerrit-Change-Number: 11766 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 20:10:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 20:10:02 +0000 Subject: Change in osmo-bts[master]: common: Implement OML for trx_set_available(1) Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11767 Change subject: common: Implement OML for trx_set_available(1) ...................................................................... common: Implement OML for trx_set_available(1) Related: OS#3692 Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a --- M src/common/bts.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/11767/1 diff --git a/src/common/bts.c b/src/common/bts.c index c251fdd..16f35ef 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -313,13 +313,11 @@ LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n", trx->nr, avail); if (avail) { - /* FIXME: This needs to be sorted out */ -#if 0 - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); - oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OFF_LINE); + int op_state = trx->rsl_link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; + oml_mo_state_chg(&trx->mo, op_state, NM_AVSTATE_OK); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); -#endif + oml_mo_state_chg(&trx->ts[tn].mo, op_state, NM_AVSTATE_OK); } else { oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_NOT_INSTALLED); -- To view, visit https://gerrit.osmocom.org/11767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a Gerrit-Change-Number: 11767 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 20:10:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 13 Nov 2018 20:10:03 +0000 Subject: Change in osmo-bts[master]: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11768 Change subject: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx ...................................................................... bts-trx: Allow re-try without exit if POWERON fails in osmo-trx If POWERON fails, announce to BSC that the TRX is not available, and announce it as available as soon as POWERON success is received. Related: OS#3692 Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 45 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/11768/1 diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index b409d51..7f50218 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -173,7 +173,7 @@ OSMO_ASSERT(!llist_empty(&l1h->trx_ctrl_list)); tcm = llist_entry(l1h->trx_ctrl_list.next, struct trx_ctrl_msg, list); - LOGP(DTRX, LOGL_NOTICE, "No response from transceiver for %s (CMD %s%s%s)\n", + LOGP(DTRX, LOGL_NOTICE, "No satisfactory response from transceiver for %s (CMD %s%s%s)\n", phy_instance_name(l1h->phy_inst), tcm->cmd, tcm->params_len ? " ":"", tcm->params); @@ -437,6 +437,41 @@ return true; } + +/* -EINVAL: unrecoverable error, exit BTS + * N > 0: try sending originating command again after N seconds + * 0: Done with response, get originating command out from send queue + */ +static int trx_ctrl_rx_rsp(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp, bool critical) +{ + struct phy_instance *pinst = l1h->phy_inst; + + /* If TRX fails, try again after 1 sec */ + if (strcmp(rsp->cmd, "POWERON") == 0) { + if (rsp->status == 0) { + if (pinst->phy_link->state != PHY_LINK_CONNECTED) + phy_link_state_set(pinst->phy_link, PHY_LINK_CONNECTED); + } else { + LOGP(DTRX, LOGL_NOTICE, + "transceiver (%s) rejected POWERON command (%d), re-trying in a few seconds\n", + phy_instance_name(pinst), rsp->status); + if (pinst->phy_link->state != PHY_LINK_SHUTDOWN) + phy_link_state_set(pinst->phy_link, PHY_LINK_SHUTDOWN); + return 5; + } + } + + if (rsp->status) { + LOGP(DTRX, critical ? LOGL_FATAL : LOGL_NOTICE, + "transceiver (%s) rejected TRX command with response: '%s%s%s %d'\n", + phy_instance_name(pinst), rsp->cmd, rsp->params[0] != '\0' ? " ":"", + rsp->params, rsp->status); + if (critical) + return -EINVAL; + } + return 0; +} + /*! Get + parse response from TRX ctrl socket */ static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what) { @@ -444,7 +479,7 @@ struct phy_instance *pinst = l1h->phy_inst; char buf[1500]; struct trx_ctrl_rsp rsp; - int len; + int len, rc; struct trx_ctrl_msg *tcm; len = recv(ofd->fd, buf, sizeof(buf) - 1, 0); @@ -492,13 +527,14 @@ } /* check for response code */ - if (rsp.status) { - LOGP(DTRX, (tcm->critical) ? LOGL_FATAL : LOGL_NOTICE, - "transceiver (%s) rejected TRX command " - "with response: '%s'\n", - phy_instance_name(pinst), buf); - if (tcm->critical) - goto rsp_error; + rc = trx_ctrl_rx_rsp(l1h, &rsp, tcm->critical); + if (rc == -EINVAL) + goto rsp_error; + + /* re-schedule last cmd in rc seconds time */ + if (rc > 0) { + osmo_timer_schedule(&l1h->trx_ctrl_timer, rc, 0); + return 0; } /* remove command from list, save it to last_acked and removed previous last_acked */ @@ -781,7 +817,6 @@ } /* FIXME: is there better way to check/report TRX availability? */ transceiver_available = 1; - phy_link_state_set(plink, PHY_LINK_CONNECTED); return 0; cleanup: -- To view, visit https://gerrit.osmocom.org/11768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 Gerrit-Change-Number: 11768 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 13 20:30:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 13 Nov 2018 20:30:01 +0000 Subject: Change in osmo-bts[master]: bts-trx: trx_if: Use struct to store CTRL msg parsed responses In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11765 ) Change subject: bts-trx: trx_if: Use struct to store CTRL msg parsed responses ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11765/1/src/osmo-bts-trx/trx_if.c File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/#/c/11765/1/src/osmo-bts-trx/trx_if.c at 388 PS1, Line 388: sizeof I am afraid there is a risk of: https://www.geeksforgeeks.org/using-sizof-operator-with-array-paratmeters/ Not sure though, needs to be tested. -- To view, visit https://gerrit.osmocom.org/11765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb84bce0621042afa4301678ba1cc58d8e3662bb Gerrit-Change-Number: 11765 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 13 Nov 2018 20:30:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 09:22:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 14 Nov 2018 09:22:53 +0000 Subject: Change in osmo-dev[master]: gits: remove code dup: ask_reset_hard() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11757 ) Change subject: gits: remove code dup: ask_reset_hard() ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a Gerrit-Change-Number: 11757 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 14 Nov 2018 09:22:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 09:23:15 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 14 Nov 2018 09:23:15 +0000 Subject: Change in osmo-dev[master]: gits: use @{u} to get upstream branch, not origin/%s In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11756 ) Change subject: gits: use @{u} to get upstream branch, not origin/%s ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 Gerrit-Change-Number: 11756 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 14 Nov 2018 09:23:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 10:26:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 10:26:06 +0000 Subject: Change in osmo-bts[master]: bts-trx: trx_if: Use struct to store CTRL msg parsed responses In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11765 ) Change subject: bts-trx: trx_if: Use struct to store CTRL msg parsed responses ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11765/1/src/osmo-bts-trx/trx_if.c File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/#/c/11765/1/src/osmo-bts-trx/trx_if.c at 388 PS1, Line 388: sizeof > I am afraid there is a risk of: https://www.geeksforgeeks. [?] Size of cmd is defined explicitly here, it's fine (and it' also specified as fine in the example you shared). The issue is when you pass an array without a size specified explicitly beforehand, because the compiler cannot know the size of the array for each caller (specially when compiling a shared object). -- To view, visit https://gerrit.osmocom.org/11765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb84bce0621042afa4301678ba1cc58d8e3662bb Gerrit-Change-Number: 11765 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 14 Nov 2018 10:26:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 10:26:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 10:26:30 +0000 Subject: Change in osmo-bts[master]: bts-trx: trx_if: Use struct to store CTRL msg parsed responses In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11765 ) Change subject: bts-trx: trx_if: Use struct to store CTRL msg parsed responses ...................................................................... Patch Set 1: And btw, I tested the changes and messages are parsed fine. -- To view, visit https://gerrit.osmocom.org/11765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb84bce0621042afa4301678ba1cc58d8e3662bb Gerrit-Change-Number: 11765 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 14 Nov 2018 10:26:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 11:45:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 11:45:04 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-pcu-sysmo: Set log level from dbg to info Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11769 Change subject: templates: osmo-pcu-sysmo: Set log level from dbg to info ...................................................................... templates: osmo-pcu-sysmo: Set log level from dbg to info Otherwise there's too much output. With debug enabled, iperf3 test from gprs testsuite generates a 111MB osmo-pcu.log. Change-Id: I687361f3d6ede9a77531cd71204b1b07e0d1af42 --- M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/69/11769/1 diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl index 5482b09..bcb3d7c 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl @@ -2,7 +2,7 @@ logging color 1 logging print extended-timestamp 1 logging print category 1 - logging level set-all debug + logging level set-all info pcu pcu-socket ${osmo_pcu_sysmo.pcu_socket_path} flow-control-interval 10 -- To view, visit https://gerrit.osmocom.org/11769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I687361f3d6ede9a77531cd71204b1b07e0d1af42 Gerrit-Change-Number: 11769 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 14 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 14 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#307?= In-Reply-To: <2147306496.571.1542121807514.JavaMail.jenkins@jenkins.osmocom.org> References: <2147306496.571.1542121807514.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <347152386.586.1542208207564.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Nov 14 15:34:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 15:34:50 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-pcu-sysmo: Set log level from dbg to info In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11769 ) Change subject: templates: osmo-pcu-sysmo: Set log level from dbg to info ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I687361f3d6ede9a77531cd71204b1b07e0d1af42 Gerrit-Change-Number: 11769 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 15:34:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 15:34:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 15:34:51 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-pcu-sysmo: Set log level from dbg to info In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11769 ) Change subject: templates: osmo-pcu-sysmo: Set log level from dbg to info ...................................................................... templates: osmo-pcu-sysmo: Set log level from dbg to info Otherwise there's too much output. With debug enabled, iperf3 test from gprs testsuite generates a 111MB osmo-pcu.log. Change-Id: I687361f3d6ede9a77531cd71204b1b07e0d1af42 --- M src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl index 5482b09..bcb3d7c 100644 --- a/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-pcu-sysmo.cfg.tmpl @@ -2,7 +2,7 @@ logging color 1 logging print extended-timestamp 1 logging print category 1 - logging level set-all debug + logging level set-all info pcu pcu-socket ${osmo_pcu_sysmo.pcu_socket_path} flow-control-interval 10 -- To view, visit https://gerrit.osmocom.org/11769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I687361f3d6ede9a77531cd71204b1b07e0d1af42 Gerrit-Change-Number: 11769 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:03:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 16:03:20 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.rnd: gobi2k changed by ec20 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11770 Change subject: resources.conf.rnd: gobi2k changed by ec20 ...................................................................... resources.conf.rnd: gobi2k changed by ec20 Given current bad support of most features used, gobi2k modem was removed and an EC20 was added instead. Change-Id: I2df38547978c7d2b1a1309f6e73b5a59413e08ff --- M example/resources.conf.rnd 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/70/11770/1 diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 61c328e..dc0251a 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -82,19 +82,19 @@ ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'sim'] -- label: ec20 +- label: ec20_1 path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.6' ki: 'BB70807226393CDBAC8DD3439FF54252' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] -- label: gobi2k +- label: ec20_2 path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.5' ki: '2F70DCA43C45ACB97E947FDD0C7CA30A' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sim'] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] osmocon_phone: - serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_0089279D-if00-port0' -- To view, visit https://gerrit.osmocom.org/11770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2df38547978c7d2b1a1309f6e73b5a59413e08ff Gerrit-Change-Number: 11770 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:03:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 16:03:20 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Allow changing port of iperf3 server Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11771 Change subject: iperf3: Allow changing port of iperf3 server ...................................................................... iperf3: Allow changing port of iperf3 server This way several servers can run sharing same IP address. default port variable is moved inside class to be available to tests. Change-Id: Id4eae7cefbb1a18ecf2676f9cb22c60cc91cec7c --- M src/osmo_gsm_tester/iperf3.py 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/71/11771/1 diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index 894b10f..d0cf806 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -22,9 +22,6 @@ from . import log, util, process, pcap_recorder -DEFAULT_SRV_PORT = 5003 - - def iperf3_result_to_json(file): with open(file) as f: # Sometimes iperf3 provides 2 dictionaries, the 2nd one being an error about being interrupted (by us). @@ -37,6 +34,8 @@ class IPerf3Server(log.Origin): + DEFAULT_SRV_PORT = 5003 + def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'iperf3-srv_%s' % ip_address.get('addr')) self.run_dir = None @@ -44,7 +43,7 @@ self.process = None self.suite_run = suite_run self.ip_address = ip_address - self._port = DEFAULT_SRV_PORT + self._port = IPerf3Server.DEFAULT_SRV_PORT def start(self): self.log('Starting iperf3-srv') @@ -62,6 +61,9 @@ self.suite_run.remember_to_stop(self.process) self.process.launch() + def set_port(self, port): + self._port = port + def stop(self): self.suite_run.stop_process(self.process) -- To view, visit https://gerrit.osmocom.org/11771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id4eae7cefbb1a18ecf2676f9cb22c60cc91cec7c Gerrit-Change-Number: 11771 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:03:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 16:03:20 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: implement str() method in iperf3 server Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11772 Change subject: iperf3: implement str() method in iperf3 server ...................................................................... iperf3: implement str() method in iperf3 server This way it can be logged easily during test runs. Change-Id: I699f0a9a8d263ac9f02ea9594a28ca9fd8d48db6 --- M src/osmo_gsm_tester/iperf3.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/72/11772/1 diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index d0cf806..8f0cddb 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -76,6 +76,9 @@ def port(self): return self._port + def __str__(self): + return "%s:%u" %(self.addr(), self.port()) + def running(self): return not self.process.terminated() -- To view, visit https://gerrit.osmocom.org/11772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I699f0a9a8d263ac9f02ea9594a28ca9fd8d48db6 Gerrit-Change-Number: 11772 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:03:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 16:03:21 +0000 Subject: Change in osmo-gsm-tester[master]: tests: iperf3: Support testing parallel iperf3 clients in test Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11773 Change subject: tests: iperf3: Support testing parallel iperf3 clients in test ...................................................................... tests: iperf3: Support testing parallel iperf3 clients in test Since tests running a single MS and several of them are really similar, generic code handling the test for N concurrent iperf3 sessions is writen an moved to testlib, and existing and new test use that code. Change-Id: I57799fde49e6845379cca332eec0a1f70aaecd2b --- M src/osmo_gsm_tester/iperf3.py M suites/gprs/iperf3.py A suites/gprs/iperf3m4.py A suites/gprs/lib/testlib.py M suites/gprs/suite.conf 5 files changed, 128 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/73/11773/1 diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index 8f0cddb..55cb546 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -95,7 +95,7 @@ self.server = iperf3srv self.suite_run = suite_run - def run_test(self, netns=None): + def prepare_test_proc(self, netns=None): self.log('Starting iperf3-client connecting to %s:%d' % (self.server.addr(), self.server.port())) self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) @@ -110,6 +110,10 @@ self.process = process.NetNSProcess(self.name(), self.run_dir, netns, popen_args, env={}) else: self.process = process.Process(self.name(), self.run_dir, popen_args, env={}) + return self.process + + def run_test_sync(self, netns=None): + self.prepare_test_proc(netns) self.process.launch_sync() return self.get_results() diff --git a/suites/gprs/iperf3.py b/suites/gprs/iperf3.py index a1dd62c..e25519a 100755 --- a/suites/gprs/iperf3.py +++ b/suites/gprs/iperf3.py @@ -1,74 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -def print_results(cli_res, srv_res): - cli_sent = cli_res['end']['sum_sent'] - cli_recv = cli_res['end']['sum_received'] - print("RESULT client:") - print("\tSEND: %d KB, %d kbps, %d seconds (%d retrans)" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'], cli_sent['retransmits'])) - print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) - print("RESULT server:") - print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'])) - print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import setup_run_iperf3_test_parallel -hlr = suite.hlr() -bts = suite.bts() -pcu = bts.pcu() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -ggsn = suite.ggsn() -sgsn = suite.sgsn(hlr, ggsn) -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) -ms = suite.modem() -iperf3srv = suite.iperf3srv() -iperf3cli = iperf3srv.create_client() - -bsc.bts_add(bts) -sgsn.bts_add(bts) - -print('start iperfv3 server...') -iperf3srv.start() - -print('start network...') -hlr.start() -stp.start() -ggsn.start() -sgsn.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() - -bts.start() -wait(bsc.bts_is_connected, bts) -print('Waiting for bts to be ready...') -wait(bts.ready_for_pcu) -pcu.start() - -hlr.subscriber_add(ms) - -ms.connect(msc.mcc_mnc()) -ms.attach() - -ms.log_info() - -print('waiting for modems to attach...') -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) - -print('waiting for modems to attach to data services...') -wait(ms.is_attached) - -# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) -ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) -print("Setting up data plan for %r" % repr(ctx_id_v4)) -ms.setup_context_data_plane(ctx_id_v4) - -print("Running iperf3 client to %s through %r" % (iperf3srv.addr(),repr(ctx_id_v4))) -res = iperf3cli.run_test(ms.netns()) -iperf3srv.stop() -print_results(res, iperf3srv.get_results()) - -ms.deactivate_context(ctx_id_v4) +setup_run_iperf3_test_parallel(1) diff --git a/suites/gprs/iperf3m4.py b/suites/gprs/iperf3m4.py new file mode 100755 index 0000000..1cc27ed --- /dev/null +++ b/suites/gprs/iperf3m4.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import setup_run_iperf3_test_parallel + +setup_run_iperf3_test_parallel(4) diff --git a/suites/gprs/lib/testlib.py b/suites/gprs/lib/testlib.py new file mode 100644 index 0000000..13a6671 --- /dev/null +++ b/suites/gprs/lib/testlib.py @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def print_results(cli_res, srv_res): + cli_sent = cli_res['end']['sum_sent'] + cli_recv = cli_res['end']['sum_received'] + print("RESULT client:") + print("\tSEND: %d KB, %d kbps, %d seconds (%d retrans)" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'], cli_sent['retransmits'])) + print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) + print("RESULT server:") + print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'])) + print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) + +def run_iperf3_cli_parallel(iperf3clients, ms_li): + assert len(iperf3clients) == len(ms_li) + procs = [] + for i in range(len(iperf3clients)): + print("Running iperf3 client to %s through %r" % (str(iperf3clients[i]), repr(ms_li[i].tmp_ctx_id))) + procs.append(iperf3clients[i].prepare_test_proc(ms_li[i].netns())) + try: + for proc in procs: + proc.launch() + for proc in procs: + proc.wait() + except Exception as e: + for proc in procs: + proc.terminate() + raise e + + +def setup_run_iperf3_test_parallel(num_ms): + hlr = suite.hlr() + bts = suite.bts() + pcu = bts.pcu() + mgw_msc = suite.mgw() + mgw_bsc = suite.mgw() + stp = suite.stp() + ggsn = suite.ggsn() + sgsn = suite.sgsn(hlr, ggsn) + msc = suite.msc(hlr, mgw_msc, stp) + bsc = suite.bsc(msc, mgw_bsc, stp) + + iperf3srv_addr = suite.ip_address() + servers = [] + clients = [] + ms_li = [] + for i in range(num_ms): + iperf3srv = suite.iperf3srv(iperf3srv_addr) + iperf3srv.set_port(iperf3srv.DEFAULT_SRV_PORT + i) + servers.append(iperf3srv) + + iperf3cli = iperf3srv.create_client() + clients.append(iperf3cli) + + ms = suite.modem() + ms_li.append(ms) + + bsc.bts_add(bts) + sgsn.bts_add(bts) + + for iperf3srv in servers: + print('start iperfv3 server %s...' % str(iperf3srv) ) + iperf3srv.start() + + print('start network...') + hlr.start() + stp.start() + ggsn.start() + sgsn.start() + msc.start() + mgw_msc.start() + mgw_bsc.start() + bsc.start() + + bts.start() + wait(bsc.bts_is_connected, bts) + print('Waiting for bts to be ready...') + wait(bts.ready_for_pcu) + pcu.start() + + for ms in ms_li: + hlr.subscriber_add(ms) + ms.connect(msc.mcc_mnc()) + ms.attach() + ms.log_info() + + print('waiting for modems to attach...') + for ms in ms_li: + wait(ms.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, *ms_li) + + print('waiting for modems to attach to data services...') + for ms in ms_li: + wait(ms.is_attached) + # We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) + ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) + print("Setting up data plan for %r" % repr(ctx_id_v4)) + ms.setup_context_data_plane(ctx_id_v4) + setattr(ms, 'tmp_ctx_id', ctx_id_v4) + + run_iperf3_cli_parallel(clients, ms_li) + + for i in range(num_ms): + servers[i].stop() + print("Results for %s through %r" % (str(servers[i]), repr(ms_li[i].tmp_ctx_id))) + print_results(clients[i].get_results(), servers[i].get_results()) + + for ms in ms_li: + ms.deactivate_context(ms.tmp_ctx_id) + delattr(ms, 'tmp_ctx_id') diff --git a/suites/gprs/suite.conf b/suites/gprs/suite.conf index a24bc5d..3d4fe48 100644 --- a/suites/gprs/suite.conf +++ b/suites/gprs/suite.conf @@ -4,6 +4,6 @@ bts: - times: 1 modem: - - times: 1 + - times: 4 features: - gprs -- To view, visit https://gerrit.osmocom.org/11773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I57799fde49e6845379cca332eec0a1f70aaecd2b Gerrit-Change-Number: 11773 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:11:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:11:22 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan: introduce sub-struct lchan->release.* In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11668 ) Change subject: cosmetic: lchan: introduce sub-struct lchan->release.* ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h at 495 PS1, Line 495: char *last_error; > Isn't this one related to release too? it gets set for any lchan_fail() invocation, so its scope is broader. Naturally, if an lchan has failed in any way, the usual effect is that it will end up being released, but that's just incidental. The error might be a missing Chan Activ ACK or whatever. https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h at 518 PS1, Line 518: bool release_requested; > Since it's now inside a "release" name, it makes sense to remove the "release_" prefix from this var [?] I considered the same, but in the end decided that a variable name of "requested" is a bit weird. I agree it should be release.requested and not release.release_requested, and there is no way to access this variable without the "release." prefix. Though, the confusion comes up when you're reading this header: "struct { requested - wtf? - ... oh it says release below". If you/others prefer dropping "release_" then I'll do that. https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h at 523 PS1, Line 523: /* RSL error code, RSL_ERR_* */ > No enum for RSL_ERR_*? (I know it's not related to this patch). yes, I thought the same, and I agree it sucks. Hysterical raisins. -- To view, visit https://gerrit.osmocom.org/11668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 Gerrit-Change-Number: 11668 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 16:11:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:13:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 16:13:45 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan: introduce sub-struct lchan->release.* In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11668 ) Change subject: cosmetic: lchan: introduce sub-struct lchan->release.* ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/11668/1/include/osmocom/bsc/gsm_data.h at 518 PS1, Line 518: bool release_requested; > I considered the same, but in the end decided that a variable name of "requested" is a bit weird. [?] I think code is cleaner if we remove the release_ prefix, indeed. -- To view, visit https://gerrit.osmocom.org/11668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 Gerrit-Change-Number: 11668 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 16:13:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:15:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:15:59 +0000 Subject: Change in osmo-bsc[master]: lchan release: always Deact SACCH In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11667 to look at the new patch set (#2). Change subject: lchan release: always Deact SACCH ...................................................................... lchan release: always Deact SACCH If an lchan is being released and had a SACCH active, there is no reason to omit the Deact SACCH message ever. All of the callers that passed do_deact_sacch = false did so for no good reason. Drop the do_deact_sacch flag everywhere and, when the lchan type matches and SAPI[0] is still active, simply always send a Deact SACCH message. The do_deact_sacch flag was carried over from legacy code, by me, mainly because I never really understood why it was there. I do hope I'm correct now, asserting that having this flag makes no sense. Change-Id: Id3301df059582da2377ef82feae554e94fa42035 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c 13 files changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/11667/2 -- To view, visit https://gerrit.osmocom.org/11667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id3301df059582da2377ef82feae554e94fa42035 Gerrit-Change-Number: 11667 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:16:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:16:16 +0000 Subject: Change in osmo-bsc[master]: lchan release: always Deact SACCH In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11667 ) Change subject: lchan release: always Deact SACCH ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id3301df059582da2377ef82feae554e94fa42035 Gerrit-Change-Number: 11667 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 16:16:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:16:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:16:30 +0000 Subject: Change in osmo-bsc[master]: fix: send RR Release (e.g. after BSSMAP Clear Cmd) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11664 ) Change subject: fix: send RR Release (e.g. after BSSMAP Clear Cmd) ...................................................................... fix: send RR Release (e.g. after BSSMAP Clear Cmd) After commit [1], the code makes sure to disassociate lchan and conn before invoking the lchan release. However, we only send RR Release if a conn is present, which clearly is nonsense after [1]. [1] commit 8b818a01b00ea3daad4ad58c162ac52b4f08a5cb "subscr conn: properly forget lchan before release" Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db Manage sending of RR Release via a flag, set during invoking lchan release. Add do_rr_release arg to lchan_release(), gscon_release_lchans(). In lchan_fsm.c, send RR Release only if do_rr_release was passed true; do not care whether a conn is still associated (because it won't ever be since [1]). That way we can intelligently decide what release process makes sense (whether the lchan terminates the subscriber connection or whether the connection goes on at another lchan), and still disassociate lchan and conn early. BTW, this problem wasn't caught by the stock OsmoBSC TTCN3 tests, because the f_expect_chan_rel() don't care whether an RR Release happens or not. This is being fixed by Ibc64058f1e214bea585f4e8dcb66f3df8ead3845. So far this patch should fix BSC_Tests_LCLS.TC_lcls_connect_clear. Related: OS#3413 Change-Id: I666b3b4f45706d898d664d380bd0fd2b018be358 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M tests/gsm0408/gsm0408_test.c 12 files changed, 32 insertions(+), 30 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index d4de1c9..fcdba50 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -71,7 +71,7 @@ struct assignment_request *req); void gscon_change_primary_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan); -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact); +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact, bool do_rr_release); void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 1be9ae8..5805a5f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -514,6 +514,7 @@ * flag, so that the lchan will gracefully release at the next sensible junction. */ bool release_requested; bool deact_sacch; + bool do_rr_release; char *last_error; diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index d2e8724..d3315a6 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -49,7 +49,7 @@ void lchan_fsm_init(); void lchan_fsm_alloc(struct gsm_lchan *lchan); -void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, +void lchan_release(struct gsm_lchan *lchan, bool do_deact_sacch, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr); struct lchan_activate_info { diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index bd104ed..ea537fe 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -901,7 +901,7 @@ * the connection will presumably be torn down and lead to an lchan release. During initial * Channel Request from the MS, an lchan has no conn yet, so in that case release now. */ if (!lchan->conn) { - lchan_release(lchan, false, true, *cause_p); + lchan_release(lchan, false, false, true, *cause_p); } else osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_RSL_CONN_FAIL, (void*)cause_p); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 3f553ff..653681e 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -98,7 +98,7 @@ if (conn->assignment.new_lchan) { struct gsm_lchan *lchan = conn->assignment.new_lchan; conn->assignment.new_lchan = NULL; - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); } if (conn->assignment.created_ci_for_msc) { @@ -213,7 +213,7 @@ if (!conn->assignment.fi) { /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan, * the conn will notice that its primary lchan is gone and should clean itself up. */ - lchan_release(conn->lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(conn->lchan, false, true, true, RSL_ERR_EQUIPMENT_FAIL); return; } diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 4d6521f..5856d7a 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -152,7 +152,7 @@ /* Release an lchan in such a way that it doesn't fire events back to the conn. */ static void gscon_release_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan, - bool do_sacch_deact, bool err, enum gsm48_rr_cause cause_rr) + bool do_sacch_deact, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) { if (!lchan || !conn) return; @@ -164,17 +164,17 @@ conn->ho.new_lchan = NULL; if (conn->assignment.new_lchan == lchan) conn->assignment.new_lchan = NULL; - lchan_release(lchan, do_sacch_deact, err, cause_rr); + lchan_release(lchan, do_sacch_deact, do_rr_release, err, cause_rr); } -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact) +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact, bool do_rr_release) { if (conn->ho.fi) handover_end(conn, HO_RESULT_CONN_RELEASE); assignment_reset(conn); - gscon_release_lchan(conn, conn->lchan, do_sacch_deact, false, 0); + gscon_release_lchan(conn, conn->lchan, do_sacch_deact, do_rr_release, false, 0); } static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) @@ -620,7 +620,7 @@ osmo_fsm_inst_dispatch(conn->lchan->fi_rtp, LCHAN_RTP_EV_ESTABLISHED, 0); if (old_lchan && (old_lchan != new_lchan)) - gscon_release_lchan(conn, old_lchan, false, false, 0); + gscon_release_lchan(conn, old_lchan, false, false, false, 0); } void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) @@ -716,7 +716,7 @@ if (conn->fi->state != ST_CLEARING) osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999); LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) after BSSMAP Clear Command\n"); - gscon_release_lchans(conn, true); + gscon_release_lchans(conn, true, true); /* FIXME: Release all terestrial resources in ST_CLEARING */ /* According to 3GPP 48.008 3.1.9.1. "The BSS need not wait for the radio channel * release to be completed or for the guard timer to expire before returning the @@ -792,7 +792,7 @@ } LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) because this conn is terminating\n"); - gscon_release_lchans(conn, false); + gscon_release_lchans(conn, false, true); /* drop pending messages */ gscon_dtap_queue_flush(conn, 0); @@ -806,7 +806,7 @@ switch (fi->T) { case 993210: - gscon_release_lchan(conn, conn->lchan, false, true, RSL_ERR_INTERWORKING); + gscon_release_lchan(conn, conn->lchan, false, true, true, RSL_ERR_INTERWORKING); /* MSC has not responded/confirmed connection with CC, this * could indicate a bad SCCP connection. We now inform the the diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 84752dd..9f42d8a 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4588,7 +4588,7 @@ } vty_out(vty, "%% Asking for release of %s in state %s%s", gsm_lchan_name(lchan), osmo_fsm_inst_state_name(lchan->fi), VTY_NEWLINE); - lchan_release(lchan, false, false, 0); + lchan_release(lchan, false, !!(lchan->conn), false, 0); } return CMD_SUCCESS; diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 4659c1a..c3dd307 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -942,7 +942,7 @@ /* allocate a new connection */ lchan->conn = bsc_subscr_con_allocate(msg->lchan->ts->trx->bts->network); if (!lchan->conn) { - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); return -1; } lchan->conn->lchan = lchan; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 062c878..48e87fc 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -525,7 +525,7 @@ /* FIXME: I have not the slightest idea what move_to_msc() intends to do; during lchan * FSM introduction, I changed this and hope it is the appropriate action. I actually * assume this is unused legacy code for osmo-bsc_nat?? */ - gscon_release_lchans(_conn, false); + gscon_release_lchans(_conn, false, false); return 1; } diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 0107ef0..8076eeb 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -243,7 +243,7 @@ struct mgwep_ci *ci; if (conn->ho.new_lchan) /* New lchan was activated but never passed to a conn */ - lchan_release(conn->ho.new_lchan, true, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(conn->ho.new_lchan, true, false, true, RSL_ERR_EQUIPMENT_FAIL); ci = conn->ho.created_ci_for_msc; if (ci) { @@ -725,7 +725,7 @@ /* 3GPP TS 48.008 3.1.5.3.3 "Abnormal Conditions": if neither MS reports * HO Failure nor the MSC sends a Clear Command, we should release the * dedicated radio resources and send a Clear Request to the MSC. */ - lchan_release(conn->lchan, false, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); + lchan_release(conn->lchan, false, true, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); /* Once the channel release is through, the BSSMAP Clear will follow. */ break; } @@ -756,7 +756,7 @@ /* Detach the new_lchan last, so we can still see it in above logging */ if (ho->new_lchan) { /* Release new lchan, it didn't work out */ - lchan_release(ho->new_lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(ho->new_lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); ho->new_lchan = NULL; } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 726a5bb..39f29f2 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -156,14 +156,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->assignment.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no" " assignment ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } osmo_fsm_inst_dispatch(lchan->conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ESTABLISHED, @@ -177,14 +177,14 @@ if (!lchan->conn) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no conn\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->ho.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no" " handover ongoing\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } osmo_fsm_inst_dispatch(lchan->conn->ho.fi, HO_EV_LCHAN_ESTABLISHED, lchan); @@ -720,14 +720,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->assignment.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no" " assignment ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } /* After the Chan Activ Ack, the MS expects to receive an RR Assignment Command. @@ -740,14 +740,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->ho.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no" " handover ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } /* After the Chan Activ Ack of the new lchan, send the MS an RR Handover Command on the @@ -937,7 +937,7 @@ if (lchan->sapis[sapi]) LOG_LCHAN(lchan, LOGL_DEBUG, "SAPI[%d] = %d\n", sapi, lchan->sapis[sapi]); - if (lchan->conn && lchan->sapis[0] != LCHAN_SAPI_UNUSED) + if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) gsm48_send_rr_release(lchan); if (lchan->fi_rtp) @@ -1291,7 +1291,7 @@ } } -void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, +void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) { if (!lchan || !lchan->fi) @@ -1305,6 +1305,7 @@ lchan->release_in_error = err; lchan->rsl_error_cause = cause_rr; lchan->deact_sacch = sacch_deact; + lchan->do_rr_release = do_rr_release; /* States waiting for events will notice the desire to release when done waiting, so it is enough * to mark for release. */ diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index f2b85e4..1e6a097 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -986,7 +986,7 @@ const char *bsc_subscr_name(struct bsc_subscr *bsub) { return NULL; } -void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, +void lchan_release(struct gsm_lchan *lchan, bool do_deact_sacch, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) {} int rsl_data_request(struct msgb *msg, uint8_t link_id) { return 0; } -- To view, visit https://gerrit.osmocom.org/11664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I666b3b4f45706d898d664d380bd0fd2b018be358 Gerrit-Change-Number: 11664 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:16:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:16:31 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: drop unused enum sacch_deact In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11665 ) Change subject: abis_rsl.c: drop unused enum sacch_deact ...................................................................... abis_rsl.c: drop unused enum sacch_deact Change-Id: I8a1542e92373d2773699744e7b64a08667a4b0f5 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index ea537fe..0ec8fbc 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -56,11 +56,6 @@ #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 -enum sacch_deact { - SACCH_NONE, - SACCH_DEACTIVATE, -}; - static void send_lchan_signal(int sig_no, struct gsm_lchan *lchan, struct gsm_meas_rep *resp) { -- To view, visit https://gerrit.osmocom.org/11665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8a1542e92373d2773699744e7b64a08667a4b0f5 Gerrit-Change-Number: 11665 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:16:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:16:31 +0000 Subject: Change in osmo-bsc[master]: lchan: release in error: fix missing messages / events In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11666 ) Change subject: lchan: release in error: fix missing messages / events ...................................................................... lchan: release in error: fix missing messages / events In the case where there is a release in error and we skip immediately to the RF Release state, send all of Deact SACCH, RR Release messages and also signal the lchan_rtp_fsm as appropriate. Move that code to static lchan_do_release() and call from both lchan_fsm_wait_rll_rtp_released_onenter() in the normal case, as well as lchan_release() when skipping that. When releasing in error, but we're already in LCHAN_ST_WAIT_RLL_RTP_RELEASED, those messages have already been sent and we can skip them. Change-Id: I648a9826ce56b611359f81462ca03e4ab4c736aa --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 18 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 39f29f2..f432644 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -927,6 +927,18 @@ } } +static void lchan_do_release(struct gsm_lchan *lchan) +{ + if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) + gsm48_send_rr_release(lchan); + + if (lchan->fi_rtp) + osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_RELEASE, 0); + + if (lchan->deact_sacch && should_sacch_deact(lchan)) + rsl_deact_sacch(lchan); +} + static void lchan_fsm_wait_rll_rtp_released_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { int sapis; @@ -937,14 +949,7 @@ if (lchan->sapis[sapi]) LOG_LCHAN(lchan, LOGL_DEBUG, "SAPI[%d] = %d\n", sapi, lchan->sapis[sapi]); - if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) - gsm48_send_rr_release(lchan); - - if (lchan->fi_rtp) - osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_RELEASE, 0); - - if (lchan->deact_sacch && should_sacch_deact(lchan)) - rsl_deact_sacch(lchan); + lchan_do_release(lchan); sapis = 0; for_each_active_sapi(sapi, 1, lchan) { @@ -1319,10 +1324,11 @@ if (lchan->release_in_error) { switch (lchan->fi->state) { default: - /* Normally we deact SACCH in lchan_fsm_wait_rll_rtp_released_onenter(). When - * skipping that, but asked to SACCH deact, do it now. */ - if (lchan->deact_sacch) - rsl_deact_sacch(lchan); + /* Normally we signal release in lchan_fsm_wait_rll_rtp_released_onenter(). When + * skipping that, do it now. */ + lchan_do_release(lchan); + /* fall thru */ + case LCHAN_ST_WAIT_RLL_RTP_RELEASED: lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK); goto exit_release_handler; case LCHAN_ST_WAIT_TS_READY: -- To view, visit https://gerrit.osmocom.org/11666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I648a9826ce56b611359f81462ca03e4ab4c736aa Gerrit-Change-Number: 11666 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:16:32 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:16:32 +0000 Subject: Change in osmo-bsc[master]: lchan release: always Deact SACCH In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11667 ) Change subject: lchan release: always Deact SACCH ...................................................................... lchan release: always Deact SACCH If an lchan is being released and had a SACCH active, there is no reason to omit the Deact SACCH message ever. All of the callers that passed do_deact_sacch = false did so for no good reason. Drop the do_deact_sacch flag everywhere and, when the lchan type matches and SAPI[0] is still active, simply always send a Deact SACCH message. The do_deact_sacch flag was carried over from legacy code, by me, mainly because I never really understood why it was there. I do hope I'm correct now, asserting that having this flag makes no sense. Change-Id: Id3301df059582da2377ef82feae554e94fa42035 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c 13 files changed, 32 insertions(+), 32 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index fcdba50..f5ed7bd 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -71,7 +71,7 @@ struct assignment_request *req); void gscon_change_primary_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *new_lchan); -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact, bool do_rr_release); +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release); void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 5805a5f..3712b97 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -513,7 +513,6 @@ /* If an event to release the lchan comes in while still waiting for responses, just mark this * flag, so that the lchan will gracefully release at the next sensible junction. */ bool release_requested; - bool deact_sacch; bool do_rr_release; char *last_error; diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index d3315a6..48cd383 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -49,7 +49,7 @@ void lchan_fsm_init(); void lchan_fsm_alloc(struct gsm_lchan *lchan); -void lchan_release(struct gsm_lchan *lchan, bool do_deact_sacch, bool do_rr_release, +void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr); struct lchan_activate_info { diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 0ec8fbc..c16f044 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -896,7 +896,7 @@ * the connection will presumably be torn down and lead to an lchan release. During initial * Channel Request from the MS, an lchan has no conn yet, so in that case release now. */ if (!lchan->conn) { - lchan_release(lchan, false, false, true, *cause_p); + lchan_release(lchan, false, true, *cause_p); } else osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_RSL_CONN_FAIL, (void*)cause_p); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 653681e..93362f8 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -98,7 +98,7 @@ if (conn->assignment.new_lchan) { struct gsm_lchan *lchan = conn->assignment.new_lchan; conn->assignment.new_lchan = NULL; - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); } if (conn->assignment.created_ci_for_msc) { @@ -213,7 +213,7 @@ if (!conn->assignment.fi) { /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan, * the conn will notice that its primary lchan is gone and should clean itself up. */ - lchan_release(conn->lchan, false, true, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(conn->lchan, true, true, RSL_ERR_EQUIPMENT_FAIL); return; } diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 5856d7a..ec06e9b 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -152,7 +152,7 @@ /* Release an lchan in such a way that it doesn't fire events back to the conn. */ static void gscon_release_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan, - bool do_sacch_deact, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) + bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) { if (!lchan || !conn) return; @@ -164,17 +164,17 @@ conn->ho.new_lchan = NULL; if (conn->assignment.new_lchan == lchan) conn->assignment.new_lchan = NULL; - lchan_release(lchan, do_sacch_deact, do_rr_release, err, cause_rr); + lchan_release(lchan, do_rr_release, err, cause_rr); } -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact, bool do_rr_release) +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) { if (conn->ho.fi) handover_end(conn, HO_RESULT_CONN_RELEASE); assignment_reset(conn); - gscon_release_lchan(conn, conn->lchan, do_sacch_deact, do_rr_release, false, 0); + gscon_release_lchan(conn, conn->lchan, do_rr_release, false, 0); } static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) @@ -620,7 +620,7 @@ osmo_fsm_inst_dispatch(conn->lchan->fi_rtp, LCHAN_RTP_EV_ESTABLISHED, 0); if (old_lchan && (old_lchan != new_lchan)) - gscon_release_lchan(conn, old_lchan, false, false, false, 0); + gscon_release_lchan(conn, old_lchan, false, false, 0); } void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan) @@ -716,7 +716,7 @@ if (conn->fi->state != ST_CLEARING) osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, 999); LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) after BSSMAP Clear Command\n"); - gscon_release_lchans(conn, true, true); + gscon_release_lchans(conn, true); /* FIXME: Release all terestrial resources in ST_CLEARING */ /* According to 3GPP 48.008 3.1.9.1. "The BSS need not wait for the radio channel * release to be completed or for the guard timer to expire before returning the @@ -792,7 +792,7 @@ } LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) because this conn is terminating\n"); - gscon_release_lchans(conn, false, true); + gscon_release_lchans(conn, true); /* drop pending messages */ gscon_dtap_queue_flush(conn, 0); @@ -806,7 +806,7 @@ switch (fi->T) { case 993210: - gscon_release_lchan(conn, conn->lchan, false, true, true, RSL_ERR_INTERWORKING); + gscon_release_lchan(conn, conn->lchan, true, true, RSL_ERR_INTERWORKING); /* MSC has not responded/confirmed connection with CC, this * could indicate a bad SCCP connection. We now inform the the diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 9f42d8a..8eb0692 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4588,7 +4588,7 @@ } vty_out(vty, "%% Asking for release of %s in state %s%s", gsm_lchan_name(lchan), osmo_fsm_inst_state_name(lchan->fi), VTY_NEWLINE); - lchan_release(lchan, false, !!(lchan->conn), false, 0); + lchan_release(lchan, !!(lchan->conn), false, 0); } return CMD_SUCCESS; diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index c3dd307..4659c1a 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -942,7 +942,7 @@ /* allocate a new connection */ lchan->conn = bsc_subscr_con_allocate(msg->lchan->ts->trx->bts->network); if (!lchan->conn) { - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); return -1; } lchan->conn->lchan = lchan; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 48e87fc..062c878 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -525,7 +525,7 @@ /* FIXME: I have not the slightest idea what move_to_msc() intends to do; during lchan * FSM introduction, I changed this and hope it is the appropriate action. I actually * assume this is unused legacy code for osmo-bsc_nat?? */ - gscon_release_lchans(_conn, false, false); + gscon_release_lchans(_conn, false); return 1; } diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 8076eeb..f2836cf 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -243,7 +243,7 @@ struct mgwep_ci *ci; if (conn->ho.new_lchan) /* New lchan was activated but never passed to a conn */ - lchan_release(conn->ho.new_lchan, true, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(conn->ho.new_lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); ci = conn->ho.created_ci_for_msc; if (ci) { @@ -725,7 +725,7 @@ /* 3GPP TS 48.008 3.1.5.3.3 "Abnormal Conditions": if neither MS reports * HO Failure nor the MSC sends a Clear Command, we should release the * dedicated radio resources and send a Clear Request to the MSC. */ - lchan_release(conn->lchan, false, true, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); + lchan_release(conn->lchan, true, true, GSM48_RR_CAUSE_ABNORMAL_TIMER); /* Once the channel release is through, the BSSMAP Clear will follow. */ break; } @@ -756,7 +756,7 @@ /* Detach the new_lchan last, so we can still see it in above logging */ if (ho->new_lchan) { /* Release new lchan, it didn't work out */ - lchan_release(ho->new_lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(ho->new_lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); ho->new_lchan = NULL; } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index f432644..5428d97 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -156,14 +156,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->assignment.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no" " assignment ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } osmo_fsm_inst_dispatch(lchan->conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ESTABLISHED, @@ -177,14 +177,14 @@ if (!lchan->conn) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no conn\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->ho.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no" " handover ongoing\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } osmo_fsm_inst_dispatch(lchan->conn->ho.fi, HO_EV_LCHAN_ESTABLISHED, lchan); @@ -720,14 +720,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->assignment.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for assignment succeeded, but lchan has no" " assignment ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } /* After the Chan Activ Ack, the MS expects to receive an RR Assignment Command. @@ -740,14 +740,14 @@ LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no conn:" " cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } if (!lchan->conn->ho.fi) { LOG_LCHAN(lchan, LOGL_ERROR, "lchan activation for handover succeeded, but lchan has no" " handover ongoing: cannot trigger appropriate actions. Release.\n"); - lchan_release(lchan, false, false, true, RSL_ERR_EQUIPMENT_FAIL); + lchan_release(lchan, false, true, RSL_ERR_EQUIPMENT_FAIL); break; } /* After the Chan Activ Ack of the new lchan, send the MS an RR Handover Command on the @@ -935,7 +935,7 @@ if (lchan->fi_rtp) osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_RELEASE, 0); - if (lchan->deact_sacch && should_sacch_deact(lchan)) + if (should_sacch_deact(lchan)) rsl_deact_sacch(lchan); } @@ -1296,7 +1296,7 @@ } } -void lchan_release(struct gsm_lchan *lchan, bool sacch_deact, bool do_rr_release, +void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) { if (!lchan || !lchan->fi) @@ -1309,7 +1309,6 @@ struct osmo_fsm_inst *fi = lchan->fi; lchan->release_in_error = err; lchan->rsl_error_cause = cause_rr; - lchan->deact_sacch = sacch_deact; lchan->do_rr_release = do_rr_release; /* States waiting for events will notice the desire to release when done waiting, so it is enough diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 1e6a097..d15e149 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -986,7 +986,7 @@ const char *bsc_subscr_name(struct bsc_subscr *bsub) { return NULL; } -void lchan_release(struct gsm_lchan *lchan, bool do_deact_sacch, bool do_rr_release, +void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, bool err, enum gsm48_rr_cause cause_rr) {} int rsl_data_request(struct msgb *msg, uint8_t link_id) { return 0; } diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 7cb4086..f728c5b 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -462,6 +462,8 @@ break; case RSL_MT_IPAC_CRCX: break; + case RSL_MT_DEACTIVATE_SACCH: + break; default: printf("unknown rsl message=0x%x\n", dh->c.msg_type); } -- To view, visit https://gerrit.osmocom.org/11667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id3301df059582da2377ef82feae554e94fa42035 Gerrit-Change-Number: 11667 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:17:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:17:03 +0000 Subject: Change in osmo-bsc[master]: coverity: gscon_forget_lchan: squelch forward-null In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11742 to look at the new patch set (#2). Change subject: coverity: gscon_forget_lchan: squelch forward-null ...................................................................... coverity: gscon_forget_lchan: squelch forward-null conn->fi should actually never be NULL, they are allocated and discarded simultaneously. So check its null from the start and remove some conditions below, to remove the coverity warning. Related: CID 189671 Change-Id: I62354aa998832131c86535f39a29294000114adc --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/11742/2 -- To view, visit https://gerrit.osmocom.org/11742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I62354aa998832131c86535f39a29294000114adc Gerrit-Change-Number: 11742 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:17:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:17:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: remove flush from f_expect_chan_rel In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11658 ) Change subject: bsc: remove flush from f_expect_chan_rel ...................................................................... bsc: remove flush from f_expect_chan_rel When we're expecting release, it can be non-deterministic / timing dependent to flush the RSL queue. Particularly the RR Release message is typically already in the queue when f_expect_chan_rel() is called and would be lost. It turns out that none of the current callers need the flush feature. If a test needs it, we can add a separate f_rsl_flush() function and call that, no need to clutter up the f_expect_chan_rel() argument list. I had such function but found that no caller needs it, so dropped it. Related: OS#3413 Change-Id: Ie1be30c3f109dda8c58c523df508211f8e20aad3 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e3ac707..551ffe0 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -824,14 +824,10 @@ setverdict(pass); } -function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, boolean flush := true, +function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, boolean handle_rll_rel := true) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); - if (flush) { - /* Clear the queue, it might still contain stuff like IMMEDIATE ASSIGN */ - IPA_RSL[bts_nr].clear; - } alt { /* ignore DEACTIVATE SACCH (if any) */ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, @@ -912,7 +908,7 @@ /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); - f_expect_chan_rel(0, dt.rsl_chan_nr, true, false); + f_expect_chan_rel(0, dt.rsl_chan_nr, handle_rll_rel := false); setverdict(pass); } @@ -934,7 +930,7 @@ [] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { } } - f_expect_chan_rel(0, dt.rsl_chan_nr, false); + f_expect_chan_rel(0, dt.rsl_chan_nr); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/11658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie1be30c3f109dda8c58c523df508211f8e20aad3 Gerrit-Change-Number: 11658 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:17:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:17:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_chan_act_ack_est_ind_noreply: use f_expect_chan_rel In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11659 ) Change subject: bsc: TC_chan_act_ack_est_ind_noreply: use f_expect_chan_rel ...................................................................... bsc: TC_chan_act_ack_est_ind_noreply: use f_expect_chan_rel Instead of placing an own set of channel release expectations, just use the common f_expect_chan_rel() that exists for exactly this purpose. This will also be in line with upcoming changes to tighten checking of the lchan release messages. Related: OS#3413 Change-Id: Ib7dd886472337e2deb968e6f9de6cecdb7855319 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 551ffe0..a2a3378 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -429,15 +429,7 @@ /* expect BSC to disable the channel again if there's no response from MSC */ /* MS waits 20s (T3210) at LU; 10s (T3230) at CM SERV REQ and 5s (T3220) AT detach */ - IPA_RSL[0].clear; - alt { - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(sid, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) -> value rx_rsl_ud { } - [] IPA_RSL[0].receive(tr_ASP_RSL_UD(sid, tr_RSL_REL_REQ(chan_nr, ?))) -> value rx_rsl_ud { - f_ipa_tx(0, ts_RSL_REL_CONF(chan_nr, main_dcch)); - repeat; - } - } - + f_expect_chan_rel(0, chan_nr); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/11659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib7dd886472337e2deb968e6f9de6cecdb7855319 Gerrit-Change-Number: 11659 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:17:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:17:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: handle RR Release messages In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11660 ) Change subject: bsc: handle RR Release messages ...................................................................... bsc: handle RR Release messages Receive RR Release messages if they happen during lchan release. Add RR Release to the alt{}s in both f_expect_chan_rel() to cover a whole bunch of test cases, and in f_tc_ho_out_fail_no_ho_detect() which has its own release expectations. Before this, RR Release messages would typically be lost in the RSL.clear recently removed by Ie1be30c3f109dda8c58c523df508211f8e20aad3. However, I still expect tests to pass after this, since the current osmo-bsc master has a bug that omits RR Release messages (since [1]). By applying this patch, both the buggy osmo-bsc (omitting RR Release) and the fix of that [2] should pass the BSC tests. So far by accepting whatever comes along, and not complaining if it doesn't come along. A subsequent patch will more precisely ensure that exactly the expected messages will be sent by osmo-bsc (Ibc64058f1e214bea585f4e8dcb66f3df8ead3845). [1] osmo-bsc I4fd582b41ba4599af704d670af83651d2450b1db commit 8b818a01b00ea3daad4ad58c162ac52b4f08a5cb "subscr conn: properly forget lchan before release" [2] osmo-bsc I666b3b4f45706d898d664d380bd0fd2b018be358 "fix: send RR Release (e.g. after BSSMAP Clear Cmd" Related: OS#3413 Change-Id: I4e6d266d091b140f56b28312cb3c5d67ffcc3a59 --- M bsc/BSC_Tests.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a2a3378..fcccad0 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -820,12 +820,16 @@ boolean handle_rll_rel := true) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); + var octetstring l3_rr_chan_rel := '060D00'O; alt { /* ignore DEACTIVATE SACCH (if any) */ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DEACT_SACCH(rsl_chan_nr))) { repeat; } + [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, l3_rr_chan_rel))) { + repeat; + } /* acknowledge RLL release (if any)*/ [handle_rll_rel] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_REL_REQ(rsl_chan_nr, ?))) { @@ -2441,7 +2445,11 @@ * RR should be released and Clear Request should go to the MSC. */ var MgcpCommand mgcp; + var octetstring l3_rr_chan_rel := '060D00'O; interleave { + [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, l3_rr_chan_rel)) { + log("Got RR Release"); + } [] RSL.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) { log("Got RF Chan Rel"); RSL.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr)); -- To view, visit https://gerrit.osmocom.org/11660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4e6d266d091b140f56b28312cb3c5d67ffcc3a59 Gerrit-Change-Number: 11660 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:17:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:17:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: handle Deact SACCH messages In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11661 ) Change subject: bsc: handle Deact SACCH messages ...................................................................... bsc: handle Deact SACCH messages Allow osmo-bsc sending a Deact SACCH messages in most cases. Prepare the ttcn3-bsc-tests to not break just because of those messages that will soon be sent. When releasing an lchan, it makes sense to Deactivate SACCH on it, if it was ever active. So far osmo-bsc was fairly reluctant to send Deactivate SACCH, but osmo-bsc Id3301df059582da2377ef82feae554e94fa42035 is about to change that. In most test cases, Deact SACCH are still optional, but in one case, the current missing Deact SACCH will introduce a test failure: in the 'interleave' of BSC_Tests.TC_ho_out_fail_no_ho_detect. As soon as abovementioned osmo-bsc patch is merged, the test will pass again. Also, as soon as Ibc64058f1e214bea585f4e8dcb66f3df8ead3845 is merged here, the bsc tests will properly ensure whether Deact SACCH is sent or not in all tests. Change-Id: I27da24dbe3184fa7a076a35f6fa6af457c1db8d2 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fcccad0..b1f3a31 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2182,6 +2182,7 @@ /* Check the amount of MGCP transactions is still consistant with the * test expectation */ f_check_mgcp_expectations() + f_sleep(0.5); } testcase TC_ho_int() runs on test_CT { @@ -2447,6 +2448,9 @@ var MgcpCommand mgcp; var octetstring l3_rr_chan_rel := '060D00'O; interleave { + [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) { + log("Got Deact SACCH"); + } [] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, l3_rr_chan_rel)) { log("Got RR Release"); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 003813a..07eafc7 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -682,6 +682,9 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected L3 received", l3)); } } + [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) { + repeat; + } [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) { RSL.send(ts_RSL_REL_CONF(st.old_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); repeat; @@ -1043,6 +1046,9 @@ } [st.rr_ho_cmpl_seen] as_Media_ipacc(); [st.rr_ho_cmpl_seen] as_Media_mgw(true); + [st.rr_ho_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) { + repeat; + } [st.rr_ho_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) { RSL.send(ts_RSL_REL_CONF(st.old_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); repeat; -- To view, visit https://gerrit.osmocom.org/11661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I27da24dbe3184fa7a076a35f6fa6af457c1db8d2 Gerrit-Change-Number: 11661 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:21:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:21:58 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11504/4/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/11504/4/src/gsm/gsm0808_utils.c at 1401 PS4, Line 1401: match_nr --; > Agree Ack -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 16:21:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:23:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 16:23:57 +0000 Subject: Change in libosmocore[master]: gsm0808: add BSSMAP Cell Identifier matching API In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11504 ) Change subject: gsm0808: add BSSMAP Cell Identifier matching API ...................................................................... Patch Set 4: > > I think you should also update TODO-RELEASE file > > Do I need to edit TODO-RELEASE for added API? I thought that would > just apply for API breakages? I've never done that before. it's only for API breakages, and t's actually not mandatory (it may help in that case though). -- To view, visit https://gerrit.osmocom.org/11504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5535f0d149c2173294538df75764dd181b023312 Gerrit-Change-Number: 11504 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 16:23:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:24:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:24:44 +0000 Subject: Change in osmo-bsc[master]: coverity: gscon_forget_lchan: squelch forward-null In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11742 ) Change subject: coverity: gscon_forget_lchan: squelch forward-null ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11742/1/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/#/c/11742/1/src/osmo-bsc/bsc_subscr_conn_fsm.c at 655 PS1, Line 655: if (!conn || !conn->fi) > Do we really then need this check at all if they are allocated and removed at the same time? "if (!c [?] Right, if no code checks conn->fi then coverity won't see a problem. -- To view, visit https://gerrit.osmocom.org/11742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62354aa998832131c86535f39a29294000114adc Gerrit-Change-Number: 11742 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 16:24:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:26:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:26:26 +0000 Subject: Change in osmo-bsc[master]: coverity: gscon_forget_lchan: squelch forward-null In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11742 to look at the new patch set (#3). Change subject: coverity: gscon_forget_lchan: squelch forward-null ...................................................................... coverity: gscon_forget_lchan: squelch forward-null conn->fi should actually never be NULL, they are allocated and discarded simultaneously. So check its null from the start and remove some conditions below, to remove the coverity warning. Related: CID 189671 Change-Id: I62354aa998832131c86535f39a29294000114adc --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/11742/3 -- To view, visit https://gerrit.osmocom.org/11742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I62354aa998832131c86535f39a29294000114adc Gerrit-Change-Number: 11742 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:36:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:36:00 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 2: > Patch Set 1: > > Which README? Top-level directory of osmo-gsm-manuals doesn't have it, neither OsmoMSC. I'd really love to see commit message which allows to reproduce this update when necessary. sorry, it is called INSTALL.txt for some odd reason. Nevertheless it is common knowledge AFAICT, please remove the -1 -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 14 Nov 2018 16:36:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:36:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:36:49 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 2: http://git.osmocom.org/osmo-gsm-manuals/tree/INSTALL.txt#n22 -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 14 Nov 2018 16:36:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 16:49:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 16:49:56 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 2: related: https://osmocom.org/issues/3695 -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 14 Nov 2018 16:49:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 17:02:38 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan: introduce sub-struct lchan->release.* In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11668 to look at the new patch set (#3). Change subject: cosmetic: lchan: introduce sub-struct lchan->release.* ...................................................................... cosmetic: lchan: introduce sub-struct lchan->release.* Put all lchan release related flags and settings in a sub-struct named 'release' to better indicate what those fields are for. There is no functional change. Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 4 files changed, 53 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/11668/3 -- To view, visit https://gerrit.osmocom.org/11668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 Gerrit-Change-Number: 11668 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 17:02:38 +0000 Subject: Change in osmo-bsc[master]: lchan: set cause for 4 instances of release_in_error = true In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11670 to look at the new patch set (#3). Change subject: lchan: set cause for 4 instances of release_in_error = true ...................................................................... lchan: set cause for 4 instances of release_in_error = true Make sure some RSL cause is set. Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 --- M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/11670/3 -- To view, visit https://gerrit.osmocom.org/11670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 Gerrit-Change-Number: 11670 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 17:02:38 +0000 Subject: Change in osmo-bsc[master]: coverity: gscon_forget_lchan: squelch forward-null In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11742 to look at the new patch set (#4). Change subject: coverity: gscon_forget_lchan: squelch forward-null ...................................................................... coverity: gscon_forget_lchan: squelch forward-null conn->fi should actually never be NULL, they are allocated and discarded simultaneously. So check its null from the start and remove some conditions below, to remove the coverity warning. Related: CID 189671 Change-Id: I62354aa998832131c86535f39a29294000114adc --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/11742/4 -- To view, visit https://gerrit.osmocom.org/11742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I62354aa998832131c86535f39a29294000114adc Gerrit-Change-Number: 11742 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:03:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 17:03:56 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan: introduce sub-struct lchan->release.* In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11668 ) Change subject: cosmetic: lchan: introduce sub-struct lchan->release.* ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 Gerrit-Change-Number: 11668 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 17:03:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:04:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 17:04:31 +0000 Subject: Change in osmo-bsc[master]: lchan: set cause for 4 instances of release_in_error = true In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11670 ) Change subject: lchan: set cause for 4 instances of release_in_error = true ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 Gerrit-Change-Number: 11670 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 17:04:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:06:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 17:06:10 +0000 Subject: Change in osmo-bsc[master]: coverity: gscon_forget_lchan: squelch forward-null In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11742 ) Change subject: coverity: gscon_forget_lchan: squelch forward-null ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62354aa998832131c86535f39a29294000114adc Gerrit-Change-Number: 11742 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 14 Nov 2018 17:06:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:38:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 17:38:55 +0000 Subject: Change in osmo-bsc[master]: cosmetic: lchan: introduce sub-struct lchan->release.* In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11668 ) Change subject: cosmetic: lchan: introduce sub-struct lchan->release.* ...................................................................... cosmetic: lchan: introduce sub-struct lchan->release.* Put all lchan release related flags and settings in a sub-struct named 'release' to better indicate what those fields are for. There is no functional change. Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 4 files changed, 53 insertions(+), 50 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 3712b97..4d8a4d0 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -492,6 +492,8 @@ uint8_t nr; char *name; + char *last_error; + struct osmo_fsm_inst *fi; struct osmo_fsm_inst *fi_rtp; struct mgwep_ci *mgw_endpoint_ci_bts; @@ -510,21 +512,21 @@ struct gsm_lchan *re_use_mgw_endpoint_from_lchan; } activate; - /* If an event to release the lchan comes in while still waiting for responses, just mark this - * flag, so that the lchan will gracefully release at the next sensible junction. */ - bool release_requested; - bool do_rr_release; + struct { + /* If an event to release the lchan comes in while still waiting for responses, just mark this + * flag, so that the lchan will gracefully release at the next sensible junction. */ + bool requested; + bool do_rr_release; - char *last_error; + /* There is an RSL error cause of value 0, so we need a separate flag. */ + bool in_error; + /* RSL error code, RSL_ERR_* */ + uint8_t rsl_error_cause; - /* There is an RSL error cause of value 0, so we need a separate flag. */ - bool release_in_error; - /* RSL error code, RSL_ERR_* */ - uint8_t rsl_error_cause; - - /* If a release event is being handled, ignore other ricocheting release events until that - * release handling has concluded. */ - bool in_release_handler; + /* If a release event is being handled, ignore other ricocheting release events until that + * release handling has concluded. */ + bool in_release_handler; + } release; /* The logical channel type */ enum gsm_chan_t type; diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index ec06e9b..0dd21d9 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -737,8 +737,8 @@ break; case GSCON_EV_RSL_CONN_FAIL: if (conn->lchan) { - conn->lchan->release_in_error = true; - conn->lchan->rsl_error_cause = data ? *(uint8_t*)data : RSL_ERR_IE_ERROR; + conn->lchan->release.in_error = true; + conn->lchan->release.rsl_error_cause = data ? *(uint8_t*)data : RSL_ERR_IE_ERROR; } gscon_bssmap_clear(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE); break; diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5428d97..c3790e5 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -485,7 +485,7 @@ OSMO_ASSERT(!lchan->conn); OSMO_ASSERT(!lchan->mgw_endpoint_ci_bts); lchan_set_last_error(lchan, NULL); - lchan->release_requested = false; + lchan->release.requested = false; lchan->conn = info->for_conn; lchan->activate.activ_for = info->activ_for; @@ -557,7 +557,7 @@ struct gsm_lchan *lchan = lchan_fi_lchan(fi); struct mgwep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); - if (lchan->release_requested) { + if (lchan->release.requested) { lchan_fail("Release requested while activating"); return; } @@ -593,7 +593,7 @@ case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: - if (lchan->in_release_handler) { + if (lchan->release.in_release_handler) { /* Already in release, the RTP is not the initial cause of failure. * Just ignore. */ return; @@ -616,7 +616,7 @@ uint8_t ho_ref = 0; struct gsm_lchan *lchan = lchan_fi_lchan(fi); - if (lchan->release_requested) { + if (lchan->release.requested) { lchan_fail_to(LCHAN_ST_UNUSED, "Release requested while activating"); return; } @@ -653,12 +653,12 @@ break; case LCHAN_EV_RSL_CHAN_ACTIV_NACK: - lchan->in_release_handler = true; + lchan->release.in_release_handler = true; if (data) { uint32_t next_state; - lchan->rsl_error_cause = *(uint8_t*)data; - lchan->release_in_error = true; - if (lchan->rsl_error_cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) + lchan->release.rsl_error_cause = *(uint8_t*)data; + lchan->release.in_error = true; + if (lchan->release.rsl_error_cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) next_state = LCHAN_ST_BORKEN; else /* Taking this over from legacy code: send an RF Chan Release even though @@ -666,18 +666,18 @@ next_state = LCHAN_ST_WAIT_RF_RELEASE_ACK; lchan_fail_to(next_state, "Chan Activ NACK: %s (0x%x)", - rsl_err_name(lchan->rsl_error_cause), lchan->rsl_error_cause); + rsl_err_name(lchan->release.rsl_error_cause), lchan->release.rsl_error_cause); } else { - lchan->rsl_error_cause = RSL_ERR_IE_NONEXIST; - lchan->release_in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_IE_NONEXIST; + lchan->release.in_error = true; lchan_fail_to(LCHAN_ST_BORKEN, "Chan Activ NACK without cause IE"); } - lchan->in_release_handler = false; + lchan->release.in_release_handler = false; break; case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: - if (lchan->in_release_handler) { + if (lchan->release.in_release_handler) { /* Already in release, the RTP is not the initial cause of failure. * Just ignore. */ return; @@ -698,7 +698,7 @@ { int rc; struct gsm_lchan *lchan = lchan_fi_lchan(fi); - if (lchan->release_requested) { + if (lchan->release.requested) { lchan_fail_to(LCHAN_ST_WAIT_RF_RELEASE_ACK, "Release requested while activating"); return; } @@ -789,7 +789,7 @@ case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: - if (lchan->in_release_handler) { + if (lchan->release.in_release_handler) { /* Already in release, the RTP is not the initial cause of failure. * Just ignore. */ return; @@ -809,7 +809,7 @@ { struct gsm_lchan *lchan = lchan_fi_lchan(fi); - if (lchan->release_requested) { + if (lchan->release.requested) { lchan_fail("Release requested while activating"); return; } @@ -896,7 +896,7 @@ case LCHAN_EV_RTP_RELEASED: case LCHAN_EV_RTP_ERROR: - if (lchan->in_release_handler) { + if (lchan->release.in_release_handler) { /* Already in release, the RTP is not the initial cause of failure. * Just ignore. */ return; @@ -929,7 +929,7 @@ static void lchan_do_release(struct gsm_lchan *lchan) { - if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) + if (lchan->release.do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED) gsm48_send_rr_release(lchan); if (lchan->fi_rtp) @@ -1027,7 +1027,7 @@ switch (event) { case LCHAN_EV_RSL_RF_CHAN_REL_ACK: - if (lchan->rsl_error_cause) + if (lchan->release.in_error) lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); else lchan_fsm_state_chg(LCHAN_ST_UNUSED); @@ -1055,7 +1055,7 @@ case LCHAN_EV_RSL_CHAN_ACTIV_ACK: /* A late Chan Activ ACK? Release. */ - lchan->release_in_error = true; + lchan->release.in_error = true; lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK); return; @@ -1066,7 +1066,7 @@ case LCHAN_EV_RSL_RF_CHAN_REL_ACK: /* A late Release ACK? */ - lchan->release_in_error = true; + lchan->release.in_error = true; lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); /* TODO: we used to do this only for sysmobts: int do_free = is_sysmobts_v2(ts->trx->bts); @@ -1290,7 +1290,7 @@ return 0; default: - lchan->release_in_error = true; + lchan->release.in_error = true; lchan_fail("Timeout"); return 0; } @@ -1302,25 +1302,26 @@ if (!lchan || !lchan->fi) return; - if (lchan->in_release_handler) + if (lchan->release.in_release_handler) return; - lchan->in_release_handler = true; + lchan->release.in_release_handler = true; struct osmo_fsm_inst *fi = lchan->fi; - lchan->release_in_error = err; - lchan->rsl_error_cause = cause_rr; - lchan->do_rr_release = do_rr_release; + + lchan->release.in_error = err; + lchan->release.rsl_error_cause = cause_rr; + lchan->release.do_rr_release = do_rr_release; /* States waiting for events will notice the desire to release when done waiting, so it is enough * to mark for release. */ - lchan->release_requested = true; + lchan->release.requested = true; /* If we took the RTP over from another lchan, put it back. */ - if (lchan->fi_rtp && lchan->release_in_error) + if (lchan->fi_rtp && lchan->release.in_error) osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_ROLLBACK, 0); /* But when in error, don't wait for the next state to pick up release_requested. */ - if (lchan->release_in_error) { + if (lchan->release.in_error) { switch (lchan->fi->state) { default: /* Normally we signal release in lchan_fsm_wait_rll_rtp_released_onenter(). When @@ -1345,7 +1346,7 @@ lchan_fsm_state_chg(LCHAN_ST_WAIT_RLL_RTP_RELEASED); exit_release_handler: - lchan->in_release_handler = false; + lchan->release.in_release_handler = false; } void lchan_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index bf73429..e3e68e5 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -256,7 +256,7 @@ int val; struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - if (lchan->release_requested) { + if (lchan->release.requested) { lchan_rtp_fail("Release requested while activating"); return; } @@ -324,7 +324,7 @@ struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); const struct mgcp_conn_peer *mgw_rtp; - if (lchan->release_requested) { + if (lchan->release.requested) { lchan_rtp_fail("Release requested while activating"); return; } @@ -439,7 +439,7 @@ struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan; - if (lchan->release_requested) { + if (lchan->release.requested) { lchan_rtp_fail("Release requested while activating"); return; } @@ -724,7 +724,7 @@ int lchan_rtp_fsm_timer_cb(struct osmo_fsm_inst *fi) { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); - lchan->release_in_error = true; + lchan->release.in_error = true; lchan_rtp_fail("Timeout"); return 0; } -- To view, visit https://gerrit.osmocom.org/11668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 Gerrit-Change-Number: 11668 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:38:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 17:38:55 +0000 Subject: Change in osmo-bsc[master]: cosmetic: abis_rsl.c: drop uneccesary braces In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11669 ) Change subject: cosmetic: abis_rsl.c: drop uneccesary braces ...................................................................... cosmetic: abis_rsl.c: drop uneccesary braces Change-Id: I20a7b160321cf86179cdcece71c8158e76ba4a1b --- M src/osmo-bsc/abis_rsl.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index c16f044..6e8d078 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -895,9 +895,9 @@ /* If the lchan is associated with a conn, we shall notify the MSC of the RSL Conn Failure, and * the connection will presumably be torn down and lead to an lchan release. During initial * Channel Request from the MS, an lchan has no conn yet, so in that case release now. */ - if (!lchan->conn) { + if (!lchan->conn) lchan_release(lchan, false, true, *cause_p); - } else + else osmo_fsm_inst_dispatch(lchan->conn->fi, GSCON_EV_RSL_CONN_FAIL, (void*)cause_p); return 0; -- To view, visit https://gerrit.osmocom.org/11669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I20a7b160321cf86179cdcece71c8158e76ba4a1b Gerrit-Change-Number: 11669 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:38:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 17:38:56 +0000 Subject: Change in osmo-bsc[master]: lchan: set cause for 4 instances of release_in_error = true In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11670 ) Change subject: lchan: set cause for 4 instances of release_in_error = true ...................................................................... lchan: set cause for 4 instances of release_in_error = true Make sure some RSL cause is set. Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 --- M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index c3790e5..71b40c1 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1056,6 +1056,7 @@ case LCHAN_EV_RSL_CHAN_ACTIV_ACK: /* A late Chan Activ ACK? Release. */ lchan->release.in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK); return; @@ -1067,6 +1068,7 @@ case LCHAN_EV_RSL_RF_CHAN_REL_ACK: /* A late Release ACK? */ lchan->release.in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); /* TODO: we used to do this only for sysmobts: int do_free = is_sysmobts_v2(ts->trx->bts); @@ -1291,6 +1293,7 @@ default: lchan->release.in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_INTERWORKING; lchan_fail("Timeout"); return 0; } diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index e3e68e5..aaba563 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -725,6 +725,7 @@ { struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi); lchan->release.in_error = true; + lchan->release.rsl_error_cause = RSL_ERR_EQUIPMENT_FAIL; lchan_rtp_fail("Timeout"); return 0; } -- To view, visit https://gerrit.osmocom.org/11670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I372ade9fc58919fbf858ce14caab8a0a22dbb083 Gerrit-Change-Number: 11670 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:38:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 17:38:56 +0000 Subject: Change in osmo-bsc[master]: coverity: gscon_forget_lchan: squelch forward-null In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11742 ) Change subject: coverity: gscon_forget_lchan: squelch forward-null ...................................................................... coverity: gscon_forget_lchan: squelch forward-null conn->fi should actually never be NULL, they are allocated and discarded simultaneously. So check its null from the start and remove some conditions below, to remove the coverity warning. Related: CID 189671 Change-Id: I62354aa998832131c86535f39a29294000114adc --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 3 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 0dd21d9..d2ca03e 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -672,14 +672,12 @@ /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ if (detach_label) { - if (conn->fi) - LOGPFSML(conn->fi, LOGL_DEBUG, "conn detaches lchan %s\n", - lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); + LOGPFSML(conn->fi, LOGL_DEBUG, "conn detaches lchan %s\n", + lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); if (lchan->fi) LOGPFSML(lchan->fi, LOGL_DEBUG, "conn %s detaches lchan (%s)\n", - conn->fi? osmo_fsm_inst_name(conn->fi) : "(conn without FSM)", - detach_label); + osmo_fsm_inst_name(conn->fi), detach_label); } if (conn->fi->state != ST_CLEARING -- To view, visit https://gerrit.osmocom.org/11742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I62354aa998832131c86535f39a29294000114adc Gerrit-Change-Number: 11742 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 17:39:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 14 Nov 2018 17:39:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: check channel release message presence In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11662 ) Change subject: bsc: check channel release message presence ...................................................................... bsc: check channel release message presence Instead of vaguely allowing any release messages to be present or not, exactly pinpoint for each test case the exact release messages expected during lchan release. Related: an osmo-bsc change broke sending of RR Release messages, which was utterly ignored and hence not caught by ttcn tests. That must not happen again. I am not actually sure that these expectations are 100% correct; if errors become apparent, we shall change the expectations in ttcn3 and then fix osmo-bsc according to that. Adjust f_expect_chan_rel() and callers, and the Assignment procedures (as_assignment and f_establish_fully). The current state of the bsc tests should all pass with osmo-bsc Id3301df059582da2377ef82feae554e94fa42035 Related: OS#3413 Change-Id: Ibc64058f1e214bea585f4e8dcb66f3df8ead3845 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 53 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b1f3a31..e06f496 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -429,7 +429,7 @@ /* expect BSC to disable the channel again if there's no response from MSC */ /* MS waits 20s (T3210) at LU; 10s (T3230) at CM SERV REQ and 5s (T3220) AT detach */ - f_expect_chan_rel(0, chan_nr); + f_expect_chan_rel(0, chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -450,7 +450,7 @@ BSSAP.send(ts_BSSAP_DISC_req(rx_c_ind.connectionId, 0)); /* expect BSC to disable the channel */ - f_expect_chan_rel(0, chan_nr); + f_expect_chan_rel(0, chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -817,32 +817,38 @@ } function f_expect_chan_rel(integer bts_nr, RslChannelNr rsl_chan_nr, - boolean handle_rll_rel := true) runs on test_CT { + boolean expect_deact_sacch := true, + boolean expect_rr_chan_rel := true, + boolean expect_rll_rel_req := true, + boolean handle_rll_rel := true + ) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); var octetstring l3_rr_chan_rel := '060D00'O; + var boolean got_deact_sacch := false; + var boolean got_rr_chan_rel := false; + var boolean got_rll_rel_req := false; + log("f_expect_chan_rel() expecting: expect_deact_sacch=", expect_deact_sacch, " expect_rr_chan_rel=", expect_rr_chan_rel, + " expect_rll_rel_req=", expect_rll_rel_req); alt { - /* ignore DEACTIVATE SACCH (if any) */ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DEACT_SACCH(rsl_chan_nr))) { + got_deact_sacch := true; repeat; } [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, l3_rr_chan_rel))) { + got_rr_chan_rel := true; repeat; } - /* acknowledge RLL release (if any)*/ - [handle_rll_rel] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, + [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_REL_REQ(rsl_chan_nr, ?))) { + got_rll_rel_req := true; /* FIXME: Why are we getting this for LinkID SACCH? */ - f_ipa_tx(0, ts_RSL_REL_CONF(rsl_chan_nr, main_dcch)); + if (handle_rll_rel) { + f_ipa_tx(0, ts_RSL_REL_CONF(rsl_chan_nr, main_dcch)); + } repeat; } - [not handle_rll_rel] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, - tr_RSL_REL_REQ(rsl_chan_nr, ?))) { - /* Do not reply, just continue */ - repeat; - } - /* Expect RF channel release from BSC on Abis */ [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) { /* respond with CHAN REL ACK */ @@ -853,6 +859,19 @@ repeat; } } + + log("f_expect_chan_rel() summary: got_deact_sacch=", got_deact_sacch, " got_rr_chan_rel=", got_rr_chan_rel, + " got_rll_rel_req=", got_rll_rel_req); + + if (expect_deact_sacch != got_deact_sacch) { + setverdict(fail, "f_expect_chan_rel(): expect_deact_sacch=", expect_deact_sacch, " got_deact_sacch=", got_deact_sacch); + } + if (expect_rr_chan_rel != got_rr_chan_rel) { + setverdict(fail, "f_expect_chan_rel(): expect_rr_chan_rel=", expect_rr_chan_rel, " got_rr_chan_rel=", got_rr_chan_rel); + } + if (expect_rll_rel_req != got_rll_rel_req) { + setverdict(fail, "f_expect_chan_rel(): expect_rll_rel_req=", expect_rll_rel_req, " got_rll_rel_req=", got_rll_rel_req); + } } /* Test behavior of channel release after hard Clear Command from MSC */ @@ -874,7 +893,7 @@ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); } - f_expect_chan_rel(0, dt.rsl_chan_nr); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -889,7 +908,7 @@ /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); - f_expect_chan_rel(0, dt.rsl_chan_nr); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -904,7 +923,7 @@ /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); - f_expect_chan_rel(0, dt.rsl_chan_nr, handle_rll_rel := false); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } @@ -926,7 +945,7 @@ [] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { } } - f_expect_chan_rel(0, dt.rsl_chan_nr); + f_expect_chan_rel(0, dt.rsl_chan_nr, expect_rll_rel_req := false); setverdict(pass); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 07eafc7..116d7af 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -603,6 +603,8 @@ boolean is_assignment, /* Assignment related bits */ boolean rr_ass_cmpl_seen, + boolean old_lchan_deact_sacch_seen, + boolean old_lchan_rll_rel_req_seen, boolean assignment_done, RslChannelNr old_chan_nr, /* Modify related bits */ @@ -614,6 +616,8 @@ voice_call := false, is_assignment := false, rr_ass_cmpl_seen := false, + old_lchan_deact_sacch_seen := false, + old_lchan_rll_rel_req_seen := false, assignment_done := false, old_chan_nr := -, rr_modify_seen := false, @@ -683,9 +687,11 @@ } } [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) { + st.old_lchan_deact_sacch_seen := true; repeat; } [st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_REL_REQ(st.old_chan_nr, tr_RslLinkID_DCCH(0))) { + st.old_lchan_rll_rel_req_seen := true; RSL.send(ts_RSL_REL_CONF(st.old_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); repeat; } @@ -994,6 +1000,17 @@ } f_check_mgcp_expectations(); + + if (st.is_assignment and st.assignment_done) { + if (not st.old_lchan_deact_sacch_seen) { + setverdict(fail, "f_establish_fully(): Assignment completed, but the old lchan was not", + " released properly: expected a Deact SACCH on the old lchan, but saw none."); + } + if (st.old_lchan_rll_rel_req_seen) { + setverdict(fail, "f_establish_fully(): Assignment completed, but the old lchan was not", + " released properly: saw an RLL Release on the old lchan, but expecting none."); + } + } } type record HandoverState { -- To view, visit https://gerrit.osmocom.org/11662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibc64058f1e214bea585f4e8dcb66f3df8ead3845 Gerrit-Change-Number: 11662 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 19:00:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 19:00:44 +0000 Subject: Change in osmo-bsc[master]: examples: Remove neighbor-list invalid for default setup Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11774 Change subject: examples: Remove neighbor-list invalid for default setup ...................................................................... examples: Remove neighbor-list invalid for default setup In default example network, there's no cells with those arfcn. Furthermore, having those seem to prevent some MS to register against nanoBTS configured by a BSC using those lines. Related: OS#3063 Change-Id: Iebe972da3a8442b6ded6d7f9e61a03b9144a843c --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg 2 files changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/11774/1 diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index a1bc7e3..750b089 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -38,11 +38,6 @@ early-classmark-sending forbidden ip.access unit_id 0 0 oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 codec-support fr gprs mode none no force-combined-si diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index 0666be3..d1b3678 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -37,11 +37,6 @@ early-classmark-sending forbidden ip.access unit_id 0 0 oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 codec-support fr gprs mode none no force-combined-si -- To view, visit https://gerrit.osmocom.org/11774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iebe972da3a8442b6ded6d7f9e61a03b9144a843c Gerrit-Change-Number: 11774 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 19:04:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 14 Nov 2018 19:04:38 +0000 Subject: Change in osmo-bsc[master]: bsc: bts_alloc: Use enum value during neigh_list_manual_mode initiali... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11775 Change subject: bsc: bts_alloc: Use enum value during neigh_list_manual_mode initialization ...................................................................... bsc: bts_alloc: Use enum value during neigh_list_manual_mode initialization Change-Id: I6a4325d45de143d32db55df8e84282cc64800c9f --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/11775/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 15853fb..774238b 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -852,7 +852,7 @@ bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED; bts->dtxd = false; bts->gprs.ctrl_ack_type_use_block = true; /* use RLC/MAC control block */ - bts->neigh_list_manual_mode = 0; + bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC; bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */ bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */ bts->si_common.cell_sel_par.rxlev_acc_min = 0; -- To view, visit https://gerrit.osmocom.org/11775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6a4325d45de143d32db55df8e84282cc64800c9f Gerrit-Change-Number: 11775 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 19:17:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 14 Nov 2018 19:17:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11776 Change subject: MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mo_smma for MO SMMA over GSUP Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/11776/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 96f522c..4f2118a 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -806,6 +806,27 @@ } } +/* Submit a MO RP-SMMA over an already existing DTAP connection */ +function f_mo_smma(inout SmsParameters spars) +runs on BSC_ConnHdlr { + var template (value) RPDU_MS_SGSN rp_mo; + var template (value) PDU_ML3_MS_NW l3_mo; + + var default d := activate(as_other_sms()); + + /* just in case this is routed to SMPP.. */ + f_create_smpp_expect(hex2str(spars.tp.da.tP_DA_NoPad.tP_DAValue)); + + rp_mo := ts_RP_SMMA_MO(spars.rp.msg_ref); + l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo)); + BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); + /* receive CP-ACK for CP-DATA above */ + BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_ACK_MT), spars.dlci)); + + deactivate(d); + setverdict(pass); +} + /* Submit a MO-SMS over an already existing DTAP connection */ function f_mo_sms_submit(inout SmsParameters spars) runs on BSC_ConnHdlr { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 11802fc..24e4a98 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2084,6 +2084,63 @@ vc_conn.done; } +/* Test MO-SMMA from MS/BTS/BSC towards HLR (via GSUP) */ +private function f_tc_gsup_mo_smma(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var GSUP_PDU gsup_msg_rx; + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Send CM Service Request for SMS */ + f_establish_fully(EST_TYPE_MO_SMS); + + var template GSUP_PDU mo_ReadyForSM := tr_GSUP_MO_READY_FOR_SM_REQ( + imsi := g_pars.imsi, + sid := ?, state := ?, + sm_rp_mr := spars.rp.msg_ref, + reas := GSUP_SM_AL_REAS_TYPE_MEM_AVAIL + ); + + /* Submit an SMS on DTAP and expect MO-forwardSM-Req on GSUP */ + f_mo_smma(spars); + alt { + [] GSUP.receive(mo_ReadyForSM) -> value gsup_msg_rx { + log("RX MO-ReadyForSM-Req"); + log(gsup_msg_rx); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + /* Trigger RP-ACK by sending MO-forwardSM-Res */ + GSUP.send(valueof(ts_GSUP_MO_READY_FOR_SM_RES( + imsi := g_pars.imsi, + sid := gsup_msg_rx.ies[1].val.session_id, + state := gsup_msg_rx.ies[2].val.session_state, + sm_rp_mr := spars.rp.msg_ref))); + /* Expect RP-ACK on DTAP */ + f_mo_sms_wait_rp_ack(spars); + + f_expect_clear(); +} +testcase TC_gsup_mo_smma() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_gsup_mo_smma), 89); + vc_conn.done; +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -2840,6 +2897,7 @@ execute( TC_smpp_mt_sms() ); execute( TC_gsup_mo_sms() ); + execute( TC_gsup_mo_smma() ); execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index f8e7eb3..17ffa76 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -64,6 +64,7 @@ + -- To view, visit https://gerrit.osmocom.org/11776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7abc95b8e416f7308d54e11be11c08586d18e6c5 Gerrit-Change-Number: 11776 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 19:17:09 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 14 Nov 2018 19:17:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms for MT SMS over GSUP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11777 Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms for MT SMS over GSUP ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_sms for MT SMS over GSUP Change-Id: Ic93105e8f9d230ac7c1991395e719c461b3cd8ab --- M msc/MSC_Tests.ttcn 1 file changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/11777/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 24e4a98..f310e0a 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2141,6 +2141,79 @@ vc_conn.done; } +/* Test MT-SMS over GSUP */ +private function f_tc_gsup_mt_sms(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + var template GSUP_PDU mt_forwardSM_req := ts_GSUP_MT_FORWARD_SM_REQ( + imsi := g_pars.imsi, + sid := 'DEADBEEF'O, + state := OSMO_GSUP_SESSION_STATE_CONTINUE, + sm_rp_mr := spars.rp.msg_ref, + /* FIXME: extract SM-RP-DA from spars.rp.dest */ + /* TODO: fix encoding of ts_GSUP_SM_RP_DA_IMSI */ + sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(g_pars.msisdn)), + sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR('DEADBEEF'O)), + /* FIXME: define coding rules for SmsParametersTp, and use 'decmatch spars.tp' */ + sm_rp_ui := '052305002143F5000000'O + ); + + var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + sid := 'DEADBEEF'O, + state := OSMO_GSUP_SESSION_STATE_CONTINUE, + sm_rp_mr := spars.rp.msg_ref + ); + + var template GSUP_PDU mt_forwardSM_err := tr_GSUP_MT_FORWARD_SM_ERR( + imsi := g_pars.imsi, + sid := 'DEADBEEF'O, + state := OSMO_GSUP_SESSION_STATE_CONTINUE, + sm_rp_mr := spars.rp.msg_ref, + cause := ? + ); + + /* Submit an SMS on GSUP and expect connection establishment */ + GSUP.send(mt_forwardSM_req); + + /* TODO! */ + + /* Expect MT-forwardSM-Res on GSUP (RP-ACK) */ + alt { + [] GSUP.receive(mt_forwardSM_res) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive(mt_forwardSM_err) { + log("RX MT-forwardSM-Err (RP-ERROR)"); + setverdict(fail); + mtc.stop; + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + f_expect_clear(); +} +testcase TC_gsup_mt_sms() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_gsup_mt_sms), 90); + vc_conn.done; +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -2898,6 +2971,7 @@ execute( TC_gsup_mo_sms() ); execute( TC_gsup_mo_smma() ); + execute( TC_gsup_mt_sms() ); execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); -- To view, visit https://gerrit.osmocom.org/11777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic93105e8f9d230ac7c1991395e719c461b3cd8ab Gerrit-Change-Number: 11777 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 21:00:53 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 14 Nov 2018 21:00:53 +0000 Subject: Change in osmo-gsm-tester[master]: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11580 ) Change subject: misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH ...................................................................... misc: Use RPATH to avoid having tests to set LD_LIBRARY_PATH Instead of each binary launcher having to check if there is a lib/ directory and then setting a LD_LIBRARY_PATH we can use an RPATH and know these binaries pick-up the right libraries. This requires I6e4ad2e3855af7bcefc22d4190cc4e6f58581857. Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 --- M contrib/jenkins-build-common.sh 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 17ab7df..a9eaf7a 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -175,6 +175,31 @@ done } +add_rpath() { + # Adds an RPATH to executables in bin/ or sbin/ to search for the + # (Osmocom) libraries in `dirname /proc/self/exe`/../lib/. Adds an + # RPATH to a library to search in the same directory as the library. + # + # NOTE: Binaries should not have the SUID bit set and should run as the + # user executing the binary. + # + # NOTE: $ORIGIN is not a shell variable but a feature of the dynamic + # linker that will be expanded at runtime. For details see: + # http://man7.org/linux/man-pages/man8/ld.so.8.html + # + # Add an rpath relative to the binary and library if the directory + # exists. + if [ -d bin/ ]; then + find bin -depth -type f -exec patchelf --set-rpath '$ORIGIN/../lib/' {} \; + fi + if [ -d sbin/ ]; then + find sbin -depth -type f -exec patchelf --set-rpath '$ORIGIN/../lib/' {} \; + fi + if [ -d lib/ ]; then + find lib -depth -type f -name "lib*.so.*" -exec patchelf --set-rpath '$ORIGIN/' {} \; + fi +} + create_bin_tgz() { # build the archive that is going to be copied to the tester @@ -190,6 +215,7 @@ prune_files sbin "$wanted_binaries_sbin" cd "$prefix_real" + add_rpath this="$name.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" tar="${this}.tgz" tar czf "$base/$tar" * -- To view, visit https://gerrit.osmocom.org/11580 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If771767dd82662e13b6b10ee7a8b8d0c84dcbdb1 Gerrit-Change-Number: 11580 Gerrit-PatchSet: 4 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 21:03:23 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 14 Nov 2018 21:03:23 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Allow to specify env and binary name/path In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11596 ) Change subject: ms_driver: Allow to specify env and binary name/path ...................................................................... ms_driver: Allow to specify env and binary name/path For the proper trial/suite integration we can't assume that the virtphy/mobile are in the PATH and that they can be executed directly (e.g. need a LD_LIBRARY_PATH to be applied). Introduce BinaryOptions to pass the name/path of the two executables and the env to use. Default this to virtphy/mobile and an empty environment. Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 4 files changed, 27 insertions(+), 14 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index a4d81c1..86186b7 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -21,6 +21,7 @@ from osmo_ms_driver.event_server import EventServer from osmo_ms_driver.simple_loop import SimpleLoop from osmo_ms_driver.location_update_test import MassUpdateLocationTest +from osmo_ms_driver.starter import BinaryOptions import os.path import shutil @@ -83,7 +84,9 @@ self._ev_server = EventServer("ev_server", event_server_path) self._ev_server.listen(self._loop) - self._test_case = MassUpdateLocationTest("mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir) + options = BinaryOptions("virtphy", "mobile", None) + self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, + self._ev_server, self.event_server_sk_tmp_dir) # TODO: We should pass subscribers down to the test and not get it from # there. diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py index 1573084..265ce47 100644 --- a/src/osmo_ms_driver/__main__.py +++ b/src/osmo_ms_driver/__main__.py @@ -20,6 +20,7 @@ from .simple_loop import SimpleLoop from .location_update_test import MassUpdateLocationTest from .cdf import cdfs +from .starter import BinaryOptions from osmo_gsm_tester import log # System modules @@ -82,7 +83,8 @@ ev_server.listen(loop) # Just a single test for now. - test = MassUpdateLocationTest("lu_test", args.num_ms, cdf, ev_server, tmp_dir) + options = BinaryOptions("virtphy", "mobile", None) + test = MassUpdateLocationTest("lu_test", options, args.num_ms, cdf, ev_server, tmp_dir) atexit.register(test.stop_all) # Run until everything has been launched diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index dfa33c3..dee99fe 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -56,8 +56,9 @@ TEMPLATE_LUA = "osmo-mobile-lu.lua" TEMPLATE_CFG = "osmo-mobile.cfg" - def __init__(self, name, number_of_ms, cdf_function, event_server, tmp_dir): + def __init__(self, name, options, number_of_ms, cdf_function, event_server, tmp_dir): super().__init__(log.C_RUN, name) + self._binary_options = options self._number_of_ms = number_of_ms self._cdf = cdf_function self._cdf.set_target(number_of_ms) @@ -71,10 +72,12 @@ for i in range(0, number_of_ms): ms_name = "%.5d" % i - phy = OsmoVirtPhy(ms_name, tmp_dir) + phy = OsmoVirtPhy(options.virtphy, options.env, + ms_name, tmp_dir) self._phys.append(phy) - launcher = OsmoMobile(ms_name, tmp_dir, self.TEMPLATE_LUA, + launcher = OsmoMobile(options.mobile, options.env, + ms_name, tmp_dir, self.TEMPLATE_LUA, self.TEMPLATE_CFG, imsi_gen, phy.phy_filename(), event_server.server_path()) diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 5218a57..2ffb33a 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -18,6 +18,7 @@ from osmo_gsm_tester import log, template +import collections import os import os.path import subprocess @@ -26,9 +27,13 @@ _devnull = open(os.devnull, 'w') #_devnull = open('/dev/stdout', 'w') +BinaryOptions = collections.namedtuple("BinaryOptions", ["virtphy", "mobile", "env"]) + class Launcher(log.Origin): - def __init__(self, base_name, name_number, tmp_dir): + def __init__(self, binary, env, base_name, name_number, tmp_dir): super().__init__(log.C_RUN, "{}/{}".format(base_name, name_number)) + self._binary = binary + self._env = env self._name_number = name_number self._tmp_dir = tmp_dir @@ -36,8 +41,8 @@ return self._name_number class OsmoVirtPhy(Launcher): - def __init__(self, name_number, tmp_dir): - super().__init__("osmo-ms-virt-phy", name_number, tmp_dir) + def __init__(self, binary, env, name_number, tmp_dir): + super().__init__(binary, env, "osmo-ms-virt-phy", name_number, tmp_dir) self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number) self._vphy_proc = None @@ -49,9 +54,9 @@ raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename) self.log("Starting virtphy process") - args = ["virtphy", "--l1ctl-sock=" + self._phy_filename] + args = [self._binary, "--l1ctl-sock=" + self._phy_filename] self.log(' '.join(args)) - self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull) + self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env) def verify_ready(self): while True: @@ -65,8 +70,8 @@ self._vphy_proc.terminate() class OsmoMobile(Launcher): - def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): - super().__init__("osmo-ms-mob", name_number, tmp_dir) + def __init__(self, binary, env, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): + super().__init__(binary, env, "osmo-ms-mob", name_number, tmp_dir) self._lua_template = lua_tmpl self._cfg_template = cfg_tmpl self._imsi_ki_generator = imsi_ki_generator @@ -117,9 +122,9 @@ self.log("Starting process") # Let the kernel pick an unused port for the VTY. - args = ["mobile", "-c", mob_filename, "--vty-port=0"] + args = [self._binary, "-c", mob_filename, "--vty-port=0"] self.log(' '.join(args)) - self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull) + self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env) def kill(self): """Clean up things.""" -- To view, visit https://gerrit.osmocom.org/11596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721 Gerrit-Change-Number: 11596 Gerrit-PatchSet: 5 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 21:12:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 14 Nov 2018 21:12:14 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 2: > Nevertheless it is common knowledge AFAICT I disagree: if you, the person who've actually made the update, remembered it from 2nd try than it's certainly a very good indication that this should be documented better. Others would have even harder time figuring out where this comes from and how it was made. At the very list the commit message should have the references you've mentioned in replies. Naturally the same applies to all the patches in this series. -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 14 Nov 2018 21:12:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 14 21:16:54 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Wed, 14 Nov 2018 21:16:54 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Switch to process.Process from subprocess In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11597 ) Change subject: ms_driver: Switch to process.Process from subprocess ...................................................................... ms_driver: Switch to process.Process from subprocess Use a single tmp/rundir for all these instances. In the next step we can create separate directories. Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 4 files changed, 27 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 86186b7..36da921 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -63,7 +63,6 @@ self._test_duration = timedelta(seconds=120) self._cdf = cdfs["ease_in_out"](self._time_start, self._time_step) self._loop = SimpleLoop() - self._suite_run.remember_to_stop(self) self._test_case = None self.event_server_sk_tmp_dir = None @@ -86,7 +85,8 @@ self._ev_server.listen(self._loop) options = BinaryOptions("virtphy", "mobile", None) self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, - self._ev_server, self.event_server_sk_tmp_dir) + self._ev_server, self.event_server_sk_tmp_dir, + suite_run=self._suite_run) # TODO: We should pass subscribers down to the test and not get it from # there. @@ -120,16 +120,11 @@ def cleanup(self): """ - Stops the testcase and all launched processes. Called by the - suite. + Cleans up the driver (e.g. AF_UNIX files). """ # Clean-up the temporary directory. if self.event_server_sk_tmp_dir: shutil.rmtree(path=self.event_server_sk_tmp_dir) - if not self._test_case: - return - self._test_case.stop_all() - # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py index 265ce47..0e3611b 100644 --- a/src/osmo_ms_driver/__main__.py +++ b/src/osmo_ms_driver/__main__.py @@ -83,7 +83,7 @@ ev_server.listen(loop) # Just a single test for now. - options = BinaryOptions("virtphy", "mobile", None) + options = BinaryOptions("virtphy", "mobile", os.environ) test = MassUpdateLocationTest("lu_test", options, args.num_ms, cdf, ev_server, tmp_dir) atexit.register(test.stop_all) diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index dee99fe..90e405e 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -56,12 +56,14 @@ TEMPLATE_LUA = "osmo-mobile-lu.lua" TEMPLATE_CFG = "osmo-mobile.cfg" - def __init__(self, name, options, number_of_ms, cdf_function, event_server, tmp_dir): + def __init__(self, name, options, number_of_ms, cdf_function, + event_server, tmp_dir, suite_run=None): super().__init__(log.C_RUN, name) self._binary_options = options self._number_of_ms = number_of_ms self._cdf = cdf_function self._cdf.set_target(number_of_ms) + self._suite_run = suite_run self._unstarted = [] self._mobiles = [] self._phys = [] @@ -100,7 +102,7 @@ """ self.log("Pre-launching all virtphy's") for phy in self._phys: - phy.start(loop) + phy.start(loop, self._suite_run) self.log("Checking if sockets are in the filesystem") for phy in self._phys: @@ -132,7 +134,7 @@ # start pending MS while len(self._started) < self._cdf.current_scaled_value() and len(self._unstarted) > 0: ms = self._unstarted.pop(0) - ms.start(loop) + ms.start(loop, self._suite_run) launch_time = time.clock_gettime(time.CLOCK_MONOTONIC) self._results[ms.name_number()].set_launch_time(launch_time) self._started.append(ms) @@ -170,7 +172,7 @@ def stop_all(self): for launcher in self._started: - launcher.kill() + launcher.terminate() def handle_msg(self, _data, addr, time): import json diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 2ffb33a..66027c6 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -16,17 +16,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from osmo_gsm_tester import log, template +from osmo_gsm_tester import log, process, template import collections import os import os.path -import subprocess import time -_devnull = open(os.devnull, 'w') -#_devnull = open('/dev/stdout', 'w') - BinaryOptions = collections.namedtuple("BinaryOptions", ["virtphy", "mobile", "env"]) class Launcher(log.Origin): @@ -49,14 +45,17 @@ def phy_filename(self): return self._phy_filename - def start(self, loop): + def start(self, loop, suite_run=None): if len(self._phy_filename.encode()) > 107: raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename) - self.log("Starting virtphy process") + self.log("Starting virtphy") args = [self._binary, "--l1ctl-sock=" + self._phy_filename] - self.log(' '.join(args)) - self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env) + self._vphy_proc = process.Process(self.name(), self._tmp_dir, + args, env=self._env) + if suite_run: + suite_run.remember_to_stop(self._vphy_proc) + self._vphy_proc.launch() def verify_ready(self): while True: @@ -64,7 +63,7 @@ return time.sleep(0.2) - def kill(self): + def terminate(self): """Clean up things.""" if self._vphy_proc: self._vphy_proc.terminate() @@ -116,17 +115,20 @@ w.write(mob_vty) return mob_cfg_file - def start(self, loop): + def start(self, loop, suite_run=None): lua_filename = self.write_lua_cfg() mob_filename = self.write_mob_cfg(lua_filename, self._phy_filename) - self.log("Starting process") + self.log("Starting mobile") # Let the kernel pick an unused port for the VTY. args = [self._binary, "-c", mob_filename, "--vty-port=0"] - self.log(' '.join(args)) - self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env) + self._omob_proc = process.Process(self.name(), self._tmp_dir, + args, env=self._env) + if suite_run: + suite_run.remember_to_stop(self._omob_proc) + self._omob_proc.launch() - def kill(self): + def terminate(self): """Clean up things.""" if self._omob_proc: self._omob_proc.terminate() -- To view, visit https://gerrit.osmocom.org/11597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 Gerrit-Change-Number: 11597 Gerrit-PatchSet: 4 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 11:32:41 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 15 Nov 2018 11:32:41 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11587/2/OsmoMSC/vty/msc_vty_reference.xml File OsmoMSC/vty/msc_vty_reference.xml: https://gerrit.osmocom.org/#/c/11587/2/OsmoMSC/vty/msc_vty_reference.xml at 2571 PS2, Line 2571: cosmetic: why not on a separate line? -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 15 Nov 2018 11:32:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 11:56:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 11:56:52 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Use enum value in neighbor-list check Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11778 Change subject: bsc: vty: Use enum value in neighbor-list check ...................................................................... bsc: vty: Use enum value in neighbor-list check Change-Id: I7c0b42bfed749f18b8ab2331475f3da35b02f456 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/11778/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 8eb0692..3a52949 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3107,7 +3107,7 @@ struct bitvec *bv = &bts->si_common.neigh_list; uint16_t arfcn = atoi(argv[1]); - if (!bts->neigh_list_manual_mode) { + if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { vty_out(vty, "%% Cannot configure neighbor list in " "automatic mode%s", VTY_NEWLINE); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/11778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7c0b42bfed749f18b8ab2331475f3da35b02f456 Gerrit-Change-Number: 11778 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 13:01:45 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 13:01:45 +0000 Subject: Change in osmo-bsc[master]: show dynamic timeslot details in 'show timeslot' vty command In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11762 ) Change subject: show dynamic timeslot details in 'show timeslot' vty command ...................................................................... show dynamic timeslot details in 'show timeslot' vty command The 'show lchan' command already shows details about timeslot state, indicating whether a channel is currently being switched to a different channel type. However, this information was not shown by 'show timeslot' yet. There are TTCN3 BSC tests which use 'show timeslot' and are seeing sporadic failures when 'show timeout' is invoked during a channel type transition. With this change, VTY sessions recorded in pcap files for these tests will contain information about the current channel type transition state. Change-Id: Ib854945756fb54c0e1c7d4212ea7b8746eec0db5 Related: OS#3690 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 34 insertions(+), 29 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 8eb0692..9115c01 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1151,6 +1151,38 @@ return CMD_SUCCESS; } +/* call vty_out() to print a string like " as TCH/H" for dynamic timeslots. + * Don't do anything if the ts is not dynamic. */ +static void vty_out_dyn_ts_status(struct vty *vty, struct gsm_bts_trx_ts *ts) +{ + enum gsm_phys_chan_config target; + if (ts_is_pchan_switching(ts, &target)) { + vty_out(vty, " switching %s -> %s", gsm_pchan_name(ts->pchan_is), + gsm_pchan_name(target)); + } else if (ts->pchan_is != ts->pchan_on_init) { + vty_out(vty, " as %s", gsm_pchan_name(ts->pchan_is)); + } +} + +static void vty_out_dyn_ts_details(struct vty *vty, struct gsm_bts_trx_ts *ts) +{ + /* show dyn TS details, if applicable */ + switch (ts->pchan_on_init) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + vty_out(vty, " Osmocom Dyn TS:"); + vty_out_dyn_ts_status(vty, ts); + vty_out(vty, VTY_NEWLINE); + break; + case GSM_PCHAN_TCH_F_PDCH: + vty_out(vty, " IPACC Dyn PDCH TS:"); + vty_out_dyn_ts_status(vty, ts); + vty_out(vty, VTY_NEWLINE); + break; + default: + /* no dyn ts */ + break; + } +} static void ts_dump_vty(struct vty *vty, struct gsm_bts_trx_ts *ts) { @@ -1160,6 +1192,7 @@ if (ts->pchan_is != ts->pchan_on_init) vty_out(vty, " (%s mode)", gsm_pchan_name(ts->pchan_is)); vty_out(vty, ", TSC %u%s NM State: ", gsm_ts_tsc(ts), VTY_NEWLINE); + vty_out_dyn_ts_details(vty, ts); net_dump_nmstate(vty, &ts->mo.nm_state); if (!is_ipaccess_bts(ts->trx->bts)) vty_out(vty, " E1 Line %u, Timeslot %u, Subslot %u%s", @@ -1287,19 +1320,6 @@ } -/* call vty_out() to print a string like " as TCH/H" for dynamic timeslots. - * Don't do anything if the ts is not dynamic. */ -static void vty_out_dyn_ts_status(struct vty *vty, struct gsm_bts_trx_ts *ts) -{ - enum gsm_phys_chan_config target; - if (ts_is_pchan_switching(ts, &target)) { - vty_out(vty, " switching %s -> %s", gsm_pchan_name(ts->pchan_is), - gsm_pchan_name(target)); - } else if (ts->pchan_is != ts->pchan_on_init) { - vty_out(vty, " as %s", gsm_pchan_name(ts->pchan_is)); - } -} - static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan) { int idx; @@ -1307,22 +1327,7 @@ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE); - /* show dyn TS details, if applicable */ - switch (lchan->ts->pchan_on_init) { - case GSM_PCHAN_TCH_F_TCH_H_PDCH: - vty_out(vty, " Osmocom Dyn TS:"); - vty_out_dyn_ts_status(vty, lchan->ts); - vty_out(vty, VTY_NEWLINE); - break; - case GSM_PCHAN_TCH_F_PDCH: - vty_out(vty, " IPACC Dyn PDCH TS:"); - vty_out_dyn_ts_status(vty, lchan->ts); - vty_out(vty, VTY_NEWLINE); - break; - default: - /* no dyn ts */ - break; - } + vty_out_dyn_ts_details(vty, lchan->ts); vty_out(vty, " Connection: %u, State: %s%s%s%s", lchan->conn ? 1: 0, lchan_state_name(lchan), lchan->fi && lchan->fi->state == LCHAN_ST_BORKEN ? " Error reason: " : "", -- To view, visit https://gerrit.osmocom.org/11762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib854945756fb54c0e1c7d4212ea7b8746eec0db5 Gerrit-Change-Number: 11762 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 13:02:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 13:02:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: attempt to fix a race condition in BSC test's f_ts_dyn_mode_get In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11763 ) Change subject: attempt to fix a race condition in BSC test's f_ts_dyn_mode_get ...................................................................... attempt to fix a race condition in BSC test's f_ts_dyn_mode_get Add two helper functions which retry a VTY command until the result matches a regular expression or a configurable timeout expires. Use these functions in BSC test's f_ts_dyn_mode_get, which has seen sporadic failures due to a race condition during channel reconfiguration, in order to hopefully close this race. Change-Id: I308ddb06e440c165fe1e73fe2c1fb78be2e1d510 Related: OS#3690 --- M bsc/BSC_Tests.ttcn M library/Osmocom_VTY_Functions.ttcn 2 files changed, 24 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e06f496..21ec0ff 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2761,8 +2761,7 @@ runs on test_CT return charstring { var charstring cmd, resp; cmd := "show timeslot "&int2str(bts_nr)&" "&int2str(trx_nr)&" "&int2str(ts_nr); - resp := f_vty_transceive_ret(BSCVTY, cmd); - return regexp(resp, "*\((*)\)*", 0); + return f_vty_transceive_match_regexp_retry(BSCVTY, cmd, "*\((*)\)*", 0, 4, 1.0); } private function f_ts_dyn_mode_assert(integer bts_nr, integer trx_nr, integer ts_nr, diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index 86f58f1..4f795ad 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -1,5 +1,6 @@ module Osmocom_VTY_Functions { import from TELNETasp_PortType all; + import from Osmocom_Types all; modulepar { charstring mp_prompt_prefix := "OpenBSC"; @@ -153,5 +154,27 @@ } } +function f_vty_transceive_match_regex(TELNETasp_PT pt, charstring cmd, charstring regex, integer groupno) return charstring +{ + var charstring resp := f_vty_transceive_ret(pt, cmd); + return regexp(resp, regex, groupno); +} + +function f_vty_transceive_match_regexp_retry(TELNETasp_PT pt, charstring cmd, charstring regex, + integer groupno, integer num_attempts, float retry_delay) return charstring +{ + while (num_attempts > 0) { + var charstring ret := f_vty_transceive_match_regex(pt, cmd, regex, groupno); + if (ret != "") { + return ret; + } + f_sleep(retry_delay); + num_attempts := num_attempts - 1; + } + + setverdict(fail, "No matching VTY response for regular expression '", regex, + "' after ", num_attempts, " attempts." ); + mtc.stop; +} } -- To view, visit https://gerrit.osmocom.org/11763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I308ddb06e440c165fe1e73fe2c1fb78be2e1d510 Gerrit-Change-Number: 11763 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 13:03:04 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 13:03:04 +0000 Subject: Change in osmo-sgsn[master]: fix bogus error check in gprs_sndcp_comp_create() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11730 ) Change subject: fix bogus error check in gprs_sndcp_comp_create() ...................................................................... fix bogus error check in gprs_sndcp_comp_create() The function gprs_sndcp_get_compression_class() returns -EINVAL upon error, not -1, so an existing assertion would never trigger. Instead, check for the values we want first (PROTOCOL_COMP or DATA_COMP) and assert(false) in case the returned value doesn't match either of these. Found by: Neels Change-Id: I8444c1ed052707c76a979fb06cb018ac678defa7 --- M src/gprs/gprs_sndcp_comp.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, approved diff --git a/src/gprs/gprs_sndcp_comp.c b/src/gprs/gprs_sndcp_comp.c index 60b15b9..3e02603 100644 --- a/src/gprs/gprs_sndcp_comp.c +++ b/src/gprs/gprs_sndcp_comp.c @@ -92,19 +92,20 @@ * (Protocol or Data compresson ?) */ comp_entity->compclass = gprs_sndcp_get_compression_class(comp_field); - OSMO_ASSERT(comp_entity->compclass != -1); - /* Create an algorithm specific compression context */ if (comp_entity->compclass == SNDCP_XID_PROTOCOL_COMPRESSION) { if (gprs_sndcp_pcomp_init(ctx, comp_entity, comp_field) != 0) { talloc_free(comp_entity); comp_entity = NULL; } - } else { + } else if (comp_entity->compclass == SNDCP_XID_DATA_COMPRESSION) { if (gprs_sndcp_dcomp_init(ctx, comp_entity, comp_field) != 0) { talloc_free(comp_entity); comp_entity = NULL; } + } else { + /* comp_field is somehow invalid */ + OSMO_ASSERT(false); } /* Bail on failure */ -- To view, visit https://gerrit.osmocom.org/11730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8444c1ed052707c76a979fb06cb018ac678defa7 Gerrit-Change-Number: 11730 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 13:27:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 13:27:22 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11656/2/include/osmocom/sgsn/gprs_sndcp_comp.h File include/osmocom/sgsn/gprs_sndcp_comp.h: https://gerrit.osmocom.org/#/c/11656/2/include/osmocom/sgsn/gprs_sndcp_comp.h at 47 PS2, Line 47: } algo; /* Algorithm type (see gprs_sndcp_xid.h) */ > We have this kind of union twice, once in this file and in next file. [?] Excellent point, thanks. See next patch set. -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 15 Nov 2018 13:27:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 13:27:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 13:27:57 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11656 to look at the new patch set (#3). Change subject: use enums consistently instead of falling back to int ...................................................................... use enums consistently instead of falling back to int The two existing enums defined in gprs_sndcp_xid.h, for protocol and data compression algorithm numbers respectively, were assigned to 'int' variables when their values were copied to other structures. This prevented the compiler from checking the enum value coverage during switch statements and also tripped up Coverity scans looking for enum value mismatch problems. So instead of copying enums to ints, make use of the enums throughout. Structures which can contain values from both enums now use a union of both, forcing us to be very explicit about which set of values we are dealing with. Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Depends: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 Depends: I8444c1ed052707c76a979fb06cb018ac678defa7 Related: CID#149102 --- M include/osmocom/sgsn/gprs_sndcp_comp.h M include/osmocom/sgsn/gprs_sndcp_xid.h M src/gprs/gprs_sndcp.c M src/gprs/gprs_sndcp_comp.c M src/gprs/gprs_sndcp_dcomp.c M src/gprs/gprs_sndcp_pcomp.c M src/gprs/gprs_sndcp_xid.c M tests/sndcp_xid/sndcp_xid_test.c 8 files changed, 180 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/11656/3 -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 13:56:17 2018 From: gerrit-no-reply at lists.osmocom.org (roox) Date: Thu, 15 Nov 2018 13:56:17 +0000 Subject: Change in libosmocore[master]: gsm/protocol/gsm_08_58.h: Fix typo Message-ID: roox has uploaded this change for review. ( https://gerrit.osmocom.org/11779 Change subject: gsm/protocol/gsm_08_58.h: Fix typo ...................................................................... gsm/protocol/gsm_08_58.h: Fix typo Fix a typo that prevents building on ppc64 (Power8, Big Endian). Tested with gcc version: 8.2.1+r265487 /bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -DBUILDING_LIBOSMOCORE -Wall -c -o panic.lo panic.c In file included from ../include/osmocom/gsm/rsl.h:6, from gsmtap_util.c:37: ../include/osmocom/gsm/protocol/gsm_08_58.h:60:4: error: expected specifier-qualifier-list before 'sapi' sapi:3; ^~~~ Change-Id: I4a40fc68cb6dfdfadfcc34213c4ecdabbbc356f2 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/11779/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index cd28caf..363f33d 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -56,7 +56,7 @@ #if OSMO_IS_BIG_ENDIAN uint8_t cbits:2, na:1, - reserved:2; + reserved:2, sapi:3; #elif OSMO_IS_LITTLE_ENDIAN uint8_t sapi:3, -- To view, visit https://gerrit.osmocom.org/11779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4a40fc68cb6dfdfadfcc34213c4ecdabbbc356f2 Gerrit-Change-Number: 11779 Gerrit-PatchSet: 1 Gerrit-Owner: roox -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:05:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 14:05:41 +0000 Subject: Change in libosmocore[master]: gsm/protocol/gsm_08_58.h: Fix typo In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11779 ) Change subject: gsm/protocol/gsm_08_58.h: Fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a40fc68cb6dfdfadfcc34213c4ecdabbbc356f2 Gerrit-Change-Number: 11779 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 15 Nov 2018 14:05:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:05:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 14:05:43 +0000 Subject: Change in libosmocore[master]: gsm/protocol/gsm_08_58.h: Fix typo In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11779 ) Change subject: gsm/protocol/gsm_08_58.h: Fix typo ...................................................................... gsm/protocol/gsm_08_58.h: Fix typo Fix a typo that prevents building on ppc64 (Power8, Big Endian). Tested with gcc version: 8.2.1+r265487 /bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -DBUILDING_LIBOSMOCORE -Wall -c -o panic.lo panic.c In file included from ../include/osmocom/gsm/rsl.h:6, from gsmtap_util.c:37: ../include/osmocom/gsm/protocol/gsm_08_58.h:60:4: error: expected specifier-qualifier-list before 'sapi' sapi:3; ^~~~ Change-Id: I4a40fc68cb6dfdfadfcc34213c4ecdabbbc356f2 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index cd28caf..363f33d 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -56,7 +56,7 @@ #if OSMO_IS_BIG_ENDIAN uint8_t cbits:2, na:1, - reserved:2; + reserved:2, sapi:3; #elif OSMO_IS_LITTLE_ENDIAN uint8_t sapi:3, -- To view, visit https://gerrit.osmocom.org/11779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4a40fc68cb6dfdfadfcc34213c4ecdabbbc356f2 Gerrit-Change-Number: 11779 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:08:42 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 15 Nov 2018 14:08:42 +0000 Subject: Change in libosmocore[master]: gsm29118: add value strings for SGSAP IEI Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11780 Change subject: gsm29118: add value strings for SGSAP IEI ...................................................................... gsm29118: add value strings for SGSAP IEI The value strings for the SGSAP IEI are missing, lets add a set of value strings and a function to retrieve them. Change-Id: I2787303174f74ffba86675bce2c12f680d8ea708 Related: OS#3615 --- M include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/gsm29118.c M src/gsm/libosmogsm.map 3 files changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/11780/1 diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index c344f04..bf210ad 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -74,7 +74,10 @@ SGSAP_IE_ADDL_PAGING_INDICATORS = 0x26, SGSAP_IE_TMSI_BASED_NRI_CONT = 0x27, }; - +const struct value_string sgsap_iei_names[]; +static inline const char *sgsap_iei_name(enum sgsap_iei iei) { + return get_value_string(sgsap_iei_names, iei); +} /* TS 29.118 Section 9.4.2 */ enum sgsap_eps_lu_type { diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c index de625a9..3898be6 100644 --- a/src/gsm/gsm29118.c +++ b/src/gsm/gsm29118.c @@ -32,6 +32,41 @@ { 0, NULL } }; +const struct value_string sgsap_iei_names[] = { + { SGSAP_IE_IMSI, "IMSI" }, + { SGSAP_IE_VLR_NAME, "VLR-NAME" }, + { SGSAP_IE_TMSI, "TMSI" }, + { SGSAP_IE_LAI, "LAI" }, + { SGSAP_IE_CHAN_NEEDED, "CHAN-NEEDED" }, + { SGSAP_IE_EMLPP_PRIORITY, "EMLPP-PRIORITY" }, + { SGSAP_IE_TMSI_STATUS, "TMSI-STATUS" }, + { SGSAP_IE_SGS_CAUSE, "SGS-CAUSE" }, + { SGSAP_IE_MME_NAME, "MME-NAME" }, + { SGSAP_IE_EPS_LU_TYPE, "EPS-LU-TYPE" }, + { SGSAP_IE_GLOBAL_CN_ID, "GLOBAL-CN-ID" }, + { SGSAP_IE_MOBILE_ID, "MOBILE-ID" }, + { SGSAP_IE_REJECT_CAUSE, "REJECT-CAUSE" }, + { SGSAP_IE_IMSI_DET_EPS_TYPE, "IMSI-DET-EPS-TYPE" }, + { SGSAP_IE_IMSI_DET_NONEPS_TYPE, "IMSI-DET-NONEPS-TYPE" }, + { SGSAP_IE_IMEISV, "IMEISV" }, + { SGSAP_IE_NAS_MSG_CONTAINER, "NAS-MSG-CONTAINER" }, + { SGSAP_IE_MM_INFO, "MM-INFO" }, + { SGSAP_IE_ERR_MSG, "ERR-MSG" }, + { SGSAP_IE_CLI, "CLI" }, + { SGSAP_IE_LCS_CLIENT_ID, "LCS-CLIENT-ID" }, + { SGSAP_IE_LCS_INDICATOR, "LCS-INDICATOR" }, + { SGSAP_IE_SS_CODE, "SS-CODE" }, + { SGSAP_IE_SERVICE_INDICATOR, "SERVICE-INDICATOR" }, + { SGSAP_IE_UE_TIMEZONE, "UE-TIMEZONE" }, + { SGSAP_IE_MS_CLASSMARK2, "MS-CLASSMARK2" }, + { SGSAP_IE_TAI, "TAI" }, + { SGSAP_IE_EUTRAN_CGI, "EUTRAN-CGI" }, + { SGSAP_IE_UE_EMM_MODE, "UE-EMM-MODE" }, + { SGSAP_IE_ADDL_PAGING_INDICATORS, "ADDL-PAGING-INDICATORS" }, + { SGSAP_IE_TMSI_BASED_NRI_CONT, "TMSI-BASED-NRI-CONT" }, + { 0, NULL } +}; + const struct value_string sgsap_eps_lu_type_names[] = { { SGSAP_EPS_LUT_IMSI_ATTACH, "IMSI Attach" }, { SGSAP_EPS_LUT_NORMAL, "Normal" }, diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 4813e13..6234d94 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -512,6 +512,7 @@ osmo_oap_client_register; sgsap_msg_type_names; +sgsap_iei_names; sgsap_eps_lu_type_names; sgsap_ismi_det_eps_type_names; sgsap_ismi_det_noneps_type_names; -- To view, visit https://gerrit.osmocom.org/11780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2787303174f74ffba86675bce2c12f680d8ea708 Gerrit-Change-Number: 11780 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:11:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 14:11:36 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11656/3/include/osmocom/sgsn/gprs_sndcp_xid.h File include/osmocom/sgsn/gprs_sndcp_xid.h: https://gerrit.osmocom.org/#/c/11656/3/include/osmocom/sgsn/gprs_sndcp_xid.h at 48 PS3, Line 48: union gprs_sendcp_comp_algo { why is it called "sendcp" while containing structs are called "sndcp"? That looks wrong... -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 15 Nov 2018 14:11:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:13:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 14:13:37 +0000 Subject: Change in libosmocore[master]: gsm29118: add value strings for SGSAP IEI In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11780 ) Change subject: gsm29118: add value strings for SGSAP IEI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2787303174f74ffba86675bce2c12f680d8ea708 Gerrit-Change-Number: 11780 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 15 Nov 2018 14:13:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:41:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 14:41:08 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11781 Change subject: add missing 'break' in switch statement ...................................................................... add missing 'break' in switch statement Coverity points out that abis_nm_rcvmsg_sw() contains a switch statement with suspicious looking missing break statements. It is unclear to me if the code intends to process some types of messages in more than one state, or of all messages which affect a particular state already appear in the state's corresponding switch block. Can someone else tell what is supposed to happen here? If this code is falling through intentionally, I will suggest a patch adding /* fallthrough */ comments for clarity. Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Related: CID#57703 --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/11781/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index f75470d..2950b5b 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1409,6 +1409,7 @@ abis_nm_queue_send_next(sign_link->trx->bts); break; } + break; case SW_STATE_WAIT_ACTACK: switch (foh->msg_type) { case NM_MT_ACTIVATE_SW_ACK: @@ -1433,6 +1434,7 @@ abis_nm_queue_send_next(sign_link->trx->bts); break; } + break; case SW_STATE_NONE: switch (foh->msg_type) { case NM_MT_ACTIVATE_SW_ACK: -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:43:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 14:43:04 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11781 ) Change subject: add missing 'break' in switch statement ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 15 Nov 2018 14:43:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:43:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 14:43:15 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11781 ) Change subject: add missing 'break' in switch statement ...................................................................... Patch Set 1: Did you look at git log for hints? -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 15 Nov 2018 14:43:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:55:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 14:55:41 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11781 ) Change subject: add missing 'break' in switch statement ...................................................................... Patch Set 1: > Patch Set 1: > > Did you look at git log for hints? Yes I did. The code was added as-is in 4724f99d194a8f0f46c368f5b4e86613daace67e -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 15 Nov 2018 14:55:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:57:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 14:57:50 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11656/3/include/osmocom/sgsn/gprs_sndcp_xid.h File include/osmocom/sgsn/gprs_sndcp_xid.h: https://gerrit.osmocom.org/#/c/11656/3/include/osmocom/sgsn/gprs_sndcp_xid.h at 48 PS3, Line 48: union gprs_sendcp_comp_algo { > why is it called "sendcp" while containing structs are called "sndcp"? That looks wrong... Oops, indeed. My mistake. Fixed in next patch set. -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 15 Nov 2018 14:57:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 14:58:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 14:58:21 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11656 to look at the new patch set (#4). Change subject: use enums consistently instead of falling back to int ...................................................................... use enums consistently instead of falling back to int The two existing enums defined in gprs_sndcp_xid.h, for protocol and data compression algorithm numbers respectively, were assigned to 'int' variables when their values were copied to other structures. This prevented the compiler from checking the enum value coverage during switch statements and also tripped up Coverity scans looking for enum value mismatch problems. So instead of copying enums to ints, make use of the enums throughout. Structures which can contain values from both enums now use a union of both, forcing us to be very explicit about which set of values we are dealing with. Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Depends: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 Depends: I8444c1ed052707c76a979fb06cb018ac678defa7 Related: CID#149102 --- M include/osmocom/sgsn/gprs_sndcp_comp.h M include/osmocom/sgsn/gprs_sndcp_xid.h M src/gprs/gprs_sndcp.c M src/gprs/gprs_sndcp_comp.c M src/gprs/gprs_sndcp_dcomp.c M src/gprs/gprs_sndcp_pcomp.c M src/gprs/gprs_sndcp_xid.c M tests/sndcp_xid/sndcp_xid_test.c 8 files changed, 180 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/11656/4 -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 15:02:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 15:02:57 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11781 to look at the new patch set (#2). Change subject: add missing 'break' in switch statement ...................................................................... add missing 'break' in switch statement Coverity points out that abis_nm_rcvmsg_sw() contains a switch statement with suspicious looking missing break statements. It is unclear to me if the code intends to process some types of messages in more than one state, or of all messages which affect a particular state already appear in the state's corresponding switch block. Can someone else tell what is supposed to happen here? If this code is falling through intentionally, I will suggest a patch adding /* fallthrough */ comments for clarity. Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Related: CID#57703 Related: CID#57704 --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/11781/2 -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 15:06:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 15:06:24 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 15 Nov 2018 15:06:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 15:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 15:06:55 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11781 ) Change subject: add missing 'break' in switch statement ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 15 Nov 2018 15:06:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 15 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 15 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#308?= In-Reply-To: <347152386.586.1542208207564.JavaMail.jenkins@jenkins.osmocom.org> References: <347152386.586.1542208207564.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2090756264.602.1542294607313.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Nov 15 15:21:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 15:21:39 +0000 Subject: Change in osmo-sgsn[master]: use enums consistently instead of falling back to int In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11656 ) Change subject: use enums consistently instead of falling back to int ...................................................................... use enums consistently instead of falling back to int The two existing enums defined in gprs_sndcp_xid.h, for protocol and data compression algorithm numbers respectively, were assigned to 'int' variables when their values were copied to other structures. This prevented the compiler from checking the enum value coverage during switch statements and also tripped up Coverity scans looking for enum value mismatch problems. So instead of copying enums to ints, make use of the enums throughout. Structures which can contain values from both enums now use a union of both, forcing us to be very explicit about which set of values we are dealing with. Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Depends: If6f3598cd6da4643ff2214e21c0d21f6eff0eb67 Depends: I8444c1ed052707c76a979fb06cb018ac678defa7 Related: CID#149102 --- M include/osmocom/sgsn/gprs_sndcp_comp.h M include/osmocom/sgsn/gprs_sndcp_xid.h M src/gprs/gprs_sndcp.c M src/gprs/gprs_sndcp_comp.c M src/gprs/gprs_sndcp_dcomp.c M src/gprs/gprs_sndcp_pcomp.c M src/gprs/gprs_sndcp_xid.c M tests/sndcp_xid/sndcp_xid_test.c 8 files changed, 180 insertions(+), 88 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/sgsn/gprs_sndcp_comp.h b/include/osmocom/sgsn/gprs_sndcp_comp.h index c04f7d4..e01a9d7 100644 --- a/include/osmocom/sgsn/gprs_sndcp_comp.h +++ b/include/osmocom/sgsn/gprs_sndcp_comp.h @@ -41,9 +41,9 @@ uint8_t comp[MAX_COMP]; /* see also: 6.5.1.1.5 and 6.6.1.1.5 */ /* Algorithm parameters */ - int algo; /* Algorithm type (see gprs_sndcp_xid.h) */ - int compclass; /* See gprs_sndcp_xid.h/c */ - void *state; /* Algorithm status and parameters */ + union gprs_sndcp_comp_algo algo; + enum gprs_sndcp_xid_param_types compclass; /* See gprs_sndcp_xid.h/c */ + void *state; /* Algorithm status and parameters */ }; #define MAX_COMP 16 /* Maximum number of possible pcomp/dcomp values */ diff --git a/include/osmocom/sgsn/gprs_sndcp_xid.h b/include/osmocom/sgsn/gprs_sndcp_xid.h index e64bc52..0dce43e 100644 --- a/include/osmocom/sgsn/gprs_sndcp_xid.h +++ b/include/osmocom/sgsn/gprs_sndcp_xid.h @@ -32,6 +32,24 @@ #define MAX_NSAPI 11 /* Maximum number usable NSAPIs */ #define MAX_ROHC 16 /* Maximum number of ROHC compression profiles */ +/* According to: 3GPP TS 44.065, 6.5.1.1.4 Algorithm identifier */ +enum gprs_sndcp_hdr_comp_algo { + RFC_1144, /* TCP/IP header compression, see also 6.5.2 */ + RFC_2507, /* TCP/UDP/IP header compression, see also: 6.5.3 */ + ROHC /* Robust Header Compression, see also 6.5.4 */ +}; + +/* According to: 3GPP TS 44.065, 6.5.1.1.4 Algorithm identifier */ +enum gprs_sndcp_data_comp_algo { + V42BIS, /* V.42bis data compression, see also 6.6.2 */ + V44 /* V44 data compression, see also: 6.6.3 */ +}; + +union gprs_sndcp_comp_algo { + enum gprs_sndcp_hdr_comp_algo pcomp; + enum gprs_sndcp_data_comp_algo dcomp; +}; + /* According to: 3GPP TS 44.065, 6.5.1.1 Format of the protocol control * information compression field (Figure 7) and 3GPP TS 44.065, * 6.6.1.1 Format of the data compression field (Figure 9) */ @@ -45,7 +63,7 @@ unsigned int entity; /* Algorithm identifier, see also: 6.5.1.1.4 and 6.6.1.1.4 */ - int algo; + union gprs_sndcp_comp_algo algo; /* Number of contained PCOMP / DCOMP values */ uint8_t comp_len; @@ -62,24 +80,12 @@ struct gprs_sndcp_dcomp_v44_params *v44_params; }; -/* According to: 3GPP TS 44.065, 6.5.1.1.4 Algorithm identifier */ -enum gprs_sndcp_hdr_comp_algo { - RFC_1144, /* TCP/IP header compression, see also 6.5.2 */ - RFC_2507, /* TCP/UDP/IP header compression, see also: 6.5.3 */ - ROHC /* Robust Header Compression, see also 6.5.4 */ -}; - -/* According to: 3GPP TS 44.065, 6.5.1.1.4 Algorithm identifier */ -enum gprs_sndcp_data_comp_algo { - V42BIS, /* V.42bis data compression, see also 6.6.2 */ - V44 /* V44 data compression, see also: 6.6.3 */ -}; - /* According to: 3GPP TS 44.065, 8 SNDCP XID parameters */ enum gprs_sndcp_xid_param_types { SNDCP_XID_VERSION_NUMBER, SNDCP_XID_DATA_COMPRESSION, /* See also: subclause 6.6.1 */ SNDCP_XID_PROTOCOL_COMPRESSION, /* See also: subclause 6.5.1 */ + SNDCP_XID_INVALID_COMPRESSION /* Not part of the spec; this means we found an invalid value */ }; /* According to: 3GPP TS 44.065, 6.5.2.1 Parameters (Table 5) */ @@ -209,7 +215,7 @@ /* Find out to which compression class the specified comp-field belongs * (header compression or data compression?) */ -int gprs_sndcp_get_compression_class( +enum gprs_sndcp_xid_param_types gprs_sndcp_get_compression_class( const struct gprs_sndcp_comp_field *comp_field); /* Dump a list with SNDCP-XID fields (Debug) */ diff --git a/src/gprs/gprs_sndcp.c b/src/gprs/gprs_sndcp.c index 52eeb75..f0239cb 100644 --- a/src/gprs/gprs_sndcp.c +++ b/src/gprs/gprs_sndcp.c @@ -934,7 +934,7 @@ rfc1144_params.s01 = sgsn->cfg.pcomp_rfc1144.s01; rfc1144_comp_field.p = 1; rfc1144_comp_field.entity = entity; - rfc1144_comp_field.algo = RFC_1144; + rfc1144_comp_field.algo.pcomp = RFC_1144; rfc1144_comp_field.comp[RFC1144_PCOMP1] = 1; rfc1144_comp_field.comp[RFC1144_PCOMP2] = 2; rfc1144_comp_field.comp_len = RFC1144_PCOMP_NUM; @@ -952,7 +952,7 @@ v42bis_params.p2 = sgsn->cfg.dcomp_v42bis.p2; v42bis_comp_field.p = 1; v42bis_comp_field.entity = entity; - v42bis_comp_field.algo = V42BIS; + v42bis_comp_field.algo.dcomp = V42BIS; v42bis_comp_field.comp[V42BIS_DCOMP1] = 1; v42bis_comp_field.comp_len = V42BIS_DCOMP_NUM; v42bis_comp_field.v42bis_params = &v42bis_params; @@ -1021,7 +1021,7 @@ comp_field->p = 0; /* Process proposed parameters */ - switch (comp_field->algo) { + switch (comp_field->algo.pcomp) { case RFC_1144: if (sgsn->cfg.pcomp_rfc1144.passive && comp_field->rfc1144_params->nsapi_len > 0) { @@ -1068,7 +1068,7 @@ comp_field->p = 0; /* Process proposed parameters */ - switch (comp_field->algo) { + switch (comp_field->algo.dcomp) { case V42BIS: if (sgsn->cfg.dcomp_v42bis.passive && comp_field->v42bis_params->nsapi_len > 0) { diff --git a/src/gprs/gprs_sndcp_comp.c b/src/gprs/gprs_sndcp_comp.c index 3e02603..0b4c67c 100644 --- a/src/gprs/gprs_sndcp_comp.c +++ b/src/gprs/gprs_sndcp_comp.c @@ -55,32 +55,36 @@ memcpy(comp_entity->nsapi, comp_field->rfc1144_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.pcomp = comp_field->algo.pcomp; } else if (comp_field->rfc2507_params) { comp_entity->nsapi_len = comp_field->rfc2507_params->nsapi_len; memcpy(comp_entity->nsapi, comp_field->rfc2507_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.pcomp = comp_field->algo.pcomp; } else if (comp_field->rohc_params) { comp_entity->nsapi_len = comp_field->rohc_params->nsapi_len; memcpy(comp_entity->nsapi, comp_field->rohc_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.pcomp = comp_field->algo.pcomp; } else if (comp_field->v42bis_params) { comp_entity->nsapi_len = comp_field->v42bis_params->nsapi_len; memcpy(comp_entity->nsapi, comp_field->v42bis_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.dcomp = comp_field->algo.dcomp; } else if (comp_field->v44_params) { comp_entity->nsapi_len = comp_field->v44_params->nsapi_len; memcpy(comp_entity->nsapi, comp_field->v44_params->nsapi, sizeof(comp_entity->nsapi)); + comp_entity->algo.dcomp = comp_field->algo.dcomp; } else { /* The caller is expected to check carefully if the all * data fields required for compression entity creation * are present. Otherwise we blow an assertion here */ OSMO_ASSERT(false); } - comp_entity->algo = comp_field->algo; /* Check if an NSAPI is selected, if not, it does not make sense * to create the compression entity, since the caller should @@ -93,17 +97,20 @@ comp_entity->compclass = gprs_sndcp_get_compression_class(comp_field); /* Create an algorithm specific compression context */ - if (comp_entity->compclass == SNDCP_XID_PROTOCOL_COMPRESSION) { + switch (comp_entity->compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: if (gprs_sndcp_pcomp_init(ctx, comp_entity, comp_field) != 0) { talloc_free(comp_entity); comp_entity = NULL; } - } else if (comp_entity->compclass == SNDCP_XID_DATA_COMPRESSION) { + break; + case SNDCP_XID_DATA_COMPRESSION: if (gprs_sndcp_dcomp_init(ctx, comp_entity, comp_field) != 0) { talloc_free(comp_entity); comp_entity = NULL; } - } else { + break; + default: /* comp_field is somehow invalid */ OSMO_ASSERT(false); } diff --git a/src/gprs/gprs_sndcp_dcomp.c b/src/gprs/gprs_sndcp_dcomp.c index 04ff491..00e40a7 100644 --- a/src/gprs/gprs_sndcp_dcomp.c +++ b/src/gprs/gprs_sndcp_dcomp.c @@ -83,7 +83,7 @@ OSMO_ASSERT(comp_field); if (comp_entity->compclass == SNDCP_XID_DATA_COMPRESSION - && comp_entity->algo == V42BIS) { + && comp_entity->algo.dcomp == V42BIS) { OSMO_ASSERT(comp_field->v42bis_params); comp_entity->state = v42bis_init(ctx, NULL, comp_field->v42bis_params->p0, @@ -114,7 +114,7 @@ OSMO_ASSERT(comp_entity); if (comp_entity->compclass == SNDCP_XID_DATA_COMPRESSION - && comp_entity->algo == V42BIS) { + && comp_entity->algo.dcomp == V42BIS) { if (comp_entity->state) { v42bis_free((v42bis_state_t *) comp_entity->state); comp_entity->state = NULL; @@ -293,7 +293,7 @@ /* Note: Currently V42BIS is the only compression method we * support, so the only allowed algorithm is V42BIS */ - OSMO_ASSERT(comp_entity->algo == V42BIS); + OSMO_ASSERT(comp_entity->algo.dcomp == V42BIS); /* Find pcomp_index */ pcomp_index = gprs_sndcp_comp_get_idx(comp_entity, pcomp); @@ -339,7 +339,7 @@ /* Note: Currently V42BIS is the only compression method we * support, so the only allowed algorithm is V42BIS */ - OSMO_ASSERT(comp_entity->algo == V42BIS); + OSMO_ASSERT(comp_entity->algo.dcomp == V42BIS); /* Run compression algo */ rc = v42bis_compress_unitdata(&pcomp_index, data, len, diff --git a/src/gprs/gprs_sndcp_pcomp.c b/src/gprs/gprs_sndcp_pcomp.c index 2911b5e..5f7f22a 100644 --- a/src/gprs/gprs_sndcp_pcomp.c +++ b/src/gprs/gprs_sndcp_pcomp.c @@ -53,7 +53,7 @@ OSMO_ASSERT(comp_field); if (comp_entity->compclass == SNDCP_XID_PROTOCOL_COMPRESSION - && comp_entity->algo == RFC_1144) { + && comp_entity->algo.pcomp == RFC_1144) { OSMO_ASSERT(comp_field->rfc1144_params); comp_entity->state = slhc_init(ctx, comp_field->rfc1144_params->s01 + 1, @@ -79,7 +79,7 @@ OSMO_ASSERT(comp_entity); if (comp_entity->compclass == SNDCP_XID_PROTOCOL_COMPRESSION - && comp_entity->algo == RFC_1144) { + && comp_entity->algo.pcomp == RFC_1144) { if (comp_entity->state) { slhc_free((struct slcompress *)comp_entity->state); comp_entity->state = NULL; @@ -214,7 +214,7 @@ /* Note: Currently RFC1144 is the only compression method we * support, so the only allowed algorithm is RFC1144 */ - OSMO_ASSERT(comp_entity->algo == RFC_1144); + OSMO_ASSERT(comp_entity->algo.pcomp == RFC_1144); /* Find pcomp_index */ pcomp_index = gprs_sndcp_comp_get_idx(comp_entity, pcomp); @@ -263,7 +263,7 @@ /* Note: Currently RFC1144 is the only compression method we * support, so the only allowed algorithm is RFC1144 */ - OSMO_ASSERT(comp_entity->algo == RFC_1144); + OSMO_ASSERT(comp_entity->algo.pcomp == RFC_1144); /* Run compression algo */ rc = rfc1144_compress(&pcomp_index, data, len, comp_entity->state); diff --git a/src/gprs/gprs_sndcp_xid.c b/src/gprs/gprs_sndcp_xid.c index 09e21f5..a19f645 100644 --- a/src/gprs/gprs_sndcp_xid.c +++ b/src/gprs/gprs_sndcp_xid.c @@ -42,9 +42,8 @@ * about the referenced algorithm to the parser. */ struct entity_algo_table { unsigned int entity; /* see also: 6.5.1.1.3 and 6.6.1.1.3 */ - unsigned int algo; /* see also: 6.5.1.1.4 and 6.6.1.1.4 */ - unsigned int compclass; /* Can be either SNDCP_XID_DATA_COMPRESSION or - SNDCP_XID_PROTOCOL_COMPRESSION */ + union gprs_sndcp_comp_algo algo; + enum gprs_sndcp_xid_param_types compclass; }; /* FUNCTIONS RELATED TO SNDCP-XID ENCODING */ @@ -386,6 +385,7 @@ int len; int expected_length; int i; + enum gprs_sndcp_xid_param_types compclass; uint8_t payload_bytes[256]; int payload_bytes_len = -1; @@ -443,7 +443,17 @@ OSMO_ASSERT(comp_field->entity <= 0x1f); /* Check if the algorithm number is within bounds */ - OSMO_ASSERT(comp_field->algo >= 0 && comp_field->algo <= 0x1f); + compclass = gprs_sndcp_get_compression_class(comp_field); + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + OSMO_ASSERT(comp_field->algo.pcomp >= 0 && comp_field->algo.pcomp <= 0x1f); + break; + case SNDCP_XID_DATA_COMPRESSION: + OSMO_ASSERT(comp_field->algo.dcomp >= 0 && comp_field->algo.dcomp <= 0x1f); + break; + default: + OSMO_ASSERT(false); + } /* Zero out buffer */ memset(dst, 0, dst_maxlen); @@ -459,7 +469,10 @@ /* Encode algorithm number */ if (comp_field->p) { - *dst |= comp_field->algo & 0x1F; + if (compclass == SNDCP_XID_PROTOCOL_COMPRESSION) + *dst |= comp_field->algo.pcomp & 0x1F; + else + *dst |= comp_field->algo.dcomp & 0x1F; dst++; dst_counter++; } @@ -501,7 +514,7 @@ /* Find out to which compression class the specified comp-field belongs * (header compression or data compression?) */ -int gprs_sndcp_get_compression_class(const struct gprs_sndcp_comp_field +enum gprs_sndcp_xid_param_types gprs_sndcp_get_compression_class(const struct gprs_sndcp_comp_field *comp_field) { OSMO_ASSERT(comp_field); @@ -517,7 +530,7 @@ else if (comp_field->v44_params) return SNDCP_XID_DATA_COMPRESSION; else - return -EINVAL; + return SNDCP_XID_INVALID_COMPRESSION; } /* Convert all compression fields to bytstreams */ @@ -1005,10 +1018,10 @@ return byte_counter; } -/* Lookup algorithm identfier by entity ID */ -static int lookup_algorithm_identifier(int entity, const struct - entity_algo_table - *lt, unsigned int lt_len, int compclass) +/* Lookup protocol compression algorithm identfier by entity ID */ +static enum gprs_sndcp_hdr_comp_algo lookup_algorithm_identifier_pcomp(int entity, + const struct entity_algo_table *lt, + unsigned int lt_len) { int i; @@ -1017,26 +1030,46 @@ for (i = 0; i < lt_len; i++) { if ((lt[i].entity == entity) - && (lt[i].compclass == compclass)) - return lt[i].algo; + && (lt[i].compclass == SNDCP_XID_PROTOCOL_COMPRESSION)) + return lt[i].algo.pcomp; } - return -1; + return SNDCP_XID_INVALID_COMPRESSION; +} + +/* Lookup a data compression algorithm identfier by entity ID */ +static enum gprs_sndcp_data_comp_algo lookup_algorithm_identifier_dcomp(int entity, + const struct entity_algo_table *lt, + unsigned int lt_len) +{ + int i; + + if (!lt) + return -1; + + for (i = 0; i < lt_len; i++) { + if ((lt[i].entity == entity) + && (lt[i].compclass == SNDCP_XID_DATA_COMPRESSION)) + return lt[i].algo.dcomp; + } + + return SNDCP_XID_INVALID_COMPRESSION; } /* Helper function for decode_comp_field(), decodes * numeric pcomp/dcomp values */ static int decode_comp_values(struct gprs_sndcp_comp_field *comp_field, - const uint8_t *src, int compclass) + const uint8_t *src, enum gprs_sndcp_xid_param_types compclass) { int src_counter = 0; int i; if (comp_field->p) { /* Determine the number of expected PCOMP/DCOMP values */ - if (compclass == SNDCP_XID_PROTOCOL_COMPRESSION) { + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: /* For protocol compression */ - switch (comp_field->algo) { + switch (comp_field->algo.pcomp) { case RFC_1144: comp_field->comp_len = RFC1144_PCOMP_NUM; break; @@ -1052,9 +1085,10 @@ default: return -EINVAL; } - } else { + break; + case SNDCP_XID_DATA_COMPRESSION: /* For data compression */ - switch (comp_field->algo) { + switch (comp_field->algo.dcomp) { case V42BIS: comp_field->comp_len = V42BIS_DCOMP_NUM; break; @@ -1067,6 +1101,9 @@ default: return -EINVAL; } + break; + default: + return -EINVAL; } for (i = 0; i < comp_field->comp_len; i++) { @@ -1094,7 +1131,7 @@ { int rc; - switch (comp_field->algo) { + switch (comp_field->algo.pcomp) { case RFC_1144: comp_field->rfc1144_params = talloc_zero(comp_field, struct gprs_sndcp_pcomp_rfc1144_params); @@ -1142,7 +1179,7 @@ { int rc; - switch (comp_field->algo) { + switch (comp_field->algo.dcomp) { case V42BIS: comp_field->v42bis_params = talloc_zero(comp_field, struct gprs_sndcp_dcomp_v42bis_params); @@ -1180,7 +1217,8 @@ static int decode_comp_field(struct gprs_sndcp_comp_field *comp_field, const uint8_t *src, unsigned int src_len, const struct entity_algo_table *lt, - unsigned int lt_len, int compclass) + unsigned int lt_len, + enum gprs_sndcp_xid_param_types compclass) { int src_counter = 0; unsigned int len; @@ -1205,15 +1243,34 @@ /* Decode algorithm number (if present) */ if (comp_field->p) { - comp_field->algo = (*src) & 0x1F; + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + comp_field->algo.pcomp = (*src) & 0x1F; + break; + case SNDCP_XID_DATA_COMPRESSION: + comp_field->algo.dcomp = (*src) & 0x1F; + break; + default: + return -EINVAL; + } src_counter++; src++; } /* Alternatively take the information from the lookup table */ - else - comp_field->algo = - lookup_algorithm_identifier(comp_field->entity, lt, - lt_len, compclass); + else { + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + comp_field->algo.pcomp = + lookup_algorithm_identifier_pcomp(comp_field->entity, lt, lt_len); + break; + case SNDCP_XID_DATA_COMPRESSION: + comp_field->algo.dcomp = + lookup_algorithm_identifier_dcomp(comp_field->entity, lt, lt_len); + break; + default: + return -EINVAL; + } + } /* Decode length field */ len = *src; @@ -1368,7 +1425,7 @@ { struct gprs_sndcp_comp_field *comp_field; int i = 0; - int rc; + enum gprs_sndcp_xid_param_types compclass; if (!comp_fields) return -EINVAL; @@ -1378,19 +1435,23 @@ memset(lt, 0, sizeof(*lt)); llist_for_each_entry(comp_field, comp_fields, list) { - if (comp_field->algo >= 0) { - lt[i].entity = comp_field->entity; - lt[i].algo = comp_field->algo; - rc = gprs_sndcp_get_compression_class(comp_field); - - if (rc < 0) { - memset(lt, 0, sizeof(*lt)); - return -EINVAL; - } - - lt[i].compclass = rc; - i++; + compclass = gprs_sndcp_get_compression_class(comp_field); + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + lt[i].algo.pcomp = comp_field->algo.pcomp; + break; + case SNDCP_XID_DATA_COMPRESSION: + lt[i].algo.dcomp = comp_field->algo.dcomp; + break; + case SNDCP_XID_INVALID_COMPRESSION: + continue; + default: + memset(lt, 0, sizeof(*lt)); + return -EINVAL; } + lt[i].compclass = compclass; + lt[i].entity = comp_field->entity; + i++; } return i; @@ -1402,7 +1463,10 @@ *comp_field_dst, const struct gprs_sndcp_comp_field *comp_field_src) { - if (comp_field_dst->algo < 0) + enum gprs_sndcp_xid_param_types compclass; + + compclass = gprs_sndcp_get_compression_class(comp_field_dst); + if (compclass == SNDCP_XID_INVALID_COMPRESSION) return -EINVAL; if (comp_field_dst->rfc1144_params && comp_field_src->rfc1144_params) { @@ -1626,7 +1690,7 @@ { int i; - switch (comp_field->algo) { + switch (comp_field->algo.pcomp) { case RFC_1144: if (comp_field->rfc1144_params == NULL) { LOGP(DSNDCP, logl, @@ -1726,7 +1790,7 @@ { int i; - switch (comp_field->algo) { + switch (comp_field->algo.dcomp) { case V42BIS: if (comp_field->v42bis_params == NULL) { LOGP(DSNDCP, logl, @@ -1791,15 +1855,26 @@ { struct gprs_sndcp_comp_field *comp_field; int i; - int compclass; + enum gprs_sndcp_xid_param_types compclass; OSMO_ASSERT(comp_fields); llist_for_each_entry(comp_field, comp_fields, list) { + compclass = gprs_sndcp_get_compression_class(comp_field); LOGP(DSNDCP, logl, "SNDCP-XID:\n"); LOGP(DSNDCP, logl, "struct gprs_sndcp_comp_field {\n"); LOGP(DSNDCP, logl, " entity=%d;\n", comp_field->entity); - LOGP(DSNDCP, logl, " algo=%d;\n", comp_field->algo); + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: + LOGP(DSNDCP, logl, " algo=%d;\n", comp_field->algo.pcomp); + break; + case SNDCP_XID_DATA_COMPRESSION: + LOGP(DSNDCP, logl, " algo=%d;\n", comp_field->algo.dcomp); + break; + default: + LOGP(DSNDCP, logl, " algo invalid!\n"); + break; + } LOGP(DSNDCP, logl, " comp_len=%d;\n", comp_field->comp_len); if (comp_field->comp_len == 0) LOGP(DSNDCP, logl, " comp[] = NULL;\n"); @@ -1808,12 +1883,16 @@ comp_field->comp[i]); } - compclass = gprs_sndcp_get_compression_class(comp_field); - - if (compclass == SNDCP_XID_PROTOCOL_COMPRESSION) { + switch (compclass) { + case SNDCP_XID_PROTOCOL_COMPRESSION: dump_pcomp_params(comp_field, logl); - } else if (compclass == SNDCP_XID_DATA_COMPRESSION) { + break; + case SNDCP_XID_DATA_COMPRESSION: dump_dcomp_params(comp_field, logl); + break; + default: + LOGP(DSNDCP, logl, " compression algorithm invalid!\n"); + break; } LOGP(DSNDCP, logl, "}\n"); diff --git a/tests/sndcp_xid/sndcp_xid_test.c b/tests/sndcp_xid/sndcp_xid_test.c index 5ed695c..56b97e3 100644 --- a/tests/sndcp_xid/sndcp_xid_test.c +++ b/tests/sndcp_xid/sndcp_xid_test.c @@ -106,7 +106,7 @@ /* Setup rfc1144 compression field */ rfc1144_comp_field.p = 1; rfc1144_comp_field.entity = 0; - rfc1144_comp_field.algo = RFC_1144; + rfc1144_comp_field.algo.pcomp = RFC_1144; rfc1144_comp_field.comp[RFC1144_PCOMP1] = 1; rfc1144_comp_field.comp[RFC1144_PCOMP2] = 2; rfc1144_comp_field.comp_len = RFC1144_PCOMP_NUM; @@ -126,7 +126,7 @@ /* Setup rfc2507 compression field */ rfc2507_comp_field.p = 1; rfc2507_comp_field.entity = 1; - rfc2507_comp_field.algo = RFC_2507; + rfc2507_comp_field.algo.pcomp = RFC_2507; rfc2507_comp_field.comp[RFC2507_PCOMP1] = 3; rfc2507_comp_field.comp[RFC2507_PCOMP2] = 4; rfc2507_comp_field.comp[RFC2507_PCOMP3] = 5; @@ -173,7 +173,7 @@ /* Setup ROHC compression field */ rohc_comp_field.p = 1; rohc_comp_field.entity = 2; - rohc_comp_field.algo = ROHC; + rohc_comp_field.algo.pcomp = ROHC; rohc_comp_field.comp[ROHC_PCOMP1] = 8; rohc_comp_field.comp[ROHC_PCOMP2] = 9; rohc_comp_field.comp_len = ROHC_PCOMP_NUM; @@ -191,7 +191,7 @@ /* Setup v42bis compression field */ v42bis_comp_field.p = 1; v42bis_comp_field.entity = 3; - v42bis_comp_field.algo = V42BIS; + v42bis_comp_field.algo.dcomp = V42BIS; v42bis_comp_field.comp[V42BIS_DCOMP1] = 10; v42bis_comp_field.comp_len = V42BIS_DCOMP_NUM; v42bis_comp_field.v42bis_params = &v42bis_params; @@ -211,7 +211,7 @@ /* Setup v44 compression field */ v44_comp_field.p = 1; v44_comp_field.entity = 3; - v44_comp_field.algo = V44; + v44_comp_field.algo.dcomp = V44; v44_comp_field.comp[V44_DCOMP1] = 10; v44_comp_field.comp[V44_DCOMP2] = 11; v44_comp_field.comp_len = V44_DCOMP_NUM; -- To view, visit https://gerrit.osmocom.org/11656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3771a5c59f4e6fee24083b3c914965baf192cbd7 Gerrit-Change-Number: 11656 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 15:42:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 15:42:19 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11782 Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... unlink socket path correctly in rf_create_socket() In commit 65c62e50335b500ac9e4658530ca5a1b4f5328d8 a call to unlink() was erroneously moved up. Since then unlink() has been called with an uninitialized path variable. The problem went unnoticed because the return value of unlink() was never checked. Ensure that unlink() is called with an initialized argument. Also check for success of the unlink operation so that this type of problem will get spotted at run-time in the future. Related: CID#188836 Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Fixes: 65c62e50335b500ac9e4658530ca5a1b4f5328d8 --- M src/osmo-bsc/bsc_rf_ctrl.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/11782/1 diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index ac87fb9..34275b9 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -450,12 +450,15 @@ } local.sun_family = AF_UNIX; - unlink(local.sun_path); if (osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { LOGP(DLINP, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", sizeof(local.sun_path), path); return -1; } + if (unlink(local.sun_path) < 0) { + LOGP(DLINP, LOGL_ERROR, "Could not unlink socket path %s:\n", path); + return -1; + } /* we use the same magic that X11 uses in Xtranssock.c for * calculating the proper length of the sockaddr */ -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 15:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 15:47:25 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11782/1/src/osmo-bsc/bsc_rf_ctrl.c File src/osmo-bsc/bsc_rf_ctrl.c: https://gerrit.osmocom.org/#/c/11782/1/src/osmo-bsc/bsc_rf_ctrl.c at 459 PS1, Line 459: LOGP(DLINP, LOGL_ERROR, "Could not unlink socket path %s:\n", path); Please print errno or rc or whatever gives more information here. -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 15 Nov 2018 15:47:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 16:01:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 16:01:41 +0000 Subject: Change in osmo-bts[master]: add missing check of osmo_wqueue_enqueue() return value Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11783 Change subject: add missing check of osmo_wqueue_enqueue() return value ...................................................................... add missing check of osmo_wqueue_enqueue() return value The return value of osmo_wqueue_enqueue() isn't checked. This can result in a memory leak if the message cannot be enqueued. Log an error an free the message upon failure, as done elsewhere. Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Related: CID#57662 --- M src/osmo-bts-sysmo/l1_if.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/83/11783/1 diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index f682ffd..8657b79 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -549,7 +549,11 @@ empty_req_from_l1sap(l1p, fl1, u8Tn, u32Fn, sapi, subCh, u8BlockNbr); } /* send message to DSP's queue */ - osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg); + if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg) != 0) { + LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full. Dropping msg.\n"); + msgb_free(nmsg); + return -EAGAIN; + } if (dtx_is_first_p1(lchan)) dtx_dispatch(lchan, E_FIRST); else -- To view, visit https://gerrit.osmocom.org/11783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Gerrit-Change-Number: 11783 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 16:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 16:05:49 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11782 to look at the new patch set (#2). Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... unlink socket path correctly in rf_create_socket() In commit 65c62e50335b500ac9e4658530ca5a1b4f5328d8 a call to unlink() was erroneously moved up. Since then unlink() has been called with an uninitialized path variable. The problem went unnoticed because the return value of unlink() was never checked. Ensure that unlink() is called with an initialized argument. Also check for success of the unlink operation so that this type of problem will get spotted at run-time in the future. Related: CID#188836 Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Fixes: 65c62e50335b500ac9e4658530ca5a1b4f5328d8 --- M src/osmo-bsc/bsc_rf_ctrl.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/11782/2 -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 16:06:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 16:06:44 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... Patch Set 2: (1 comment) > Patch Set 1: Code-Review-1 > > (1 comment) Good i https://gerrit.osmocom.org/#/c/11782/1/src/osmo-bsc/bsc_rf_ctrl.c File src/osmo-bsc/bsc_rf_ctrl.c: https://gerrit.osmocom.org/#/c/11782/1/src/osmo-bsc/bsc_rf_ctrl.c at 459 PS1, Line 459: LOGP(DLINP, LOGL_ERROR, "Could not unlink socket path %s: errno: %d/%s\n", > Please print errno or rc or whatever gives more information here. Good idea. See next patch set. It now logs the error in the same way as done elsewhere in this function. -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 15 Nov 2018 16:06:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 16:27:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 16:27:15 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 15 Nov 2018 16:27:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 16:41:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 16:41:02 +0000 Subject: Change in osmo-bts[master]: properly initialize si3 in test_is_ccch_for_agch_setup() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11784 Change subject: properly initialize si3 in test_is_ccch_for_agch_setup() ...................................................................... properly initialize si3 in test_is_ccch_for_agch_setup() Prevent potential use of uninitialized memory in paging test. Change-Id: Ie8f8fc3c4a9e4cc18fc85b6822110de79da4246b Related: CID#188828 --- M tests/paging/paging_test.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/11784/1 diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c index 18708e2..f112404 100644 --- a/tests/paging/paging_test.c +++ b/tests/paging/paging_test.c @@ -116,7 +116,7 @@ { static struct gsm_bts_trx trx; static struct gsm_bts bts; - struct gsm48_system_information_type_3 si3; + struct gsm48_system_information_type_3 si3 = { 0 }; si3.control_channel_desc.bs_ag_blks_res = bs_ag_blks_res; trx.bts = &bts; bts.si_valid |= 0x8; -- To view, visit https://gerrit.osmocom.org/11784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8f8fc3c4a9e4cc18fc85b6822110de79da4246b Gerrit-Change-Number: 11784 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 16:43:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 16:43:27 +0000 Subject: Change in osmo-bts[master]: properly initialize si3 in test_is_ccch_for_agch_setup() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11784 ) Change subject: properly initialize si3 in test_is_ccch_for_agch_setup() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie8f8fc3c4a9e4cc18fc85b6822110de79da4246b Gerrit-Change-Number: 11784 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 15 Nov 2018 16:43:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 16:44:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 16:44:08 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... Patch Set 2: Can anyone tell what is up with the Jenkins builder? 'make check' is passing for me locally. -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 15 Nov 2018 16:44:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 16:51:45 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 16:51:45 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... Patch Set 2: > Patch Set 2: > > Can anyone tell what is up with the Jenkins builder? > 'make check' is passing for me locally. OK I see there are additional tests which aren't enabled by default. Will try to reproduce the problem locally. -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 15 Nov 2018 16:51:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 17:26:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 17:26:08 +0000 Subject: Change in libosmocore[master]: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11785 Change subject: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f ...................................................................... gsm48: gsm48_decode_freq_list: Improve documentation of paramter f Change-Id: Id8e3afff737211ded3c5689f2c83b1a544b42f9d --- M src/gsm/gsm48_ie.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/11785/1 diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c index 1baf287..ffe3eba 100644 --- a/src/gsm/gsm48_ie.c +++ b/src/gsm/gsm48_ie.c @@ -807,7 +807,7 @@ } /*! Decode TS 04.08 Cell Channel Description IE (10.5.2.1b) and other frequency lists - * \param[out] f Caller-provided output memory + * \param[out] f Caller-provided output memory, an array of 1024 elements * \param[in] cd Cell Channel Description IE * \param[in] len Length of \a cd in bytes * \returns 0 on success; negative on error */ -- To view, visit https://gerrit.osmocom.org/11785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id8e3afff737211ded3c5689f2c83b1a544b42f9d Gerrit-Change-Number: 11785 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 17:27:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 15 Nov 2018 17:27:35 +0000 Subject: Change in libosmocore[master]: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11785 ) Change subject: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11785/1/src/gsm/gsm48_ie.c File src/gsm/gsm48_ie.c: https://gerrit.osmocom.org/#/c/11785/1/src/gsm/gsm48_ie.c at 814 PS1, Line 814: int gsm48_decode_freq_list(struct gsm_sysinfo_freq *f, uint8_t *cd, As you can notice, there's 2 parameters still requiring documentation. -- To view, visit https://gerrit.osmocom.org/11785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8e3afff737211ded3c5689f2c83b1a544b42f9d Gerrit-Change-Number: 11785 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 15 Nov 2018 17:27:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 17:47:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 17:47:01 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11782 to look at the new patch set (#3). Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... unlink socket path correctly in rf_create_socket() In commit 65c62e50335b500ac9e4658530ca5a1b4f5328d8 a call to unlink() was erroneously moved up. Since then unlink() has been called with an uninitialized path variable. osmo-bsc's python tests are starting to fail if the socket is actually removed. So assume that this unlink() call has never succeeded and simply remove it. Related: CID#188836 Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Fixes: 65c62e50335b500ac9e4658530ca5a1b4f5328d8 --- M src/osmo-bsc/bsc_rf_ctrl.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/11782/3 -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 17:48:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 17:48:36 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... Patch Set 3: > Patch Set 2: > > > Patch Set 2: > > > > Can anyone tell what is up with the Jenkins builder? > > 'make check' is passing for me locally. > > OK I see there are additional tests which aren't enabled by default. > Will try to reproduce the problem locally. It is surprising, but it seems like this unlink() call has never worked right because tests are starting to fail with my initially proposed patch. So my next patch simply removes the unlink() call. -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 15 Nov 2018 17:48:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 15 17:49:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 15 Nov 2018 17:49:19 +0000 Subject: Change in osmo-bsc[master]: don't remove socket path in rf_create_socket() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11782 to look at the new patch set (#4). Change subject: don't remove socket path in rf_create_socket() ...................................................................... don't remove socket path in rf_create_socket() In commit 65c62e50335b500ac9e4658530ca5a1b4f5328d8 a call to unlink() was erroneously moved up. Since then unlink() has been called with an uninitialized path variable. osmo-bsc's python tests are starting to fail if the socket is actually removed. So assume that this unlink() call has never succeeded and simply remove it. Related: CID#188836 Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Fixes: 65c62e50335b500ac9e4658530ca5a1b4f5328d8 --- M src/osmo-bsc/bsc_rf_ctrl.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/11782/4 -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 00:04:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 16 Nov 2018 00:04:30 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11787 Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 --- M include/osmocom/gprs/protocol/gsm_04_60.h M include/osmocom/gsm/protocol/gsm_03_41.h M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_04_08_gprs.h M include/osmocom/gsm/protocol/gsm_04_12.h M include/osmocom/gsm/protocol/gsm_04_14.h M include/osmocom/gsm/protocol/gsm_08_58.h M include/osmocom/gsm/protocol/gsm_44_318.h M tests/endian/endian_test.c 9 files changed, 650 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/11787/1 diff --git a/include/osmocom/gprs/protocol/gsm_04_60.h b/include/osmocom/gprs/protocol/gsm_04_60.h index 96e9ab7..5d5fca9 100644 --- a/include/osmocom/gprs/protocol/gsm_04_60.h +++ b/include/osmocom/gprs/protocol/gsm_04_60.h @@ -7,10 +7,12 @@ #pragma once #include +#include #if OSMO_IS_LITTLE_ENDIAN == 1 /* TS 04.60 10.3a.4.1.1 */ struct gprs_rlc_ul_header_egprs_1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t r:1, si:1, cv:4, @@ -26,10 +28,20 @@ spare_hi:1; uint8_t spare_lo:6, dummy:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:2, cv:4, si:1, r:1; + uint8_t bsn1_hi:5, tfi_lo:3; + uint8_t bsn2_hi:2, bsn1_lo:6; + uint8_t bsn2_lo:8; + uint8_t spare_hi:1, pi:1, rsb:1, cps:5; + uint8_t dummy:2, spare_lo:6; +#endif } __attribute__ ((packed)); /* TS 04.60 10.3a.4.2.1 */ struct gprs_rlc_ul_header_egprs_2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t r:1, si:1, cv:4, @@ -44,10 +56,19 @@ spare_hi:5; uint8_t spare_lo:5, dummy:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:2, cv:4, si:1, r:1; + uint8_t bsn1_hi:5, tfi_lo:3; + uint8_t cps_hi:2, bsn1_lo:6; + uint8_t spare_hi:5, pi:1, rsb:1, cps_lo:1; + uint8_t dummy:3, spare_lo:5; +#endif } __attribute__ ((packed)); /* TS 04.60 10.3a.4.3.1 */ struct gprs_rlc_ul_header_egprs_3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t r:1, si:1, cv:4, @@ -62,9 +83,17 @@ pi:1, spare:1, dummy:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:2, cv:4, si:1, r:1; + uint8_t bsn1_hi:5, tfi_lo:3; + uint8_t cps_hi:2, bsn1_lo:6; + uint8_t dummy:1, spare:1, pi:1, rsb:1, spb:2, cps_lo:2; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t usf:3, es_p:2, rrbp:2, @@ -77,9 +106,18 @@ bsn2_hi:7; uint8_t bsn2_lo:3, cps:5; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3; + uint8_t bsn1_hi:2, pr:2, tfi_lo:4; + uint8_t bsn1_mid:8; + uint8_t bsn2_hi:7, bsn1_lo:1; + uint8_t cps:5, bsn2_lo:3; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t usf:3, es_p:2, rrbp:2, @@ -91,9 +129,17 @@ uint8_t bsn1_lo:1, cps:3, dummy:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3; + uint8_t bsn1_hi:2, pr:2, tfi_lo:4; + uint8_t bsn1_mid:8; + uint8_t dummy:4, cps:3, bsn1_lo:1; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t usf:3, es_p:2, rrbp:2, @@ -106,10 +152,18 @@ cps:4, spb:2, dummy:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3; + uint8_t bsn1_hi:2, pr:2, tfi_lo:4; + uint8_t bsn1_mid:8; + uint8_t dummy:1, spb:2, cps:4, bsn1_lo:1; +#endif } __attribute__ ((packed)); #else /* TS 04.60 10.3a.4.1.1 */ struct gprs_rlc_ul_header_egprs_1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:2, cv:4, si:1, @@ -125,10 +179,20 @@ cps:5; uint8_t dummy:2, spare_lo:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t r:1, si:1, cv:4, tfi_hi:2; + uint8_t tfi_lo:3, bsn1_hi:5; + uint8_t bsn1_lo:6, bsn2_hi:2; + uint8_t bsn2_lo:8; + uint8_t cps:5, rsb:1, pi:1, spare_hi:1; + uint8_t spare_lo:6, dummy:2; +#endif } __attribute__ ((packed)); /* TS 04.60 10.3a.4.2.1 */ struct gprs_rlc_ul_header_egprs_2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:2, cv:4, si:1, @@ -143,10 +207,19 @@ cps_lo:1; uint8_t dummy:3, spare_lo:5; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t r:1, si:1, cv:4, tfi_hi:2; + uint8_t tfi_lo:3, bsn1_hi:5; + uint8_t bsn1_lo:6, cps_hi:2; + uint8_t cps_lo:1, rsb:1, pi:1, spare_hi:5; + uint8_t spare_lo:5, dummy:3; +#endif } __attribute__ ((packed)); /* TS 04.60 10.3a.4.3.1 */ struct gprs_rlc_ul_header_egprs_3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:2, cv:4, si:1, @@ -161,9 +234,17 @@ rsb:1, spb:2, cps_lo:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t r:1, si:1, cv:4, tfi_hi:2; + uint8_t tfi_lo:3, bsn1_hi:5; + uint8_t bsn1_lo:6, cps_hi:2; + uint8_t cps_lo:2, spb:2, rsb:1, pi:1, spare:1, dummy:1; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:1, rrbp:2, es_p:2, @@ -176,9 +257,18 @@ bsn1_lo:1; uint8_t cps:5, bsn2_lo:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; + uint8_t tfi_lo:4, pr:2, bsn1_hi:2; + uint8_t bsn1_mid:8; + uint8_t bsn1_lo:1, bsn2_hi:7; + uint8_t bsn2_lo:3, cps:5; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:1, rrbp:2, es_p:2, @@ -190,9 +280,17 @@ uint8_t dummy:4, cps:3, bsn1_lo:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; + uint8_t tfi_lo:4, pr:2, bsn1_hi:2; + uint8_t bsn1_mid:8; + uint8_t bsn1_lo:1, cps:3, dummy:4; +#endif } __attribute__ ((packed)); struct gprs_rlc_dl_header_egprs_3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t tfi_hi:1, rrbp:2, es_p:2, @@ -205,5 +303,12 @@ spb:2, cps:4, bsn1_lo:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1; + uint8_t tfi_lo:4, pr:2, bsn1_hi:2; + uint8_t bsn1_mid:8; + uint8_t bsn1_lo:1, cps:4, spb:2, dummy:1; +#endif } __attribute__ ((packed)); #endif diff --git a/include/osmocom/gsm/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h index 2e0ad69..1b399ae 100644 --- a/include/osmocom/gsm/protocol/gsm_03_41.h +++ b/include/osmocom/gsm/protocol/gsm_03_41.h @@ -19,35 +19,34 @@ /* Chapter 9.3.2 */ struct gsm341_ms_message { struct { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t code_hi:6; uint8_t gs:2; uint8_t update:4; uint8_t code_lo:4; -#else - uint8_t gs:2; - uint8_t code_hi:6; - uint8_t code_lo:4; - uint8_t update:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t gs:2, code_hi:6; + uint8_t code_lo:4, update:4; #endif } serial; uint16_t msg_id; struct { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t language:4; uint8_t group:4; -#else - uint8_t group:4; - uint8_t language:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t group:4, language:4; #endif } dcs; struct { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t total:4; uint8_t current:4; -#else - uint8_t current:4; - uint8_t total:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t current:4, total:4; #endif } page; uint8_t data[0]; @@ -56,20 +55,17 @@ /* Chapter 9.4.1.3 */ struct gsm341_etws_message { struct { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t code_hi:4; uint8_t popup:1; uint8_t alert:1; uint8_t gs:2; uint8_t update:4; uint8_t code_lo:4; -#else - uint8_t gs:2; - uint8_t alert:1; - uint8_t popup:1; - uint8_t code_hi:4; - uint8_t code_lo:4; - uint8_t update:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t gs:2, alert:1, popup:1, code_hi:4; + uint8_t code_lo:4, update:4; #endif } serial; uint16_t msg_id; diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index e218295..896f184 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -13,15 +13,21 @@ /* Chapter 10.5.1.5 */ struct gsm48_classmark1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t pwr_lev:3, a5_1:1, es_ind:1, rev_lev:2, spare:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:1, rev_lev:2, es_ind:1, a5_1:1, pwr_lev:3; +#endif } __attribute__ ((packed)); /* Chapter 10.5.1.6 */ struct gsm48_classmark2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t pwr_lev:3, a5_1:1, es_ind:1, @@ -42,11 +48,18 @@ lcsva_cap:1, spare4:1, cm3:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:1, rev_lev:2, es_ind:1, a5_1:1, pwr_lev:3; + uint8_t spare2:1, ps_cap:1, ss_scr:2, sm_cap:1, vbs:1, vgcs:1, fc:1; + uint8_t cm3:1, spare4:1, lcsva_cap:1, spare3:1, solsa:1, cmsp:1, a5_3:1, a5_2:1; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.1b.3 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_1024 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t w1_hi:2, f0:1, form_id:5; @@ -78,9 +91,29 @@ w14_lo:3; uint8_t w16:6, w15_lo:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:5, f0:1, w1_hi:2; + uint8_t w1_lo; + uint8_t w2_hi; + uint8_t w2_lo:1, w3_hi:7; + uint8_t w3_lo:2, w4_hi:6; + uint8_t w4_lo:2, w5_hi:6; + uint8_t w5_lo:2, w6_hi:6; + uint8_t w6_lo:2, w7_hi:6; + uint8_t w7_lo:2, w8_hi:6; + uint8_t w8_lo:1, w9:7; + uint8_t w10:7, w11_hi:1; + uint8_t w11_lo:6, w12_hi:2; + uint8_t w12_lo:5, w13_hi:3; + uint8_t w13_lo:4, w14_hi:4; + uint8_t w14_lo:3, w15_hi:5; + uint8_t w15_lo:2, w16:6; +#endif } __attribute__ ((packed)); #else struct gsm48_range_1024 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t form_id:5, f0:1, w1_hi:2; @@ -112,12 +145,32 @@ w15_hi:5; uint8_t w15_lo:2, w16:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t w1_hi:2, f0:1, form_id:5; + uint8_t w1_lo; + uint8_t w2_hi; + uint8_t w3_hi:7, w2_lo:1; + uint8_t w4_hi:6, w3_lo:2; + uint8_t w5_hi:6, w4_lo:2; + uint8_t w6_hi:6, w5_lo:2; + uint8_t w7_hi:6, w6_lo:2; + uint8_t w8_hi:6, w7_lo:2; + uint8_t w9:7, w8_lo:1; + uint8_t w11_hi:1, w10:7; + uint8_t w12_hi:2, w11_lo:6; + uint8_t w13_hi:3, w12_lo:5; + uint8_t w14_hi:4, w13_lo:4; + uint8_t w15_hi:5, w14_lo:3; + uint8_t w16:6, w15_lo:2; +#endif } __attribute__ ((packed)); #endif /* Chapter 10.5.2.1b.4 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_512 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t orig_arfcn_hi:1, form_id:7; uint8_t orig_arfcn_mid; @@ -149,9 +202,29 @@ w15:6; uint8_t w17:5, w16_lo:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:7, orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, w1_hi:7; + uint8_t w1_lo:2, w2_hi:6; + uint8_t w2_lo:2, w3_hi:6; + uint8_t w3_lo:2, w4_hi:6; + uint8_t w4_lo:1, w5:7; + uint8_t w6:7, w7_hi:1; + uint8_t w7_lo:6, w8_hi:2; + uint8_t w8_lo:4, w9_hi:4; + uint8_t w9_lo:2, w10:6; + uint8_t w11:6, w12_hi:2; + uint8_t w12_lo:4, w13_hi:4; + uint8_t w13_lo:2, w14:6; + uint8_t w15:6, w16_hi:2; + uint8_t w16_lo:3, w17:5; +#endif } __attribute__ ((packed)); #else struct gsm48_range_512 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t form_id:7, orig_arfcn_hi:1; uint8_t orig_arfcn_mid; @@ -183,12 +256,32 @@ w16_hi:2; uint8_t w16_lo:3, w17:5; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t orig_arfcn_hi:1, form_id:7; + uint8_t orig_arfcn_mid; + uint8_t w1_hi:7, orig_arfcn_lo:1; + uint8_t w2_hi:6, w1_lo:2; + uint8_t w3_hi:6, w2_lo:2; + uint8_t w4_hi:6, w3_lo:2; + uint8_t w5:7, w4_lo:1; + uint8_t w7_hi:1, w6:7; + uint8_t w8_hi:2, w7_lo:6; + uint8_t w9_hi:4, w8_lo:4; + uint8_t w10:6, w9_lo:2; + uint8_t w12_hi:2, w11:6; + uint8_t w13_hi:4, w12_lo:4; + uint8_t w14:6, w13_lo:2; + uint8_t w16_hi:2, w15:6; + uint8_t w17:5, w16_lo:3; +#endif } __attribute__ ((packed)); #endif /* Chapter 10.5.2.1b.5 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_256 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t orig_arfcn_hi:1, form_id:7; uint8_t orig_arfcn_mid; @@ -226,9 +319,29 @@ uint8_t spare:1, w21:4, w20_lo:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:7, orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, w1_hi:7; + uint8_t w1_lo:1, w2:7; + uint8_t w3:7, w4_hi:1; + uint8_t w4_lo:5, w5_hi:3; + uint8_t w5_lo:3, w6_hi:5; + uint8_t w6_lo:1, w7:6, w8_hi:1; + uint8_t w8_lo:4, w9_hi:4; + uint8_t w9_lo:1, w10:5, w11_hi:2; + uint8_t w11_lo:3, w12:5; + uint8_t w13:5, w14_hi:3; + uint8_t w14_lo:2, w15:5, w16_hi:1; + uint8_t w16_lo:3, w17:4, w18_hi:1; + uint8_t w18_lo:3, w19:4, w20_hi:1; + uint8_t w20_lo:3, w21:4, spare:1; +#endif } __attribute__ ((packed)); #else struct gsm48_range_256 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t form_id:7, orig_arfcn_hi:1; uint8_t orig_arfcn_mid; @@ -266,12 +379,32 @@ uint8_t w20_lo:3, w21:4, spare:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t orig_arfcn_hi:1, form_id:7; + uint8_t orig_arfcn_mid; + uint8_t w1_hi:7, orig_arfcn_lo:1; + uint8_t w2:7, w1_lo:1; + uint8_t w4_hi:1, w3:7; + uint8_t w5_hi:3, w4_lo:5; + uint8_t w6_hi:5, w5_lo:3; + uint8_t w8_hi:1, w7:6, w6_lo:1; + uint8_t w9_hi:4, w8_lo:4; + uint8_t w11_hi:2, w10:5, w9_lo:1; + uint8_t w12:5, w11_lo:3; + uint8_t w14_hi:3, w13:5; + uint8_t w16_hi:1, w15:5, w14_lo:2; + uint8_t w18_hi:1, w17:4, w16_lo:3; + uint8_t w20_hi:1, w19:4, w18_lo:3; + uint8_t spare:1, w21:4, w20_lo:3; +#endif } __attribute__ ((packed)); #endif /* Chapter 10.5.2.1b.6 */ #if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_128 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t orig_arfcn_hi:1, form_id:7; uint8_t orig_arfcn_mid; @@ -311,9 +444,29 @@ w28:3, w27:3, w26_lo:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:7, orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, w1:7; + uint8_t w2:6, w3_hi:2; + uint8_t w3_lo:4, w4_hi:4; + uint8_t w4_lo:1, w5:5, w6_hi:2; + uint8_t w6_lo:3, w7:5; + uint8_t w8:4, w9:4; + uint8_t w10:4, w11:4; + uint8_t w12:4, w13:4; + uint8_t w14:4, w15:4; + uint8_t w16:3, w17:3, w18_hi:2; + uint8_t w18_lo:1, w19:3, w20:3, w21_hi:1; + uint8_t w21_lo:2, w22:3, w23:3; + uint8_t w24:3, w25:3, w26_hi:2; + uint8_t w26_lo:1, w27:3, w28:3, spare:1; +#endif } __attribute__ ((packed)); #else struct gsm48_range_128 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t form_id:7, orig_arfcn_hi:1; uint8_t orig_arfcn_mid; @@ -353,17 +506,44 @@ w27:3, w28:3, spare:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t orig_arfcn_hi:1, form_id:7; + uint8_t orig_arfcn_mid; + uint8_t w1:7, orig_arfcn_lo:1; + uint8_t w3_hi:2, w2:6; + uint8_t w4_hi:4, w3_lo:4; + uint8_t w6_hi:2, w5:5, w4_lo:1; + uint8_t w7:5, w6_lo:3; + uint8_t w9:4, w8:4; + uint8_t w11:4, w10:4; + uint8_t w13:4, w12:4; + uint8_t w15:4, w14:4; + uint8_t w18_hi:2, w17:3, w16:3; + uint8_t w21_hi:1, w20:3, w19:3, w18_lo:1; + uint8_t w23:3, w22:3, w21_lo:2; + uint8_t w26_hi:2, w25:3, w24:3; + uint8_t spare:1, w28:3, w27:3, w26_lo:1; +#endif } __attribute__ ((packed)); #endif /* Chapter 10.5.2.1b.7 */ struct gsm48_var_bit { +#if OSMO_IS_LITTLE_ENDIAN uint8_t orig_arfcn_hi:1, form_id:7; uint8_t orig_arfcn_mid; uint8_t rrfcn1_7:7, orig_arfcn_lo:1; uint8_t rrfcn8_111[13]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t form_id:7, orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, rrfcn1_7:7; + uint8_t rrfcn8_111[13]; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.5 */ @@ -371,13 +551,21 @@ uint8_t chan_nr; union { struct { +#if OSMO_IS_LITTLE_ENDIAN uint8_t maio_high:4, h:1, tsc:3; uint8_t hsn:6, maio_low:2; } __attribute__ ((packed)) h1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tsc:3, h:1, maio_high:4; + uint8_t maio_low:2, hsn:6; + } __attribute__ ((packed)) h1; +#endif struct { +#if OSMO_IS_LITTLE_ENDIAN uint8_t arfcn_high:2, spare:2, h:1, @@ -385,10 +573,18 @@ uint8_t arfcn_low; } __attribute__ ((packed)) h0; } __attribute__ ((packed)); +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tsc:3, h:1, spare:2, arfcn_high:2; + uint8_t arfcn_low; + } __attribute__ ((packed)) h0; + } __attribute__ ((packed)); +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.20 */ struct gsm48_meas_res { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rxlev_full:6, dtx_used:1, ba_used:1; @@ -428,10 +624,30 @@ rxlev_nc6_lo:5; uint8_t bsic_nc6:6, bcch_f_nc6_lo:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ba_used:1, dtx_used:1, rxlev_full:6; + uint8_t spare:1, meas_valid:1, rxlev_sub:6; + uint8_t spare2:1, rxqual_full:3, rxqual_sub:3, no_nc_n_hi:1; + uint8_t no_nc_n_lo:2, rxlev_nc1:6; + uint8_t bcch_f_nc1:5, bsic_nc1_hi:3; + uint8_t bsic_nc1_lo:3, rxlev_nc2_hi:5; + uint8_t rxlev_nc2_lo:1, bcch_f_nc2:5, bsic_nc2_hi:2; + uint8_t bsic_nc2_lo:4, rxlev_nc3_hi:4; + uint8_t rxlev_nc3_lo:2, bcch_f_nc3:5, bsic_nc3_hi:1; + uint8_t bsic_nc3_lo:5, rxlev_nc4_hi:3; + uint8_t rxlev_nc4_lo:3, bcch_f_nc4:5; + uint8_t bsic_nc4:6, rxlev_nc5_hi:2; + uint8_t rxlev_nc5_lo:4, bcch_f_nc5_hi:4; + uint8_t bcch_f_nc5_lo:1, bsic_nc5:6, rxlev_nc6_hi:1; + uint8_t rxlev_nc6_lo:5, bcch_f_nc6_hi:3; + uint8_t bcch_f_nc6_lo:2, bsic_nc6:6; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.21aa */ struct gsm48_multi_rate_conf { +#if OSMO_IS_LITTLE_ENDIAN uint8_t smod : 2, spare: 1, icmi : 1, @@ -445,23 +661,40 @@ m7_95 : 1, m10_2 : 1, m12_2 : 1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ver:3, nscb:1, icmi:1, spare:1, smod:2; + uint8_t m12_2:1, m10_2:1, m7_95:1, m7_40:1, m6_70:1, m5_90:1, m5_15:1, m4_75:1; +#endif } __attribute__((packed)); /* Chapter 10.5.2.28(a) */ struct gsm48_power_cmd { +#if OSMO_IS_LITTLE_ENDIAN uint8_t power_level:5, spare:2, atc:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t atc:1, spare:2, power_level:5; +#endif } __attribute__((packed)); /* Chapter 10.5.2.29 */ struct gsm48_rach_control { +#if OSMO_IS_LITTLE_ENDIAN uint8_t re :1, cell_bar :1, tx_integer :4, max_trans :2; uint8_t t2; /* ACC 8-15 barred flags */ uint8_t t3; /* ACC 0-7 barred flags */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t max_trans:2, tx_integer:4, cell_bar:1, re:1; + uint8_t t2; + uint8_t t3; +#endif } __attribute__ ((packed)); /* @@ -508,27 +741,45 @@ /* Chapter 10.5.2.30 */ struct gsm48_req_ref { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ra; uint8_t t3_high:3, t1:5; uint8_t t2:5, t3_low:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ra; + uint8_t t1:5, t3_high:3; + uint8_t t3_low:3, t2:5; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.38 */ struct gsm48_start_time { +#if OSMO_IS_LITTLE_ENDIAN uint8_t t3_high:3, t1:5; uint8_t t2:5, t3_low:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t t1:5, t3_high:3; + uint8_t t3_low:3, t2:5; +#endif } __attribute__ ((packed)); /* Chapter 10.5.2.39 */ struct gsm48_sync_ind { +#if OSMO_IS_LITTLE_ENDIAN uint8_t si:2, rot:1, nci:1, sync_ie:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t sync_ie:4, nci:1, rot:1, si:2; +#endif } __attribute__((packed)); /* @@ -582,10 +833,16 @@ /* Chapter 10.5.2.2 */ struct gsm48_cell_desc { +#if OSMO_IS_LITTLE_ENDIAN uint8_t bcc:3, ncc:3, arfcn_hi:2; uint8_t arfcn_lo; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t arfcn_hi:2, ncc:3, bcc:3; + uint8_t arfcn_lo; +#endif } __attribute__((packed)); /* Chapter 9.1.15 */ @@ -612,11 +869,19 @@ /* Chapter 9.1.25 */ struct gsm48_pag_resp { +#if OSMO_IS_LITTLE_ENDIAN uint8_t spare:4, key_seq:4; uint32_t classmark2; uint8_t mi_len; uint8_t mi[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t key_seq:4, spare:4; + uint32_t classmark2; + uint8_t mi_len; + uint8_t mi[0]; +#endif } __attribute__ ((packed)); /* Chapter 10.5.1.3 */ @@ -627,9 +892,15 @@ /* Section 9.2.2 */ struct gsm48_auth_req { +#if OSMO_IS_LITTLE_ENDIAN uint8_t key_seq:4, spare:4; uint8_t rand[16]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:4, key_seq:4; + uint8_t rand[16]; +#endif } __attribute__ ((packed)); /* Section 9.2.3 */ @@ -639,12 +910,21 @@ /* Section 9.2.15 */ struct gsm48_loc_upd_req { +#if OSMO_IS_LITTLE_ENDIAN uint8_t type:4, key_seq:4; struct gsm48_loc_area_id lai; struct gsm48_classmark1 classmark1; uint8_t mi_len; uint8_t mi[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t key_seq:4, type:4; + struct gsm48_loc_area_id lai; + struct gsm48_classmark1 classmark1; + uint8_t mi_len; + uint8_t mi[0]; +#endif } __attribute__ ((packed)); /* Section 10.1 */ @@ -656,23 +936,37 @@ /* Section 9.1.3x System information Type header */ struct gsm48_system_information_type_header { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l2_plen; uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t l2_plen; + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; +#endif } __attribute__ ((packed)); /* Section 10.5.2.4 Cell Selection Parameters */ struct gsm48_cell_sel_par { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ms_txpwr_max_ccch:5, /* GSM 05.08 MS-TXPWR-MAX-CCCH */ cell_resel_hyst:3; /* GSM 05.08 CELL-RESELECT-HYSTERESIS */ uint8_t rxlev_acc_min:6, /* GSM 05.08 RXLEV-ACCESS-MIN */ neci:1, acs:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t cell_resel_hyst:3, ms_txpwr_max_ccch:5; + uint8_t acs:1, neci:1, rxlev_acc_min:6; +#endif } __attribute__ ((packed)); /* 3GPP TS 44.018 Section 10.5.2.11 Control Channel Description */ struct gsm48_control_channel_descr { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ccch_conf :3, bs_ag_blks_res :3, att :1, @@ -682,6 +976,12 @@ cbq3 :2, spare_2 :1; uint8_t t3212; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t mscr:1, att:1, bs_ag_blks_res:3, ccch_conf:3; + uint8_t spare_2:1, cbq3:2, spare_1:2, bs_pa_mfrms:3; + uint8_t t3212; +#endif } __attribute__ ((packed)); enum gsm48_dtx_mode { @@ -693,15 +993,21 @@ /* Cell Options for SI6, SACCH (10.5.2.3a.2) or SI3, BCCH (Table 10.5.2.3.1), 3GPP TS 44.018 */ struct gsm48_cell_options { +#if OSMO_IS_LITTLE_ENDIAN uint8_t radio_link_timeout:4, dtx:2, pwrc:1, /* either DN-IND or top bit of DTX IND */ d:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t d:1, pwrc:1, dtx:2, radio_link_timeout:4; +#endif } __attribute__ ((packed)); /* Section 9.2.9 CM service request */ struct gsm48_service_request { +#if OSMO_IS_LITTLE_ENDIAN uint8_t cm_service_type : 4, cipher_key_seq : 4; /* length + 3 bytes */ @@ -709,6 +1015,13 @@ uint8_t mi_len; uint8_t mi[0]; /* optional priority level */ +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t cipher_key_seq:4, cm_service_type:4; + uint32_t classmark; + uint8_t mi_len; + uint8_t mi[0]; +#endif } __attribute__ ((packed)); /* Section 9.1.31 System information Type 1 */ @@ -774,30 +1087,52 @@ /* Section 9.1.37 System information Type 5 */ struct gsm48_system_information_type_5 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; uint8_t bcch_frequency_list[16]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; + uint8_t bcch_frequency_list[16]; +#endif } __attribute__ ((packed)); /* Section 9.1.38 System information Type 5bis */ struct gsm48_system_information_type_5bis { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; uint8_t bcch_frequency_list[16]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; + uint8_t bcch_frequency_list[16]; +#endif } __attribute__ ((packed)); /* Section 9.1.39 System information Type 5ter */ struct gsm48_system_information_type_5ter { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; uint8_t bcch_frequency_list[16]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; + uint8_t bcch_frequency_list[16]; +#endif } __attribute__ ((packed)); /* Section 9.1.40 System information Type 6 */ struct gsm48_system_information_type_6 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rr_protocol_discriminator :4, skip_indicator:4; uint8_t system_information; @@ -806,6 +1141,16 @@ struct gsm48_cell_options cell_options; uint8_t ncc_permitted; uint8_t rest_octets[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t skip_indicator:4, rr_protocol_discriminator:4; + uint8_t system_information; + uint16_t cell_identity; + struct gsm48_loc_area_id lai; + struct gsm48_cell_options cell_options; + uint8_t ncc_permitted; + uint8_t rest_octets[0]; +#endif } __attribute__ ((packed)); /* Section 9.1.43a System Information type 13 */ @@ -857,10 +1202,15 @@ /* Section 9.1.9 */ struct gsm48_cip_mode_cmd { +#if OSMO_IS_LITTLE_ENDIAN uint8_t sc:1, alg_id:3, cr:1, spare:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:3, cr:1, alg_id:3, sc:1; +#endif } __attribute__((packed)); /* Section 9.1.11 */ @@ -905,6 +1255,7 @@ /* Section 9.1.22 */ struct gsm48_paging1 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l2_plen; uint8_t proto_discr; uint8_t msg_type; @@ -913,10 +1264,19 @@ cneed1:2, cneed2:2; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t l2_plen; + uint8_t proto_discr; + uint8_t msg_type; + uint8_t cneed2:2, cneed1:2, spare:2, pag_mode:2; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Section 9.1.23 */ struct gsm48_paging2 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l2_plen; uint8_t proto_discr; uint8_t msg_type; @@ -927,10 +1287,21 @@ uint32_t tmsi1; uint32_t tmsi2; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t l2_plen; + uint8_t proto_discr; + uint8_t msg_type; + uint8_t cneed2:2, cneed1:2, spare:2, pag_mode:2; + uint32_t tmsi1; + uint32_t tmsi2; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Section 9.1.24 */ struct gsm48_paging3 { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l2_plen; uint8_t proto_discr; uint8_t msg_type; @@ -946,15 +1317,36 @@ cneed4:2, spare2:4; uint8_t rest[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t l2_plen; + uint8_t proto_discr; + uint8_t msg_type; + uint8_t cneed2:2, cneed1:2, spare:2, pag_mode:2; + uint32_t tmsi1; + uint32_t tmsi2; + uint32_t tmsi3; + uint32_t tmsi4; + uint8_t spare2:4, cneed4:2, cneed3:2; + uint8_t rest[0]; +#endif } __attribute__((packed)); /* Section 9.1.25 */ struct gsm48_pag_rsp { +#if OSMO_IS_LITTLE_ENDIAN uint8_t key_seq:3, spare:5; uint8_t cm2_len; struct gsm48_classmark2 cm2; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:5, key_seq:3; + uint8_t cm2_len; + struct gsm48_classmark2 cm2; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Section 9.1.29 */ diff --git a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h index 61304c0..2ec0aa7 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h +++ b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h @@ -7,6 +7,7 @@ #include #include #include +#include /* Table 10.4 / 10.4a, GPRS Mobility Management (GMM) */ #define GSM48_MT_GMM_ATTACH_REQ 0x01 @@ -120,11 +121,19 @@ /* Chapter 9.4.15 / Table 9.4.15 */ struct gsm48_ra_upd_ack { +#if OSMO_IS_LITTLE_ENDIAN uint8_t force_stby:4, /* 10.5.5.7 */ upd_result:4; /* 10.5.5.17 */ uint8_t ra_upd_timer; /* 10.5.7.3 */ struct gsm48_ra_id ra_id; /* 10.5.5.15 */ uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t upd_result:4, force_stby:4; + uint8_t ra_upd_timer; + struct gsm48_ra_id ra_id; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Chapter 10.5.7.3 */ @@ -140,28 +149,50 @@ /* Chapter 9.4.2 / Table 9.4.2 */ struct gsm48_attach_ack { +#if OSMO_IS_LITTLE_ENDIAN uint8_t att_result:4, /* 10.5.5.7 */ force_stby:4; /* 10.5.5.1 */ uint8_t ra_upd_timer; /* 10.5.7.3 */ uint8_t radio_prio; /* 10.5.7.2 */ struct gsm48_ra_id ra_id; /* 10.5.5.15 */ uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t force_stby:4, att_result:4; + uint8_t ra_upd_timer; + uint8_t radio_prio; + struct gsm48_ra_id ra_id; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Chapter 9.4.9 / Table 9.4.9 */ struct gsm48_auth_ciph_req { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ciph_alg:4, /* 10.5.5.3 */ imeisv_req:4; /* 10.5.5.10 */ uint8_t force_stby:4, /* 10.5.5.7 */ ac_ref_nr:4; /* 10.5.5.19 */ uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t imeisv_req:4, ciph_alg:4; + uint8_t ac_ref_nr:4, force_stby:4; + uint8_t data[0]; +#endif } __attribute__((packed)); /* optional: TV RAND, TV CKSN */ struct gsm48_auth_ciph_resp { +#if OSMO_IS_LITTLE_ENDIAN uint8_t ac_ref_nr:4, spare:4; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:4, ac_ref_nr:4; + uint8_t data[0]; +#endif } __attribute__((packed)); /* Chapter 9.5.1 / Table 9.5.1 */ diff --git a/include/osmocom/gsm/protocol/gsm_04_12.h b/include/osmocom/gsm/protocol/gsm_04_12.h index 826e69b..3f34ee7 100644 --- a/include/osmocom/gsm/protocol/gsm_04_12.h +++ b/include/osmocom/gsm/protocol/gsm_04_12.h @@ -4,6 +4,7 @@ #pragma once #include +#include #define GSM412_MSG_LEN 88 /* TS 04.12 Section 3.1 */ #define GSM412_BLOCK_LEN 22 /* TS 04.12 Section 3.1 */ @@ -16,17 +17,30 @@ #define GSM412_SEQ_NULL_MSG 0xf struct gsm412_block_type { +#if OSMO_IS_LITTLE_ENDIAN uint8_t seq_nr : 4, lb : 1, lpd : 2, spare : 1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:1, lpd:2, lb:1, seq_nr:4; +#endif } __attribute__((packed)); struct gsm412_sched_msg { +#if OSMO_IS_LITTLE_ENDIAN uint8_t beg_slot_nr : 6, type : 2; uint8_t end_slot_nr : 6, spare1 : 1, spare2: 1; uint8_t cbsms_msg_map[6]; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t type:2, beg_slot_nr:6; + uint8_t spare2:1, spare1:1, end_slot_nr:6; + uint8_t cbsms_msg_map[6]; + uint8_t data[0]; +#endif } __attribute__((packed)); diff --git a/include/osmocom/gsm/protocol/gsm_04_14.h b/include/osmocom/gsm/protocol/gsm_04_14.h index 6f7d92c..5ef7837 100644 --- a/include/osmocom/gsm/protocol/gsm_04_14.h +++ b/include/osmocom/gsm/protocol/gsm_04_14.h @@ -25,29 +25,26 @@ #define GSM414_MT_CLOSE_MSLOT_LOOP_CMD 0x20 /* 8.4 */ struct gsm414_close_mslot_loop_cmd { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t chc:2, loop_mech:3, tn:3; -#else - uint8_t tn:3, - loop_mech:3, - chc:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t tn:3, loop_mech:3, chc:2; #endif } __attribute__((packed)); #define GSM414_MT_CLOSE_MSLOT_LOOP_ACK 0x21 /* 8.5 */ struct gsm414_close_mslot_loop_ack { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t err_ind:1, loop_mech:3, chc:2, spare:2; -#else - uint8_t spare:2, - chc:2, - loop_mech:3, - err_ind:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:2, chc:2, loop_mech:3, err_ind:1; #endif } __attribute__((packed)); @@ -65,34 +62,32 @@ #define GSM414_MT_GPRS_TEST_MODE_CMD 0x24 /* 8.13 */ struct gsm414_gprs_test_mode_cmd { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint16_t d:12, spare:3, l:1; uint8_t m:1, dl_tx_offset:3, _spare:4; -#else - uint16_t l:1, +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint16_t d:12, spare:3, - d:12; - uint8_t _spare:4, - dl_tx_offset:3, - m:1; + l:1; + uint8_t _spare:4, dl_tx_offset:3, m:1; #endif } __attribute__((packed)); #define GSM414_MT_EGPRS_ST_RB_LOOP_CMD 0x25 /* 8.14 */ struct gsm414_egprs_st_sb_loop_cmd { -#if OSMO_IS_LITTLE_ENDIAN == 1 +#if OSMO_IS_LITTLE_ENDIAN uint8_t _spare:4, dl_tx_offset:3, m:1; -#else - uint8_t m:1, - dl_tx_offset:3, - _spare:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t m:1, dl_tx_offset:3, _spare:4; #endif } __attribute__((packed)); diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index cd28caf..d376369 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -594,10 +594,15 @@ /*! RSL Cell Broadcast Command (Chapter 9.3.45) */ struct rsl_ie_cb_cmd_type { +#if OSMO_IS_LITTLE_ENDIAN uint8_t last_block:2; uint8_t spare:1; uint8_t def_bcast:1; uint8_t command:4; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t command:4, def_bcast:1, spare:1, last_block:2; +#endif } __attribute__ ((packed)); /* ->command */ #define RSL_CB_CMD_TYPE_NORMAL 0x00 @@ -732,14 +737,21 @@ }; struct ipac_preproc_ave_cfg { +#if OSMO_IS_LITTLE_ENDIAN uint8_t h_reqave:5, param_id:2, reserved:1; uint8_t h_reqt:5, ave_method:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved:1, param_id:2, h_reqave:5; + uint8_t ave_method:3, h_reqt:5; +#endif }__attribute__ ((packed)); struct ipac_preproc_ho_thresh { +#if OSMO_IS_LITTLE_ENDIAN uint8_t l_rxlev_ul_h:6, reserved_l_rxlev_ul:2; uint8_t l_rxlev_dl_h:6, @@ -754,9 +766,19 @@ reserved_rxqual_dl:1; uint8_t ms_range_max:6, reserved_ms_range:2; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved_l_rxlev_ul:2, l_rxlev_ul_h:6; + uint8_t reserved_l_rxlev_dl:2, l_rxlev_dl_h:6; + uint8_t reserved_rxlev_ul:2, rxlev_ul_ih:6; + uint8_t reserved_rxlev_dl:2, rxlev_dl_ih:6; + uint8_t reserved_rxqual_dl:1, l_rxqual_dl_h:3, reserved_rxlqual_ul:1, l_rxqual_ul_h:3; + uint8_t reserved_ms_range:2, ms_range_max:6; +#endif }__attribute__ ((packed)); struct ipac_preproc_ho_comp { +#if OSMO_IS_LITTLE_ENDIAN uint8_t p5:5, reserved_p5:3; uint8_t n5:5, @@ -777,30 +799,61 @@ reserved_ho:3; uint8_t reserved; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved_p5:3, p5:5; + uint8_t reserved_n5:3, n5:5; + uint8_t reserved_p6:3, p6:5; + uint8_t reserved_n6:3, n6:5; + uint8_t reserved_p7:3, p7:5; + uint8_t reserved_n7:3, n7:5; + uint8_t reserved_p8:3, p8:5; + uint8_t reserved_n8:3, n8:5; + uint8_t reserved_ho:3, ho_interval:5; + uint8_t reserved; +#endif }__attribute__ ((packed)); struct ipac_preproc_ho_candidates { +#if OSMO_IS_LITTLE_ENDIAN uint8_t bsic:6, reserved0:2; uint8_t bcch_freq:5, ba_used:1, s:1, reserved1:1; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved0:2, bsic:6; + uint8_t reserved1:1, s:1, ba_used:1, bcch_freq:5; +#endif }__attribute__ ((packed)); struct ipac_preproc_ncell_dflts { +#if OSMO_IS_LITTLE_ENDIAN uint8_t rxlev_min_def:6, reserved_rxlev_min_def:2; uint8_t ho_margin_def:5, reserved_ho_margin_def:3; uint8_t ms_txpwr_max_def:5, reserved_ms_txpwr_max_def:3; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved_rxlev_min_def:2, rxlev_min_def:6; + uint8_t reserved_ho_margin_def:3, ho_margin_def:5; + uint8_t reserved_ms_txpwr_max_def:3, ms_txpwr_max_def:5; +#endif }__attribute__ ((packed)); struct ipac_preproc_ho_ctl_param { +#if OSMO_IS_LITTLE_ENDIAN uint8_t sdcch_ho_gsm:1, sdcch_ho_umts:1, reserved:6; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved:6, sdcch_ho_umts:1, sdcch_ho_gsm:1; +#endif }__attribute__ ((packed)); struct ipac_preproc_cfg { diff --git a/include/osmocom/gsm/protocol/gsm_44_318.h b/include/osmocom/gsm/protocol/gsm_44_318.h index 76e8396..b3942be 100644 --- a/include/osmocom/gsm/protocol/gsm_44_318.h +++ b/include/osmocom/gsm/protocol/gsm_44_318.h @@ -4,6 +4,7 @@ #pragma once #include +#include /* Table 11.1.1.2.1: Protocol Discriminator */ enum gan_pdisc { @@ -154,15 +155,24 @@ /* 11.1.1 GA-RC and GA-CSR Message header IE */ struct gan_rc_csr_hdr { +#if OSMO_IS_LITTLE_ENDIAN uint16_t len; uint8_t pdisc:4, skip_ind:4; uint8_t msg_type; uint8_t data[0]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint16_t len; + uint8_t skip_ind:4, pdisc:4; + uint8_t msg_type; + uint8_t data[0]; +#endif } __attribute__((packed)); /* 11.2.14.1: GAN Control Channel Description IE */ struct gan_cch_desc_ie { +#if OSMO_IS_LITTLE_ENDIAN uint8_t spare:1, ecmc:1, nmo:2, @@ -170,15 +180,6 @@ dtm:1, att:1, mscr:1; -#if 0 - uint8_t mscr:1, - att:1, - dtm:1, - gprs:1, - nmo:2, - ecmc:1, - spare:1; -#endif uint8_t t3212; uint8_t rac; uint8_t sgsnr:1, @@ -187,13 +188,13 @@ pfcfm:1, tgecs:2, spare2:2; -#if 0 - uint8_t spare2:2, - tgecs:2, - pfcfm:1, - re:1, - ecmp:1, - sgsnr:1; -#endif uint8_t access_class[2]; +#elif OSMO_IS_BIG_ENDIAN +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t mscr:1, att:1, dtm:1, gprs:1, nmo:2, ecmc:1, spare:1; + uint8_t t3212; + uint8_t rac; + uint8_t spare2:2, tgecs:2, pfcfm:1, re:1, ecmp:1, sgsnr:1; + uint8_t access_class[2]; +#endif } __attribute__((packed)); diff --git a/tests/endian/endian_test.c b/tests/endian/endian_test.c index 8737e7a..dd0697a 100644 --- a/tests/endian/endian_test.c +++ b/tests/endian/endian_test.c @@ -1,5 +1,6 @@ #include #include +#include int main(int argc, char **argv) { -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 00:04:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 16 Nov 2018 00:04:29 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11786 Change subject: add contrib/struct_endianess.py ...................................................................... add contrib/struct_endianess.py In libosmocore (and likely elsewhere) we have scores of packed structs with sub-byte integer members that lack the necessary member reversal shims to be able to work on big endian architectures. Instead of manually editing each one of them and probably introduce errors in the process, this script handles the change automatically, and in the future allows us to verify correctness in gerrit verifications. Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 --- A contrib/struct_endianess.py 1 file changed, 337 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/11786/1 diff --git a/contrib/struct_endianess.py b/contrib/struct_endianess.py new file mode 100755 index 0000000..fbff10f --- /dev/null +++ b/contrib/struct_endianess.py @@ -0,0 +1,337 @@ +#!/usr/bin/env python3 + +'''Using mad regexes, automatically make sure that all structs with sub-byte +integers have matching big-endian definitions. The idea is to save a lot of +manual effort, and to automatically verify that there are no errors. +This script most certainly has numerous holes and shortcomings, but actually, +if you hit problems with it, rather adjust your coding style so that this +script can deal with it...''' + +import re +import sys +import codecs +import os.path + +re_struct_start = re.compile(r'^struct\s*[a-zA-Z_][a-zA-Z_0-9]*\s*{\s*$') +re_struct_end = re.compile(r'^}[^;]*;\s*$') + +re_substruct_start = re.compile(r'^\s+struct\s*{\s*$') +re_substruct_end = re.compile(r'^\s+}\s*[a-zA-Z_][a-zA-Z_0-9]*\s*;\s*$') + +re_int_def = re.compile(r'(^\s*((const|unsigned|signed|char|int|long|int[0-9]+_t|uint[0-9]_t)\s+)+\s*)([^;]*;)', + re.DOTALL | re.MULTILINE) +re_int_members = re.compile(r'([a-zA-Z_][a-zA-Z_0-9]*|[a-zA-Z_][a-zA-Z_0-9]*\s*:\s*[0-9]+)\s*[,;]\s*', re.DOTALL | re.MULTILINE) + +re_little_endian_ifdef = re.compile(r'#\s*(if|elif)\s+OSMO_IS_LITTLE_ENDIAN\s*(==\s*1\s*|)'); +re_big_endian_ifdef = re.compile(r'#\s*(if|elif)\s+OSMO_IS_BIG_ENDIAN\s*'); +re_else = re.compile(r'#\s*else\s*'); +re_endif = re.compile(r'#\s*endif\s*'); + +re_c_comment = re.compile(r'(/\*[^*]+\*/|//.?$)') + +errors_found = 0 + +def remove_c_comments(code_str): + return ''.join(re_c_comment.split(code_str)[::2]) + +def struct_body_to_big_endian(body_str): + + # kick comments out of the code analysis. They will end up being stripped + # from big-endian only. + body_str = remove_c_comments(body_str) + + def_strs = body_str.split(';') + def_strs = ('%s;' % def_str for def_str in def_strs if def_str.strip()) + + # classify defs as containing sub-byte members or not + # defs = [ (true, 'uint8_t ', ('foo:3', 'bar:5')), + # (false, 'int baz;'),...] + defs = [] + any_sub_byte_ints = False + for one_def in def_strs: + + # does it have sub-string integers? + int_def = re_int_def.fullmatch(one_def) + if not int_def: + # not even a number, same for big and little endian + defs.append((False, one_def)) + continue + + int_type = int_def.group(1) + members_str = int_def.groups()[-1] + has_sub_byte_ints = False + + members = [] + for int_member in re_int_members.finditer(members_str): + member = int_member.group(1) + members.append(member) + if ':' in member: + has_sub_byte_ints = True + + if not has_sub_byte_ints: + defs.append((False, one_def)) + else: + defs.append((True, one_def, int_type, members)) + any_sub_byte_ints = True + + if not any_sub_byte_ints: + return None + + # now the interesting part, go over the defs, and reverse the sub-byte ints + # at byte boundaries. + + i = 0 + got_bits = 0 + byte_type = None + members_within_a_byte = [] + big_endian_defs = [] + + big_defs = [] + for classified_def in defs: + has_sub_byte_ints = classified_def[0] + + # now the big endian part + if has_sub_byte_ints: + _, one_def, int_type, members = classified_def + + if byte_type and byte_type.strip() != int_type.strip(): + raise Exception('mismatching type continuation after incomplete byte: %r %r to %r' + % (byte_type, members_within_a_byte, int_type)) + byte_type = int_type + + for member in members: + member_name, bits_str = member.split(':') + member_name = member_name.strip() + bits = int(bits_str) + member = '%s:%d' % (member_name, bits) + members_within_a_byte.append(member) + got_bits += bits + + if got_bits == 8: + # reverse these. + big_endian_defs.append('%s%s;' % (byte_type, ', '.join(reversed(members_within_a_byte)))) + members_within_a_byte = [] + byte_type = None + got_bits = 0 + + elif got_bits > 8: + raise Exception('sub-byte int breaks clean byte bounds: %s -- %d + %d = %d bits' + % (member, got_bits - bits, bits, got_bits)) + + elif not has_sub_byte_ints: + if got_bits: + raise Exception('sub-byte members do not add up to clean byte bounds: %r' % members_within_a_byte) + + big_endian_defs.append(classified_def[1]) + + # strip empty lines + lines = [l for l in (''.join(big_endian_defs).split('\n')) if l.strip()] + # clean lines' whitespace errors we might have taken in with the type names + for i in range(len(lines)): + line = lines[i] + while len(line) and line[-1] in ' \t': + line = line[:-1] + lines[i] = line + return '\n'.join(lines) + +def handle_struct_body(body_str): + + big_endian_body_str = struct_body_to_big_endian(body_str) + + if big_endian_body_str: + new_lines = ['#if OSMO_IS_LITTLE_ENDIAN\n'] + new_lines.append(body_str) + new_lines.append('#elif OSMO_IS_BIG_ENDIAN\n' + '/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */\n') + new_lines.append(big_endian_body_str) + new_lines.append('\n#endif\n') + return ''.join(new_lines) + else: + return body_str + +def _check_file(f): + global errors_found + global struct_body_parts + global arbitrary_part + global def_part + if not (f.endswith('.h') or f.endswith('.c') or f.endswith('.cpp')): + return + + # section the file into + # [ ["no struct def"], ["struct {...};"], ["no struct def"], ... ] + sections = [] + in_struct = False + buf = [] + for line in codecs.open(f, "r", "utf-8").readlines(): + + if not in_struct and re_struct_start.fullmatch(line): + sections.append(buf) + buf = [line] + in_struct = True + elif in_struct and re_struct_end.fullmatch(line): + buf.append(line) + sections.append(buf) + in_struct = False + buf = [] + else: + buf.append(line) + if buf: + sections.append(buf) + + # examine each struct, i.e. every second item in 'sections' + for i in range(len(sections)): + if not (i & 1): + continue + + struct = sections[i] + + # if the struct isn't packed, we need not bother + if not 'packed' in struct[-1]: + continue + + try: + + # assume the 'struct foo {' is on the first line, the closing brace + # '};' on the last, and the rest are individual definitions split by + # ';'. + struct_body_lines = struct[1:-1] + + # divide in struct body sections of + # ['arbitrary string', ['body;\n', 'lines;\n'], 'arbitrary string'] + # Aim: handle each sub-struct on its own, and + # if there already are ifdefs for little and big endian, keep just the + # little endian bit and derive big endian from it. + struct_body_parts = [] + arbitrary_part = [] + def_part = [] + + def end_def(): + global struct_body_parts + global arbitrary_part + global def_part + + if def_part: + struct_body_parts.append(arbitrary_part) + arbitrary_part = [] + struct_body_parts.append(def_part) + def_part = [] + + j = 0 + while j < len(struct_body_lines): + line = struct_body_lines[j] + + if (re_substruct_start.fullmatch(line) + or re_substruct_end.fullmatch(line)): + end_def() + arbitrary_part.append(line) + j += 1 + continue + + if re_big_endian_ifdef.fullmatch(line): + end_def() + # discard big endian section + j += 1 + while j < len(struct_body_lines): + line = struct_body_lines[j] + if re_endif.fullmatch(line): + end_def() + j += 1 + break; + if re_little_endian_ifdef.fullmatch(line): + end_def() + # keep that start of little endian section, not j++ + break; + if re_else.fullmatch(line): + # there's an '#else' after big-endian. Shim a little-endian header in just for the loop. + struct_body_lines[j] = '#if OSMO_IS_LITTLE_ENDIAN\n' + break; + j += 1 + continue + + if re_little_endian_ifdef.fullmatch(line): + end_def() + j += 1 + while j < len(struct_body_lines): + line = struct_body_lines[j] + if re_endif.fullmatch(line): + end_def() + j += 1 + break; + if re_big_endian_ifdef.fullmatch(line): + end_def() + # keep that start of big endian section, not j++ + break; + if re_else.fullmatch(line): + # there's an '#else' after little-endian. Shim a big-endian header in just for the loop. + struct_body_lines[j] = '#if OSMO_IS_BIG_ENDIAN\n' + break; + def_part.append(line) + j += 1 + + continue + + def_part.append(line) + j += 1 + + end_def() + if arbitrary_part: + struct_body_parts.append(arbitrary_part) + + new_struct_body_parts = [] + for j in range(len(struct_body_parts)): + part = ''.join(struct_body_parts[j]) + if not (j & 1): + new_struct_body_parts.append(part) + else: + new_struct_body_parts.append(handle_struct_body(part)) + + new_struct = [struct[0], ''.join(new_struct_body_parts), struct[-1]] + sections[i] = new_struct + except Exception as e: + raise Exception('ERROR in struct %r' % struct[0]) + + # phew. result. + result = ''.join((''.join(s) for s in sections)) + + # see if osmocom/core/endian.h is needed and included. + if (not f.endswith('endian.h') + and 'OSMO_IS_LITTLE_ENDIAN' in result + and '#include ' not in result): + # add the include after the last 'osmocom/core' include + last_include_start = result.rfind('#include ' + result[insert_at:] + + with codecs.open(f, "w", "utf-8") as fd: + fd.write(result) + +def check_file(f): + try: + _check_file(f) + except Exception as e: + raise Exception('ERROR IN FILE %r' % f) + +args = sys.argv[1:] +if not args: + args = ['.'] + +for f in args: + if os.path.isdir(f): + for parent_path, subdirs, files in os.walk(f, None, None): + for ff in files: + check_file(os.path.join(parent_path, ff)) + else: + check_file(f) + +sys.exit(errors_found) + +# vim: tabstop=4 shiftwidth=4 expandtab -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 00:11:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 16 Nov 2018 00:11:17 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11786 ) Change subject: add contrib/struct_endianess.py ...................................................................... Patch Set 1: see also http://lists.osmocom.org/pipermail/openbsc/2018-November/012404.html -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 16 Nov 2018 00:11:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 00:24:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 16 Nov 2018 00:24:38 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11787 to look at the new patch set (#2). Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... add/clean big-endian packed structs (struct_endianess.py) Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 --- M include/osmocom/gprs/protocol/gsm_04_60.h M include/osmocom/gsm/protocol/gsm_03_41.h M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_04_08_gprs.h M include/osmocom/gsm/protocol/gsm_04_12.h M include/osmocom/gsm/protocol/gsm_04_14.h M include/osmocom/gsm/protocol/gsm_08_58.h M include/osmocom/gsm/protocol/gsm_44_318.h M tests/endian/endian_test.c 9 files changed, 647 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/11787/2 -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 00:24:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 16 Nov 2018 00:24:39 +0000 Subject: Change in libosmocore[master]: gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11788 Change subject: gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie ...................................................................... gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie These are actually parts of the struct in big endian order, which will soon be done automatically by struct_endianess.py. Change-Id: I9bc694f10fa9cef0bb7fc791bb40e7602459b16b --- M include/osmocom/gsm/protocol/gsm_44_318.h 1 file changed, 0 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/11788/1 diff --git a/include/osmocom/gsm/protocol/gsm_44_318.h b/include/osmocom/gsm/protocol/gsm_44_318.h index 76e8396..6ac02cf 100644 --- a/include/osmocom/gsm/protocol/gsm_44_318.h +++ b/include/osmocom/gsm/protocol/gsm_44_318.h @@ -170,15 +170,6 @@ dtm:1, att:1, mscr:1; -#if 0 - uint8_t mscr:1, - att:1, - dtm:1, - gprs:1, - nmo:2, - ecmc:1, - spare:1; -#endif uint8_t t3212; uint8_t rac; uint8_t sgsnr:1, @@ -187,13 +178,5 @@ pfcfm:1, tgecs:2, spare2:2; -#if 0 - uint8_t spare2:2, - tgecs:2, - pfcfm:1, - re:1, - ecmp:1, - sgsnr:1; -#endif uint8_t access_class[2]; } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/11788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9bc694f10fa9cef0bb7fc791bb40e7602459b16b Gerrit-Change-Number: 11788 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 00:24:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 16 Nov 2018 00:24:38 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11786 to look at the new patch set (#2). Change subject: add contrib/struct_endianess.py ...................................................................... add contrib/struct_endianess.py In libosmocore (and likely elsewhere) we have scores of packed structs with sub-byte integer members that lack the necessary member reversal shims to be able to work on big endian architectures. Instead of manually editing each one of them and probably introduce errors in the process, this script handles the change automatically, and in the future allows us to verify correctness in gerrit verifications. Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 --- A contrib/struct_endianess.py 1 file changed, 337 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/11786/2 -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 09:02:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 09:02:39 +0000 Subject: Change in osmo-bsc[master]: don't remove socket path in rf_create_socket() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: don't remove socket path in rf_create_socket() ...................................................................... Patch Set 4: How do tests fail? Why not fixing the tests instead of removing unlink()? -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 16 Nov 2018 09:02:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 09:03:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 09:03:26 +0000 Subject: Change in libosmocore[master]: gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11788 ) Change subject: gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9bc694f10fa9cef0bb7fc791bb40e7602459b16b Gerrit-Change-Number: 11788 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 09:03:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 10:41:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 10:41:23 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11786 ) Change subject: add contrib/struct_endianess.py ...................................................................... Patch Set 2: (13 comments) https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py File contrib/struct_endianess.py: https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 37 PS2, Line 37: def struct_body_to_big_endian(body_str): Document what this function does exactly. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 80 PS2, Line 80: # now the interesting part, go over the defs, and reverse the sub-byte ints You can probably split into a different function starting from here. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 118 PS2, Line 118: raise Exception('sub-byte int breaks clean byte bounds: %s -- %d + %d = %d bits' what about eg. bitfield for uint16_t? are they expected to be reversed too in big endian? https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 168 PS2, Line 168: sections.append(buf) shouldn't appending to sections be done at the end of the struct only? (line 173). https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 181 PS2, Line 181: # examine each struct, i.e. every second item in 'sections' Ah I see now, the one you append is actually the buffer until before the struct code starts. Worth explicitly commenting that during first "for" loop I think, specially comment "why" you want to have both at that point. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 189 PS2, Line 189: if not 'packed' in struct[-1]: probably better/easier to look for __atribute((packed)) or whatever is called, and check all lines (to avoid possible corner cases with whitespace or whatever). https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 199 PS2, Line 199: # divide in struct body sections of Probably worth moving this into another function to make code easier to read and maintain. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 200 PS2, Line 200: # ['arbitrary string', ['body;\n', 'lines;\n'], 'arbitrary string'] what does body and lines means? brief explanation here welcome. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 208 PS2, Line 208: def end_def(): Please document this function and global variables below. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 224 PS2, Line 224: or re_substruct_end.fullmatch(line)): I think this can go in same line https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 248 PS2, Line 248: j += 1 Not sure if this j += 1 in here applied for all cases is correct. Have a look. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 276 PS2, Line 276: end_def() afaiu this end_def() should be one lne above and indented one more level (inside while). https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 308 PS2, Line 308: raise Exception('do not know where to include osmocom/core/endian.h in %r' % f) Just add it around first empty line (to avoid adding if before guard IFDEF or pragma once). -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 10:41:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 10:49:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 10:49:20 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gprs/protocol/gsm_04_60.h File include/osmocom/gprs/protocol/gsm_04_60.h: https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gprs/protocol/gsm_04_60.h at 33 PS2, Line 33: uint8_t tfi_hi:2, cv:4, si:1, r:1; Please change the script to add lines/formatting like in the little endian case. https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gsm/protocol/gsm_03_41.h File include/osmocom/gsm/protocol/gsm_03_41.h: https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gsm/protocol/gsm_03_41.h at 36 PS2, Line 36: uint8_t language:4; Be careful here!! Big endian generated code is not the same as in little endian. In little endian you are saying: I have 2 bytes, and for each I only care about the lower 4 bits (so it should never handle values greater than 16). In the big endian you are saying: I have 1 byte, and 4 lower bits are repreented by one variable, and the 4 higher bits by the other variable. So I see 2 possible issues here: * original little endian strucut looks suspicously wrong. Probably we want 1 byte with 2 variables instead of 2 bytes with 2 variables. We need to check that in specs. * Regardless of that, the script checking for endianess should take care of this case, since it's valid in general and used in some cases. -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 10:49:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 10:49:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 10:49:32 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11786 ) Change subject: add contrib/struct_endianess.py ...................................................................... Patch Set 2: Code-Review-1 -1 see reason in next patch. -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 10:49:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 12:28:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 12:28:59 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11789 Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ARFCNs are values in well defined ranges. Until this patch, ARFCNs not belonging to any band were blindly assigned to DCS1800 by gsm_arfcn2band, causing unnoticed bugs and misconfigurations in osmo-bsc. Previous API gsm_arfcn2band cannot accomodate this kind of check easily, so let's deprecate it to tell people to use a new API gsm_arfcn2band_rc which performs this kind of checks and allows callers to log failures, misconfigurations, etc. At the same time, modify implementation of gsm_arfcn2band to abort if an invalid ARFCN is passed, this way users of this API can notice they are passing wrong data to it that most probably will produce unexpected results. Related: OS#3063 Change-Id: I780d452dcebce385469e32ef2fd844df6033393a --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c M src/gsm/libosmogsm.map M utils/osmo-arfcn.c 4 files changed, 56 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/11789/1 diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 7eda5b9..fe5903d 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -161,7 +161,8 @@ #define ARFCN_UPLINK 0x4000 #define ARFCN_FLAG_MASK 0xf000 /* Reserve the upper 5 bits for flags */ -enum gsm_band gsm_arfcn2band(uint16_t arfcn); +int gsm_arfcn2band_rc(uint16_t arfcn, enum gsm_band *band); +enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); /* Convert an ARFCN to the frequency in MHz * 10 */ uint16_t gsm_arfcn2freq10(uint16_t arfcn, int uplink); diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 7e6c794..191e0a5 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -709,33 +709,58 @@ /*! Resolve GSM band from ARFCN * In Osmocom, we use the highest bit of the \a arfcn to indicate PCS * \param[in] arfcn Osmocom ARFCN, highest bit determines PCS mode - * \returns GSM Band */ -enum gsm_band gsm_arfcn2band(uint16_t arfcn) + * \param[out] band GSM Band containing \arfcn if arfcn is valid, undetermined otherwise + * \returns 0 if arfcn is valid and \a band was set, negative on error */ +int gsm_arfcn2band_rc(uint16_t arfcn, enum gsm_band *band) { int is_pcs = arfcn & ARFCN_PCS; arfcn &= ~ARFCN_FLAG_MASK; - if (is_pcs) - return GSM_BAND_1900; - else if (arfcn <= 124) - return GSM_BAND_900; - else if (arfcn >= 955 && arfcn <= 1023) - return GSM_BAND_900; - else if (arfcn >= 128 && arfcn <= 251) - return GSM_BAND_850; - else if (arfcn >= 512 && arfcn <= 885) - return GSM_BAND_1800; - else if (arfcn >= 259 && arfcn <= 293) - return GSM_BAND_450; - else if (arfcn >= 306 && arfcn <= 340) - return GSM_BAND_480; - else if (arfcn >= 350 && arfcn <= 425) - return GSM_BAND_810; - else if (arfcn >= 438 && arfcn <= 511) - return GSM_BAND_750; - else - return GSM_BAND_1800; + if (is_pcs) { + *band = GSM_BAND_1900; + return 0; + } else if (arfcn <= 124) { + *band = GSM_BAND_900; + return 0; + } else if (arfcn >= 955 && arfcn <= 1023) { + *band = GSM_BAND_900; + return 0; + } else if (arfcn >= 128 && arfcn <= 251) { + *band = GSM_BAND_850; + return 0; + } else if (arfcn >= 512 && arfcn <= 885) { + *band = GSM_BAND_1800; + return 0; + } else if (arfcn >= 259 && arfcn <= 293) { + *band = GSM_BAND_450; + return 0; + } else if (arfcn >= 306 && arfcn <= 340) { + *band = GSM_BAND_480; + return 0; + } else if (arfcn >= 350 && arfcn <= 425) { + *band = GSM_BAND_810; + return 0; + } else if (arfcn >= 438 && arfcn <= 511) { + *band = GSM_BAND_750; + return 0; + } + return -1; +} + +/*! Resolve GSM band from ARFCN, aborts process on invalid ARFCN + * In Osmocom, we use the highest bit of the \a arfcn to indicate PCS. + * DEPRECATED: Use gsm_arfcn2band_rc instead. + * \param[in] arfcn Osmocom ARFCN, highest bit determines PCS mode + * \returns GSM Band if ARFCN is valid (part of any valid band), aborts otherwise */ +enum gsm_band gsm_arfcn2band(uint16_t arfcn) +{ + enum gsm_band band; + if (gsm_arfcn2band_rc(arfcn, &band) == 0) + return band; + + osmo_panic("%s:%d Invalid arfcn %" PRIu16 " passed to gsm_arfcn2band\n", + __FILE__, __LINE__, arfcn); } struct gsm_freq_range { diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 4813e13..74a9d8e 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -346,6 +346,7 @@ gsm_7bit_encode_n; gsm_7bit_encode_n_ussd; +gsm_arfcn2band_rc; gsm_arfcn2band; gsm_arfcn2freq10; gsm_freq102arfcn; diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c index 61108f8..7d3c16a 100644 --- a/utils/osmo-arfcn.c +++ b/utils/osmo-arfcn.c @@ -62,6 +62,7 @@ static int freq2arfcn(int freq10, int uplink) { uint16_t arfcn; + enum gsm_band band; if (uplink != 0 && uplink != 1) { fprintf(stderr, "Need to specify uplink or downlink\n"); @@ -75,8 +76,12 @@ return -EINVAL; } + if (gsm_arfcn2band_rc(arfcn, &band) < 0) { + fprintf(stderr, "ARFCN contains no valid band\n"); + } + printf("%s: ARFCN %4d\n", - gsm_band_name(gsm_arfcn2band(arfcn)), + gsm_band_name(band), arfcn & ~ARFCN_FLAG_MASK); return 0; } -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 12:53:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 12:53:56 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11790 Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... bsc: band_compatible: Return band non-compatible for invalid arfcn Before libosmocore Change-Id I780d452dcebce385469e32ef2fd844df6033393a, it avoids stating arfcn 886-954 are compatible when operating under DC1800. After that Change-Id, avoids aborting the program due to unexpected behaviour. Related: OS#3063 Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 --- M src/osmo-bsc/system_information.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/11790/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 2104e92..461232f 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -53,7 +53,11 @@ */ static int band_compatible(const struct gsm_bts *bts, int arfcn) { - enum gsm_band band = gsm_arfcn2band(arfcn); + enum gsm_band band; + if (gsm_arfcn2band_rc(arfcn, &band) < 0) { + LOGP(DRR, LOGL_ERROR, "Invalid arfcn %d detected!\n", arfcn); + return 0; + } /* normal case */ if (band == bts->band) -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 13:13:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 13:13:17 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Verify and warn on invalid arfcn passed Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11791 Change subject: bsc: vty: Verify and warn on invalid arfcn passed ...................................................................... bsc: vty: Verify and warn on invalid arfcn passed Related: OS#3063 Depends: libosmocore Change-Id I780d452dcebce385469e32ef2fd844df6033393a Change-Id: Ib001501bf37289e824a1f72b62afde23892e88d2 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/11791/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index b9a5268..7537dbe 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3111,6 +3111,7 @@ struct gsm_bts *bts = vty->index; struct bitvec *bv = &bts->si_common.neigh_list; uint16_t arfcn = atoi(argv[1]); + enum gsm_band unused; if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { vty_out(vty, "%% Cannot configure neighbor list in " @@ -3118,6 +3119,11 @@ return CMD_WARNING; } + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } + if (!strcmp(argv[0], "add")) bitvec_set_bit_pos(bv, arfcn, 1); else @@ -3254,6 +3260,7 @@ "Delete from SI5 manual neighbor list\n" "ARFCN of neighbor\n" "ARFCN of neighbor\n") { + enum gsm_band unused; struct gsm_bts *bts = vty->index; struct bitvec *bv = &bts->si_common.si5_neigh_list; uint16_t arfcn = atoi(argv[1]); @@ -3264,6 +3271,11 @@ return CMD_WARNING; } + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } + if (!strcmp(argv[0], "add")) bitvec_set_bit_pos(bv, arfcn, 1); else @@ -3932,8 +3944,14 @@ "Set the ARFCN for this TRX\n" "Absolute Radio Frequency Channel Number\n") { - int arfcn = atoi(argv[0]); + enum gsm_band unused; struct gsm_bts_trx *trx = vty->index; + int arfcn = atoi(argv[0]); + + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } /* FIXME: check if this ARFCN is supported by this TRX */ @@ -4181,9 +4199,15 @@ HOPPING_STR "Configure hopping ARFCN list\n" "Add an entry to the hopping ARFCN list\n" "ARFCN\n") { + enum gsm_band unused; struct gsm_bts_trx_ts *ts = vty->index; int arfcn = atoi(argv[0]); + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } + bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, 1); return CMD_SUCCESS; @@ -4195,9 +4219,15 @@ HOPPING_STR "Configure hopping ARFCN list\n" "Delete an entry to the hopping ARFCN list\n" "ARFCN\n") { + enum gsm_band unused; struct gsm_bts_trx_ts *ts = vty->index; int arfcn = atoi(argv[0]); + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } + bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, 0); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/11791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib001501bf37289e824a1f72b62afde23892e88d2 Gerrit-Change-Number: 11791 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 13:14:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 13:14:34 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11790 ) Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... Patch Set 1: Fails from here du to dependent patch from libosmocore not yet merged -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 13:14:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 13:32:50 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 13:32:50 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if ESME accepted it Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11792 Change subject: libmsc: Don't send SMS STATUS REPORT locally if ESME accepted it ...................................................................... libmsc: Don't send SMS STATUS REPORT locally if ESME accepted it When using smpp-first, after the ESME accepts our STATUS REPORT, we were sending it locally into gsm340_rx_sms_submit() anyway. This would result in two copies of the status report in the SMS database, which were also both then delivered to the MS. This causes no visible error to the user but is a waste of radio resources. With this patch, we check if it is the sms_report with a receiver and not the original SMS we are reporting on, which of course has a receiver. Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be --- M src/libmsc/gsm_04_11.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/11792/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 8d9169b..52edcd6 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -691,7 +691,7 @@ } /* No route via SMPP, send the GSM 03.40 status-report now. */ - if (gsms->receiver) + if (sms_report->receiver) gsm340_rx_sms_submit(sms_report); LOGP(DLSMS, LOGL_NOTICE, "Status report has been sent\n"); -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 13:49:38 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 13:49:38 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11792 to look at the new patch set (#2). Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. When using smpp-first, after the ESME accepts our STATUS REPORT, we were sending it locally into gsm340_rx_sms_submit() anyway. In the case of the ESME mirroring the report back to us, this would result in two copies of the status report in the SMS database, which were also both then delivered to the MS. This causes no visible error to the user but is a waste of radio resources. With this patch, we check if it is the sms_report with a receiver and not the original SMS we are reporting on, which of course has a receiver. Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be --- M src/libmsc/gsm_04_11.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/11792/2 -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 13:52:58 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 13:52:58 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11792 to look at the new patch set (#3). Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. When using smpp-first, after the ESME accepts our STATUS REPORT, we were sending it locally into gsm340_rx_sms_submit() anyway. In the case of the ESME mirroring the report back to us, this would result in two copies of the status report in the SMS database, which were also both then delivered to the MS. This causes no visible error to the user but is a waste of radio resources. With this patch, we check if it is the sms_report that has had receiver set in sms_route_mt_sms() and not the original SMS we are reporting on, which of course already has receiver set. Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be --- M src/libmsc/gsm_04_11.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/11792/3 -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:12:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:12:06 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Looks fine, only one cosmetic issue though. https://gerrit.osmocom.org/#/c/11792/3/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11792/3/src/libmsc/gsm_04_11.c at 690 PS3, Line 690: Let's please avoid mixing tabs and spaces when it's not required. I recommend either use a tab here, or not to wrap the line at all. -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:12:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:15:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:15:27 +0000 Subject: Change in osmo-bsc[master]: examples: Remove neighbor-list invalid for default setup In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11774 ) Change subject: examples: Remove neighbor-list invalid for default setup ...................................................................... Patch Set 3: Code-Review+1 In general, it would be great to have the configuration examples similar to what srsLTE has. Optional options are commented out and quite good described (in comments) there. -- To view, visit https://gerrit.osmocom.org/11774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebe972da3a8442b6ded6d7f9e61a03b9144a843c Gerrit-Change-Number: 11774 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:15:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:15:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:15:59 +0000 Subject: Change in osmo-bsc[master]: bsc: bts_alloc: Use enum value during neigh_list_manual_mode initiali... In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11775 ) Change subject: bsc: bts_alloc: Use enum value during neigh_list_manual_mode initialization ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a4325d45de143d32db55df8e84282cc64800c9f Gerrit-Change-Number: 11775 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:15:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:16:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:16:10 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Use enum value in neighbor-list check In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11778 ) Change subject: bsc: vty: Use enum value in neighbor-list check ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7c0b42bfed749f18b8ab2331475f3da35b02f456 Gerrit-Change-Number: 11778 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:16:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:16:58 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 14:16:58 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11792/3/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11792/3/src/libmsc/gsm_04_11.c at 690 PS3, Line 690: > Let's please avoid mixing tabs and spaces when it's not required. [?] Given that this is not part of this patch, Do you suggest that one should fix this kind of thing as we come across it? And then submit as a separate "cosmetic" tagged patch? I didn't even notice this line, as i wasn't editing it. -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:16:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:19:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:19:11 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11790 ) Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11790/1/src/osmo-bsc/system_information.c File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/#/c/11790/1/src/osmo-bsc/system_information.c at 56 PS1, Line 56: enum gsm_band band; cosmetic: we usually have a blank line between the variable definitions and the function's logic. Let's have it here too. -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:19:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:21:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:21:11 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11790 ) Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11790/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11790/1//COMMIT_MSG at 15 PS1, Line 15: Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 > Fails from here du to dependent patch from libosmocore not yet merged It makes sense to indicate it here as "Depends-on: blabla..." ;) -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:21:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:23:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:23:50 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Verify and warn on invalid arfcn passed In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11791 ) Change subject: bsc: vty: Verify and warn on invalid arfcn passed ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib001501bf37289e824a1f72b62afde23892e88d2 Gerrit-Change-Number: 11791 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:23:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:31:31 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:31:31 +0000 Subject: Change in libosmocore[master]: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11785 ) Change subject: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8e3afff737211ded3c5689f2c83b1a544b42f9d Gerrit-Change-Number: 11785 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 16 Nov 2018 14:31:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:34:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 14:34:01 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11792/3/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11792/3/src/libmsc/gsm_04_11.c at 690 PS3, Line 690: > Given that this is not part of this patch, [?] Is this line modified by your patch? If it is, then submit a new version of the patch without this line formatting change, since it's non-related. If the line is not changed by your patch, then the issue is already there and you can 2 things: 1- Leave it as it is, no problem 2- Submit a separate cosmetic patch to fix it. -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 14:34:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:35:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 14:35:58 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:35:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:37:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:37:36 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... Patch Set 1: Code-Review-1 Sorry, but I don't think it makes sense to introduce a new symbol. Why not to introduce something like: GSM_BAND_NONE or GSM_BAND_INVAL (0x00)? Moreover, you're changing the logic of old gsm_arfcn2band() anyway... -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:37:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:45:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 14:45:02 +0000 Subject: Change in osmo-bts[master]: properly initialize si3 in test_is_ccch_for_agch_setup() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11784 ) Change subject: properly initialize si3 in test_is_ccch_for_agch_setup() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie8f8fc3c4a9e4cc18fc85b6822110de79da4246b Gerrit-Change-Number: 11784 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:45:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:45:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 14:45:14 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... Patch Set 1: > Sorry, but I don't think it makes sense to introduce a new symbol. > Why not to introduce something like: GSM_BAND_NONE or > GSM_BAND_INVAL (0x00)? > I already thought about this possibility first, but decided to do it this way finally. Because then all code using switch() statements on enum gsm_band will start failing and will break several repositories, and need to check for default value or that specific enum value in lots of places were really doesn't make sense since it should not happen (as in you expect a valid band). So really having to change lots of places which expect a valid band to fix a single place were unknown band can be returned makes no sense to me. > Moreover, you're changing the logic of old gsm_arfcn2band() > anyway... You are changing the logic of osmo_arfcn2band too by doing it the way you say, so no real change here. It's still not changing the API I'd argue, because I'd say passing an invalid arfcn was not contemplated for this API, since obviously makes no sense to return DCS1800 in that case. So this commit actually makes the API more concrete for some corner cases which used to be "undefined behaviour". -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 14:45:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:20 +0000 Subject: Change in osmo-msc[master]: move project specific manuals to their own repos In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11726 to look at the new patch set (#2). Change subject: move project specific manuals to their own repos ...................................................................... move project specific manuals to their own repos Build manuals when ./configure --enable-manuals is specified. Requires osmo-gsm-manuals to be installed. Related: OS#3385 Depends: I96933dd4dd6cac159847647f1c642215051a9aad (osmo-gsm-manuals) Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 --- M .gitignore M configure.ac M doc/Makefile.am A doc/manuals/Makefile.am A doc/manuals/chapters/control.adoc A doc/manuals/chapters/counters.adoc A doc/manuals/chapters/counters_generated.adoc A doc/manuals/chapters/net.adoc A doc/manuals/chapters/overview.adoc A doc/manuals/chapters/running.adoc A doc/manuals/images/sgs-imsi_attach_lu.msc A doc/manuals/images/sgs-mo_call_no_ps_ho.msc A doc/manuals/images/sgs-mo_sms_idle.msc A doc/manuals/images/sgs-mt_call_idle.msc A doc/manuals/images/sgs-mt_sms_idle.msc A doc/manuals/osmomsc-usermanual-docinfo.xml A doc/manuals/osmomsc-usermanual.adoc A doc/manuals/osmomsc-vty-reference.xml A doc/manuals/vty/msc_vty_additions.xml A doc/manuals/vty/msc_vty_reference.xml A myscript.sh 21 files changed, 3,318 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/11726/2 -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:37 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11740 to look at the new patch set (#2). Change subject: publish from project repos, not this repo anymore ...................................................................... publish from project repos, not this repo anymore Do not publish PDFs for all projects anymore with jenkins.sh --publish or "make publish". Extract known_hosts from jenkins.sh, and install it along with the other shared files in OSMO_GSM_MANUALS_DIR. Add a "publish" target to Makefile.common.inc, so we can use it from the project repositories: $ cd docs/manuals $ make publish No automatism for building and publishing the documentation of all projects will be implemented in this patch series, as discussed here: https://osmocom.org/issues/3385#note-7 (moving manuals to project repositories 14/16) Related: OS#3385 Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 --- M build/Makefile.common.inc A build/known_hosts M contrib/jenkins.sh 3 files changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/40/11740/2 -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:37 +0000 Subject: Change in osmo-gsm-manuals[master]: remove project specific files In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11738 to look at the new patch set (#4). Change subject: remove project specific files ...................................................................... remove project specific files Add to the project repositories in: * I2f9c27f81940b02414f0e618483bffade72e8cf7 (osmo-msc) * (TODO: create patches for all of them and list them here, once msc is reviewed) (moving manuals to project repositories 15/16) Related: OS#3385 Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc --- M Makefile.am D OsmoBSC/Makefile.am D OsmoBSC/aoip-mgw-options-docinfo.xml D OsmoBSC/aoip-mgw-options.adoc D OsmoBSC/chapters/bts-examples.adoc D OsmoBSC/chapters/control.adoc D OsmoBSC/chapters/counters.adoc D OsmoBSC/chapters/counters_generated.adoc D OsmoBSC/chapters/handover.adoc D OsmoBSC/chapters/handover_inter_bsc.dot D OsmoBSC/chapters/handover_intra_bsc.dot D OsmoBSC/chapters/overview.adoc D OsmoBSC/chapters/running.adoc D OsmoBSC/message-sequences/mo_call-abis_a.msc D OsmoBSC/mgw/classic-bsc.msc D OsmoBSC/mgw/osmo-bsc-new-mgw-e1.msc D OsmoBSC/mgw/osmo-bsc-new-mgw.msc D OsmoBSC/mgw/osmo-bsc-old-sccplite.msc D OsmoBSC/om2000/README D OsmoBSC/om2000/om2k-bts.msc D OsmoBSC/om2000/om2k-mo-cf.msc D OsmoBSC/om2000/om2k-mo-is.msc D OsmoBSC/om2000/om2k-mo-rx.msc D OsmoBSC/om2000/om2k-mo-tf.msc D OsmoBSC/om2000/om2k-mo-trxc.msc D OsmoBSC/om2000/om2k-mo-ts.msc D OsmoBSC/om2000/om2k-mo-tx.msc D OsmoBSC/om2000/om2k-trx.msc D OsmoBSC/osmobsc-usermanual-docinfo.xml D OsmoBSC/osmobsc-usermanual.adoc D OsmoBSC/osmux-reference-docinfo.xml D OsmoBSC/osmux-reference.adoc D OsmoBSC/vty/bsc_vty_additions.xml D OsmoBSC/vty/bsc_vty_reference.xml D OsmoBSC/vty/libbsc_vty_additions.xml D OsmoBTS/Makefile.am D OsmoBTS/abis/abis-startup.msc D OsmoBTS/abis/dyn_ts_ipa_style1.msc D OsmoBTS/abis/dyn_ts_ipa_style2.msc D OsmoBTS/abis/dyn_ts_osmocom_style1.msc D OsmoBTS/abis/dyn_ts_osmocom_style2.msc D OsmoBTS/abis/ipa.adoc D OsmoBTS/abis/oml-mo-bts.msc D OsmoBTS/abis/oml-mo-carrier.msc D OsmoBTS/abis/oml-mo-channel.msc D OsmoBTS/abis/oml-mo-sitemgr.msc D OsmoBTS/abis/oml-mo-transceiver.msc D OsmoBTS/abis/oml-startup.msc D OsmoBTS/abis/oml-startup2.msc D OsmoBTS/abis/oml-startup3.msc D OsmoBTS/abis/oml.adoc D OsmoBTS/abis/rsl-startup-pri.msc D OsmoBTS/abis/rsl-startup-sec.msc D OsmoBTS/abis/rsl-tch-rtp.msc D OsmoBTS/abis/rsl.adoc D OsmoBTS/abis/rtp.adoc D OsmoBTS/chapters/architecture.adoc D OsmoBTS/chapters/bts-models.adoc D OsmoBTS/chapters/configuration.adoc D OsmoBTS/chapters/control.adoc D OsmoBTS/chapters/dynamic-timeslots.adoc D OsmoBTS/chapters/interfaces.adoc D OsmoBTS/chapters/overview.adoc D OsmoBTS/dtx.dot D OsmoBTS/osmobts-abis-docinfo.xml D OsmoBTS/osmobts-abis.adoc D OsmoBTS/osmobts-usermanual-docinfo.xml D OsmoBTS/osmobts-usermanual.adoc D OsmoBTS/rtp-amr-docinfo.xml D OsmoBTS/rtp-amr.adoc D OsmoBTS/vty/bts_vty_additions.xml D OsmoBTS/vty/bts_vty_reference.xml D OsmoGGSN/Makefile.am D OsmoGGSN/chapters/configuration.adoc D OsmoGGSN/chapters/overview.adoc D OsmoGGSN/chapters/running.adoc D OsmoGGSN/osmoggsn-usermanual-docinfo.xml D OsmoGGSN/osmoggsn-usermanual.adoc D OsmoGGSN/vty/ggsn_vty_additions.xml D OsmoGGSN/vty/ggsn_vty_reference.xml D OsmoGSMTester/Makefile.am D OsmoGSMTester/chapters/config.adoc D OsmoGSMTester/chapters/debugging.adoc D OsmoGSMTester/chapters/install.adoc D OsmoGSMTester/chapters/intro.adoc D OsmoGSMTester/chapters/test_api.adoc D OsmoGSMTester/chapters/trial.adoc D OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml D OsmoGSMTester/osmo-gsm-tester-manual.adoc D OsmoHLR/Makefile.am D OsmoHLR/chapters/control.adoc D OsmoHLR/chapters/overview.adoc D OsmoHLR/chapters/running.adoc D OsmoHLR/chapters/subscribers.adoc D OsmoHLR/chapters/ussd.adoc D OsmoHLR/example_subscriber_add_update_delete.vty D OsmoHLR/example_subscriber_cs_ps_enabled.ctrl D OsmoHLR/example_subscriber_info.ctrl D OsmoHLR/osmohlr-usermanual-docinfo.xml D OsmoHLR/osmohlr-usermanual.adoc D OsmoHLR/vty/hlr_vty_additions.xml D OsmoHLR/vty/hlr_vty_reference.xml D OsmoMGCP/Makefile.am D OsmoMGCP/vty/mgcp_vty_additions.xml D OsmoMGCP/vty/mgcp_vty_reference.xml D OsmoMGW/Makefile.am D OsmoMGW/chapters/configuration.adoc D OsmoMGW/chapters/counters.adoc D OsmoMGW/chapters/counters_generated.adoc D OsmoMGW/chapters/mgcp_extensions.adoc D OsmoMGW/chapters/overview.adoc D OsmoMGW/chapters/running.adoc D OsmoMGW/osmomgw-usermanual-docinfo.xml D OsmoMGW/osmomgw-usermanual.adoc D OsmoMGW/vty/mgw_vty_additions.xml D OsmoMGW/vty/mgw_vty_reference.xml D OsmoMSC/Makefile.am D OsmoMSC/chapters/control.adoc D OsmoMSC/chapters/counters.adoc D OsmoMSC/chapters/counters_generated.adoc D OsmoMSC/chapters/net.adoc D OsmoMSC/chapters/overview.adoc D OsmoMSC/chapters/running.adoc D OsmoMSC/images/sgs-imsi_attach_lu.msc D OsmoMSC/images/sgs-mo_call_no_ps_ho.msc D OsmoMSC/images/sgs-mo_sms_idle.msc D OsmoMSC/images/sgs-mt_call_idle.msc D OsmoMSC/images/sgs-mt_sms_idle.msc D OsmoMSC/osmomsc-usermanual-docinfo.xml D OsmoMSC/osmomsc-usermanual.adoc D OsmoMSC/vty/msc_vty_additions.xml D OsmoMSC/vty/msc_vty_reference.xml D OsmoNAT/Makefile.am D OsmoNAT/vty/nat_vty_additions.xml D OsmoNAT/vty/nat_vty_reference.xml D OsmoNITB/Makefile.am D OsmoNITB/chapters/bts-examples.adoc D OsmoNITB/chapters/control.adoc D OsmoNITB/chapters/hlr.adoc D OsmoNITB/chapters/net.adoc D OsmoNITB/chapters/overview.adoc D OsmoNITB/chapters/running.adoc D OsmoNITB/osmonitb-usermanual-docinfo.xml D OsmoNITB/osmonitb-usermanual.adoc D OsmoNITB/vty/bsc_vty_additions.xml D OsmoNITB/vty/nitb_vty_additions.xml D OsmoNITB/vty/nitb_vty_reference.xml D OsmoPCU/Makefile.am D OsmoPCU/chapters/configuration.adoc D OsmoPCU/chapters/counters.adoc D OsmoPCU/chapters/counters_generated.adoc D OsmoPCU/chapters/overview.adoc D OsmoPCU/chapters/running.adoc D OsmoPCU/gb/bssgp.adoc D OsmoPCU/gb/gb-startup.msc D OsmoPCU/gb/ns.adoc D OsmoPCU/osmopcu-gb-docinfo.xml D OsmoPCU/osmopcu-gb.adoc D OsmoPCU/osmopcu-usermanual-docinfo.xml D OsmoPCU/osmopcu-usermanual.adoc D OsmoPCU/vty/osmo-pcu_vty_additions.xml D OsmoPCU/vty/osmo-pcu_vty_reference.xml D OsmoSGSN/Makefile.am D OsmoSGSN/chapters/configuration.adoc D OsmoSGSN/chapters/control.adoc D OsmoSGSN/chapters/counters.adoc D OsmoSGSN/chapters/counters_generated.adoc D OsmoSGSN/chapters/overview.adoc D OsmoSGSN/chapters/running.adoc D OsmoSGSN/osmosgsn-usermanual-docinfo.xml D OsmoSGSN/osmosgsn-usermanual.adoc D OsmoSGSN/vty/sgsn_vty_additions.xml D OsmoSGSN/vty/sgsn_vty_reference.xml D OsmoSIPConnector/Makefile.am D OsmoSIPConnector/chapters/configuration.adoc D OsmoSIPConnector/chapters/overview.adoc D OsmoSIPConnector/chapters/running.adoc D OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml D OsmoSIPConnector/osmosipconnector-usermanual.adoc D OsmoSIPConnector/vty/sipconn_vty_additions.xml D OsmoSIPConnector/vty/sipconn_vty_reference.xml D OsmoSTP/Makefile.am D OsmoSTP/chapters/overview.adoc D OsmoSTP/osmostp-usermanual-docinfo.xml D OsmoSTP/osmostp-usermanual.adoc D OsmoSTP/vty/osmo-stp_vty_reference.xml D OsmoTRX/Makefile.am D OsmoTRX/chapters/code-architecture.adoc D OsmoTRX/chapters/configuration.adoc D OsmoTRX/chapters/control.adoc D OsmoTRX/chapters/counters.adoc D OsmoTRX/chapters/counters_generated.adoc D OsmoTRX/chapters/overview.adoc D OsmoTRX/chapters/running.adoc D OsmoTRX/chapters/trx-architectures.adoc D OsmoTRX/chapters/trx-backends.adoc D OsmoTRX/chapters/trx-devices.adoc D OsmoTRX/osmotrx-usermanual-docinfo.xml D OsmoTRX/osmotrx-usermanual.adoc D OsmoTRX/vty/trx_vty_additions.xml D OsmoTRX/vty/trx_vty_reference.xml D OsmocomBB/Makefile.am D OsmocomBB/chapters/scripting.adoc D OsmocomBB/osmocombb-usermanual-docinfo.xml D OsmocomBB/osmocombb-usermanual.adoc 205 files changed, 1 insertion(+), 45,061 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/38/11738/4 -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:38 +0000 Subject: Change in osmo-gsm-manuals[master]: jenkins.sh: do not use libosomcore source Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11793 Change subject: jenkins.sh: do not use libosomcore source ...................................................................... jenkins.sh: do not use libosomcore source Build scripts do not depend on the libosmocore sources anymore with 161365f ("merge_doc.xsl: move from libosmocore.git"), so don't try to use them in jenkins.sh anymore. Related: OS#3385 Change-Id: Ied3661b8a02e9defca0e5aedcc4494845553db84 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/93/11793/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 573e042..80d873d 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,20 +4,10 @@ publish="$1" -base="$PWD" -deps="$base/deps" -export deps - osmo-clean-workspace.sh -mkdir "$deps" || true - -cd "$deps" -osmo-deps.sh libosmocore - -cd "$base" -$MAKE $PARALLEL_MAKE LIBOSMO_DIR="$deps/libosmocore" -$MAKE $PARALLEL_MAKE LIBOSMO_DIR="$deps/libosmocore" check +$MAKE $PARALLEL_MAKE +$MAKE $PARALLEL_MAKE check if [ "x$publish" = "x--publish" ]; then mkdir out/ -- To view, visit https://gerrit.osmocom.org/11793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ied3661b8a02e9defca0e5aedcc4494845553db84 Gerrit-Change-Number: 11793 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:38 +0000 Subject: Change in osmo-gsm-manuals[master]: make check: properly reference dependencies Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11794 Change subject: make check: properly reference dependencies ...................................................................... make check: properly reference dependencies Use $(ASCIIDOC_DEPS) instead of assuming that the value would be "chapters/*.adoc". The variable exists already, but it was not used yet in 'make check' of Makefile.asciidoc.inc. This allows creating a tests folder without its own chapters subfolder (follow-up commit), which is part of a larger effort to move manuals to project repositories. The reason for moving manuals to project repositories is that we can have documentation changes together with code changes in the same patches. Not part of this patchset, but possible in the future, is optionally building UNIX man pages in the project repositories (OS#3386) as well as generating the VTY documentation on the fly from running the project binaries (OS#3695). (moving manuals to project repositories 1/16) Related: OS#3386 Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/94/11794/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index a3c95fe..c2b0961 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -62,7 +62,7 @@ check: $(ASCIIDOC_CHECKS) -$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc chapters/*.adoc +$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 # Make absolutely sure that the %.check target is updated. touch $@ -- To view, visit https://gerrit.osmocom.org/11794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 Gerrit-Change-Number: 11794 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:38 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add shared content pdf build tests Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11795 Change subject: tests: add shared content pdf build tests ...................................................................... tests: add shared content pdf build tests Build project independent "test-usermanual.pdf" (with all common chapters automatically included) and "test-vty-reference.pdf" files. This allows testing if changed common chapters and the build scripts are still working, even when the project specific manuals will be moved away from this repository. (moving manuals to project repositories 2/16) Related: OS#3386 Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf --- M .gitignore M Makefile A tests/Makefile A tests/test-usermanual-docinfo.xml A tests/test-vty-reference.xml A tests/vty/test_vty_additions.xml A tests/vty/test_vty_reference.xml 7 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/95/11795/1 diff --git a/.gitignore b/.gitignore index 3c72c7f..1e0984f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ *__*.svg *.check generated/ +tests/test-usermanual.adoc diff --git a/Makefile b/Makefile index eb3be75..c94f0a8 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ cd OsmoTRX; $(MAKE) clean: + cd tests; $(MAKE) clean cd OsmoBTS; $(MAKE) clean cd OsmoNITB; $(MAKE) clean cd OsmoBSC; $(MAKE) clean @@ -53,6 +54,7 @@ cd OsmoTRX; $(MAKE) upload check: + cd tests; $(MAKE) cd OsmoBTS; $(MAKE) check cd OsmoNITB; $(MAKE) check cd OsmoBSC; $(MAKE) check diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..0b914e9 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,30 @@ +TOPDIR = .. + +# Generate adoc file that includes all chapters +ASCIIDOC = test-usermanual.adoc +ASCIIDOC_DEPS = +$(ASCIIDOC): $(TOPDIR)/common/chapters/*.adoc + echo ":gfdl-enabled:" > $@ + echo ":program-name: Test" >> $@ + echo "" >> $@ + echo "Osmo GSM Manuals Shared Content Test" >> $@ + echo "====================================" >> $@ + echo "Oliver Smith " >> $@ + echo "" >> $@ + for chapter in $(TOPDIR)/common/chapters/*.adoc; do \ + echo "include::$${chapter}[]" >> $@; \ + done; +CLEAN_FILES = $(ASCIIDOC) + +include $(TOPDIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = test-vty-reference.xml +include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(TOPDIR)/build/Makefile.common.inc + + +default: all check + + +.DEFAULT_GOAL := default +.PHONY: default diff --git a/tests/test-usermanual-docinfo.xml b/tests/test-usermanual-docinfo.xml new file mode 100644 index 0000000..4edc233 --- /dev/null +++ b/tests/test-usermanual-docinfo.xml @@ -0,0 +1,31 @@ + + + 1 + 6th November 2018 + os + Initial + + + + + 2018 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/tests/test-vty-reference.xml b/tests/test-vty-reference.xml new file mode 100644 index 0000000..8bec1e6 --- /dev/null +++ b/tests/test-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 6th November 2018 + os + Initial + + + + Test VTY Reference + + + 2018 + + + + This work is copyrighted by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/tests/vty/test_vty_additions.xml b/tests/vty/test_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/tests/vty/test_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/tests/vty/test_vty_reference.xml b/tests/vty/test_vty_reference.xml new file mode 100644 index 0000000..e5674e7 --- /dev/null +++ b/tests/vty/test_vty_reference.xml @@ -0,0 +1,17 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/11795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf Gerrit-Change-Number: 11795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:39 +0000 Subject: Change in osmo-gsm-manuals[master]: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11796 Change subject: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g ...................................................................... s/TOPDIR/OSMO_GSM_MANUALS_DIR/g Replace TOPDIR with OSMO_GSM_MANUALS_DIR. When the project specific manuals will be built out of this repository, we still need to refer to the top folder of the shared content. But it will be in another repository, so we need to rename the variable to avoid confusion. (moving manuals to project repositories 3/16) Related: OS#3385 Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab --- M OsmoBSC/Makefile M OsmoBTS/Makefile M OsmoGGSN/Makefile M OsmoGSMTester/Makefile M OsmoHLR/Makefile M OsmoMGCP/Makefile M OsmoMGW/Makefile M OsmoMSC/Makefile M OsmoNAT/Makefile M OsmoNITB/Makefile M OsmoPCU/Makefile M OsmoSGSN/Makefile M OsmoSIPConnector/Makefile M OsmoSTP/Makefile M OsmoTRX/Makefile M OsmocomBB/Makefile M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc M tests/Makefile 20 files changed, 88 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/96/11796/1 diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile index b9f50d0..422c598 100644 --- a/OsmoBSC/Makefile +++ b/OsmoBSC/Makefile @@ -1,11 +1,11 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc osmobsc-usermanual.pdf: chapters/*.adoc chapters/*.dot aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc VTY_REFERENCE = osmobsc-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoBTS/Makefile b/OsmoBTS/Makefile index e1ff214..536ed17 100644 --- a/OsmoBTS/Makefile +++ b/OsmoBTS/Makefile @@ -1,12 +1,12 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmobts-usermanual.adoc osmobts-abis.adoc rtp-amr.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc osmobts-usermanual.pdf: chapters/*.adoc osmobts-abis.pdf: abis/*.adoc abis/*.msc rtp-amr.pdf: dtx.dot VTY_REFERENCE = osmobts-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGGSN/Makefile b/OsmoGGSN/Makefile index e809632..dce2b02 100644 --- a/OsmoGGSN/Makefile +++ b/OsmoGGSN/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmoggsn-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmoggsn-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGSMTester/Makefile b/OsmoGSMTester/Makefile index 43c5a37..4fe6748 100644 --- a/OsmoGSMTester/Makefile +++ b/OsmoGSMTester/Makefile @@ -1,7 +1,7 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmo-gsm-tester-manual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoHLR/Makefile b/OsmoHLR/Makefile index 234a48c..321c2a1 100644 --- a/OsmoHLR/Makefile +++ b/OsmoHLR/Makefile @@ -1,13 +1,13 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmohlr-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc *.vty *.ctrl -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmohlr-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc OSMO_HLR_PATH ?= ../../osmo-hlr TMP_DB = generated/hlr.db diff --git a/OsmoMGCP/Makefile b/OsmoMGCP/Makefile index e2a5e37..d47f390 100644 --- a/OsmoMGCP/Makefile +++ b/OsmoMGCP/Makefile @@ -1,6 +1,6 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. VTY_REFERENCE = osmomgcp-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMGW/Makefile b/OsmoMGW/Makefile index b092e66..96b436b 100644 --- a/OsmoMGW/Makefile +++ b/OsmoMGW/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmomgw-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmomgw-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMSC/Makefile b/OsmoMSC/Makefile index c9edcef..2548852 100644 --- a/OsmoMSC/Makefile +++ b/OsmoMSC/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmomsc-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmomsc-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoNAT/Makefile b/OsmoNAT/Makefile index fde7132..8d7c4a5 100644 --- a/OsmoNAT/Makefile +++ b/OsmoNAT/Makefile @@ -1,6 +1,6 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. VTY_REFERENCE = osmonat-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoNITB/Makefile b/OsmoNITB/Makefile index 0cd260d..4b275dd 100644 --- a/OsmoNITB/Makefile +++ b/OsmoNITB/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmonitb-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmonitb-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoPCU/Makefile b/OsmoPCU/Makefile index 7a1acc0..0f0ae76 100644 --- a/OsmoPCU/Makefile +++ b/OsmoPCU/Makefile @@ -1,11 +1,11 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc osmopcu-gb.pdf: gb/*.adoc gb/*.msc osmopcu-usermanual.pdf: chapters/*.adoc VTY_REFERENCE = osmopcu-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSGSN/Makefile b/OsmoSGSN/Makefile index baa1a49..ce69960 100644 --- a/OsmoSGSN/Makefile +++ b/OsmoSGSN/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmosgsn-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosgsn-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile index cd3bb89..e275e41 100644 --- a/OsmoSIPConnector/Makefile +++ b/OsmoSIPConnector/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmosipconnector-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosipconnector-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSTP/Makefile b/OsmoSTP/Makefile index 6832dd4..10149bf 100644 --- a/OsmoSTP/Makefile +++ b/OsmoSTP/Makefile @@ -1,11 +1,11 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmostp-usermanual.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc osmostp-usermanual.pdf: chapters/*.adoc aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc VTY_REFERENCE = osmostp-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoTRX/Makefile b/OsmoTRX/Makefile index 81aec9a..3b4b8b1 100644 --- a/OsmoTRX/Makefile +++ b/OsmoTRX/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmotrx-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmotrx-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmocomBB/Makefile b/OsmocomBB/Makefile index 9f861a5..a0b7a2a 100644 --- a/OsmocomBB/Makefile +++ b/OsmocomBB/Makefile @@ -1,7 +1,7 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmocombb-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index c2b0961..2cd7d50 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -1,6 +1,6 @@ # USAGE: # -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define in 'ASCIIDOC' all root .adoc files, # - optionally define in 'ASCIIDOC_DEPS' all dependencies common to all .adocs, # - include this file, @@ -8,16 +8,16 @@ # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # ASCIIDOC = osmo_yada.adoc osmo_moo.adoc # ASCIIDOC_DEPS = for_all/*.adoc -# include $(TOPDIR)/build/Makefile.asciidoc.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc # osmo_yada.pdf: yada/*.adoc yada/*.msc -BUILDDIR = $(TOPDIR)/build +BUILDDIR = $(OSMO_GSM_MANUALS_DIR)/build GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) -GIT_DATE := $(shell $(TOPDIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`) +GIT_DATE := $(shell $(OSMO_GSM_MANUALS_DIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`) # prepend the document name with the version numbe suffix #DOCS_VER = $(foreach P, $(ASCIIDOC_NAME), $(P)-v$(shell xmllint --recover --xpath "//revnumber[position()=last()]/text()" $(P)-docinfo.xml 2>/dev/null)) @@ -51,8 +51,8 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ $(ASCIIDOC_DEPS) \ $(ASCIIDOCSTYLE) \ - $(TOPDIR)/common/*/*.adoc \ - $(TOPDIR)/common/images/* + $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \ + $(OSMO_GSM_MANUALS_DIR)/common/images/* @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ @@ -62,7 +62,7 @@ check: $(ASCIIDOC_CHECKS) -$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) +$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 # Make absolutely sure that the %.check target is updated. touch $@ diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 70dfafa..acf410e 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -1,6 +1,6 @@ # USAGE: # -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define in 'DOCBOOKS' all root .xml files, # - optionally define in 'DOCBOOKS_DEPS' all dependencies common to all .xmls, # - include this file, @@ -8,10 +8,10 @@ # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # DOCBOOKS = osmo_yada.xml osmo_moo.xml # ASCIIDOC_DEPS = for_all/*.xml -# include $(TOPDIR)/build/Makefile.docbook.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc # osmo_yada.pdf: yada/*.xml # # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 1528d32..659f26c 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -8,34 +8,34 @@ # Export from VTY 'show online-help', exactly one file. # # In your Makefile, -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define the (single) name of the vty-reference source in VTY_REFERENCE, # - include this file. # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # VTY_REFERENCE = osmofoo-vty-reference -# include $(TOPDIR)/build/Makefile.vty-reference.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc # # This uses the Makefile.docbook.inc, you should not mix uses of # Makefile.vty-reference.inc and Makefile.docbook.inc. DOCBOOKS = $(VTY_REFERENCE) DOCBOOKS_DEPS = generated/docbook_vty.xml -include $(TOPDIR)/build/Makefile.docbook.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc -MERGE_DOC = $(shell realpath $(TOPDIR)/merge_doc.xsl) +MERGE_DOC = $(shell realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl) CLEAN_FILES += generated generated/docbook_vty.xml: \ vty/*xml \ - $(TOPDIR)/common/vty_additions.xml \ - $(TOPDIR)/common/chapters/vty.xml \ - $(TOPDIR)/vty_reference.xsl - $(TOPDIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ - $(TOPDIR)/common/vty_additions.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \ + $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl + $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ vty/*additions*.xml - xsltproc $(TOPDIR)/vty_reference.xsl generated/combined.xml \ + xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml diff --git a/tests/Makefile b/tests/Makefile index 0b914e9..5afc8ca 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,9 +1,9 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. # Generate adoc file that includes all chapters ASCIIDOC = test-usermanual.adoc ASCIIDOC_DEPS = -$(ASCIIDOC): $(TOPDIR)/common/chapters/*.adoc +$(ASCIIDOC): $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc echo ":gfdl-enabled:" > $@ echo ":program-name: Test" >> $@ echo "" >> $@ @@ -11,16 +11,16 @@ echo "====================================" >> $@ echo "Oliver Smith " >> $@ echo "" >> $@ - for chapter in $(TOPDIR)/common/chapters/*.adoc; do \ + for chapter in $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc; do \ echo "include::$${chapter}[]" >> $@; \ done; CLEAN_FILES = $(ASCIIDOC) -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = test-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc default: all check -- To view, visit https://gerrit.osmocom.org/11796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab Gerrit-Change-Number: 11796 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:39 +0000 Subject: Change in osmo-gsm-manuals[master]: prepare for autotools: add git-version-gen Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11797 Change subject: prepare for autotools: add git-version-gen ...................................................................... prepare for autotools: add git-version-gen Add the latestest upstream version of git-version-gen: https://git.savannah.gnu.org/cgit/autoconf.git/plain/build-aux/git-version-gen?h=v2.69 git-version-gen generates a version string derived from the git repository, or from a .tarball-version file when running outside of a git folder. It is used by all other Osmocom repositories, that use autotools. Unfortunatelly it seems to be impossible to use git-version-gen from autoconf without adding it to the source tree. Autotools will be used to install the shared manual files into the system in a way that is consistent with the other Osmocom repositories: $ autoreconf -fi $ ./configure --prefix=/usr/local $ make $ make install Project repositories will check with pkg-config if osmo-gsm-manuals is installed (like any other shared Osmocom component), when a new configure flag for building the manuals is passed. This will also work with distribution's package managers, for instance we could have a osmo-gsm-manuals-dev package in Debian on which the other packages would have a build-time dependency to build the UNIX man pages (OS#3386). (moving manuals to project repositories 4/16) Related: OS#3385 Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 --- M .gitignore A git-version-gen 2 files changed, 224 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/97/11797/1 diff --git a/.gitignore b/.gitignore index 1e0984f..fbe2111 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ *.check generated/ tests/test-usermanual.adoc + +# git-version-gen +.tarball-version +.version diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..0fa9063 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,220 @@ +#!/bin/sh +# Print a version string. +scriptversion=2012-03-18.17; # UTC + +# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# As with any generated file in a VC'd directory, you should add +# /.version to .gitignore, so that you don't accidentally commit it. +# .tarball-version is never generated in a VC'd directory, so needn't +# be listed there. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .version and +# .tarball-version will exist in distribution tarballs. +# +# EXTRA_DIST = $(top_srcdir)/.version +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + + +me=$0 + +version="git-version-gen $scriptversion + +Copyright 2011 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING." + +usage="\ +Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] +Print a version string. + +Options: + + --prefix prefix of git tags (default 'v') + + --help display this help and exit + --version output version information and exit + +Running without arguments will suffice in most cases." + +prefix=v + +while test $# -gt 0; do + case $1 in + --help) echo "$usage"; exit 0;; + --version) echo "$version"; exit 0;; + --prefix) shift; prefix="$1";; + -*) + echo "$0: Unknown option '$1'." >&2 + echo "$0: Try '--help' for more information." >&2 + exit 1;; + *) + if test -z "$tarball_version_file"; then + tarball_version_file="$1" + elif test -z "$tag_sed_script"; then + tag_sed_script="$1" + else + echo "$0: extra non-option argument '$1'." >&2 + exit 1 + fi;; + esac + shift +done + +if test -z "$tarball_version_file"; then + echo "$usage" + exit 1 +fi + +tag_sed_script="${tag_sed_script:-s/x/x/}" + +nl=' +' + +# Avoid meddling by environment variable of the same name. +v= +v_from_git= + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || v= + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +# Otherwise, if there is at least one git commit involving the working +# directory, and "git describe" output looks sensible, use that to +# derive a version string. +elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ + && v=`git describe --abbrev=4 --match="$prefix*" HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ + && case $v in + $prefix[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \ + || { commit_list=failed; + echo "$0: WARNING: git rev-list failed" 1>&2; } + numcommits=`echo "$commit_list" | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + test "$commit_list" = failed && v=UNKNOWN + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; + v_from_git=1 +else + v=UNKNOWN +fi + +v=`echo "$v" |sed "s/^$prefix//"` + +# Test whether to append the "-dirty" suffix only if the version +# string we're using came from git. I.e., skip the test if it's "UNKNOWN" +# or if it came from .tarball-version. +if test -n "$v_from_git"; then + # Don't declare a version "dirty" merely because a time stamp has changed. + git update-index --refresh > /dev/null 2>&1 + + dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty= + case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; + esac +fi + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d "$nl" + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: -- To view, visit https://gerrit.osmocom.org/11797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 Gerrit-Change-Number: 11797 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:39 +0000 Subject: Change in osmo-gsm-manuals[master]: *filter.conf/*.sty: use symlinks to build, common Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11798 Change subject: *filter.conf/*.sty: use symlinks to build, common ...................................................................... *filter.conf/*.sty: use symlinks to build, common $(OSMO_GSM_MANUALS_DIR) is used in most places to reference to the top folder, which contains "build" and "common". But not in the asciidoc mscgen filter configurations, and in the custom LaTeX style. They have ../common or ../build hardcoded, which won't work anymore when the project specific files will be in another repository. Update the Makefiles to create symlinks to "build" and "common" in the folder where the build was started. Use ./common in the files that had ../common hardcoded, and do the same for ./build. Update the Makefile.common.inc comment to refer to common targets in general, so we don't need to list each single one there (like the new 'common' and 'build' targets). I've also thought about using variables there, but this would only work for the asciidoc files, not for the .sty file. We would need to generate the latter from another file and replace the variable dynamically. Having the symlinks instead seemed to be slightly easier. (moving manuals to project repositories 6/16) Related: OS#3385 Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 --- M .gitignore M build/Makefile.asciidoc.inc M build/Makefile.common.inc M build/Makefile.docbook.inc M build/custom-dblatex.sty M build/mscgen-filter.conf M build/python2-filter.conf 7 files changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/98/11798/1 diff --git a/.gitignore b/.gitignore index 30bc93e..bdf3212 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,7 @@ *.pc Makefile.in Makefile + +# symlinks to shared folders (needed for out-of-tree builds) +*/common +*/build diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 2cd7d50..0d84b0b 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -52,7 +52,8 @@ $(ASCIIDOC_DEPS) \ $(ASCIIDOCSTYLE) \ $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \ - $(OSMO_GSM_MANUALS_DIR)/common/images/* + $(OSMO_GSM_MANUALS_DIR)/common/images/* \ + build common @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ @@ -62,7 +63,11 @@ check: $(ASCIIDOC_CHECKS) -$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) +$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \ + $(ASCIIDOCSTYLE) \ + $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc \ + $(ASCIIDOC_DEPS) \ + build common asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 # Make absolutely sure that the %.check target is updated. touch $@ diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index e624b5f..35a6236 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -3,9 +3,14 @@ # Other makefiles like Makefile.asciidoc.inc and Makefile.vty-reference.inc add # entries to UPLOAD_FILES and CLEAN_FILES. # -# Include this file at the end to have 'upload' and 'clean' targets. +# Include this file at the end to have the common targets (upload, clean etc.). UPLOAD_PATH ?= generic at sysmocom-downloads:documents +SYMLINKS = common build +CLEAN_FILES += $(SYMLINKS) + +$(SYMLINKS): + ln -s $(OSMO_GSM_MANUALS_DIR)/$@ $@ upload: $(UPLOAD_FILES) rsync -avz $(UPLOAD_FILES) $(UPLOAD_PATH)/ diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index acf410e..59dcdb2 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -30,6 +30,6 @@ xmllint --xinclude --postvalid --noout $< # Create a PDF file and lint it before -%.pdf: %.xml %.xml-lint $(DOCBOOKS_DEPS) +%.pdf: %.xml %.xml-lint $(DOCBOOKS_DEPS) build common dblatex $(dblatex_quiet) -P draft.mode=no $< diff --git a/build/custom-dblatex.sty b/build/custom-dblatex.sty index 606b9ab..40fb7cf 100644 --- a/build/custom-dblatex.sty +++ b/build/custom-dblatex.sty @@ -1,5 +1,6 @@ %% %% This style is derived from the docbook one. +%% The "common" folder is symlinked to ./common when building. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{asciidoc}[2008/06/05 AsciiDoc DocBook Style] @@ -40,13 +41,13 @@ \textsf{ \vfill \begin{center} - \includegraphics{../common/images/sysmocom.pdf} + \includegraphics{./common/images/sysmocom.pdf} \ \\ % \huge{\Company} \end{center} \vspace{2.5cm} \begin{center} - \includegraphics{../common/images/osmocom.pdf} + \includegraphics{./common/images/osmocom.pdf} \ \\ % \vspace{0.5cm} \huge{\textbf{\DBKtitle}}\\ % diff --git a/build/mscgen-filter.conf b/build/mscgen-filter.conf index ce3cb3f..689fa7c 100644 --- a/build/mscgen-filter.conf +++ b/build/mscgen-filter.conf @@ -1,9 +1,10 @@ # # AsciiDoc mscgen filter configuration file. +# The "build" folder is symlinked to ./build when building. # [mscgen-filter-style] -mscgen-style=template="mscgen-block",subs=(),posattrs=("style","target"),filter='../build/filter-wrapper.py mscgen -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} -' +mscgen-style=template="mscgen-block",subs=(),posattrs=("style","target"),filter='./build/filter-wrapper.py mscgen -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} -' [blockdef-listing] template::[mscgen-filter-style] diff --git a/build/python2-filter.conf b/build/python2-filter.conf index ca2ddaf..8ca2faa 100644 --- a/build/python2-filter.conf +++ b/build/python2-filter.conf @@ -1,9 +1,10 @@ # # AsciiDoc mscgen filter configuration file. +# The "build" folder is symlinked to ./build when building. # [python2-filter-style] -python2-style=template="python2-block",subs=(),posattrs=("style","target"),filter='../build/filter-wrapper.py python2 - --output="{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}"' +python2-style=template="python2-block",subs=(),posattrs=("style","target"),filter='./build/filter-wrapper.py python2 - --output="{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}"' [blockdef-listing] template::[python2-filter-style] -- To view, visit https://gerrit.osmocom.org/11798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 Gerrit-Change-Number: 11798 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:40 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: include from ./common, not ../common Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11799 Change subject: *.adoc: include from ./common, not ../common ...................................................................... *.adoc: include from ./common, not ../common Change hardcoded ../common paths, which will break when moving the project specific manuals in other repositories, to ./common so they use the dynamically created symlink that always points to the right path. (moving manuals to project repositories 7/16) Related: OS#3385 Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 --- M OsmoBSC/osmobsc-usermanual.adoc M OsmoBTS/osmobts-abis.adoc M OsmoBTS/osmobts-usermanual.adoc M OsmoGGSN/osmoggsn-usermanual.adoc M OsmoHLR/osmohlr-usermanual.adoc M OsmoMGW/osmomgw-usermanual.adoc M OsmoMSC/osmomsc-usermanual.adoc M OsmoNITB/osmonitb-usermanual.adoc M OsmoPCU/osmopcu-gb.adoc M OsmoPCU/osmopcu-usermanual.adoc M OsmoSGSN/osmosgsn-usermanual.adoc M OsmoSIPConnector/osmosipconnector-usermanual.adoc M OsmoSTP/osmostp-usermanual.adoc M OsmoTRX/osmotrx-usermanual.adoc M OsmocomBB/osmocombb-usermanual.adoc M common/chapters/logging.adoc 16 files changed, 131 insertions(+), 131 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/99/11799/1 diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index 0ec15e5..c3954bb 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -5,7 +5,7 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -17,27 +17,27 @@ include::chapters/handover.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] -include::../common/chapters/bts.adoc[] +include::./common/chapters/bts.adoc[] include::../OsmoNITB/chapters/bts-examples.adoc[] -include::../common/chapters/bsc.adoc[] +include::./common/chapters/bsc.adoc[] -include::../common/chapters/abis.adoc[] +include::./common/chapters/abis.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/cell-broadcast.adoc[] +include::./common/chapters/cell-broadcast.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoBTS/osmobts-abis.adoc b/OsmoBTS/osmobts-abis.adoc index 1e02414..20e56e0 100644 --- a/OsmoBTS/osmobts-abis.adoc +++ b/OsmoBTS/osmobts-abis.adoc @@ -85,8 +85,8 @@ include::abis/rtp.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoBTS/osmobts-usermanual.adoc b/OsmoBTS/osmobts-usermanual.adoc index 07f88e2..ee3e37f 100644 --- a/OsmoBTS/osmobts-usermanual.adoc +++ b/OsmoBTS/osmobts-usermanual.adoc @@ -4,19 +4,19 @@ =================== Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] -include::../common/chapters/abis.adoc[] +include::./common/chapters/abis.adoc[] include::chapters/interfaces.adoc[] include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] @@ -26,14 +26,14 @@ include::chapters/architecture.adoc[] -include::../common/chapters/trx_if.adoc[] +include::./common/chapters/trx_if.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoGGSN/osmoggsn-usermanual.adoc b/OsmoGGSN/osmoggsn-usermanual.adoc index efa2c8f..3394121 100644 --- a/OsmoGGSN/osmoggsn-usermanual.adoc +++ b/OsmoGGSN/osmoggsn-usermanual.adoc @@ -3,7 +3,7 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -11,19 +11,19 @@ //include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoHLR/osmohlr-usermanual.adoc b/OsmoHLR/osmohlr-usermanual.adoc index d9a4654..bc2a614 100644 --- a/OsmoHLR/osmohlr-usermanual.adoc +++ b/OsmoHLR/osmohlr-usermanual.adoc @@ -6,7 +6,7 @@ Neels Hofmeyr -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -16,21 +16,21 @@ include::chapters/ussd.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/control.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/gsup.adoc[] +include::./common/chapters/gsup.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc index 6030023..55e9090 100644 --- a/OsmoMGW/osmomgw-usermanual.adoc +++ b/OsmoMGW/osmomgw-usermanual.adoc @@ -6,15 +6,15 @@ Daniel Willmann -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] include::chapters/running.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] @@ -22,12 +22,12 @@ //include::chapters/counters.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoMSC/osmomsc-usermanual.adoc b/OsmoMSC/osmomsc-usermanual.adoc index ac68d93..1b48435 100644 --- a/OsmoMSC/osmomsc-usermanual.adoc +++ b/OsmoMSC/osmomsc-usermanual.adoc @@ -6,7 +6,7 @@ Neels Hofmeyr -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -16,25 +16,25 @@ include::chapters/counters.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/net.adoc[] -include::../common/chapters/smpp.adoc[] +include::./common/chapters/smpp.adoc[] -include::../common/chapters/mncc.adoc[] +include::./common/chapters/mncc.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/gsup.adoc[] +include::./common/chapters/gsup.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoNITB/osmonitb-usermanual.adoc b/OsmoNITB/osmonitb-usermanual.adoc index 63d430a..d836f7b 100644 --- a/OsmoNITB/osmonitb-usermanual.adoc +++ b/OsmoNITB/osmonitb-usermanual.adoc @@ -6,7 +6,7 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -14,35 +14,35 @@ include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/net.adoc[] -include::../common/chapters/bsc.adoc[] +include::./common/chapters/bsc.adoc[] -include::../common/chapters/bts.adoc[] +include::./common/chapters/bts.adoc[] include::chapters/bts-examples.adoc[] include::chapters/hlr.adoc[] -include::../common/chapters/smpp.adoc[] +include::./common/chapters/smpp.adoc[] -include::../common/chapters/mncc.adoc[] +include::./common/chapters/mncc.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/cell-broadcast.adoc[] +include::./common/chapters/cell-broadcast.adoc[] -include::../common/chapters/abis.adoc[] +include::./common/chapters/abis.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoPCU/osmopcu-gb.adoc b/OsmoPCU/osmopcu-gb.adoc index 64316a2..af5ea27 100644 --- a/OsmoPCU/osmopcu-gb.adoc +++ b/OsmoPCU/osmopcu-gb.adoc @@ -88,8 +88,8 @@ include::gb/bssgp.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoPCU/osmopcu-usermanual.adoc b/OsmoPCU/osmopcu-usermanual.adoc index a72e947..810772e 100644 --- a/OsmoPCU/osmopcu-usermanual.adoc +++ b/OsmoPCU/osmopcu-usermanual.adoc @@ -5,26 +5,26 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] include::chapters/running.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] include::chapters/counters.adoc[] -include::../common/chapters/gb.adoc[] +include::./common/chapters/gb.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoSGSN/osmosgsn-usermanual.adoc b/OsmoSGSN/osmosgsn-usermanual.adoc index 079e811..c85fc6e 100644 --- a/OsmoSGSN/osmosgsn-usermanual.adoc +++ b/OsmoSGSN/osmosgsn-usermanual.adoc @@ -5,7 +5,7 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -13,26 +13,26 @@ include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] -include::../common/chapters/gb.adoc[] +include::./common/chapters/gb.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/oap.adoc[] +include::./common/chapters/oap.adoc[] -include::../common/chapters/gsup.adoc[] +include::./common/chapters/gsup.adoc[] include::chapters/counters.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoSIPConnector/osmosipconnector-usermanual.adoc b/OsmoSIPConnector/osmosipconnector-usermanual.adoc index 72f6c1f..67a0e52 100644 --- a/OsmoSIPConnector/osmosipconnector-usermanual.adoc +++ b/OsmoSIPConnector/osmosipconnector-usermanual.adoc @@ -6,23 +6,23 @@ Daniel Willmann -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] include::chapters/running.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoSTP/osmostp-usermanual.adoc b/OsmoSTP/osmostp-usermanual.adoc index 6dc1d08..5c919b9 100644 --- a/OsmoSTP/osmostp-usermanual.adoc +++ b/OsmoSTP/osmostp-usermanual.adoc @@ -3,32 +3,32 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] // include::chapters/overview.adoc[] -include::../common/chapters/sigtran.adoc[] +include::./common/chapters/sigtran.adoc[] -include::../common/chapters/sigtran-osmocom.adoc[] +include::./common/chapters/sigtran-osmocom.adoc[] //include::chapters/running.adoc[] // include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] -//include::../common/chapters/bts.adoc[] +//include::./common/chapters/bts.adoc[] //include::../OsmoNITB/chapters/bts-examples.adoc[] -//include::../common/chapters/control_if.adoc[] +//include::./common/chapters/control_if.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc index 14f5514..fdd9c8a 100644 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ b/OsmoTRX/osmotrx-usermanual.adoc @@ -5,19 +5,19 @@ Pau Espin Pedrol -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] include::chapters/running.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/counters.adoc[] @@ -31,12 +31,12 @@ include::chapters/code-architecture.adoc[] -include::../common/chapters/trx_if.adoc[] +include::./common/chapters/trx_if.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmocomBB/osmocombb-usermanual.adoc b/OsmocomBB/osmocombb-usermanual.adoc index b405934..c055577 100644 --- a/OsmocomBB/osmocombb-usermanual.adoc +++ b/OsmocomBB/osmocombb-usermanual.adoc @@ -3,19 +3,19 @@ Holger Hans Peter Freyther -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/scripting.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/common/chapters/logging.adoc b/common/chapters/logging.adoc index db6afdb..dbbf5c6 100644 --- a/common/chapters/logging.adoc +++ b/common/chapters/logging.adoc @@ -172,7 +172,7 @@ [[fig-wireshark-gsmtap-log]] .Wireshark with logs delivered over GSMTAP -image::../common/images/wireshark-gsmtap-log.png[] +image::./common/images/wireshark-gsmtap-log.png[] Note: the logs are also duplicated to stderr when GSMTAP logging is configured because stderr is the default log target which is initialized automatically. To descrease stderr logging to absolute minimum, you can configure it as follows: -- To view, visit https://gerrit.osmocom.org/11799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 Gerrit-Change-Number: 11799 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:40 +0000 Subject: Change in osmo-gsm-manuals[master]: *-vty-reference.xml: use ./common, not ../common Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11800 Change subject: *-vty-reference.xml: use ./common, not ../common ...................................................................... *-vty-reference.xml: use ./common, not ../common Change hardcoded ../common paths, which will break when moving the project specific manuals in other repositories, to ./common so they use the dynamically created symlink that always points to the right path. (moving manuals to project repositories 8/16) Change-Id: I5368bcff34586c515af23e5a868417e561fd539d --- M OsmoBSC/osmobsc-vty-reference.xml M OsmoBTS/osmobts-vty-reference.xml M OsmoGGSN/osmoggsn-vty-reference.xml M OsmoHLR/osmohlr-vty-reference.xml M OsmoMGCP/osmomgcp-vty-reference.xml M OsmoMGW/osmomgw-vty-reference.xml M OsmoMSC/osmomsc-vty-reference.xml M OsmoNAT/osmonat-vty-reference.xml M OsmoNITB/osmonitb-vty-reference.xml M OsmoPCU/osmopcu-vty-reference.xml M OsmoSGSN/osmosgsn-vty-reference.xml M OsmoSIPConnector/osmosipconnector-vty-reference.xml M OsmoSTP/osmostp-vty-reference.xml M OsmoTRX/osmotrx-vty-reference.xml M tests/test-vty-reference.xml 15 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/00/11800/1 diff --git a/OsmoBSC/osmobsc-vty-reference.xml b/OsmoBSC/osmobsc-vty-reference.xml index 6d993b4..f51e56e 100644 --- a/OsmoBSC/osmobsc-vty-reference.xml +++ b/OsmoBSC/osmobsc-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoBTS/osmobts-vty-reference.xml b/OsmoBTS/osmobts-vty-reference.xml index f404843..b7c8a59 100644 --- a/OsmoBTS/osmobts-vty-reference.xml +++ b/OsmoBTS/osmobts-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoGGSN/osmoggsn-vty-reference.xml b/OsmoGGSN/osmoggsn-vty-reference.xml index c9aea03..3ad7e83 100644 --- a/OsmoGGSN/osmoggsn-vty-reference.xml +++ b/OsmoGGSN/osmoggsn-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoHLR/osmohlr-vty-reference.xml b/OsmoHLR/osmohlr-vty-reference.xml index 11633fd..f2d06ef 100644 --- a/OsmoHLR/osmohlr-vty-reference.xml +++ b/OsmoHLR/osmohlr-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoMGCP/osmomgcp-vty-reference.xml b/OsmoMGCP/osmomgcp-vty-reference.xml index 46b40d3..e9cc898 100644 --- a/OsmoMGCP/osmomgcp-vty-reference.xml +++ b/OsmoMGCP/osmomgcp-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoMGW/osmomgw-vty-reference.xml b/OsmoMGW/osmomgw-vty-reference.xml index 2d91545..334453e 100644 --- a/OsmoMGW/osmomgw-vty-reference.xml +++ b/OsmoMGW/osmomgw-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoMSC/osmomsc-vty-reference.xml b/OsmoMSC/osmomsc-vty-reference.xml index 3b54e9e..132f200 100644 --- a/OsmoMSC/osmomsc-vty-reference.xml +++ b/OsmoMSC/osmomsc-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoNAT/osmonat-vty-reference.xml b/OsmoNAT/osmonat-vty-reference.xml index 335beab..8f8b096 100644 --- a/OsmoNAT/osmonat-vty-reference.xml +++ b/OsmoNAT/osmonat-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoNITB/osmonitb-vty-reference.xml b/OsmoNITB/osmonitb-vty-reference.xml index 1407165..da0e358 100644 --- a/OsmoNITB/osmonitb-vty-reference.xml +++ b/OsmoNITB/osmonitb-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoPCU/osmopcu-vty-reference.xml b/OsmoPCU/osmopcu-vty-reference.xml index c28c472..f8c39ec 100644 --- a/OsmoPCU/osmopcu-vty-reference.xml +++ b/OsmoPCU/osmopcu-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoSGSN/osmosgsn-vty-reference.xml b/OsmoSGSN/osmosgsn-vty-reference.xml index 9a8b8d9..82b666a 100644 --- a/OsmoSGSN/osmosgsn-vty-reference.xml +++ b/OsmoSGSN/osmosgsn-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoSIPConnector/osmosipconnector-vty-reference.xml b/OsmoSIPConnector/osmosipconnector-vty-reference.xml index fe22a99..0eeb952 100644 --- a/OsmoSIPConnector/osmosipconnector-vty-reference.xml +++ b/OsmoSIPConnector/osmosipconnector-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoSTP/osmostp-vty-reference.xml b/OsmoSTP/osmostp-vty-reference.xml index b4ee500..ae0f7b0 100644 --- a/OsmoSTP/osmostp-vty-reference.xml +++ b/OsmoSTP/osmostp-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoTRX/osmotrx-vty-reference.xml b/OsmoTRX/osmotrx-vty-reference.xml index ae0afbf..4291929 100644 --- a/OsmoTRX/osmotrx-vty-reference.xml +++ b/OsmoTRX/osmotrx-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/tests/test-vty-reference.xml b/tests/test-vty-reference.xml index 8bec1e6..94ccab1 100644 --- a/tests/test-vty-reference.xml +++ b/tests/test-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> -- To view, visit https://gerrit.osmocom.org/11800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5368bcff34586c515af23e5a868417e561fd539d Gerrit-Change-Number: 11800 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:40 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11801 Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... vty_reference_combine.sh: add *reference.xml arg Pass the path to $(srcdir)/vty/*reference.xml as parameter to vty_reference_combine.sh instead of assuming that it will be in ./vty/*reference.xml. This is necessary to make the build scripts work for out-of-tree builds. Because when building out-of-tree, the source folder and build folder (the one where the Makefile gets generated, and in which "make" runs), are not the same anymore. The relative vty/reference.xml path is only valid in the source folder, not in the build folder. The next commits in this series have more changes for out-of-tree builds. Out-of-tree building is necessary for consistency with the other Osmocom code, which can be built out-of-tree as well. It would be strange if this did not work anymore as soon as the users enabled building the manuals. (moving manuals to project repositories 9/16) Related: OS#3385 Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c --- M build/Makefile.vty-reference.inc M build/vty_reference_combine.sh 2 files changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/01/11801/1 diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 659f26c..32c98b8 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -35,6 +35,7 @@ $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \ $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ + $(srcdir)/vty/*reference.xml \ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ vty/*additions*.xml xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh index be234a7..cb18e9e 100755 --- a/build/vty_reference_combine.sh +++ b/build/vty_reference_combine.sh @@ -1,16 +1,20 @@ #!/bin/sh +# usage: vty_reference_combine.sh path/to/merge_doc.xsl path/to/*reference.xml [paths to additional xmls] +# see Makefile.vty-reference.inc set -e -# the first argument should point at libosmocore/doc/vty/merge_doc.xsl +# first argument: merge_doc.xsl MERGE_DOC="$1" shift +# second argument: *reference.xml +reference="$1" +test "$(ls -1 $reference | wc -l)" = "1" +shift + combined="generated/combined.xml" combine_src="generated/combine_src.xml" -reference="vty/*reference.xml" -test "$(ls -1 $reference | wc -l)" = "1" - set -x mkdir -p generated cp $reference "$combined" -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:40 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11802 Change subject: Osmo*/Makefile.am: use $(srcdir) ...................................................................... Osmo*/Makefile.am: use $(srcdir) Use $(srcdir) infront of all relative paths, which reference other files in the repository. This is needed for out-of-tree building. (moving manuals to project repositories 10/16) Related: OS#3385 Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc --- M OsmoBSC/Makefile.am M OsmoBTS/Makefile.am M OsmoGGSN/Makefile.am M OsmoGSMTester/Makefile.am M OsmoHLR/Makefile.am M OsmoMGCP/Makefile.am M OsmoMGW/Makefile.am M OsmoMSC/Makefile.am M OsmoNAT/Makefile.am M OsmoNITB/Makefile.am M OsmoPCU/Makefile.am M OsmoSGSN/Makefile.am M OsmoSIPConnector/Makefile.am M OsmoSTP/Makefile.am M OsmoTRX/Makefile.am M OsmocomBB/Makefile.am M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M tests/Makefile.am 19 files changed, 41 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/02/11802/1 diff --git a/OsmoBSC/Makefile.am b/OsmoBSC/Makefile.am index 422c598..f88b9e7 100644 --- a/OsmoBSC/Makefile.am +++ b/OsmoBSC/Makefile.am @@ -1,11 +1,11 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmobsc-usermanual.pdf: chapters/*.adoc chapters/*.dot -aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc +osmobsc-usermanual.pdf: $(srcdir)/chapters/*.adoc $(srcdir)/chapters/*.dot +aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc -VTY_REFERENCE = osmobsc-vty-reference.xml +VTY_REFERENCE = $(srcdir)/osmobsc-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoBTS/Makefile.am b/OsmoBTS/Makefile.am index 536ed17..8abde91 100644 --- a/OsmoBTS/Makefile.am +++ b/OsmoBTS/Makefile.am @@ -1,12 +1,12 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmobts-usermanual.adoc osmobts-abis.adoc rtp-amr.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmobts-usermanual.pdf: chapters/*.adoc -osmobts-abis.pdf: abis/*.adoc abis/*.msc -rtp-amr.pdf: dtx.dot +osmobts-usermanual.pdf: $(srcdir)/chapters/*.adoc +osmobts-abis.pdf: $(srcdir)/abis/*.adoc $(srcdir)/abis/*.msc +rtp-amr.pdf: $(srcdir)/dtx.dot -VTY_REFERENCE = osmobts-vty-reference.xml +VTY_REFERENCE = $(srcdir)/osmobts-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGGSN/Makefile.am b/OsmoGGSN/Makefile.am index dce2b02..ff372b4 100644 --- a/OsmoGGSN/Makefile.am +++ b/OsmoGGSN/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmoggsn-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmoggsn-vty-reference.xml diff --git a/OsmoGSMTester/Makefile.am b/OsmoGSMTester/Makefile.am index 4fe6748..e14cd6d 100644 --- a/OsmoGSMTester/Makefile.am +++ b/OsmoGSMTester/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmo-gsm-tester-manual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoHLR/Makefile.am b/OsmoHLR/Makefile.am index 321c2a1..b0ff6dd 100644 --- a/OsmoHLR/Makefile.am +++ b/OsmoHLR/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmohlr-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc *.vty *.ctrl +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.vty $(srcdir)/*.ctrl include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmohlr-vty-reference.xml diff --git a/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am index d47f390..ddc498c 100644 --- a/OsmoMGCP/Makefile.am +++ b/OsmoMGCP/Makefile.am @@ -1,4 +1,4 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) VTY_REFERENCE = osmomgcp-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoMGW/Makefile.am b/OsmoMGW/Makefile.am index 96b436b..b2e1f85 100644 --- a/OsmoMGW/Makefile.am +++ b/OsmoMGW/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmomgw-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmomgw-vty-reference.xml diff --git a/OsmoMSC/Makefile.am b/OsmoMSC/Makefile.am index 2548852..a03ccf3 100644 --- a/OsmoMSC/Makefile.am +++ b/OsmoMSC/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmomsc-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmomsc-vty-reference.xml diff --git a/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am index 8d7c4a5..eaaff14 100644 --- a/OsmoNAT/Makefile.am +++ b/OsmoNAT/Makefile.am @@ -1,4 +1,4 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) VTY_REFERENCE = osmonat-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoNITB/Makefile.am b/OsmoNITB/Makefile.am index 4b275dd..c6fcac3 100644 --- a/OsmoNITB/Makefile.am +++ b/OsmoNITB/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmonitb-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmonitb-vty-reference.xml diff --git a/OsmoPCU/Makefile.am b/OsmoPCU/Makefile.am index 0f0ae76..846e10a 100644 --- a/OsmoPCU/Makefile.am +++ b/OsmoPCU/Makefile.am @@ -1,9 +1,9 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) -ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc +ASCIIDOC = $(srcdir)/osmopcu-usermanual.adoc $(srcdir)/osmopcu-gb.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmopcu-gb.pdf: gb/*.adoc gb/*.msc -osmopcu-usermanual.pdf: chapters/*.adoc +osmopcu-gb.pdf: $(srcdir)/gb/*.adoc $(srcdir)/gb/*.msc +osmopcu-usermanual.pdf: $(srcdir)/chapters/*.adoc VTY_REFERENCE = osmopcu-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoSGSN/Makefile.am b/OsmoSGSN/Makefile.am index ce69960..c3352d7 100644 --- a/OsmoSGSN/Makefile.am +++ b/OsmoSGSN/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmosgsn-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosgsn-vty-reference.xml diff --git a/OsmoSIPConnector/Makefile.am b/OsmoSIPConnector/Makefile.am index e275e41..60c244f 100644 --- a/OsmoSIPConnector/Makefile.am +++ b/OsmoSIPConnector/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmosipconnector-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosipconnector-vty-reference.xml diff --git a/OsmoSTP/Makefile.am b/OsmoSTP/Makefile.am index 10149bf..113f426 100644 --- a/OsmoSTP/Makefile.am +++ b/OsmoSTP/Makefile.am @@ -1,9 +1,9 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmostp-usermanual.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmostp-usermanual.pdf: chapters/*.adoc -aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc +osmostp-usermanual.pdf: $(srcdir)/chapters/*.adoc +aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc VTY_REFERENCE = osmostp-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoTRX/Makefile.am b/OsmoTRX/Makefile.am index 3b4b8b1..901b245 100644 --- a/OsmoTRX/Makefile.am +++ b/OsmoTRX/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmotrx-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmotrx-vty-reference.xml diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am index a0b7a2a..be2ba25 100644 --- a/OsmocomBB/Makefile.am +++ b/OsmocomBB/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) ASCIIDOC = osmocombb-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 0d84b0b..4cad1f3 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -10,7 +10,7 @@ # # OSMO_GSM_MANUALS_DIR = .. # ASCIIDOC = osmo_yada.adoc osmo_moo.adoc -# ASCIIDOC_DEPS = for_all/*.adoc +# ASCIIDOC_DEPS = $(srcdir)/for_all/*.adoc # include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc # osmo_yada.pdf: yada/*.adoc yada/*.msc diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 59dcdb2..e746d58 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -10,7 +10,7 @@ # # OSMO_GSM_MANUALS_DIR = .. # DOCBOOKS = osmo_yada.xml osmo_moo.xml -# ASCIIDOC_DEPS = for_all/*.xml +# ASCIIDOC_DEPS = $(srcdir)/for_all/*.xml # include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc # osmo_yada.pdf: yada/*.xml # diff --git a/tests/Makefile.am b/tests/Makefile.am index 5afc8ca..3484193 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) # Generate adoc file that includes all chapters ASCIIDOC = test-usermanual.adoc -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:41 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11803 Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Makefile.*.inc: adjust to out-of-tree building Makefile.asciidoc.inc: create a symlink for the root adoc file, from which a PDF gets generated, from the srcdir to the builddir. This file may include other adoc files, which do not get symlinked. We need to do this, because a2x (the program generating the PDF file) does not have a parameter for the output file, and will otherwise generate the PDF in the srcdir instead of the builddir. Do the same in the check target, so the relative include paths work the same. Makefile.asciidoc.inc, Makefile.docbook.inc: set the include paths for the xstl parser, as well as the LaTeX compiler, so they can find the files they need from both srcdir andbuilddir. Makefile.vty-reference.inc: use $(srcdir) in references to vty/*.xml files. (moving manuals to project repositories 11/16) Related: OS#3385 Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d --- M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc 3 files changed, 20 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/03/11803/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 4cad1f3..0d5c497 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -54,12 +54,18 @@ $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \ $(OSMO_GSM_MANUALS_DIR)/common/images/* \ build common + + # a2x can't use a different output file, so we symlink the file to the + # build folder in case of an out-of-tree build + [ -f $(notdir $<) ] || ln -s $< $(notdir $<) + @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true - a2x $(A2X_OPTS) $< || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ - asciidoc -v $(ASCIIDOC_OPTS) $<; exit 1) + TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ + a2x $(A2X_OPTS) $(notdir $<) || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ + asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<); exit 1) check: $(ASCIIDOC_CHECKS) @@ -68,7 +74,14 @@ $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc \ $(ASCIIDOC_DEPS) \ build common - asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 + + # out-of-tree building: use a symlink to the output file like done in + # the non-check build above, so the relative include paths work the + # same. + [ -f $(notdir $<) ] || ln -s $< $(notdir $<) + + asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<) > $@ 2>&1 + # Make absolutely sure that the %.check target is updated. touch $@ # Do print the WARNING output but return error if any was found diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index e746d58..96d9073 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -31,5 +31,6 @@ # Create a PDF file and lint it before %.pdf: %.xml %.xml-lint $(DOCBOOKS_DEPS) build common - dblatex $(dblatex_quiet) -P draft.mode=no $< + dblatex --xslt-opts="--path $(OSMO_GSM_MANUALS_DIR)/common/chapters:$$PWD/generated" \ + $(dblatex_quiet) -P draft.mode=no -o $@ $< diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 32c98b8..855d8aa 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -30,13 +30,13 @@ CLEAN_FILES += generated generated/docbook_vty.xml: \ - vty/*xml \ + $(srcdir)/vty/*xml \ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \ $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ $(srcdir)/vty/*reference.xml \ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ - vty/*additions*.xml + $(srcdir)/vty/*additions*.xml xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:41 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: use {srcdir} for out-of-tree builds Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11804 Change subject: *.adoc: use {srcdir} for out-of-tree builds ...................................................................... *.adoc: use {srcdir} for out-of-tree builds Define a new {srcdir} variable in Makefile.asciidoc.inc, that can be used in all adoc files. The value is the same as the Makefile variable $(srcdir). Use {srcdir} in the "include::" lines of all adoc files. This change concludes the out-of-tree building related changes in this patch series. (moving manuals to project repositories 12/16) Related: OS#3385 Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a --- M OsmoBSC/aoip-mgw-options.adoc M OsmoBSC/osmobsc-usermanual.adoc M OsmoBTS/osmobts-abis.adoc M OsmoBTS/osmobts-usermanual.adoc M OsmoBTS/rtp-amr.adoc M OsmoGGSN/osmoggsn-usermanual.adoc M OsmoGSMTester/osmo-gsm-tester-manual.adoc M OsmoHLR/osmohlr-usermanual.adoc M OsmoMGW/osmomgw-usermanual.adoc M OsmoMSC/osmomsc-usermanual.adoc M OsmoNITB/osmonitb-usermanual.adoc M OsmoPCU/osmopcu-gb.adoc M OsmoPCU/osmopcu-usermanual.adoc M OsmoSGSN/osmosgsn-usermanual.adoc M OsmoSIPConnector/osmosipconnector-usermanual.adoc M OsmoSTP/osmostp-usermanual.adoc M OsmoTRX/osmotrx-usermanual.adoc M OsmocomBB/osmocombb-usermanual.adoc M build/Makefile.asciidoc.inc 19 files changed, 82 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/04/11804/1 diff --git a/OsmoBSC/aoip-mgw-options.adoc b/OsmoBSC/aoip-mgw-options.adoc index 8ce3b91..f693093 100644 --- a/OsmoBSC/aoip-mgw-options.adoc +++ b/OsmoBSC/aoip-mgw-options.adoc @@ -29,7 +29,7 @@ [mscgen] ---- -include::mgw/classic-bsc.msc[] +include::{srcdir}/mgw/classic-bsc.msc[] ---- === OsmoBSC 2010-2017: IPA-style A over SCCPlite @@ -43,7 +43,7 @@ [mscgen] ---- -include::mgw/osmo-bsc-old-sccplite.msc[] +include::{srcdir}/mgw/osmo-bsc-old-sccplite.msc[] ---- @@ -61,7 +61,7 @@ [mscgen] ---- -include::mgw/osmo-bsc-new-mgw.msc[] +include::{srcdir}/mgw/osmo-bsc-new-mgw.msc[] ---- @@ -73,5 +73,5 @@ [mscgen] ---- -include::mgw/osmo-bsc-new-mgw-e1.msc[] +include::{srcdir}/mgw/osmo-bsc-new-mgw-e1.msc[] ---- diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index c3954bb..7f7f450 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -7,15 +7,15 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] -include::chapters/handover.adoc[] +include::{srcdir}/chapters/handover.adoc[] include::./common/chapters/vty.adoc[] diff --git a/OsmoBTS/osmobts-abis.adoc b/OsmoBTS/osmobts-abis.adoc index 20e56e0..857b4bf 100644 --- a/OsmoBTS/osmobts-abis.adoc +++ b/OsmoBTS/osmobts-abis.adoc @@ -64,7 +64,7 @@ .Overview of A-bis connection establishment ["mscgen"] ---- -include::abis/abis-startup.msc[] +include::{srcdir}/abis/abis-startup.msc[] ---- === Identities @@ -77,13 +77,13 @@ * The BTS number at the site * The TRX number within the BTS -include::abis/ipa.adoc[] +include::{srcdir}/abis/ipa.adoc[] -include::abis/oml.adoc[] +include::{srcdir}/abis/oml.adoc[] -include::abis/rsl.adoc[] +include::{srcdir}/abis/rsl.adoc[] -include::abis/rtp.adoc[] +include::{srcdir}/abis/rtp.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoBTS/osmobts-usermanual.adoc b/OsmoBTS/osmobts-usermanual.adoc index ee3e37f..40db72b 100644 --- a/OsmoBTS/osmobts-usermanual.adoc +++ b/OsmoBTS/osmobts-usermanual.adoc @@ -6,25 +6,25 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] include::./common/chapters/abis.adoc[] -include::chapters/interfaces.adoc[] +include::{srcdir}/chapters/interfaces.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::chapters/dynamic-timeslots.adoc[] +include::{srcdir}/chapters/dynamic-timeslots.adoc[] -include::chapters/bts-models.adoc[] +include::{srcdir}/chapters/bts-models.adoc[] -include::chapters/architecture.adoc[] +include::{srcdir}/chapters/architecture.adoc[] include::./common/chapters/trx_if.adoc[] diff --git a/OsmoBTS/rtp-amr.adoc b/OsmoBTS/rtp-amr.adoc index 4da2e1b..5a36aea 100644 --- a/OsmoBTS/rtp-amr.adoc +++ b/OsmoBTS/rtp-amr.adoc @@ -1335,7 +1335,7 @@ [[dtx_dl_fsm]] [graphviz] ---- -include::dtx.dot[] +include::{srcdir}/dtx.dot[] ---- The idea is that each state corresponds to the particular message type which have to be send to L1 next while state transition happens on incoming events like FACCH or Voice frames. There are 3 different classes of of events driving this FSM: diff --git a/OsmoGGSN/osmoggsn-usermanual.adoc b/OsmoGGSN/osmoggsn-usermanual.adoc index 3394121..9bc3885 100644 --- a/OsmoGGSN/osmoggsn-usermanual.adoc +++ b/OsmoGGSN/osmoggsn-usermanual.adoc @@ -5,18 +5,18 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -//include::chapters/control.adoc[] +//include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] include::./common/chapters/control_if.adoc[] diff --git a/OsmoGSMTester/osmo-gsm-tester-manual.adoc b/OsmoGSMTester/osmo-gsm-tester-manual.adoc index b728384..6f0edf7 100644 --- a/OsmoGSMTester/osmo-gsm-tester-manual.adoc +++ b/OsmoGSMTester/osmo-gsm-tester-manual.adoc @@ -7,14 +7,14 @@ *NOTE: The osmo-gsm-tester is still in pre-alpha stage: some parts are still incomplete, and details will still change and move around.* -include::chapters/intro.adoc[] +include::{srcdir}/chapters/intro.adoc[] -include::chapters/install.adoc[] +include::{srcdir}/chapters/install.adoc[] -include::chapters/config.adoc[] +include::{srcdir}/chapters/config.adoc[] -include::chapters/trial.adoc[] +include::{srcdir}/chapters/trial.adoc[] -include::chapters/test_api.adoc[] +include::{srcdir}/chapters/test_api.adoc[] -include::chapters/debugging.adoc[] +include::{srcdir}/chapters/debugging.adoc[] diff --git a/OsmoHLR/osmohlr-usermanual.adoc b/OsmoHLR/osmohlr-usermanual.adoc index bc2a614..7e709bd 100644 --- a/OsmoHLR/osmohlr-usermanual.adoc +++ b/OsmoHLR/osmohlr-usermanual.adoc @@ -8,19 +8,19 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/subscribers.adoc[] +include::{srcdir}/chapters/subscribers.adoc[] -include::chapters/ussd.adoc[] +include::{srcdir}/chapters/ussd.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/control_if.adoc[] diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc index 55e9090..b0bc83d 100644 --- a/OsmoMGW/osmomgw-usermanual.adoc +++ b/OsmoMGW/osmomgw-usermanual.adoc @@ -8,19 +8,19 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::chapters/mgcp_extensions.adoc[] +include::{srcdir}/chapters/mgcp_extensions.adoc[] -//include::chapters/counters.adoc[] +//include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoMSC/osmomsc-usermanual.adoc b/OsmoMSC/osmomsc-usermanual.adoc index 1b48435..4fd0cc7 100644 --- a/OsmoMSC/osmomsc-usermanual.adoc +++ b/OsmoMSC/osmomsc-usermanual.adoc @@ -8,19 +8,19 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/net.adoc[] +include::{srcdir}/chapters/net.adoc[] include::./common/chapters/smpp.adoc[] diff --git a/OsmoNITB/osmonitb-usermanual.adoc b/OsmoNITB/osmonitb-usermanual.adoc index d836f7b..42afe89 100644 --- a/OsmoNITB/osmonitb-usermanual.adoc +++ b/OsmoNITB/osmonitb-usermanual.adoc @@ -8,25 +8,25 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/net.adoc[] +include::{srcdir}/chapters/net.adoc[] include::./common/chapters/bsc.adoc[] include::./common/chapters/bts.adoc[] -include::chapters/bts-examples.adoc[] +include::{srcdir}/chapters/bts-examples.adoc[] -include::chapters/hlr.adoc[] +include::{srcdir}/chapters/hlr.adoc[] include::./common/chapters/smpp.adoc[] diff --git a/OsmoPCU/osmopcu-gb.adoc b/OsmoPCU/osmopcu-gb.adoc index af5ea27..00576c9 100644 --- a/OsmoPCU/osmopcu-gb.adoc +++ b/OsmoPCU/osmopcu-gb.adoc @@ -60,7 +60,7 @@ .Overview of Gb link establishment ["mscgen"] ---- -include::gb/gb-startup.msc[] +include::{srcdir}/gb/gb-startup.msc[] ---- [[ident]] @@ -84,9 +84,9 @@ This means that typically each OsmoPCU has one unique set of NSEI, NSVCI and BVCI in your network. -include::gb/ns.adoc[] +include::{srcdir}/gb/ns.adoc[] -include::gb/bssgp.adoc[] +include::{srcdir}/gb/bssgp.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoPCU/osmopcu-usermanual.adoc b/OsmoPCU/osmopcu-usermanual.adoc index 810772e..bf25cfd 100644 --- a/OsmoPCU/osmopcu-usermanual.adoc +++ b/OsmoPCU/osmopcu-usermanual.adoc @@ -7,17 +7,17 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/gb.adoc[] diff --git a/OsmoSGSN/osmosgsn-usermanual.adoc b/OsmoSGSN/osmosgsn-usermanual.adoc index c85fc6e..dea91a9 100644 --- a/OsmoSGSN/osmosgsn-usermanual.adoc +++ b/OsmoSGSN/osmosgsn-usermanual.adoc @@ -7,17 +7,17 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] include::./common/chapters/gb.adoc[] @@ -27,7 +27,7 @@ include::./common/chapters/gsup.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoSIPConnector/osmosipconnector-usermanual.adoc b/OsmoSIPConnector/osmosipconnector-usermanual.adoc index 67a0e52..72d7127 100644 --- a/OsmoSIPConnector/osmosipconnector-usermanual.adoc +++ b/OsmoSIPConnector/osmosipconnector-usermanual.adoc @@ -8,15 +8,15 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoSTP/osmostp-usermanual.adoc b/OsmoSTP/osmostp-usermanual.adoc index 5c919b9..9f41e5d 100644 --- a/OsmoSTP/osmostp-usermanual.adoc +++ b/OsmoSTP/osmostp-usermanual.adoc @@ -5,14 +5,14 @@ include::./common/chapters/preface.adoc[] -// include::chapters/overview.adoc[] +// include::{srcdir}/chapters/overview.adoc[] include::./common/chapters/sigtran.adoc[] include::./common/chapters/sigtran-osmocom.adoc[] -//include::chapters/running.adoc[] -// include::chapters/control.adoc[] +//include::{srcdir}/chapters/running.adoc[] +// include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc index fdd9c8a..a17a899 100644 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ b/OsmoTRX/osmotrx-usermanual.adoc @@ -7,29 +7,29 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] include::./common/chapters/control_if.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::chapters/trx-architectures.adoc[] +include::{srcdir}/chapters/trx-architectures.adoc[] -include::chapters/trx-devices.adoc[] +include::{srcdir}/chapters/trx-devices.adoc[] -include::chapters/trx-backends.adoc[] +include::{srcdir}/chapters/trx-backends.adoc[] -include::chapters/code-architecture.adoc[] +include::{srcdir}/chapters/code-architecture.adoc[] include::./common/chapters/trx_if.adoc[] diff --git a/OsmocomBB/osmocombb-usermanual.adoc b/OsmocomBB/osmocombb-usermanual.adoc index c055577..024fc79 100644 --- a/OsmocomBB/osmocombb-usermanual.adoc +++ b/OsmocomBB/osmocombb-usermanual.adoc @@ -5,7 +5,7 @@ include::./common/chapters/preface.adoc[] -include::chapters/scripting.adoc[] +include::{srcdir}/chapters/scripting.adoc[] include::./common/chapters/vty.adoc[] diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 0d5c497..6a25e25 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -34,7 +34,7 @@ CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) UPLOAD_FILES += $(ASCIIDOC_PDF) -ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf +ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -a srcdir='$(srcdir)' DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0 ifeq (,$(BUILD_RELEASE)) -- To view, visit https://gerrit.osmocom.org/11804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a Gerrit-Change-Number: 11804 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:41 +0000 Subject: Change in osmo-gsm-manuals[master]: copy NITB's osmobsc-usermanual.adoc to OsmoBSC Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11805 Change subject: copy NITB's osmobsc-usermanual.adoc to OsmoBSC ...................................................................... copy NITB's osmobsc-usermanual.adoc to OsmoBSC Includes from other projects don't work anymore when moving project specific manuals into other repositories. (moving manuals to project repositories 13/16) Related: OS#3385 Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad --- A OsmoBSC/chapters/bts-examples.adoc M OsmoBSC/osmobsc-usermanual.adoc 2 files changed, 282 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/05/11805/1 diff --git a/OsmoBSC/chapters/bts-examples.adoc b/OsmoBSC/chapters/bts-examples.adoc new file mode 100644 index 0000000..b15fb99 --- /dev/null +++ b/OsmoBSC/chapters/bts-examples.adoc @@ -0,0 +1,281 @@ +[[bts-examples]] +== OsmoNITB example configuration files + +The `openbsc/doc/examples/osmo-nitb` directory in the OpenBSC source +tree contains a collection of example configuration files, sorted by BTS +type. + +This chapter is illustrating some excerpts from those examples + +[[bts_example_bs11]] +=== Example configuration for OsmoNITB with one dual-TRX BS-11 + +.OsmoNITB with BS11, 2 TRX, no frequency hopping +==== + +---- +e1_input + e1_line 0 driver misdn +network + network country code 1 + mobile network code 1 + short name OpenBSC + long name OpenBSC + timer t3101 10 + timer t3113 60 + bts 0 + type bs11 <1> + band GSM900 + cell_identity 1 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + oml e1 line 0 timeslot 1 sub-slot full <2> + oml e1 tei 25 <3> + trx 0 + arfcn 121 + max_power_red 0 + rsl e1 line 0 timeslot 1 sub-slot full <4> + rsl e1 tei 1 <5> + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 1 <6> + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 3 + trx 1 + arfcn 123 + max_power_red 0 + rsl e1 line 0 timeslot 1 sub-slot full <4> + rsl e1 tei 2 <5> + timeslot 0 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 0 <6> + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 3 +---- +==== + +<1> The BTS type must be set to __bs11__ +<2> The OML E1 timeslot needs to be identical with what was on the BTS side using LMT. +<3> The OML TEI value needs to be identical with what was configured on the BTS side using LMT. +<4> The RSL E1 timeslot can be identical for all TRX. +<5> The RSL TEI values __must__ be different if multiple TRX share one E1 signalling timeslot. +<6> The TCH all need to be allocated one 16k sub-slot on the E1 + +[[bts_example_nbts]] +=== Example configuration for OsmoNITB with one single-TRX nanoBTS + +.OsmoNITB with one single-TRX nanoBTS +==== + +---- +e1_input + e1_line 0 driver ipa <1> +network + network country code 1 + mobile network code 1 + short name OpenBSC + long name OpenBSC + auth policy closed + location updating reject cause 13 + encryption a5 0 + neci 1 + rrlp mode none + mm info 1 + handover 0 + bts 0 + type nanobts <2> + band DCS1800 <3> + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + ip.access unit_id 1801 0 <4> + oml ip.access stream_id 255 line 0 + gprs mode none + trx 0 + rf_locked 0 + arfcn 871 <5> + nominal power 23 + max_power_red 20 <6> + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F +---- +==== + +<1> You have to configure one virtual E1 line with the + IPA driver in order to use Abis/IP. One e1_line is + sufficient for any number of A-bis/IP BTSs, there is no + limit like in physical E1 lines. +<2> The BTS type must be set using `type nanobts` +<3> The GSM band must be set according to the BTS hardware. +<4> The IPA Unit ID parameter must be set to what has been configured on + the BTS side using the __BTS Manager__ or `ipaccess-config`. +<5> The ARFCN of the BTS. +<6> All known nanoBTS units have a nominal transmit power of 23 dBm. If + a `max_power_red` of 20 (dB) is configured, the resulting output + power at the BTS Tx port is 23 - 20 = 3 dBm. + +[NOTE] +==== +The `nominal_power` setting does __not__ influence the transmitted power +to the BTS! It is a setting by which the system administrator tells the +BSC about the nominal output power of the BTS. The BSC uses this as +basis for calculations. +==== + + +[[bts_example_nbts_multi]] +=== Example configuration for OsmoNITB with multi-TRX nanoBTS + +.OsmoNITB configured for dual-TRX (stacked) nanoBTS +==== + +---- +e1_input + e1_line 0 driver ipa +network + network country code 1 + mobile network code 1 + short name OpenBSC + long name OpenBSC + auth policy closed + location updating reject cause 13 + encryption a5 0 + neci 1 + rrlp mode none + mm info 0 + handover 0 + bts 0 + type nanobts + band DCS1800 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + ip.access unit_id 1800 0 <1> + oml ip.access stream_id 255 line 0 + gprs mode none + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 0 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F + trx 1 + rf_locked 0 + arfcn 873 + nominal power 23 + max_power_red 0 + rsl e1 tei 0 + timeslot 0 + phys_chan_config SDCCH8 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F +---- +==== + +<1> In this example, the IPA Unit ID is specified as `1800 0`. Thus, the + first nanoBTS unit (`trx 0`) needs to be configured to 1800/0/0 and + the second nanoBTS unit (`trx 1`) needs to be configured to 1800/0/1. + You can configure the BTS unit IDs using the `ipaccess-config` + utility included in OpenBSC. + +[NOTE] +==== +For building a multi-TRX setup, you also need to connect the TIB cables +between the two nanoBTS units, as well as the coaxial/RF AUX cabling. +==== diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index 7f7f450..eec77d7 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -23,7 +23,7 @@ include::./common/chapters/bts.adoc[] -include::../OsmoNITB/chapters/bts-examples.adoc[] +include::{srcdir}/chapters/bts-examples.adoc[] include::./common/chapters/bsc.adoc[] -- To view, visit https://gerrit.osmocom.org/11805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad Gerrit-Change-Number: 11805 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:46:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:46:41 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11806 Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... cosmetic: update usage of OSMO_GSM_MANUALS_DIR OSMO_GSM_MANUALS_DIR should use pkg-config to figure out the location of the shared osmo-gsm-manuals files. (moving manuals to project repositories 16/16) Related: OS#3385 Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 --- M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc 3 files changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/06/11806/1 diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 6a25e25..b5a0e13 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -1,6 +1,8 @@ # USAGE: # -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define in 'ASCIIDOC' all root .adoc files, # - optionally define in 'ASCIIDOC_DEPS' all dependencies common to all .adocs, # - include this file, diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 96d9073..f5563d2 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -1,6 +1,8 @@ # USAGE: # -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define in 'DOCBOOKS' all root .xml files, # - optionally define in 'DOCBOOKS_DEPS' all dependencies common to all .xmls, # - include this file, diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 855d8aa..9d8f127 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -7,8 +7,10 @@ # - vty/*_reference.xml # Export from VTY 'show online-help', exactly one file. # -# In your Makefile, -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# In your Makefile.am, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define the (single) name of the vty-reference source in VTY_REFERENCE, # - include this file. # -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 14:55:35 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 14:55:35 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11725 ) Change subject: use autotools to add "make install" target ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 16 Nov 2018 14:55:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 15:08:07 +0000 Subject: Change in osmo-gsm-manuals[master]: remove project specific files In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11738 to look at the new patch set (#5). Change subject: remove project specific files ...................................................................... remove project specific files Add to the project repositories in: * I2f9c27f81940b02414f0e618483bffade72e8cf7 (osmo-msc) * (TODO: create patches for all of them and list them here, once msc is reviewed) (moving manuals to project repositories 15/16) Related: OS#3385 Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc --- M Makefile.am D OsmoBSC/Makefile.am D OsmoBSC/aoip-mgw-options-docinfo.xml D OsmoBSC/aoip-mgw-options.adoc D OsmoBSC/chapters/bts-examples.adoc D OsmoBSC/chapters/control.adoc D OsmoBSC/chapters/counters.adoc D OsmoBSC/chapters/counters_generated.adoc D OsmoBSC/chapters/handover.adoc D OsmoBSC/chapters/handover_inter_bsc.dot D OsmoBSC/chapters/handover_intra_bsc.dot D OsmoBSC/chapters/overview.adoc D OsmoBSC/chapters/running.adoc D OsmoBSC/message-sequences/mo_call-abis_a.msc D OsmoBSC/mgw/classic-bsc.msc D OsmoBSC/mgw/osmo-bsc-new-mgw-e1.msc D OsmoBSC/mgw/osmo-bsc-new-mgw.msc D OsmoBSC/mgw/osmo-bsc-old-sccplite.msc D OsmoBSC/om2000/README D OsmoBSC/om2000/om2k-bts.msc D OsmoBSC/om2000/om2k-mo-cf.msc D OsmoBSC/om2000/om2k-mo-is.msc D OsmoBSC/om2000/om2k-mo-rx.msc D OsmoBSC/om2000/om2k-mo-tf.msc D OsmoBSC/om2000/om2k-mo-trxc.msc D OsmoBSC/om2000/om2k-mo-ts.msc D OsmoBSC/om2000/om2k-mo-tx.msc D OsmoBSC/om2000/om2k-trx.msc D OsmoBSC/osmobsc-usermanual-docinfo.xml D OsmoBSC/osmobsc-usermanual.adoc D OsmoBSC/osmux-reference-docinfo.xml D OsmoBSC/osmux-reference.adoc D OsmoBSC/vty/bsc_vty_additions.xml D OsmoBSC/vty/bsc_vty_reference.xml D OsmoBSC/vty/libbsc_vty_additions.xml D OsmoBTS/Makefile.am D OsmoBTS/abis/abis-startup.msc D OsmoBTS/abis/dyn_ts_ipa_style1.msc D OsmoBTS/abis/dyn_ts_ipa_style2.msc D OsmoBTS/abis/dyn_ts_osmocom_style1.msc D OsmoBTS/abis/dyn_ts_osmocom_style2.msc D OsmoBTS/abis/ipa.adoc D OsmoBTS/abis/oml-mo-bts.msc D OsmoBTS/abis/oml-mo-carrier.msc D OsmoBTS/abis/oml-mo-channel.msc D OsmoBTS/abis/oml-mo-sitemgr.msc D OsmoBTS/abis/oml-mo-transceiver.msc D OsmoBTS/abis/oml-startup.msc D OsmoBTS/abis/oml-startup2.msc D OsmoBTS/abis/oml-startup3.msc D OsmoBTS/abis/oml.adoc D OsmoBTS/abis/rsl-startup-pri.msc D OsmoBTS/abis/rsl-startup-sec.msc D OsmoBTS/abis/rsl-tch-rtp.msc D OsmoBTS/abis/rsl.adoc D OsmoBTS/abis/rtp.adoc D OsmoBTS/chapters/architecture.adoc D OsmoBTS/chapters/bts-models.adoc D OsmoBTS/chapters/configuration.adoc D OsmoBTS/chapters/control.adoc D OsmoBTS/chapters/dynamic-timeslots.adoc D OsmoBTS/chapters/interfaces.adoc D OsmoBTS/chapters/overview.adoc D OsmoBTS/dtx.dot D OsmoBTS/osmobts-abis-docinfo.xml D OsmoBTS/osmobts-abis.adoc D OsmoBTS/osmobts-usermanual-docinfo.xml D OsmoBTS/osmobts-usermanual.adoc D OsmoBTS/rtp-amr-docinfo.xml D OsmoBTS/rtp-amr.adoc D OsmoBTS/vty/bts_vty_additions.xml D OsmoBTS/vty/bts_vty_reference.xml D OsmoGGSN/Makefile.am D OsmoGGSN/chapters/configuration.adoc D OsmoGGSN/chapters/overview.adoc D OsmoGGSN/chapters/running.adoc D OsmoGGSN/osmoggsn-usermanual-docinfo.xml D OsmoGGSN/osmoggsn-usermanual.adoc D OsmoGGSN/vty/ggsn_vty_additions.xml D OsmoGGSN/vty/ggsn_vty_reference.xml D OsmoGSMTester/Makefile.am D OsmoGSMTester/chapters/config.adoc D OsmoGSMTester/chapters/debugging.adoc D OsmoGSMTester/chapters/install.adoc D OsmoGSMTester/chapters/intro.adoc D OsmoGSMTester/chapters/test_api.adoc D OsmoGSMTester/chapters/trial.adoc D OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml D OsmoGSMTester/osmo-gsm-tester-manual.adoc D OsmoHLR/Makefile.am D OsmoHLR/chapters/control.adoc D OsmoHLR/chapters/overview.adoc D OsmoHLR/chapters/running.adoc D OsmoHLR/chapters/subscribers.adoc D OsmoHLR/chapters/ussd.adoc D OsmoHLR/example_subscriber_add_update_delete.vty D OsmoHLR/example_subscriber_cs_ps_enabled.ctrl D OsmoHLR/example_subscriber_info.ctrl D OsmoHLR/osmohlr-usermanual-docinfo.xml D OsmoHLR/osmohlr-usermanual.adoc D OsmoHLR/vty/hlr_vty_additions.xml D OsmoHLR/vty/hlr_vty_reference.xml D OsmoMGCP/Makefile.am D OsmoMGCP/vty/mgcp_vty_additions.xml D OsmoMGCP/vty/mgcp_vty_reference.xml D OsmoMGW/Makefile.am D OsmoMGW/chapters/configuration.adoc D OsmoMGW/chapters/counters.adoc D OsmoMGW/chapters/counters_generated.adoc D OsmoMGW/chapters/mgcp_extensions.adoc D OsmoMGW/chapters/overview.adoc D OsmoMGW/chapters/running.adoc D OsmoMGW/osmomgw-usermanual-docinfo.xml D OsmoMGW/osmomgw-usermanual.adoc D OsmoMGW/vty/mgw_vty_additions.xml D OsmoMGW/vty/mgw_vty_reference.xml D OsmoMSC/Makefile.am D OsmoMSC/chapters/control.adoc D OsmoMSC/chapters/counters.adoc D OsmoMSC/chapters/counters_generated.adoc D OsmoMSC/chapters/net.adoc D OsmoMSC/chapters/overview.adoc D OsmoMSC/chapters/running.adoc D OsmoMSC/images/sgs-imsi_attach_lu.msc D OsmoMSC/images/sgs-mo_call_no_ps_ho.msc D OsmoMSC/images/sgs-mo_sms_idle.msc D OsmoMSC/images/sgs-mt_call_idle.msc D OsmoMSC/images/sgs-mt_sms_idle.msc D OsmoMSC/osmomsc-usermanual-docinfo.xml D OsmoMSC/osmomsc-usermanual.adoc D OsmoMSC/vty/msc_vty_additions.xml D OsmoMSC/vty/msc_vty_reference.xml D OsmoNAT/Makefile.am D OsmoNAT/vty/nat_vty_additions.xml D OsmoNAT/vty/nat_vty_reference.xml D OsmoNITB/Makefile.am D OsmoNITB/chapters/bts-examples.adoc D OsmoNITB/chapters/control.adoc D OsmoNITB/chapters/hlr.adoc D OsmoNITB/chapters/net.adoc D OsmoNITB/chapters/overview.adoc D OsmoNITB/chapters/running.adoc D OsmoNITB/osmonitb-usermanual-docinfo.xml D OsmoNITB/osmonitb-usermanual.adoc D OsmoNITB/vty/bsc_vty_additions.xml D OsmoNITB/vty/nitb_vty_additions.xml D OsmoNITB/vty/nitb_vty_reference.xml D OsmoPCU/Makefile.am D OsmoPCU/chapters/configuration.adoc D OsmoPCU/chapters/counters.adoc D OsmoPCU/chapters/counters_generated.adoc D OsmoPCU/chapters/overview.adoc D OsmoPCU/chapters/running.adoc D OsmoPCU/gb/bssgp.adoc D OsmoPCU/gb/gb-startup.msc D OsmoPCU/gb/ns.adoc D OsmoPCU/osmopcu-gb-docinfo.xml D OsmoPCU/osmopcu-gb.adoc D OsmoPCU/osmopcu-usermanual-docinfo.xml D OsmoPCU/osmopcu-usermanual.adoc D OsmoPCU/vty/osmo-pcu_vty_additions.xml D OsmoPCU/vty/osmo-pcu_vty_reference.xml D OsmoSGSN/Makefile.am D OsmoSGSN/chapters/configuration.adoc D OsmoSGSN/chapters/control.adoc D OsmoSGSN/chapters/counters.adoc D OsmoSGSN/chapters/counters_generated.adoc D OsmoSGSN/chapters/overview.adoc D OsmoSGSN/chapters/running.adoc D OsmoSGSN/osmosgsn-usermanual-docinfo.xml D OsmoSGSN/osmosgsn-usermanual.adoc D OsmoSGSN/vty/sgsn_vty_additions.xml D OsmoSGSN/vty/sgsn_vty_reference.xml D OsmoSIPConnector/Makefile.am D OsmoSIPConnector/chapters/configuration.adoc D OsmoSIPConnector/chapters/overview.adoc D OsmoSIPConnector/chapters/running.adoc D OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml D OsmoSIPConnector/osmosipconnector-usermanual.adoc D OsmoSIPConnector/vty/sipconn_vty_additions.xml D OsmoSIPConnector/vty/sipconn_vty_reference.xml D OsmoSTP/Makefile.am D OsmoSTP/chapters/overview.adoc D OsmoSTP/osmostp-usermanual-docinfo.xml D OsmoSTP/osmostp-usermanual.adoc D OsmoSTP/vty/osmo-stp_vty_reference.xml D OsmoTRX/Makefile.am D OsmoTRX/chapters/code-architecture.adoc D OsmoTRX/chapters/configuration.adoc D OsmoTRX/chapters/control.adoc D OsmoTRX/chapters/counters.adoc D OsmoTRX/chapters/counters_generated.adoc D OsmoTRX/chapters/overview.adoc D OsmoTRX/chapters/running.adoc D OsmoTRX/chapters/trx-architectures.adoc D OsmoTRX/chapters/trx-backends.adoc D OsmoTRX/chapters/trx-devices.adoc D OsmoTRX/osmotrx-usermanual-docinfo.xml D OsmoTRX/osmotrx-usermanual.adoc D OsmoTRX/vty/trx_vty_additions.xml D OsmoTRX/vty/trx_vty_reference.xml D OsmocomBB/Makefile.am D OsmocomBB/chapters/scripting.adoc D OsmocomBB/osmocombb-usermanual-docinfo.xml D OsmocomBB/osmocombb-usermanual.adoc M configure.ac 206 files changed, 2 insertions(+), 45,078 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/38/11738/5 -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 16 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 16 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#309?= In-Reply-To: <2090756264.602.1542294607313.JavaMail.jenkins@jenkins.osmocom.org> References: <2090756264.602.1542294607313.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1233866326.619.1542381007670.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:19:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 15:19:51 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11781 ) Change subject: add missing 'break' in switch statement ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 15:19:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:20:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 15:20:13 +0000 Subject: Change in osmo-bts[master]: add missing check of osmo_wqueue_enqueue() return value In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11783 ) Change subject: add missing check of osmo_wqueue_enqueue() return value ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Gerrit-Change-Number: 11783 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 15:20:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:22:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 15:22:51 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 3: Ahh, sorry :/ For some reason, I though it's also a part of this change. My bad. -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 15:22:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:44:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 15:44:14 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11790 to look at the new patch set (#2). Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... bsc: band_compatible: Return band non-compatible for invalid arfcn Before libosmocore Change-Id I780d452dcebce385469e32ef2fd844df6033393a, it avoids stating arfcn 886-954 are compatible when operating under DC1800. After that Change-Id, avoids aborting the program due to unexpected behaviour. Related: OS#3063 Depends: libosmocore Change-Id I780d452dcebce385469e32ef2fd844df6033393a Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 --- M src/osmo-bsc/system_information.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/11790/2 -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:45:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 15:45:08 +0000 Subject: Change in osmo-trx[master]: ChannelizerBase: Fix ASan alloc-dealloc-mismatch In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11570 ) Change subject: ChannelizerBase: Fix ASan alloc-dealloc-mismatch ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11570/1/Transceiver52M/ChannelizerBase.cpp File Transceiver52M/ChannelizerBase.cpp: https://gerrit.osmocom.org/#/c/11570/1/Transceiver52M/ChannelizerBase.cpp at 242 PS1, Line 242: delete[] hist[i]; Ok, makes sense as we allocate it in the following way: hist[i] = new float[2 * hLen]; -- To view, visit https://gerrit.osmocom.org/11570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7c98ae478f319573dd86a0d2cb264f676bb3859 Gerrit-Change-Number: 11570 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 15:45:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:45:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 15:45:38 +0000 Subject: Change in osmo-gsm-manuals[master]: jenkins.sh: do not use libosomcore source In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11793 ) Change subject: jenkins.sh: do not use libosomcore source ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ied3661b8a02e9defca0e5aedcc4494845553db84 Gerrit-Change-Number: 11793 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 15:45:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:50:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 15:50:12 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11571 ) Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... Patch Set 1: (1 comment) I don't think 'Same check is done in getRxGain' is a good explanation ;) What did inspire you to write this change? What was broken before? > we avoid outputing an error which error exactly? https://gerrit.osmocom.org/#/c/11571/1/Transceiver52M/device/uhd/UHDDevice.cpp File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/#/c/11571/1/Transceiver52M/device/uhd/UHDDevice.cpp at 489 PS1, Line 489: It would be great to have a comment here instead of the ws, describing why do we need to overwrite chan? It should be clarified. -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 15:50:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 15:50:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 15:50:22 +0000 Subject: Change in osmo-bts[master]: add missing check of osmo_wqueue_enqueue() return value In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11783 ) Change subject: add missing check of osmo_wqueue_enqueue() return value ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11783/1/src/osmo-bts-sysmo/l1_if.c File src/osmo-bts-sysmo/l1_if.c: https://gerrit.osmocom.org/#/c/11783/1/src/osmo-bts-sysmo/l1_if.c at 555 PS1, Line 555: return -EAGAIN; IMHO doesn't make much sense to use -EAGAIN while freeing the parameter passed from caller (msg). What about returning -ENOBUFS ? -- To view, visit https://gerrit.osmocom.org/11783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Gerrit-Change-Number: 11783 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 15:50:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:00:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 16:00:38 +0000 Subject: Change in osmo-dev[master]: gits: fix MODS marks by timestamp-only changes Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11807 Change subject: gits: fix MODS marks by timestamp-only changes ...................................................................... gits: fix MODS marks by timestamp-only changes Use 'git diff' instead of 'git diff-index'. The latter does not look at the content. It listed a file with an updated timestap as modified (indicated in gits with "MODS"), whereas 'git diff' and 'git status' did not (and we want this behavior, not marking it as modified). This was a regression from b93f50 ("gits: use git plumbing commands"). Change-Id: I6726190912a1b3eb865cda77fbea6bf58a635d6e --- M src/gits 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/07/11807/1 diff --git a/src/gits b/src/gits index 8b75278..bd53cb5 100755 --- a/src/gits +++ b/src/gits @@ -99,7 +99,7 @@ def git_has_modifications(git_dir): - return not git_bool(git_dir, 'diff-index', '--quiet', 'HEAD') + return not git_bool(git_dir, 'diff', '--quiet', 'HEAD') def git_can_fast_forward(git_dir, branch='master', remote='origin'): -- To view, visit https://gerrit.osmocom.org/11807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6726190912a1b3eb865cda77fbea6bf58a635d6e Gerrit-Change-Number: 11807 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:02:15 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 16 Nov 2018 16:02:15 +0000 Subject: Change in osmo-gsm-manuals[master]: jenkins.sh: do not use libosomcore source In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11793 ) Change subject: jenkins.sh: do not use libosomcore source ...................................................................... jenkins.sh: do not use libosomcore source Build scripts do not depend on the libosmocore sources anymore with 161365f ("merge_doc.xsl: move from libosmocore.git"), so don't try to use them in jenkins.sh anymore. Related: OS#3385 Change-Id: Ied3661b8a02e9defca0e5aedcc4494845553db84 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 573e042..80d873d 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,20 +4,10 @@ publish="$1" -base="$PWD" -deps="$base/deps" -export deps - osmo-clean-workspace.sh -mkdir "$deps" || true - -cd "$deps" -osmo-deps.sh libosmocore - -cd "$base" -$MAKE $PARALLEL_MAKE LIBOSMO_DIR="$deps/libosmocore" -$MAKE $PARALLEL_MAKE LIBOSMO_DIR="$deps/libosmocore" check +$MAKE $PARALLEL_MAKE +$MAKE $PARALLEL_MAKE check if [ "x$publish" = "x--publish" ]; then mkdir out/ -- To view, visit https://gerrit.osmocom.org/11793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ied3661b8a02e9defca0e5aedcc4494845553db84 Gerrit-Change-Number: 11793 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:04:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:04:17 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11571 to look at the new patch set (#2). Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... UHDDevice: setRxGain on chan 0 when using multi-arfcn When using multi-arfcn feature, several logical channels (arfcn) are multiplxed into one physical transceiver, as can be seen in uhd_device::set_channels. As a result, when multi-arfcn is enabled some properties are actually shared for those logical channels, and internally mapped to the first (only existing) channel, and per-channel internal array variables are allocated accordingly (size() == 1). When setting RxGain, we need to set the correct existing physical channel. Same check is done in getRxGain, and then we apply the RxGain correctly and we avoid outputing an error "Requested non-existent channel" immediatelly after. Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/71/11571/2 -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:15:19 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Nov 2018 16:15:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: extend SGSAP testcases In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/11702 ) Change subject: WIP: MSC_Tests: extend SGSAP testcases ...................................................................... Abandoned fixed up into I38543c35a9e74cea276e58d1d7ef01ef07ffe858 -- To view, visit https://gerrit.osmocom.org/11702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I38ea0de12b4350fa525d483e4744f6ea23db790b Gerrit-Change-Number: 11702 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:27:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:27:27 +0000 Subject: Change in osmo-gsm-manuals[master]: make check: properly reference dependencies In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11794 ) Change subject: make check: properly reference dependencies ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11794/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11794/1//COMMIT_MSG at 13 PS1, Line 13: This allows creating a tests folder without its own chapters subfolder I tend to think "folder" is a windows specific concept, while usually called directories in Unix domain :) -- To view, visit https://gerrit.osmocom.org/11794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 Gerrit-Change-Number: 11794 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:27:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:28:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:28:53 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add shared content pdf build tests In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11795 ) Change subject: tests: add shared content pdf build tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf Gerrit-Change-Number: 11795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:28:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:29:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:29:41 +0000 Subject: Change in osmo-gsm-manuals[master]: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11796 ) Change subject: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab Gerrit-Change-Number: 11796 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:29:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:30:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:30:50 +0000 Subject: Change in osmo-gsm-manuals[master]: prepare for autotools: add git-version-gen In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11797 ) Change subject: prepare for autotools: add git-version-gen ...................................................................... Patch Set 1: Code-Review+1 Worth checking if we do modifications to the upstream script ourselves. -- To view, visit https://gerrit.osmocom.org/11797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 Gerrit-Change-Number: 11797 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:30:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:33:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:33:56 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11725 ) Change subject: use autotools to add "make install" target ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11725/5/configure.ac File configure.ac: https://gerrit.osmocom.org/#/c/11725/5/configure.ac at 22 PS5, Line 22: if ! $srcdir/check-depends.sh I think this should be builddir instead, and make sure check-depends.sh is added to EXTRA_DIST. Because we want to support make distcheck, right? -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 16 Nov 2018 16:33:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:37:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:37:13 +0000 Subject: Change in osmo-gsm-manuals[master]: *filter.conf/*.sty: use symlinks to build, common In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11798 ) Change subject: *filter.conf/*.sty: use symlinks to build, common ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 Gerrit-Change-Number: 11798 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:37:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:37:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:37:48 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: include from ./common, not ../common In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11799 ) Change subject: *.adoc: include from ./common, not ../common ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 Gerrit-Change-Number: 11799 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:37:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:38:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:38:18 +0000 Subject: Change in osmo-gsm-manuals[master]: *-vty-reference.xml: use ./common, not ../common In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11800 ) Change subject: *-vty-reference.xml: use ./common, not ../common ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5368bcff34586c515af23e5a868417e561fd539d Gerrit-Change-Number: 11800 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:38:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:40:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:40:10 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11801 ) Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11801/1/build/Makefile.vty-reference.inc File build/Makefile.vty-reference.inc: https://gerrit.osmocom.org/#/c/11801/1/build/Makefile.vty-reference.inc at 38 PS1, Line 38: $(srcdir)/vty/*reference.xml \ You probably need builddir + EXTRA_DIST here. -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:40:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:40:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:40:59 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir) ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11802/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11802/1//COMMIT_MSG at 9 PS1, Line 9: Use $(srcdir) infront of all relative paths, which reference other Use $builddir + EXTRA_DIST. -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:40:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:47:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:47:15 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11801 ) Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11801/1/build/Makefile.vty-reference.inc File build/Makefile.vty-reference.inc: https://gerrit.osmocom.org/#/c/11801/1/build/Makefile.vty-reference.inc at 38 PS1, Line 38: $(srcdir)/vty/*reference.xml \ > You probably need builddir + EXTRA_DIST here. Hm Actually srcdir should be fine. -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:47:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:48:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:48:23 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir) ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11802/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11802/1//COMMIT_MSG at 9 PS1, Line 9: Use $(srcdir) infront of all relative paths, which reference other > Use $builddir + EXTRA_DIST. Hm nevermind my prev comment. -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:48:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:48:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:48:30 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11801 ) Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:48:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:49:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:49:21 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:49:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:50:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:50:34 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: use {srcdir} for out-of-tree builds In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11804 ) Change subject: *.adoc: use {srcdir} for out-of-tree builds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a Gerrit-Change-Number: 11804 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:50:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:51:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:51:35 +0000 Subject: Change in osmo-gsm-manuals[master]: copy NITB's osmobsc-usermanual.adoc to OsmoBSC In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11805 ) Change subject: copy NITB's osmobsc-usermanual.adoc to OsmoBSC ...................................................................... Patch Set 1: Code-Review+1 You could also move it to common/, but fine. -- To view, visit https://gerrit.osmocom.org/11805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad Gerrit-Change-Number: 11805 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:51:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:53:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:53:09 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: publish from project repos, not this repo anymore ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11740/2/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11740/2/contrib/jenkins.sh at 7 PS2, Line 7: echo "Manuals have been moved to the projects, and need to be published from there." Mentiond that "make publish" exists now? -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 16 Nov 2018 16:53:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:53:33 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Nov 2018 16:53:33 +0000 Subject: Change in libosmocore[master]: fsm: fix apidoc of osmo_fsm_state_name() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11808 Change subject: fsm: fix apidoc of osmo_fsm_state_name() ...................................................................... fsm: fix apidoc of osmo_fsm_state_name() The api documentation of osmo_fsm_state_name() refers to an FSM instance, but it really means the state of an FSM. Change-Id: I88ddd6048426d380c49170e66f57b3843398c046 --- M src/fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/11808/1 diff --git a/src/fsm.c b/src/fsm.c index b5af2e7..1f6141f 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -414,7 +414,7 @@ return fi->fsm->name; } -/*! get human-readable name of FSM instance +/*! get human-readable name of FSM state * \param[in] fsm FSM descriptor * \param[in] state FSM state number * \returns string rendering of the FSM state -- To view, visit https://gerrit.osmocom.org/11808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I88ddd6048426d380c49170e66f57b3843398c046 Gerrit-Change-Number: 11808 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:53:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:53:56 +0000 Subject: Change in osmo-gsm-manuals[master]: remove project specific files In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: remove project specific files ...................................................................... Patch Set 5: I'd personally remove them one by one as they are moved to its own repo, one commit at a time. -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:53:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:55:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:55:10 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11806 ) Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... Patch Set 2: You probably want to move this as a fixup of another commit, or at least before patch 15/16 which will take some time to gt merged. -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 16 Nov 2018 16:55:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 16:57:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 16 Nov 2018 16:57:51 +0000 Subject: Change in libosmocore[master]: fsm: fix apidoc of osmo_fsm_state_name() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11808 ) Change subject: fsm: fix apidoc of osmo_fsm_state_name() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88ddd6048426d380c49170e66f57b3843398c046 Gerrit-Change-Number: 11808 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 16 Nov 2018 16:57:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 17:16:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 17:16:37 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11571 ) Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... Patch Set 2: Great, but that ws is still there, please see my comment. -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 17:16:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 17:16:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 16 Nov 2018 17:16:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log BTS number on failure Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11809 Change subject: BSC: log BTS number on failure ...................................................................... BSC: log BTS number on failure It's useful to see which BTS exactly has failed the test in configuration with multiple BTS on single BSC. Change-Id: Ib813635862c04d51a30e7bbcca4ec05ce664f7e9 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/11809/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 21ec0ff..c329105 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -243,7 +243,7 @@ } f_sleep(0.1); if (not T.running) { - setverdict(fail, "Timeout waiting for oml-connection-state ", status); + setverdict(fail, "Timeout waiting for BTS" & int2str(bts_nr) & " oml-connection-state ", status); mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/11809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib813635862c04d51a30e7bbcca4ec05ce664f7e9 Gerrit-Change-Number: 11809 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 17:42:46 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Nov 2018 17:42:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11701 to look at the new patch set (#4). Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... BSC_ConnectionHandler: make VTY interface available The BSC_ConnectionHandler currently has no access to the VTY interface. Lets make it available so that upcoming tests can use the VTY interface to trigger actions (e.g. Paging, see also Change Id: 6a1a6bd6da1bf46d6d703be495795d3610ca431) Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Related: OS#3615 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/11701/4 -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 17:43:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 16 Nov 2018 17:43:56 +0000 Subject: Change in osmo-dev[master]: fill_config.py: add ${foreach(FOO)} Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11810 Change subject: fill_config.py: add ${foreach(FOO)} ...................................................................... fill_config.py: add ${foreach(FOO)} This patch indicates that we should rather use a proper templating python library instead of re-inventing this stuff. But now that we're here... Add a construct ${foreach(BTS)} bts ${BTSn} location_area_code ${BTSn_LAC} ${foreach_end} that repeats for each BTS variable found, e.g. BTS0_LAC=23 BTS1_LAC=24 BTS2_LAC=25 would result in three blocks of the above. I am using this to avoid copy-pasting for configuring N BTSes for 35c3. Change-Id: Ie1139a017f42cea5bf7ebbbe457bbc3bfe06944c --- M net/fill_config.py 1 file changed, 100 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/10/11810/1 diff --git a/net/fill_config.py b/net/fill_config.py index c33e6b7..6aa3829 100755 --- a/net/fill_config.py +++ b/net/fill_config.py @@ -99,30 +99,109 @@ print('Stale: %r is newer than %r' % (src_path, target_path)) exit(1) -def insert_includes(tmpl, tmpl_dir, tmpl_src): +def replace_vars(tmpl, tmpl_dir, tmpl_src, local_config, strict=True): + used_vars = set() + for m in replace_re.finditer(tmpl): + name = m.group(1) + if not name in local_config: + if strict: + print('Error: undefined var %r in %r' % (name, tmpl_src)) + exit(1) + else: + continue + used_vars.add(name) + + for var in used_vars: + tmpl = tmpl.replace('${%s}' % var, local_config.get(var)) + + return tmpl + +def insert_includes(tmpl, tmpl_dir, tmpl_src, local_config, arg): + include_path = os.path.join(tmpl_dir, arg) + if not os.path.isfile(include_path): + print('Error: included file does not exist: %r in %r' % (include_path, tmpl_src)) + exit(1) + try: + incl = open(include_path).read() + except: + print('Cannot read %r for %r' % (include_path, tmpl_src)) + raise + if args.check_stale: + check_stale(include_path, dst) + + # recurse, to follow the paths that the included bits come from + incl = handle_commands(incl, os.path.dirname(include_path), include_path, local_config) + + return tmpl.replace('${include(%s)}' % arg, incl) + +def insert_foreach(tmpl, tmpl_dir, tmpl_src, match, local_config, arg): + + # figure out section to handle + start_span = match.span() + + if tmpl[start_span[1]] == '\n': + start_span = (start_span[0], start_span[1] + 1) + + end_str = '${foreach_end}\n' + + end_at = tmpl.find(end_str, start_span[1]) + if end_at < 0: + end_str = end_str[:-1] + end_at = tmpl.find(end_str, start_span[1]) + + if end_at < 0: + raise Exception('%r: unmatched %r' % (tmpl_src, match.string)) + + end_span = (end_at, end_at + len(end_str)) + + before_block = tmpl[:start_span[0]] + foreach_block = tmpl[start_span[1]:end_span[0]] + after_block = tmpl[end_span[1]:] + + # figure out what items matching the foreach(FOO) there are + item_re = re.compile('(^%s([0-9]+))_.*' % arg) + items = set() + for item in local_config.keys(): + item_m = item_re.match(item) + if not item_m: + continue + items.add((item_m.group(1), item_m.group(2))) + + items = sorted(list(items)) + + expanded = [before_block] + for item, nr in items: + expanded_block = foreach_block + + while True: + expanded_block_was = expanded_block + + expanded_block = expanded_block.replace('${%sn_' % arg, '${%s_' % item) + expanded_block = expanded_block.replace('${%sn}' % arg, nr) + expanded_block = replace_vars(expanded_block, tmpl_dir, tmpl_src, local_config) + + if expanded_block_was == expanded_block: + break + + expanded.append(expanded_block) + + expanded.extend(after_block) + return ''.join(expanded) + +def handle_commands(tmpl, tmpl_dir, tmpl_src, local_config): + handled = 0 for m in command_re.finditer(tmpl): + handled += 1 cmd = m.group(1) arg = m.group(2) if cmd == 'include': - include_path = os.path.join(tmpl_dir, arg) - if not os.path.isfile(include_path): - print('Error: included file does not exist: %r in %r' % (include_path, tmpl_src)) - exit(1) - try: - incl = open(include_path).read() - except: - print('Cannot read %r for %r' % (include_path, tmpl_src)) - raise - if args.check_stale: - check_stale(include_path, dst) - - # recurse, to follow the paths that the included bits come from - incl = insert_includes(incl, os.path.dirname(include_path), include_path) - - tmpl = tmpl.replace('${%s(%s)}' % (cmd, arg), incl) + tmpl = insert_includes(tmpl, tmpl_dir, tmpl_src, local_config, arg) + elif cmd == 'foreach': + tmpl = insert_foreach(tmpl, tmpl_dir, tmpl_src, m, local_config, arg) else: print('Error: unknown command: %r in %r' % (cmd, tmpl_src)) exit(1) + return tmpl for tmpl_name in sorted(os.listdir(tmpl_dir)): @@ -151,23 +230,12 @@ raise while True: - used_vars = set() - - result = insert_includes(result, tmpl_dir, tmpl_src) - - for m in replace_re.finditer(result): - name = m.group(1) - if not name in local_config: - print('Error: undefined var %r in %r' % (name, tmpl_src)) - exit(1) - used_vars.add(name) - - if not used_vars: + result_was = result + result = handle_commands(result, tmpl_dir, tmpl_src, local_config) + result = replace_vars(result, tmpl_dir, tmpl_src, local_config) + if result_was == result: break - for var in used_vars: - result = result.replace('${%s}' % var, local_config.get(var)) - if not args.check_stale: with open(dst, 'w') as dst_file: dst_file.write(result) -- To view, visit https://gerrit.osmocom.org/11810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1139a017f42cea5bf7ebbbe457bbc3bfe06944c Gerrit-Change-Number: 11810 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 18:08:55 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Nov 2018 18:08:55 +0000 Subject: Change in libosmocore[master]: gsm29118: add value strings for SGSAP IEI In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11780 ) Change subject: gsm29118: add value strings for SGSAP IEI ...................................................................... gsm29118: add value strings for SGSAP IEI The value strings for the SGSAP IEI are missing, lets add a set of value strings and a function to retrieve them. Change-Id: I2787303174f74ffba86675bce2c12f680d8ea708 Related: OS#3615 --- M include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/gsm29118.c M src/gsm/libosmogsm.map 3 files changed, 40 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h b/include/osmocom/gsm/protocol/gsm_29_118.h index c344f04..bf210ad 100644 --- a/include/osmocom/gsm/protocol/gsm_29_118.h +++ b/include/osmocom/gsm/protocol/gsm_29_118.h @@ -74,7 +74,10 @@ SGSAP_IE_ADDL_PAGING_INDICATORS = 0x26, SGSAP_IE_TMSI_BASED_NRI_CONT = 0x27, }; - +const struct value_string sgsap_iei_names[]; +static inline const char *sgsap_iei_name(enum sgsap_iei iei) { + return get_value_string(sgsap_iei_names, iei); +} /* TS 29.118 Section 9.4.2 */ enum sgsap_eps_lu_type { diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c index de625a9..3898be6 100644 --- a/src/gsm/gsm29118.c +++ b/src/gsm/gsm29118.c @@ -32,6 +32,41 @@ { 0, NULL } }; +const struct value_string sgsap_iei_names[] = { + { SGSAP_IE_IMSI, "IMSI" }, + { SGSAP_IE_VLR_NAME, "VLR-NAME" }, + { SGSAP_IE_TMSI, "TMSI" }, + { SGSAP_IE_LAI, "LAI" }, + { SGSAP_IE_CHAN_NEEDED, "CHAN-NEEDED" }, + { SGSAP_IE_EMLPP_PRIORITY, "EMLPP-PRIORITY" }, + { SGSAP_IE_TMSI_STATUS, "TMSI-STATUS" }, + { SGSAP_IE_SGS_CAUSE, "SGS-CAUSE" }, + { SGSAP_IE_MME_NAME, "MME-NAME" }, + { SGSAP_IE_EPS_LU_TYPE, "EPS-LU-TYPE" }, + { SGSAP_IE_GLOBAL_CN_ID, "GLOBAL-CN-ID" }, + { SGSAP_IE_MOBILE_ID, "MOBILE-ID" }, + { SGSAP_IE_REJECT_CAUSE, "REJECT-CAUSE" }, + { SGSAP_IE_IMSI_DET_EPS_TYPE, "IMSI-DET-EPS-TYPE" }, + { SGSAP_IE_IMSI_DET_NONEPS_TYPE, "IMSI-DET-NONEPS-TYPE" }, + { SGSAP_IE_IMEISV, "IMEISV" }, + { SGSAP_IE_NAS_MSG_CONTAINER, "NAS-MSG-CONTAINER" }, + { SGSAP_IE_MM_INFO, "MM-INFO" }, + { SGSAP_IE_ERR_MSG, "ERR-MSG" }, + { SGSAP_IE_CLI, "CLI" }, + { SGSAP_IE_LCS_CLIENT_ID, "LCS-CLIENT-ID" }, + { SGSAP_IE_LCS_INDICATOR, "LCS-INDICATOR" }, + { SGSAP_IE_SS_CODE, "SS-CODE" }, + { SGSAP_IE_SERVICE_INDICATOR, "SERVICE-INDICATOR" }, + { SGSAP_IE_UE_TIMEZONE, "UE-TIMEZONE" }, + { SGSAP_IE_MS_CLASSMARK2, "MS-CLASSMARK2" }, + { SGSAP_IE_TAI, "TAI" }, + { SGSAP_IE_EUTRAN_CGI, "EUTRAN-CGI" }, + { SGSAP_IE_UE_EMM_MODE, "UE-EMM-MODE" }, + { SGSAP_IE_ADDL_PAGING_INDICATORS, "ADDL-PAGING-INDICATORS" }, + { SGSAP_IE_TMSI_BASED_NRI_CONT, "TMSI-BASED-NRI-CONT" }, + { 0, NULL } +}; + const struct value_string sgsap_eps_lu_type_names[] = { { SGSAP_EPS_LUT_IMSI_ATTACH, "IMSI Attach" }, { SGSAP_EPS_LUT_NORMAL, "Normal" }, diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 4813e13..6234d94 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -512,6 +512,7 @@ osmo_oap_client_register; sgsap_msg_type_names; +sgsap_iei_names; sgsap_eps_lu_type_names; sgsap_ismi_det_eps_type_names; sgsap_ismi_det_noneps_type_names; -- To view, visit https://gerrit.osmocom.org/11780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2787303174f74ffba86675bce2c12f680d8ea708 Gerrit-Change-Number: 11780 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 18:11:00 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Nov 2018 18:11:00 +0000 Subject: Change in libosmocore[master]: fsm: fix apidoc of osmo_fsm_state_name() In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11808 ) Change subject: fsm: fix apidoc of osmo_fsm_state_name() ...................................................................... fsm: fix apidoc of osmo_fsm_state_name() The api documentation of osmo_fsm_state_name() refers to an FSM instance, but it really means the state of an FSM. Change-Id: I88ddd6048426d380c49170e66f57b3843398c046 --- M src/fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/fsm.c b/src/fsm.c index b5af2e7..1f6141f 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -414,7 +414,7 @@ return fi->fsm->name; } -/*! get human-readable name of FSM instance +/*! get human-readable name of FSM state * \param[in] fsm FSM descriptor * \param[in] state FSM state number * \returns string rendering of the FSM state -- To view, visit https://gerrit.osmocom.org/11808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I88ddd6048426d380c49170e66f57b3843398c046 Gerrit-Change-Number: 11808 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 18:11:50 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 16 Nov 2018 18:11:50 +0000 Subject: Change in osmo-msc[master]: vlr: drop unused is_ps parameter in vlr_subscr_req_lu() In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11761 ) Change subject: vlr: drop unused is_ps parameter in vlr_subscr_req_lu() ...................................................................... vlr: drop unused is_ps parameter in vlr_subscr_req_lu() the function vlr_subscr_req_lu() has a parameter is_ps, which is set to vsub->vlr->cfg.is_ps by the only caller in vlr_lu_fsm.c. Inside the function one can see that vsub->vlr->cfg.is_ps is used directly to decide between PS or CS LU, we could also use is_ps there. Presumably the parameter is_ps had been abandonned in an early development stage and was not removed, so lets drop the parameter. Change-Id: Id239721773b90099d122b232dae1ba457be9d255 --- M src/libvlr/vlr.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index f7572f2..f7ac864 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -616,7 +616,7 @@ } /* VLR internal call to request UpdateLocation from HLR */ -int vlr_subscr_req_lu(struct vlr_subscr *vsub, bool is_ps) +int vlr_subscr_req_lu(struct vlr_subscr *vsub) { struct osmo_gsup_message gsup_msg = {0}; int rc; diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index a6585be..d336b1b 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -5,7 +5,7 @@ struct osmo_gsup_message; const char *vlr_subscr_name(struct vlr_subscr *vsub); -int vlr_subscr_req_lu(struct vlr_subscr *vsub, bool is_ps) __attribute__((warn_unused_result)); +int vlr_subscr_req_lu(struct vlr_subscr *vsub) __attribute__((warn_unused_result)); int vlr_subscr_req_sai(struct vlr_subscr *vsub, const uint8_t *auts, const uint8_t *auts_rand) __attribute__((warn_unused_result)); struct vlr_subscr *vlr_subscr_alloc(struct vlr_instance *vlr); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 717db42..02e49e0 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -79,7 +79,7 @@ OSMO_ASSERT(event == UPD_HLR_VLR_E_START); /* Send UpdateLocation to HLR */ - rc = vlr_subscr_req_lu(vsub, vsub->vlr->cfg.is_ps); + rc = vlr_subscr_req_lu(vsub); if (rc < 0) LOGPFSML(fi, LOGL_ERROR, "Failed to send UpdateLocation to HLR\n"); osmo_fsm_inst_state_chg(fi, UPD_HLR_VLR_S_WAIT_FOR_DATA, -- To view, visit https://gerrit.osmocom.org/11761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id239721773b90099d122b232dae1ba457be9d255 Gerrit-Change-Number: 11761 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 18:47:13 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 18:47:13 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 18:47:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 18:48:59 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 18:48:59 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 3: > Ahh, sorry :/ For some reason, I though it's also a part of this > change. My bad. Maybe they way that gerrit is highlighting WS makes it looks like a diff-erence -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 18:48:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 19:08:57 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 19:08:57 +0000 Subject: Change in osmo-dev[master]: Add expect script: 'vty' for easy access to all vtys Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/11811 Change subject: Add expect script: 'vty' for easy access to all vtys ...................................................................... Add expect script: 'vty' for easy access to all vtys This expect script can be run as: ./vty bsc ./vty msc ./vty sip ... etc (no need to remember ports) One can edit the script itself to configure the preferred logging configuration for each component. Requires expect, available on most distributions. Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec --- A vty 1 file changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/11/11811/1 diff --git a/vty b/vty new file mode 100755 index 0000000..ce37cf3 --- /dev/null +++ b/vty @@ -0,0 +1,70 @@ +#!/usr/bin/expect -f + +set vty [lindex $argv 0] + +switch $vty { + hlr { set port 4258 } + bsc { set port 4242 } + mgw { set port 4243 } + sg { set port 4245 } + msc { set port 4254 } + sip { set port 4256 } + gg { set port 4260 } + default { set port 4242 } +} + +spawn telnet localhost $port +expect ">" +send "enable\r" +expect "#" +send "logging enable\r" +expect "#" +send "logging print category 1\r" +expect "#" +send "logging print level 1\r" +expect "#" + +switch $vty { + + hlr - + sip { + send "logging level all debug\r" + expect "#" + } + + bsc { + send "logging level msc error\r" + expect "#" + send "logging level mm debug\r" + expect "#" + send "logging level rr debug\r" + expect "#" + } + + msc { + send "logging level vlr fatal\r" + expect "#" + send "logging level mncc debug\r" + expect "#" + send "logging level cc debug\r" + expect "#" + } + + mgw { + send "logging level lglobal debug\r" + expect "#" + send "logging level rtp debug\r" + expect "#" + } + + default { + send "logging level all everything\r" + expect "#" + } + +} + + +send "logging filter all 1\r" +expect "#" +interact -- To view, visit https://gerrit.osmocom.org/11811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec Gerrit-Change-Number: 11811 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 19:10:54 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 19:10:54 +0000 Subject: Change in osmo-dev[master]: Add expect script: 'vty' for easy access to all vtys In-Reply-To: References: Message-ID: Keith Whyte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11811 ) Change subject: Add expect script: 'vty' for easy access to all vtys ...................................................................... Add expect script: 'vty' for easy access to all vtys This expect script can be run as: ./vty bsc ./vty msc ./vty sip ... etc (no need to remember ports) One can edit the script itself to configure the preferred logging configuration for each component. Requires expect, available on most distributions. Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec --- A vty 1 file changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/11/11811/2 -- To view, visit https://gerrit.osmocom.org/11811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec Gerrit-Change-Number: 11811 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 19:12:26 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 19:12:26 +0000 Subject: Change in osmo-dev[master]: Add expect script: 'vty' for easy access to all vtys In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11811 ) Change subject: Add expect script: 'vty' for easy access to all vtys ...................................................................... Patch Set 2: > Uploaded patch set 2. I wonder is this of any use.. and is this a place for it? -- To view, visit https://gerrit.osmocom.org/11811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec Gerrit-Change-Number: 11811 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 16 Nov 2018 19:12:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 19:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 16 Nov 2018 19:14:44 +0000 Subject: Change in osmocom-bb[master]: mobile: log socket path on error Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11812 Change subject: mobile: log socket path on error ...................................................................... mobile: log socket path on error Change-Id: I18eb46743e4c0e4e8f8032883f39fec355f03c78 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/12/11812/1 diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index b0e2a13..f53445a 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -213,7 +213,7 @@ rc = layer2_open(ms, ms->settings.layer2_socket_path); if (rc < 0) { - LOGP(DMOB, LOGL_ERROR, "Failed during layer2_open()\n"); + LOGP(DMOB, LOGL_ERROR, "Failed during layer2_open(%s)\n", ms->settings.layer2_socket_path); ms->l2_wq.bfd.fd = -1; mobile_exit(ms, 1); return rc; -- To view, visit https://gerrit.osmocom.org/11812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I18eb46743e4c0e4e8f8032883f39fec355f03c78 Gerrit-Change-Number: 11812 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 19:14:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 16 Nov 2018 19:14:46 +0000 Subject: Change in osmocom-bb[master]: l1l2 interface: use LOGP for socket errors Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11814 Change subject: l1l2 interface: use LOGP for socket errors ...................................................................... l1l2 interface: use LOGP for socket errors Log via LOGP() like the rest of the file instead of fprintf() for consistency. While at it, also print error cause. Change-Id: Id205bcd9bdb7c3e4b96493d50be8381a6fa80ac6 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/11814/1 diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index b366d51..c07b0a1 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -109,7 +109,8 @@ rc = osmo_sock_unix_init_ofd(&ms->l2_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); + LOGP(DL1C, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n", + socket_path, strerror(-rc)); return rc; } diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index cab3c6b..936beb3 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -503,7 +503,8 @@ rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); + LOGP(DSAP, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n", + socket_path, strerror(-rc)); ms->sap_entity.sap_state = SAP_SOCKET_ERROR; return rc; } -- To view, visit https://gerrit.osmocom.org/11814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id205bcd9bdb7c3e4b96493d50be8381a6fa80ac6 Gerrit-Change-Number: 11814 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 19:14:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 16 Nov 2018 19:14:45 +0000 Subject: Change in osmocom-bb[master]: osmocon: log error cause for socket opening Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11813 Change subject: osmocon: log error cause for socket opening ...................................................................... osmocon: log error cause for socket opening Change-Id: I2f871cb16e5e1033e42863a9e12459057004782c --- M src/host/osmocon/osmoload.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/13/11813/1 diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c index decdc13..d320b29 100644 --- a/src/host/osmocon/osmoload.c +++ b/src/host/osmocon/osmoload.c @@ -499,7 +499,8 @@ rc = osmo_sock_unix_init_ofd(conn, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); + fprintf(stderr, "Failed to create unix domain socket %s: %s\n", + socket_path, strerror(-rc)); exit(1); } -- To view, visit https://gerrit.osmocom.org/11813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2f871cb16e5e1033e42863a9e12459057004782c Gerrit-Change-Number: 11813 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 19:38:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 16 Nov 2018 19:38:15 +0000 Subject: Change in osmo-bsc[master]: LCLS: make config and control redable in 'sh conns' Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11815 Change subject: LCLS: make config and control redable in 'sh conns' ...................................................................... LCLS: make config and control redable in 'sh conns' Display LCLS config and control state as text in "show conns" command. Change-Id: Ibc2525d453e3aa845fe6f3a98f908c2b6b49f1f0 Related: OS#3659 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/15/11815/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 9115c01..82a0784 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1532,8 +1532,10 @@ vty_out(vty, " LCLS GCR: %s%s", osmo_hexdump_nospc(conn->lcls.global_call_ref, conn->lcls.global_call_ref_len), VTY_NEWLINE); - vty_out(vty, " LCLS Config: 0x%02x, LCLS Control: 0x%02x, LCLS BSS Status: %s%s", - conn->lcls.config, conn->lcls.control, osmo_fsm_inst_state_name(conn->lcls.fi), + vty_out(vty, " LCLS Config: %s, LCLS Control: %s, LCLS BSS Status: %s%s", + gsm0808_lcls_config_name(conn->lcls.config), + gsm0808_lcls_control_name(conn->lcls.control), + osmo_fsm_inst_state_name(conn->lcls.fi), VTY_NEWLINE); } if (conn->lchan) -- To view, visit https://gerrit.osmocom.org/11815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc2525d453e3aa845fe6f3a98f908c2b6b49f1f0 Gerrit-Change-Number: 11815 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 20:34:00 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 16 Nov 2018 20:34:00 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11790 ) Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... Patch Set 2: > Uploaded patch set 2. I read adding Depends: and the Change-Id is supposed to help jenkins figure it out. But no... -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 20:34:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 20:40:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 16 Nov 2018 20:40:22 +0000 Subject: Change in osmocom-bb[master]: mobile: add header for MS' MNCC functions Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11816 Change subject: mobile: add header for MS' MNCC functions ...................................................................... mobile: add header for MS' MNCC functions This simplifies adding new functions and re-using them from other parts of the code. Change-Id: Ibad400a99afe052f011f54fc706836b6bf89f4b9 --- M src/host/layer23/include/osmocom/bb/mobile/Makefile.am A src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/11816/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 12cf24b..8e4be1a 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -1,3 +1,3 @@ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ gsm48_rr.h mncc.h settings.h subscriber.h support.h \ - transaction.h vty.h mncc_sock.h primitives.h + transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h new file mode 100644 index 0000000..49ce1a4 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h @@ -0,0 +1,9 @@ +#pragma once + +int mncc_call(struct osmocom_ms *ms, char *number); +int mncc_hangup(struct osmocom_ms *ms); +int mncc_answer(struct osmocom_ms *ms); +int mncc_hold(struct osmocom_ms *ms); +int mncc_retrieve(struct osmocom_ms *ms, int number); +int mncc_dtmf(struct osmocom_ms *ms, char *dtmf); + diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 9be9c8f..9f58112 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -30,15 +30,14 @@ #include #include #include +#include #include static uint32_t new_callref = 1; static LLIST_HEAD(call_list); -void mncc_set_cause(struct gsm_mncc *data, int loc, int val); static int dtmf_statemachine(struct gsm_call *call, struct gsm_mncc *mncc); static void timeout_dtmf(void *arg); -int mncc_answer(struct osmocom_ms *ms); /* * support functions diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 12c32a5..a0ad993 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -43,13 +44,6 @@ #include #include -int mncc_call(struct osmocom_ms *ms, char *number); -int mncc_hangup(struct osmocom_ms *ms); -int mncc_answer(struct osmocom_ms *ms); -int mncc_hold(struct osmocom_ms *ms); -int mncc_retrieve(struct osmocom_ms *ms, int number); -int mncc_dtmf(struct osmocom_ms *ms, char *dtmf); - extern struct llist_head ms_list; extern struct llist_head active_connections; -- To view, visit https://gerrit.osmocom.org/11816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibad400a99afe052f011f54fc706836b6bf89f4b9 Gerrit-Change-Number: 11816 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 20:40:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 16 Nov 2018 20:40:24 +0000 Subject: Change in osmocom-bb[master]: mobile: use proper type for boolean flags Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11817 Change subject: mobile: use proper type for boolean flags ...................................................................... mobile: use proper type for boolean flags This makes reading code easier and simplifies further modifications. Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d --- M src/host/layer23/include/osmocom/bb/mobile/mncc.h M src/host/layer23/src/mobile/mnccms.c 2 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/17/11817/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index cad1883..8ec9358 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -36,9 +36,9 @@ uint32_t callref; - uint8_t init; /* call initiated, no response yet */ - uint8_t hold; /* call on hold */ - uint8_t ring; /* call ringing/knocking */ + bool init; /* call initiated, no response yet */ + bool hold; /* call on hold */ + bool ring; /* call ringing/knocking */ struct osmo_timer_list dtmf_timer; uint8_t dtmf_state; diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 9f58112..2243291 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -294,7 +294,7 @@ } /* not in initiated state anymore */ - call->init = 0; + call->init = false; switch (msg_type) { case MNCC_DISC_IND: @@ -478,9 +478,9 @@ LOGP(DMNCC, LOGL_INFO, "Ring!\n"); else { LOGP(DMNCC, LOGL_INFO, "Knock!\n"); - call->hold = 1; + call->hold = true; } - call->ring = 1; + call->ring = true; memset(&mncc, 0, sizeof(struct gsm_mncc)); mncc.callref = call->callref; mncc_tx_to_cc(ms, MNCC_ALERT_REQ, &mncc); @@ -498,7 +498,7 @@ vty_notify(ms, NULL); vty_notify(ms, "Call is on hold\n"); LOGP(DMNCC, LOGL_INFO, "Call is on hold\n"); - call->hold = 1; + call->hold = true; break; case MNCC_HOLD_REJ: vty_notify(ms, NULL); @@ -509,7 +509,7 @@ vty_notify(ms, NULL); vty_notify(ms, "Call is retrieved\n"); LOGP(DMNCC, LOGL_INFO, "Call is retrieved\n"); - call->hold = 0; + call->hold = false; break; case MNCC_RETRIEVE_REJ: vty_notify(ms, NULL); @@ -554,7 +554,7 @@ return -ENOMEM; call->ms = ms; call->callref = new_callref++; - call->init = 1; + call->init = true; llist_add_tail(&call->entry, &call_list); memset(&setup, 0, sizeof(struct gsm_mncc)); @@ -646,8 +646,8 @@ vty_notify(ms, "Please put active call on hold first!\n"); return -EBUSY; } - alerting->ring = 0; - alerting->hold = 0; + alerting->ring = false; + alerting->hold = false; memset(&rsp, 0, sizeof(struct gsm_mncc)); rsp.callref = alerting->callref; -- To view, visit https://gerrit.osmocom.org/11817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d Gerrit-Change-Number: 11817 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 20:40:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 16 Nov 2018 20:40:24 +0000 Subject: Change in osmocom-bb[master]: mobile: add function to show active calls Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11818 Change subject: mobile: add function to show active calls ...................................................................... mobile: add function to show active calls Change-Id: I108b9518517433c87df1f6569d032ad411622d45 --- M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/18/11818/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h index 49ce1a4..d7772ca 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h @@ -6,4 +6,5 @@ int mncc_hold(struct osmocom_ms *ms); int mncc_retrieve(struct osmocom_ms *ms, int number); int mncc_dtmf(struct osmocom_ms *ms, char *dtmf); - +void dump_calls(const struct osmocom_ms *ms, + void (*print)(void *, const char *, ...), void *v); diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 2243291..df3c062 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -596,6 +596,23 @@ return mncc_tx_to_cc(ms, MNCC_SETUP_REQ, &setup); } +void dump_calls(const struct osmocom_ms *ms, + void (*print)(void *, const char *, ...), void *v) +{ + struct gsm_call *call; + + llist_for_each_entry(call, &call_list, entry) { + print(v, "MS %s, CallRef %X ", ms->name, call->callref); + if (call->init) + print(v, "initiating"); + if (call->hold) + print(v, "on hold"); + if (call->ring) + print(v, "ringing"); + print(v, "\n"); + } +} + int mncc_hangup(struct osmocom_ms *ms) { struct gsm_call *call, *found = NULL; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index a0ad993..635874e 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -263,6 +263,27 @@ return CMD_SUCCESS; } +DEFUN(show_calls, show_calls_cmd, "show calls [MS_NAME]", + SHOW_STR "Display information about calls\n" + "Name of MS (see \"show ms\")") +{ + struct osmocom_ms *ms; + + if (argc) { + ms = get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + dump_calls(ms, print_vty, vty); + } else { + llist_for_each_entry(ms, &ms_list, entity) { + dump_calls(ms, print_vty, vty); + vty_out(vty, "%s", VTY_NEWLINE); + } + } + + return CMD_SUCCESS; +} + DEFUN(show_support, show_support_cmd, "show support [MS_NAME]", SHOW_STR "Display information about MS support\n" "Name of MS (see \"show ms\")") -- To view, visit https://gerrit.osmocom.org/11818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I108b9518517433c87df1f6569d032ad411622d45 Gerrit-Change-Number: 11818 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 21:41:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 21:41:22 +0000 Subject: Change in osmocom-bb[master]: mobile: add header for MS' MNCC functions In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11816 ) Change subject: mobile: add header for MS' MNCC functions ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibad400a99afe052f011f54fc706836b6bf89f4b9 Gerrit-Change-Number: 11816 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 21:41:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 21:42:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 21:42:10 +0000 Subject: Change in osmocom-bb[master]: mobile: use proper type for boolean flags In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11817 ) Change subject: mobile: use proper type for boolean flags ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d Gerrit-Change-Number: 11817 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 21:42:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 21:46:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 21:46:07 +0000 Subject: Change in osmocom-bb[master]: mobile: add function to show active calls In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11818 ) Change subject: mobile: add function to show active calls ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11818/1/src/host/layer23/src/mobile/vty_interface.c File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/#/c/11818/1/src/host/layer23/src/mobile/vty_interface.c at 266 PS1, Line 266: show_calls_cmd I think you need to register this command using: install_element_ve(&show_calls_cmd); -- To view, visit https://gerrit.osmocom.org/11818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I108b9518517433c87df1f6569d032ad411622d45 Gerrit-Change-Number: 11818 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 21:46:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 16 21:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 16 Nov 2018 21:47:25 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11790 ) Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... Patch Set 2: > > Uploaded patch set 2. > > I read adding Depends: and the Change-Id is supposed to help > jenkins figure it out. But no... Yep, for some reason it doesn't care :/ -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 16 Nov 2018 21:47:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Nov 17 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 17 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#310?= In-Reply-To: <1233866326.619.1542381007670.JavaMail.jenkins@jenkins.osmocom.org> References: <1233866326.619.1542381007670.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1088987110.634.1542467407811.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Nov 18 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 18 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#311?= In-Reply-To: <1088987110.634.1542467407811.JavaMail.jenkins@jenkins.osmocom.org> References: <1088987110.634.1542467407811.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <367700345.648.1542553807677.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:56:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:56:51 +0000 Subject: Change in osmocom-bb[master]: mobile: use proper type for boolean flags In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11817 ) Change subject: mobile: use proper type for boolean flags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d Gerrit-Change-Number: 11817 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 19:56:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:57:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:57:07 +0000 Subject: Change in osmocom-bb[master]: mobile: add header for MS' MNCC functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11816 ) Change subject: mobile: add header for MS' MNCC functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibad400a99afe052f011f54fc706836b6bf89f4b9 Gerrit-Change-Number: 11816 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 19:57:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:57:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:57:41 +0000 Subject: Change in osmo-bsc[master]: examples: Remove neighbor-list invalid for default setup In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11774 ) Change subject: examples: Remove neighbor-list invalid for default setup ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebe972da3a8442b6ded6d7f9e61a03b9144a843c Gerrit-Change-Number: 11774 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 19:57:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:57:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:57:42 +0000 Subject: Change in osmo-bsc[master]: examples: Remove neighbor-list invalid for default setup In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11774 ) Change subject: examples: Remove neighbor-list invalid for default setup ...................................................................... examples: Remove neighbor-list invalid for default setup In default example network, there's no cells with those arfcn. Furthermore, having those seem to prevent some MS to register against nanoBTS configured by a BSC using those lines. Related: OS#3063 Change-Id: Iebe972da3a8442b6ded6d7f9e61a03b9144a843c --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg 2 files changed, 0 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index a1bc7e3..750b089 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -38,11 +38,6 @@ early-classmark-sending forbidden ip.access unit_id 0 0 oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 codec-support fr gprs mode none no force-combined-si diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index 0666be3..d1b3678 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -37,11 +37,6 @@ early-classmark-sending forbidden ip.access unit_id 0 0 oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 codec-support fr gprs mode none no force-combined-si -- To view, visit https://gerrit.osmocom.org/11774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iebe972da3a8442b6ded6d7f9e61a03b9144a843c Gerrit-Change-Number: 11774 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:57:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:57:53 +0000 Subject: Change in osmo-bsc[master]: bsc: bts_alloc: Use enum value during neigh_list_manual_mode initiali... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11775 ) Change subject: bsc: bts_alloc: Use enum value during neigh_list_manual_mode initialization ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a4325d45de143d32db55df8e84282cc64800c9f Gerrit-Change-Number: 11775 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 19:57:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:57:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:57:54 +0000 Subject: Change in osmo-bsc[master]: bsc: bts_alloc: Use enum value during neigh_list_manual_mode initiali... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11775 ) Change subject: bsc: bts_alloc: Use enum value during neigh_list_manual_mode initialization ...................................................................... bsc: bts_alloc: Use enum value during neigh_list_manual_mode initialization Change-Id: I6a4325d45de143d32db55df8e84282cc64800c9f --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 15853fb..774238b 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -852,7 +852,7 @@ bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED; bts->dtxd = false; bts->gprs.ctrl_ack_type_use_block = true; /* use RLC/MAC control block */ - bts->neigh_list_manual_mode = 0; + bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC; bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */ bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */ bts->si_common.cell_sel_par.rxlev_acc_min = 0; -- To view, visit https://gerrit.osmocom.org/11775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6a4325d45de143d32db55df8e84282cc64800c9f Gerrit-Change-Number: 11775 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:58:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:58:04 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Use enum value in neighbor-list check In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11778 ) Change subject: bsc: vty: Use enum value in neighbor-list check ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7c0b42bfed749f18b8ab2331475f3da35b02f456 Gerrit-Change-Number: 11778 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 19:58:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:58:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:58:35 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11790 ) Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 19:58:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:58:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:58:38 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Use enum value in neighbor-list check In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11778 ) Change subject: bsc: vty: Use enum value in neighbor-list check ...................................................................... bsc: vty: Use enum value in neighbor-list check Change-Id: I7c0b42bfed749f18b8ab2331475f3da35b02f456 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 9115c01..b9a5268 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3112,7 +3112,7 @@ struct bitvec *bv = &bts->si_common.neigh_list; uint16_t arfcn = atoi(argv[1]); - if (!bts->neigh_list_manual_mode) { + if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { vty_out(vty, "%% Cannot configure neighbor list in " "automatic mode%s", VTY_NEWLINE); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/11778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7c0b42bfed749f18b8ab2331475f3da35b02f456 Gerrit-Change-Number: 11778 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 19:59:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 19:59:17 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Verify and warn on invalid arfcn passed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11791 ) Change subject: bsc: vty: Verify and warn on invalid arfcn passed ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib001501bf37289e824a1f72b62afde23892e88d2 Gerrit-Change-Number: 11791 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 19:59:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:00:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:00:14 +0000 Subject: Change in libosmocore[master]: Update GSM0808_LCLS enums In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11678 ) Change subject: Update GSM0808_LCLS enums ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52dc6a52f5ee043ed2c1625ffecfd495e3c746b1 Gerrit-Change-Number: 11678 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:00:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:01:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:01:27 +0000 Subject: Change in osmo-bsc[master]: LCLS: move mode check into separate function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11551 ) Change subject: LCLS: move mode check into separate function ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 20:01:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:02:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:02:23 +0000 Subject: Change in osmo-bsc[master]: LCLS: explicitly check for mode before closing the loop In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11565 ) Change subject: LCLS: explicitly check for mode before closing the loop ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Gerrit-Change-Number: 11565 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 20:02:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:02:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:02:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log number of expected/seen *CX messages on failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11645 ) Change subject: BSC: log number of expected/seen *CX messages on failure ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 Gerrit-Change-Number: 11645 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 20:02:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:02:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:02:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log number of expected/seen *CX messages on failure In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11645 ) Change subject: BSC: log number of expected/seen *CX messages on failure ...................................................................... BSC: log number of expected/seen *CX messages on failure Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 116d7af..f96e74a 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -826,10 +826,10 @@ ", mdcx_seen=", g_media.mgcp_conn[i].mdcx_seen, ", mdcx_seen_exp=", g_media.mgcp_conn[i].mdcx_seen_exp); if(g_media.mgcp_conn[i].crcx_seen != g_media.mgcp_conn[i].crcx_seen_exp) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-CRCX transactions"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-CRCX transactions on g_media.mgcp_conn[" & int2str(i) & "]"); } if(g_media.mgcp_conn[i].mdcx_seen != g_media.mgcp_conn[i].mdcx_seen_exp) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-MDCX transactions"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "unexpected number of MGW-MDCX transactions on g_media.mgcp_conn[" & int2str(i) & "]"); } } } -- To view, visit https://gerrit.osmocom.org/11645 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3b743aaf9d68f2f332660d819d38ad8212484e00 Gerrit-Change-Number: 11645 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:03:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:03:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: restructure tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11555 ) Change subject: BSC LCLS: restructure tests ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Gerrit-Change-Number: 11555 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sun, 18 Nov 2018 20:03:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:03:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:03:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: restructure tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11555 ) Change subject: BSC LCLS: restructure tests ...................................................................... BSC LCLS: restructure tests Move duplicated code into separate functions to simplify adding test cases which do not use MGW MDCX methods for closing the loop. Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Related: OS#3659 --- M bsc/BSC_Tests_LCLS.ttcn 1 file changed, 52 insertions(+), 60 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 0151329..585059e 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -255,11 +255,28 @@ f_lcls_test_fini(); } +private function f_tc_lcls_recv_ls_exp_mgcp() runs on lcls_test_CT { + var MgcpCommand mgcp_cmd; + + interleave { + [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)); + [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched)); + [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); + [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd { + CONN_A.send(f_build_mdcx_rsp(mgcp_cmd)); + } + /* not needed, as this MDCX is still handled within MSC_ConnectionHandler + [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd { + CONN_B.send(f_build_mdcx_rsp(mgcp_cmd)); + } + */ + } +} + private function f_tc_lcls_gcr_bway_connect(boolean hr) runs on lcls_test_CT { var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_b; var MSC_ConnHdlr vc_conn; - var MgcpCommand mgcp_cmd; f_lcls_init(); @@ -281,14 +298,8 @@ f_lcls_test_init(pars_a, pars_b); CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - interleave { - [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)); - [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched)); - [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd { - CONN_A.send(f_build_mdcx_rsp(mgcp_cmd)); - } - } + + f_tc_lcls_recv_ls_exp_mgcp(); f_lcls_test_fini(); } @@ -366,6 +377,12 @@ f_lcls_test_fini(); } +/* check for the cases where LCLS is not possible due to some reason */ +private function f_lcls_not_yet_ls() runs on lcls_test_CT { + CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); + CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); + CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)); +} /* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */ testcase TC_lcls_gcr_bway_dont_connect() runs on lcls_test_CT { @@ -387,9 +404,7 @@ pars_b.lcls.exp_sts := LCLS_STS_not_yet_ls; f_lcls_test_init(pars_a, pars_b); - CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)); + f_lcls_not_yet_ls(); f_wait_fail_notify(); f_lcls_test_fini(); } @@ -435,12 +450,26 @@ pars_b.lcls.exp_sts := LCLS_STS_not_yet_ls; f_lcls_test_init(pars_a, pars_b); - CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)); + f_lcls_not_yet_ls(); f_lcls_test_fini(); } +/* Expect given LCLS status alongside with corresponding MDCX commands */ +private function f_lcls_sts_mgcp(BIT4 expected_status) runs on lcls_test_CT { + var MgcpCommand mgcp_cmd; + + interleave { + [] CONN_B.receive(tr_BSSMAP_LclsConnCtrlAck(tr_BSSMAP_IE_LclsSts(expected_status))); + [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(expected_status)); + [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd { + CONN_A.send(f_build_mdcx_rsp(mgcp_cmd)); + } + [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd { + CONN_B.send(f_build_mdcx_rsp(mgcp_cmd)); + } + } +} + /* Send an ASSIGNMENT REQ with "do not connect" and enable later using LCLS CTRL */ testcase TC_lcls_gcr_bway_dont_connect_csc() runs on lcls_test_CT { var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); @@ -463,9 +492,7 @@ /* start call and expect it to be "not yet" LS */ f_lcls_test_init(pars_a, pars_b); - CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)); + f_lcls_not_yet_ls(); f_sleep(2.0); /* send "connect" on A side, expect call to remain in "not yet" */ @@ -475,16 +502,7 @@ /* send "connect" on B side, expect call to go LS, with notify to A side */ CONN_B.send(ts_BSSMAP_LclsConnCtrl(omit, ts_BSSMAP_IE_LclsCsc(LCLS_CSC_connect))); - interleave { - [] CONN_B.receive(tr_BSSMAP_LclsConnCtrlAck(tr_BSSMAP_IE_LclsSts(LCLS_STS_locally_switched))); - [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched)); - [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd { - CONN_A.send(f_build_mdcx_rsp(mgcp_cmd)); - } - [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd { - CONN_B.send(f_build_mdcx_rsp(mgcp_cmd)); - } - } + f_lcls_sts_mgcp(LCLS_STS_locally_switched); f_wait_fail_notify(); f_lcls_test_fini(); } @@ -510,7 +528,6 @@ var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_b; var MSC_ConnHdlr vc_conn; - var MgcpCommand mgcp_cmd; f_lcls_init(); @@ -528,19 +545,8 @@ /* Expect LS to be established successfully */ f_lcls_test_init(pars_a, pars_b); CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - interleave { - [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)); - [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched)); - [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd { - CONN_A.send(f_build_mdcx_rsp(mgcp_cmd)); - } -/* not needed, as this MDCX is still handled within MSC_ConnectionHandler - [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd { - CONN_B.send(f_build_mdcx_rsp(mgcp_cmd)); - } -*/ - } + + f_tc_lcls_recv_ls_exp_mgcp() /* request LS release on "A" side; call continues to be locally switched */ CONN_A.send(ts_BSSMAP_LclsConnCtrl(omit, ts_BSSMAP_IE_LclsCsc(LCLS_CSC_release_lcls))); @@ -549,16 +555,8 @@ /* request LS release on "B" side; call LS is released */ CONN_B.send(ts_BSSMAP_LclsConnCtrl(omit, ts_BSSMAP_IE_LclsCsc(LCLS_CSC_release_lcls))); - interleave { - [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd { - CONN_A.send(f_build_mdcx_rsp(mgcp_cmd)); - } - [] CONN_B.receive(tr_MDCX) -> value mgcp_cmd { - CONN_B.send(f_build_mdcx_rsp(mgcp_cmd)); - } - [] CONN_B.receive(tr_BSSMAP_LclsConnCtrlAck(tr_BSSMAP_IE_LclsSts(LCLS_STS_no_longer_ls))); - [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_no_longer_ls)); - } + + f_lcls_sts_mgcp(LCLS_STS_no_longer_ls) f_lcls_test_fini(); } @@ -587,14 +585,8 @@ /* Expect LS to be established successfully */ f_lcls_test_init(pars_a, pars_b); CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - interleave { - [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)); - [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched)); - [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - [] CONN_A.receive(tr_MDCX) -> value mgcp_cmd { - CONN_A.send(f_build_mdcx_rsp(mgcp_cmd)); - } - } + + f_tc_lcls_recv_ls_exp_mgcp(); /* Perform hard BSSMAP Clear on "A" side, expect no LS on "B" side */ var myBSSMAP_Cause cause_val := GSM0808_CAUSE_CALL_CONTROL; -- To view, visit https://gerrit.osmocom.org/11555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idf9fc8e639b0ece662ab26c481899ef39fb7edfe Gerrit-Change-Number: 11555 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:03:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:03:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: LCLS: explicitly check for *CX adjustment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11558 ) Change subject: LCLS: explicitly check for *CX adjustment ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076 Gerrit-Change-Number: 11558 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 18 Nov 2018 20:03:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:04:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:04:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: LCLS: explicitly check for *CX adjustment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11558 ) Change subject: LCLS: explicitly check for *CX adjustment ...................................................................... LCLS: explicitly check for *CX adjustment Previously the expectations for number of CRCX and MDCX messages from MGW was adjusted unconditionally for LCLS tests. However this is only necessary for MGW-loop type of LCLS. Use explicit variable (with default value preserving current behavior) to decide whether to apply this adjustment or not. This simplifies support for other kinds of LCLS loops. Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076 Related: OS#3659 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index f96e74a..0ea73a0 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -408,7 +408,9 @@ BIT4 cfg optional, /* LCLS Connection Status Control */ BIT4 csc optional, - BIT4 exp_sts optional + BIT4 exp_sts optional, + /* Whether to adjust *cx_seen_exp for LCLS tests */ + boolean adjust_cx_exp } type record TestHdlrParamsHandover { @@ -446,7 +448,8 @@ gcr := omit, cfg := omit, csc := omit, - exp_sts := omit + exp_sts := omit, + adjust_cx_exp := true }, handover := omit, aoip := true @@ -992,7 +995,7 @@ * is mgcp_conn[1]. The BSC performs this operation already before the * assignment complete is generated. This means we expect another MDCX * at mgcp_conn[1] when LCLS is expected. */ - if (ispresent(exp_ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status.lCLS_BSS_StatusValue)) { + if (g_pars.lcls.adjust_cx_exp and ispresent(exp_ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status.lCLS_BSS_StatusValue)) { if (valueof(exp_ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status.lCLS_BSS_StatusValue) == LCLS_STS_locally_switched) { g_media.mgcp_conn[1].mdcx_seen_exp := g_media.mgcp_conn[1].mdcx_seen_exp + 1; -- To view, visit https://gerrit.osmocom.org/11558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076 Gerrit-Change-Number: 11558 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:04:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:04:41 +0000 Subject: Change in osmo-gsm-manuals[master]: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11611 ) Change subject: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 Gerrit-Change-Number: 11611 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sun, 18 Nov 2018 20:04:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:04:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:04:54 +0000 Subject: Change in osmo-gsm-manuals[master]: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11611 ) Change subject: Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo ...................................................................... Abis: Change abisip-find/ipaccess-config path to osmo-bsc repo Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 --- M common/chapters/abis.adoc 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/abis.adoc b/common/chapters/abis.adoc index a53d6f3..7524661 100644 --- a/common/chapters/abis.adoc +++ b/common/chapters/abis.adoc @@ -29,8 +29,11 @@ === Locate Abis/IP based BTS We can use a tool called abisip-find to be able to find BTS which is -connected in the network. This tool is located under: -'./openbsc/openbsc/src/ipaccess' +connected in the network. This tool is located in the OsmoBSC project +repository under: +'./src/ipaccess' + + ==== abisip-find @@ -79,8 +82,8 @@ ==== ipaccess-config This program is very helpful tool which is used to configure Unit ID and -Primarly OML IP. You can find this tool under: -'./openbsc/openbsc/src/ipaccess' +Primarly OML IP. You can find this tool in the OsmoBSC repository under: +'./src/ipaccess' .Example: using ipaccess-config to configure Unit ID and Primarly OML IP of -- To view, visit https://gerrit.osmocom.org/11611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b92a611abd6e92ad69f77f8ec81a6501224afe5 Gerrit-Change-Number: 11611 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:04:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:04:54 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBTS: Print VTY command in fixed-width font In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11612 ) Change subject: OsmoBTS: Print VTY command in fixed-width font ...................................................................... OsmoBTS: Print VTY command in fixed-width font Surrounding with '@' didn't seem to yield the intended result, the charactars appeared in the compiled document. Change-Id: I66e7949fa4a6c2164bf9572a2beaf8ace169fa1c --- M OsmoBTS/chapters/interfaces.adoc M common/chapters/bts.adoc 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoBTS/chapters/interfaces.adoc b/OsmoBTS/chapters/interfaces.adoc index 127d4dc..9fefa72 100644 --- a/OsmoBTS/chapters/interfaces.adoc +++ b/OsmoBTS/chapters/interfaces.adoc @@ -152,5 +152,5 @@ with the PHY. The default PCU socket interface name is `/tmp/pcu_sock`, but this can -be overridden by the @pcu-socket@ VTY command in the BTS configuration +be overridden by the `pcu-socket` VTY command in the BTS configuration VTY node. diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index 81ca1a2..2e11db1 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -349,7 +349,7 @@ ==== Dynamic Timeslot Configuration Examples -This is an extract of an @osmo-bsc@ or @osmo-nitb@ config file. A timeslot +This is an extract of an `osmo-bsc` or `osmo-nitb` config file. A timeslot configuration with five Osmocom style dynamic timeslots and one dedicated PDCH may look like this: -- To view, visit https://gerrit.osmocom.org/11612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I66e7949fa4a6c2164bf9572a2beaf8ace169fa1c Gerrit-Change-Number: 11612 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:05:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:05:02 +0000 Subject: Change in osmo-gsm-manuals[master]: VTY: Remove osmo-nitb VTY port number example In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11613 ) Change subject: VTY: Remove osmo-nitb VTY port number example ...................................................................... VTY: Remove osmo-nitb VTY port number example We reference the port list appendix where all the ports used by various Osmocom projects are listed and it's unlikely that pointing out the osmo-nitb port would significantly help the reader, so just remove the reference. Change-Id: I354d50314ba248835191fa3da122032201618a0e --- M common/chapters/vty.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/vty.adoc b/common/chapters/vty.adoc index 3f72718..c9e3d59 100644 --- a/common/chapters/vty.adoc +++ b/common/chapters/vty.adoc @@ -66,7 +66,7 @@ === Accessing the telnet VTY The VTY of a given Osmocom program is implemented as a telnet server, -listening to a specific TCP port. For `osmo-nitb`, this port is `4242`. +listening to a specific TCP port. Please see <> to check for the default TCP port number of the VTY interface of the specific Osmocom software you would like to -- To view, visit https://gerrit.osmocom.org/11613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I354d50314ba248835191fa3da122032201618a0e Gerrit-Change-Number: 11613 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:05:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:05:12 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBTS: Fix typo In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11614 ) Change subject: OsmoBTS: Fix typo ...................................................................... OsmoBTS: Fix typo Change-Id: I0a4c9f052f14816e88ed0a4a5fff9b3854da195a --- M OsmoBTS/chapters/configuration.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoBTS/chapters/configuration.adoc b/OsmoBTS/chapters/configuration.adoc index dbc7a29..558bd4b 100644 --- a/OsmoBTS/chapters/configuration.adoc +++ b/OsmoBTS/chapters/configuration.adoc @@ -4,7 +4,7 @@ application is starting, the A-bis OML connection is established towards the BSC. Almost all BTS configuration (such as ARFCN, channel configuration, transmit power, etc.) will be sent from the BSC to the -BTS via OML messages. After OML start-up has competed, the BSC will +BTS via OML messages. After OML start-up has completed, the BSC will instruct the BTS to establish the RSL connections. Given that most configuration is downloaded from the BSC into the BTS at -- To view, visit https://gerrit.osmocom.org/11614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0a4c9f052f14816e88ed0a4a5fff9b3854da195a Gerrit-Change-Number: 11614 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:05:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:05:14 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBSC/HLR/MSC: Fix default config file name In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11615 ) Change subject: OsmoBSC/HLR/MSC: Fix default config file name ...................................................................... OsmoBSC/HLR/MSC: Fix default config file name Mention that the default is not openbsc.cfg, but osmo-*.cfg Change-Id: I139e6004e28d6f918f31792e634214a6153edd0e --- M OsmoBSC/chapters/running.adoc M OsmoHLR/chapters/running.adoc M OsmoMSC/chapters/running.adoc 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoBSC/chapters/running.adoc b/OsmoBSC/chapters/running.adoc index 6747a29..f62ba6e 100644 --- a/OsmoBSC/chapters/running.adoc +++ b/OsmoBSC/chapters/running.adoc @@ -21,7 +21,7 @@ Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be - used. If none is specified, use `openbsc.cfg` in the current + used. If none is specified, use `osmo-bsc.cfg` in the current working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been diff --git a/OsmoHLR/chapters/running.adoc b/OsmoHLR/chapters/running.adoc index 44b66f2..5f24746 100644 --- a/OsmoHLR/chapters/running.adoc +++ b/OsmoHLR/chapters/running.adoc @@ -21,7 +21,7 @@ Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be - used. If none is specified, use `openbsc.cfg` in the current + used. If none is specified, use `osmo-hlr.cfg` in the current working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been diff --git a/OsmoMSC/chapters/running.adoc b/OsmoMSC/chapters/running.adoc index 8656a58..cb68157 100644 --- a/OsmoMSC/chapters/running.adoc +++ b/OsmoMSC/chapters/running.adoc @@ -21,7 +21,7 @@ Fork the process as a daemon into background. *-c, --config-file 'CONFIGFILE'*:: Specify the file and path name of the configuration file to be - used. If none is specified, use `openbsc.cfg` in the current + used. If none is specified, use `osmo-msc.cfg` in the current working directory. *-s, --disable-color*:: Disable colors for logging to stderr. This has mostly been -- To view, visit https://gerrit.osmocom.org/11615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I139e6004e28d6f918f31792e634214a6153edd0e Gerrit-Change-Number: 11615 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:05:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:05:31 +0000 Subject: Change in osmo-gsm-manuals[master]: Change OpenBSC mentions to OsmoBSC where applicable In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11616 ) Change subject: Change OpenBSC mentions to OsmoBSC where applicable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cc6874302b6089a54d44b09f08660a25e46d4dc Gerrit-Change-Number: 11616 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 20:05:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:05:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:05:46 +0000 Subject: Change in osmo-gsm-manuals[master]: common/chapters/bts: Remove duplicate spaces in text In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11639 ) Change subject: common/chapters/bts: Remove duplicate spaces in text ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38f3e94342461f494ef547bcdccd2594c30e679d Gerrit-Change-Number: 11639 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:05:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:06:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:06:00 +0000 Subject: Change in osmo-gsm-manuals[master]: Change OpenBSC mentions to OsmoBSC where applicable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11616 ) Change subject: Change OpenBSC mentions to OsmoBSC where applicable ...................................................................... Change OpenBSC mentions to OsmoBSC where applicable Change-Id: I4cc6874302b6089a54d44b09f08660a25e46d4dc --- M OsmoPCU/gb/bssgp.adoc M common/chapters/bts.adoc 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoPCU/gb/bssgp.adoc b/OsmoPCU/gb/bssgp.adoc index fe30d84..18f1842 100644 --- a/OsmoPCU/gb/bssgp.adoc +++ b/OsmoPCU/gb/bssgp.adoc @@ -490,7 +490,7 @@ described in <>. OsmoPCU allocates a BVC context for the BVCI given by OsmoBTS, which -in turn receives it from OpenBSC via OML procedures. +in turn receives it from OsmoBSC or OsmoNITB via OML procedures. In addition to the BVCI identifying the OsmoPCU side of BSSGP connection, there is also special BVCI which is accepted by OsmoPCU in diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index 2e11db1..eb28497 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -3,7 +3,7 @@ The main functionality of the BSC component is to manage BTSs. As such, provisioning BTSs within the BSC is one of the most common tasks during -BSC operation. Just like about anything else in OpenBSC, they are +BSC operation. Just like about anything else in OsmoBSC, they are configured using the VTY. BTSs are internally numbered with integer numbers starting from "0" for -- To view, visit https://gerrit.osmocom.org/11616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4cc6874302b6089a54d44b09f08660a25e46d4dc Gerrit-Change-Number: 11616 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:06:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:06:01 +0000 Subject: Change in osmo-gsm-manuals[master]: common/chapters/bts: Remove duplicate spaces in text In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11639 ) Change subject: common/chapters/bts: Remove duplicate spaces in text ...................................................................... common/chapters/bts: Remove duplicate spaces in text Change-Id: I38f3e94342461f494ef547bcdccd2594c30e679d --- M common/chapters/bts.adoc 1 file changed, 21 insertions(+), 21 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/bts.adoc b/common/chapters/bts.adoc index eb28497..30a33cc 100644 --- a/common/chapters/bts.adoc +++ b/common/chapters/bts.adoc @@ -1,20 +1,20 @@ [[bts]] == Reviewing and Provisioning BTS configuration -The main functionality of the BSC component is to manage BTSs. As such, +The main functionality of the BSC component is to manage BTSs. As such, provisioning BTSs within the BSC is one of the most common tasks during -BSC operation. Just like about anything else in OsmoBSC, they are +BSC operation. Just like about anything else in OsmoBSC, they are configured using the VTY. BTSs are internally numbered with integer numbers starting from "0" for -the first BTS. BTS numbers have to be contiguous, so you cannot +the first BTS. BTS numbers have to be contiguous, so you cannot configure 0,1,2 and then 5. === Reviewing current BTS status and configuration In order to view the status and properties of a BTS, you can issue the -`show bts` command. If used without any BTS number, it will display +`show bts` command. If used without any BTS number, it will display information about all provisioned BTS numbers. ---- @@ -55,9 +55,9 @@ specified BTS (`show trx 0 0`). Furthermore, information on the individual timeslots can be shown by -means of `show timeslot`. The output can be restricted to the +means of `show timeslot`. The output can be restricted to the timeslots of a single BTS (`show timeslot 0`) or that of a single -TRX (`show timeslot 0 0`). Finally, you can restrict the output to +TRX (`show timeslot 0 0`). Finally, you can restrict the output to a single timeslot by specifying the BTS, TRX and TS numbers (`show timeslot 0 0 4`). @@ -74,7 +74,7 @@ === Provisioning a new BTS In order to provision BTSs, you have to enter the BTS config node of the -VTY. In order to configure BTS 0, you can issue the following sequence +VTY. In order to configure BTS 0, you can issue the following sequence of commands: ---- @@ -87,12 +87,12 @@ At this point, you have a plethora of commands, in fact an entire hierarchy of commands to configure all aspects of the BTS, as well as -each of its TRX and each timeslot within each TRX. For a full +each of its TRX and each timeslot within each TRX. For a full reference, please consult the telnet VTY integrated help or the respective chapter in the VTY reference. BTS configuration depends quite a bit on the specific BTS vendor and -model. The section below provides just one possible example for the +model. The section below provides just one possible example for the case of a sysmoBTS. Note that from the `configure terminal` command onwards, the telnet VTY @@ -140,7 +140,7 @@ A GSM BTS periodically transmits a series of 'SYSTEM INFORMATION' messages to mobile stations, both via the BCCH in idle mode, was well as -via the SACCH in dedicated mode. There are many different types of such +via the SACCH in dedicated mode. There are many different types of such messages. For their detailed contents and encoding, please see _3GPP TS 24.008_ <<3gpp-ts-24-008>>. @@ -161,7 +161,7 @@ === Neighbor List configuration Every BTS sends a list of ARFCNs of neighbor cells -. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH +. within its 'SYSTEM INFORMATION 2' (and 2bis/2ter) messages on the BCCH . within its 'SYSTEM INFORMATION 5' messages on SACCH in dedicated mode For every BTS config node in the VTY, you can specify the behavior of @@ -184,17 +184,17 @@ === Configuring GPRS PCU parameters of a BTS In the case of BTS models using Abis/IP (IPA), the GPRS PCU is located -inside the BTS. The BTS then establishes a Gb connection to the SGSN. +inside the BTS. The BTS then establishes a Gb connection to the SGSN. All the BTS-internal PCU configuration is performed via A-bis OML by means of configuring the 'CELL', 'NSVC' (NS Virtual Connection and 'NSE' (NS Entity). There is one 'CELL' node and one 'NSE' node, but there are two 'NSVC' -nodes. At the time of this writing, only the NSVC 0 is supported by +nodes. At the time of this writing, only the NSVC 0 is supported by OsmoBTS, while both NSVC are supported by the ip.access nanoBTS. -The respective VTY configuration parameters are described below. They +The respective VTY configuration parameters are described below. They all exist beneath each BTS VTY config node. But let's first start with a small example @@ -224,29 +224,29 @@ ==== `gprs cell bvci <2-65535>` -Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique +Configures the 'BSSGP Virtual Circuit Identifier'. It must be unique between all BGSGP connections to one SGSN. NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique bvci. OsmoBSC will not ensure this policy. +allocated an unique bvci. OsmoBSC will not ensure this policy. ==== `gprs nsei <0-65535>` -Configures the 'NS Entity Identifier'. It must be unique between all NS +Configures the 'NS Entity Identifier'. It must be unique between all NS connections to one SGSN. NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique bvci. OsmoBSC will not ensure this policy. +allocated an unique bvci. OsmoBSC will not ensure this policy. ==== `gprs nsvc <0-1> nsvci <0-65535>` -Configures the 'NS Virtual Connection Identifier'. It must be unique +Configures the 'NS Virtual Connection Identifier'. It must be unique between all NS virtual connections to one SGSN. NOTE: It is up to the system administrator to ensure all PCUs are -allocated an unique nsvci. OsmoBSC will not ensure this policy. +allocated an unique nsvci. OsmoBSC will not ensure this policy. ==== `gprs nsvc <0-1> local udp port <0-65535>` @@ -266,7 +266,7 @@ ==== `gprs ns timer (tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)` <0-255> -Configures the various GPRS NS related timers. Please check the GPRS NS +Configures the various GPRS NS related timers. Please check the GPRS NS specification for the detailed meaning of those timers. -- To view, visit https://gerrit.osmocom.org/11639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I38f3e94342461f494ef547bcdccd2594c30e679d Gerrit-Change-Number: 11639 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:06:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:06:01 +0000 Subject: Change in osmo-gsm-manuals[master]: Logging: Describe all log options, including set-all and force-all In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11617 ) Change subject: Logging: Describe all log options, including set-all and force-all ...................................................................... Logging: Describe all log options, including set-all and force-all Change-Id: Ica03c3ea08289314819448a22ae7ed38a7bd4f83 --- M common/chapters/logging.adoc 1 file changed, 47 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/logging.adoc b/common/chapters/logging.adoc index db6afdb..a89526c 100644 --- a/common/chapters/logging.adoc +++ b/common/chapters/logging.adoc @@ -70,6 +70,53 @@ Management category to info, you can use the following command: `log level mm info`. +There is also a special command to set all categories as a one-off to a desired +log level. For example, to silence all messages but those logged as notice and +above issue the command: `log level set-all notice` + +Afterwards you can adjust specific categories as usual. + +A similar command is `log level force-all ` which causes all categories +to behave as if set to log level until the command is reverted with +`no log level force-all` after which the individually-configured log levels will +again take effect. The difference between `set-all` and `force-all` is that +`set-all` actually changes the individual category settings while `force-all` +is a (temporary) override of those settings and does not change them. + +[[log_options]] +=== Log printing options + +The logging system has various options to change the information +displayed in the log message. + +log color 1:: + With this option each log message will log with the color of its + category. The color is hard-coded and can not be changed. As with + other options a '0' disables this functionality. + +log timestamp 1:: + Includes the current time in the log message. When logging to syslog + this option should not be needed, but may come in handy when debugging + an issue while logging to file. + +log print extended-timestamp 1:: + In order to debug time-critical issues this option will print a + timestamp with millisecond granularity. + +log print category 1:: + Prefix each log message with the category name. + +log print category-hex 1:: + Prefix each log message with the category number in hex ('<000b>'). + +log print level 1:: + Prefix each log message with the name of the log level. + +log print file 1:: + Prefix each log message with the source file and line number. Append + the keyword `last` to append the file information instead of prefixing + it. + [[log_filters]] === Log filters -- To view, visit https://gerrit.osmocom.org/11617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ica03c3ea08289314819448a22ae7ed38a7bd4f83 Gerrit-Change-Number: 11617 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:06:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:06:35 +0000 Subject: Change in libosmo-sccp[master]: osmo-stp: add SCCP related VTY commands In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11583 ) Change subject: osmo-stp: add SCCP related VTY commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 Gerrit-Change-Number: 11583 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:06:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:06:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:06:37 +0000 Subject: Change in libosmo-sccp[master]: osmo-stp: add SCCP related VTY commands In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11583 ) Change subject: osmo-stp: add SCCP related VTY commands ...................................................................... osmo-stp: add SCCP related VTY commands Call osmo_sccp_vty_init(), so far forgotten. This adds the various 'show cs7 instance N sccp *' commands, as well as making the SCCP timers configurable. See Id941b8e31d3b4cfdb3f912beedc1e7af321a0113 for a diff of the VTY reference, showing what commands are enabled by this patch. Change-Id: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 --- M stp/stp_main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/stp/stp_main.c b/stp/stp_main.c index aa2304c..0efe4ed 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -174,6 +174,7 @@ osmo_fsm_log_addr(false); logging_vty_add_cmds(&log_info); osmo_ss7_vty_init_sg(tall_stp_ctx); + osmo_sccp_vty_init(); osmo_fsm_vty_add_cmds(); rc = vty_read_config_file(cmdline_config.config_file, NULL); -- To view, visit https://gerrit.osmocom.org/11583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 Gerrit-Change-Number: 11583 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:09:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:09:01 +0000 Subject: Change in osmo-bsc[master]: bsc: gsm0808: Fix return code in bsc_compl_l3 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11605 ) Change subject: bsc: gsm0808: Fix return code in bsc_compl_l3 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 Gerrit-Change-Number: 11605 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Sun, 18 Nov 2018 20:09:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:09:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:09:55 +0000 Subject: Change in osmo-bsc[master]: bsc: gsm0808: Fix return code in bsc_compl_l3 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11605 ) Change subject: bsc: gsm0808: Fix return code in bsc_compl_l3 ...................................................................... bsc: gsm0808: Fix return code in bsc_compl_l3 complete_layer3 returns true if everything succeeded, false otherwise. However, its caller bsc_compl_l3 returns unix style (0 sucess, negative error). This commit has no real effect since only caller of bsc_compl_l3 never checks return code, but will check it in the future. Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 062c878..a3e8b30 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -366,7 +366,7 @@ return -1; } - return complete_layer3(conn, msg, msc); + return complete_layer3(conn, msg, msc) ? 0 : -2; } static int handle_page_resp(struct gsm_subscriber_connection *conn, struct msgb *msg) -- To view, visit https://gerrit.osmocom.org/11605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I722696c3f6402288b51d6fcf51f478b3b0c9f0f0 Gerrit-Change-Number: 11605 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:10:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:10:05 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11606 ) Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 20:10:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:11:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:11:26 +0000 Subject: Change in libasn1c[master]: remove a redundant assertion In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11625 ) Change subject: remove a redundant assertion ...................................................................... Patch Set 1: Code-Review-1 I don't think we should diverge more from upstream asn1c than needed. If at all, fixes should be made upstream. -- To view, visit https://gerrit.osmocom.org/11625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib81e76cfb339838f5e8981d175176557f1a8a63f Gerrit-Change-Number: 11625 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 20:11:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:12:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:12:39 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak conn_exists() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11458 ) Change subject: msc_vlr_tests: tweak conn_exists() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 Gerrit-Change-Number: 11458 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sun, 18 Nov 2018 20:12:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:12:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:12:41 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests: tweak conn_exists() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11458 ) Change subject: msc_vlr_tests: tweak conn_exists() ...................................................................... msc_vlr_tests: tweak conn_exists() * constify function parameter * internalize parameter check Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 --- M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 2 files changed, 10 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 1192cf2..fd196c8 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -161,13 +161,18 @@ OSMO_ASSERT(gsup_tx_confirmed); } -bool conn_exists(struct gsm_subscriber_connection *conn) +bool conn_exists(const struct gsm_subscriber_connection *conn) { struct gsm_subscriber_connection *c; + + if (!conn) + return false; + llist_for_each_entry(c, &net->subscr_conns, entry) { if (c == conn) return true; } + return false; } @@ -212,7 +217,7 @@ ran_type_name(rx_from_ran), gh_type_name(gh)); - if (g_conn && !conn_exists(g_conn)) + if (!conn_exists(g_conn)) g_conn = NULL; if (!g_conn) { @@ -230,7 +235,7 @@ msc_dtap(g_conn, 23, msg); } - if (g_conn && !conn_exists(g_conn)) + if (!conn_exists(g_conn)) g_conn = NULL; } @@ -258,7 +263,7 @@ bh->type = BSSAP_MSG_BSS_MANAGEMENT; bh->length = msgb_l3len(msg); - if (g_conn && !conn_exists(g_conn)) + if (!conn_exists(g_conn)) g_conn = NULL; OSMO_ASSERT(g_conn); diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index cc200bd..40377c1 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -152,7 +152,7 @@ struct msgb *msgb_from_hex(const char *label, uint16_t size, const char *hex); void clear_vlr(); -bool conn_exists(struct gsm_subscriber_connection *conn); +bool conn_exists(const struct gsm_subscriber_connection *conn); void conn_conclude_cm_service_req(struct gsm_subscriber_connection *conn, enum ran_type via_ran); -- To view, visit https://gerrit.osmocom.org/11458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92 Gerrit-Change-Number: 11458 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:13:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:13:13 +0000 Subject: Change in libosmocore[master]: Add helper wrapper for BSSAP TLV parsing In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11655 ) Change subject: Add helper wrapper for BSSAP TLV parsing ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib228368901ce90a02a5664f2510593371c7d29cd Gerrit-Change-Number: 11655 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:13:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:13:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:13:15 +0000 Subject: Change in libosmocore[master]: Add helper wrapper for BSSAP TLV parsing In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11655 ) Change subject: Add helper wrapper for BSSAP TLV parsing ...................................................................... Add helper wrapper for BSSAP TLV parsing Change-Id: Ib228368901ce90a02a5664f2510593371c7d29cd --- M include/osmocom/gsm/gsm0808.h 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index cdbb273..652aae9 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -173,6 +173,9 @@ const struct tlv_definition *gsm0808_att_tlvdef(void); +/*! Parse BSSAP TLV structure using \ref tlv_parse */ +#define osmo_bssap_tlv_parse(dec, buf, len) tlv_parse(dec, gsm0808_att_tlvdef(), buf, len, 0, 0) + const char *gsm0808_bssmap_name(uint8_t msg_type); const char *gsm0808_bssap_name(uint8_t msg_type); const char *gsm0808_cause_name(uint8_t cause); -- To view, visit https://gerrit.osmocom.org/11655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib228368901ce90a02a5664f2510593371c7d29cd Gerrit-Change-Number: 11655 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:14:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:14:04 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sun, 18 Nov 2018 20:14:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:14:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:14:06 +0000 Subject: Change in libosmocore[master]: Update 3GPP TS 08.08 Cause handling In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11577 ) Change subject: Update 3GPP TS 08.08 Cause handling ...................................................................... Update 3GPP TS 08.08 Cause handling * add Class definitions * add helper to check for extended bit * add helper to get Cause's Class * use enum in gsm0808_cause_name() and gsm0808_create_cipher_reject() to avoid confusion between class and cause * update gsm0808_create_cipher_reject() comments Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Related: OS#3187 --- M TODO-RELEASE M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 6 files changed, 59 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 5222ec9..00720f6 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,8 @@ libosmogsm gsm48_push_l3hdr() (re)introduced in gsm/gsm48.h (GSM 04.08 API) libosmogsm gsm48_push_l3hdr_tid() a wrapper around gsm48_push_l3hdr() libosmocore msgb_l4len new symbol (exposed as 'static inline' in msgb.h) +libosmogsm gsm0808_cause_class_name() getter for class description +libosmogsm gsm0808_cause_class() getter for cause class +libosmogsm gsm0808_cause_ext() check for cause extended bit +libosmogsm gsm0808_cause_name() use enum as parameter +libosmogsm gsm0808_create_cipher_reject() use enum as parameter diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 652aae9..66f7c27 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -50,7 +50,7 @@ struct msgb *gsm0808_create_cipher(const struct gsm0808_encrypt_info *ei, const uint8_t *cipher_response_mode); struct msgb *gsm0808_create_cipher_complete(struct msgb *layer3, uint8_t alg_id); -struct msgb *gsm0808_create_cipher_reject(uint8_t cause); +struct msgb *gsm0808_create_cipher_reject(enum gsm0808_cause cause); struct msgb *gsm0808_create_classmark_request(); struct msgb *gsm0808_create_classmark_update(const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); @@ -178,7 +178,8 @@ const char *gsm0808_bssmap_name(uint8_t msg_type); const char *gsm0808_bssap_name(uint8_t msg_type); -const char *gsm0808_cause_name(uint8_t cause); +const char *gsm0808_cause_name(enum gsm0808_cause cause); +const char *gsm0808_cause_class_name(enum gsm0808_cause_class class); extern const struct value_string gsm0808_lcls_config_names[]; extern const struct value_string gsm0808_lcls_control_names[]; diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index f70dbdb..b56e263 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -107,7 +107,20 @@ uint16_t gsm0808_sc_cfg_from_gsm48_mr_cfg(const struct gsm48_multi_rate_conf *cfg, bool fr); void gsm48_mr_cfg_from_gsm0808_sc_cfg(struct gsm48_multi_rate_conf *cfg, uint16_t s15_s0); -/*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ +/*! \returns 3GPP TS 08.08 ?3.2.2.5 Class of a given Cause */ +static inline enum gsm0808_cause_class gsm0808_cause_class(enum gsm0808_cause cause) +{ + return (cause << 1) >> 4; +} + +/*! \returns true if 3GPP TS 08.08 ?3.2.2.5 Class has extended bit set */ +static inline bool gsm0808_cause_ext(enum gsm0808_cause cause) +{ + /* check that cause looks like 1XXX0000 where XXX represent class */ + return (cause & 0x80) && !(cause & 0x0F); +} + +/*! \returns 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) { switch (type) { diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 8431ace..2317e78 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -384,6 +384,18 @@ GSM0808_CAUSE_DTM_HO_TIMER_EXPIRY = 0x62, }; +/* 3GPP TS 08.08 ?3.2.2.5 Cause Class */ +enum gsm0808_cause_class { + GSM0808_CAUSE_CLASS_NORM0 = 0, + GSM0808_CAUSE_CLASS_NORM1 = 1, + GSM0808_CAUSE_CLASS_RES_UNAVAIL = 2, + GSM0808_CAUSE_CLASS_SRV_OPT_NA = 3, + GSM0808_CAUSE_CLASS_SRV_OPT_NIMPL = 4, + GSM0808_CAUSE_CLASS_INVAL = 5, + GSM0808_CAUSE_CLASS_PERR = 6, + GSM0808_CAUSE_CLASS_INTW = 7, +}; + /* GSM 08.08 3.2.2.11 Channel Type */ enum gsm0808_chan_indicator { GSM0808_CHAN_SPEECH = 1, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e5c3e30..791ebc2 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -265,18 +265,18 @@ } /*! Create BSSMAP Cipher Mode Reject message - * \param[in] cause TS 08.08 cause value + * \param[in] cause 3GPP TS 08.08 ?3.2.2.5 cause value * \returns callee-allocated msgb with BSSMAP Cipher Mode Reject message */ -struct msgb *gsm0808_create_cipher_reject(uint8_t cause) +struct msgb *gsm0808_create_cipher_reject(enum gsm0808_cause cause) { struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, - "bssmap: clear complete"); + "bssmap: cipher mode reject"); if (!msg) return NULL; msgb_v_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT); - /* FIXME: support 2-byte cause value as per 3GPP TS 08.08 ?3.2.2.5 */ - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + + msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, (const uint8_t *)&cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); @@ -1271,8 +1271,26 @@ { 0, NULL } }; +static const struct value_string gsm0808_cause_class_names[] = { + { GSM0808_CAUSE_CLASS_NORM0, "Normal event" }, + { GSM0808_CAUSE_CLASS_NORM1, "Normal event" }, + { GSM0808_CAUSE_CLASS_RES_UNAVAIL, "Resource unavailable" }, + { GSM0808_CAUSE_CLASS_SRV_OPT_NA, "Service or option not available" }, + { GSM0808_CAUSE_CLASS_SRV_OPT_NIMPL, "Service or option not implemented" }, + { GSM0808_CAUSE_CLASS_INVAL, "Invalid message" }, + { GSM0808_CAUSE_CLASS_PERR, "Protocol error" }, + { GSM0808_CAUSE_CLASS_INTW, "Interworking" }, + { 0, NULL } +}; + +/*! Return string name of BSSMAP Cause Class name */ +const char *gsm0808_cause_class_name(enum gsm0808_cause_class class) +{ + return get_value_string(gsm0808_cause_class_names, class); +} + /*! Return string name of BSSMAP Cause name */ -const char *gsm0808_cause_name(uint8_t cause) +const char *gsm0808_cause_name(enum gsm0808_cause cause) { return get_value_string(gsm0808_cause_names, cause); } diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 6234d94..32e4ce9 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -148,6 +148,7 @@ gsm0808_bssap_name; gsm0808_bssmap_name; gsm0808_cause_name; +gsm0808_cause_class_name; gsm0808_create_ass; gsm0808_create_assignment_completed; gsm0808_create_ass_compl; -- To view, visit https://gerrit.osmocom.org/11577 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I31b31dfc22eb4b6b07089e1255246ac458125340 Gerrit-Change-Number: 11577 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:15:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:15:08 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11601 ) Change subject: Support cipher mode reject with extended cause ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 20:15:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:15:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:15:33 +0000 Subject: Change in osmo-pcu[master]: deb: add missing copyright file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11653 ) Change subject: deb: add missing copyright file ...................................................................... deb: add missing copyright file File is imported as-is from current .deb package Change-Id: Ib05480c0eea91bfb55bfc7ab446ea60932096d3d --- A debian/copyright 1 file changed, 132 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..853cd6e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,132 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: osmo-pcu +Source: git://git.osmocom.org/osmo-pcu +Files-Excluded: debian + +Files: * +Copyright: 2009-2015 Holger Hans Peter Freyther + 2013 Jacob Erlbeck + 2016-2017 sysmocom s.m.f.c. GmbH + 2015 by Yves Godin +License: AGPL-3.0+ + +Files: src/gprs_ms_storage.h + src/gprs_ms_storage.cpp + src/gprs_ms.h + src/gprs_coding_scheme.cpp + src/gprs_coding_scheme.h + src/cxx_linuxlist.h + src/pcu_vty_functions.cpp + src/pcu_vty_functions.h + src/pcu_utils.h + src/gprs_codel.c + src/gprs_codel.h +Copyright: 2016-2017 sysmocom s.m.f.c. GmbH +License: GPL-2.0+ + +Files: osmoappdesc.py +Copyright: 2013 by Katerina Barone-Adesi +License: GPL-3.0+ + +Files: src/gprs_debug.cpp + src/gprs_debug.h + src/pcu_main.cpp + src/pcu_l1_if.h + src/gsm_timer.cpp + src/gsm_timer.h +Copyright: 2012 Ivan Klyuchnikov +License: GPL-2.0+ + +Files: src/tbf.cpp + src/tbf_ul.cpp + src/tbf_dl.cpp + src/sba.cpp + src/sba.h + src/llc.cpp + src/encoding.cpp + src/encoding.h + src/gprs_rlcmac.cpp + src/gprs_rlcmac_ts_alloc.cpp +Copyright: 2012 Ivan Klyuchnikov + 2012 Andreas Eversberg + 2013 by Holger Hans Peter Freyther +License: GPL-2.0+ + +Files: src/gprs_rlcmac.h + src/gprs_bssgp_pcu.cpp + src/gprs_bssgp_pcu.h + src/bts.h +Copyright: 2012 Ivan Klyuchnikov + 2013 by Holger Hans Peter Freyther +License: GPL-2.0+ + +Files: src/rlc.h + src/decoding.cpp + src/decoding.h +Copyright: 2012 Ivan Klyuchnikov + 2012 Andreas Eversberg +License: GPL-2.0+ + +Files: src/rlc.cpp + src/llc.h + src/tbf.h +Copyright: 2013 by Holger Hans Peter Freyther +License: GPL-2.0+ + +Files: src/pcu_l1_if.cpp + src/gprs_rlcmac_meas.cpp + src/gprs_rlcmac_sched.cpp + src/osmobts_sock.cpp +Copyright: 2012 Andreas Eversberg +License: GPL-2.0+ + +Files: src/csn1.h + src/csn1.cpp + src/gsm_rlcmac.cpp + src/gsm_rlcmac.h +Copyright: 2011 Vincent Helfre + 2011 ST-Ericsson (Jari Sassi) +License: GPL-2.0+ + +License: AGPL-3.0+ + All rights not specifically granted under this license are reserved. + . + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published by the + Free Software Foundation; either version 3 of the License, or (at your + option) any later version. + +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + Version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +License: GPL-2.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + Version 2 can be found in `/usr/share/common-licenses/GPL-2'. + -- To view, visit https://gerrit.osmocom.org/11653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib05480c0eea91bfb55bfc7ab446ea60932096d3d Gerrit-Change-Number: 11653 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:15:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:15:31 +0000 Subject: Change in osmo-pcu[master]: deb: add missing copyright file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11653 ) Change subject: deb: add missing copyright file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib05480c0eea91bfb55bfc7ab446ea60932096d3d Gerrit-Change-Number: 11653 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 18 Nov 2018 20:15:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:19:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:19:04 +0000 Subject: Change in libosmocore[master]: Move msgb_push helpers to public header In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11679 ) Change subject: Move msgb_push helpers to public header ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11679/1/include/osmocom/core/msgb.h File include/osmocom/core/msgb.h: https://gerrit.osmocom.org/#/c/11679/1/include/osmocom/core/msgb.h at 378 PS1, Line 378: static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, this is just a wrapper around msgb_tlv_push() with addressof-value and length 1. Please use a inline function or #define rather than re-implementing this from gsm/tlv.h -- To view, visit https://gerrit.osmocom.org/11679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37e91d031fba28cf1c6735b8069b0265746f55e6 Gerrit-Change-Number: 11679 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:19:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Nov 18 20:19:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 18 Nov 2018 20:19:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sip-connector_=C2=BB_a1=3D?= =?UTF-8?Q?default,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#880?= Message-ID: <825423316.649.1542572375379.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 38.66 KB...] more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128.lo CC comp128v23.lo CC gsm_utils.lo CC rsl.lo CC gsm48.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la ' libtool: warning: relinking 'libosmocoding.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:1:1 -no-undefined -ltalloc -o libosmocoding.la -rpath gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.1 libosmocoding.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.1 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.1 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gb make[2]: Entering directory ' CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_ns_frgre.lo CC gprs_bssgp_util.lo CC gprs_bssgp.lo CC gprs_bssgp_bss.lo CC gprs_bssgp_vty.lo CC common_vty.lo CCLD libosmogb.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogb.la ' libtool: warning: relinking 'libosmogb.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogb.map -version-info 7:0:1 -o libosmogb.la -rpath gprs_ns.lo gprs_ns_frgre.lo gprs_ns_vty.lo gprs_bssgp.lo gprs_bssgp_util.lo gprs_bssgp_vty.lo gprs_bssgp_bss.lo common_vty.lo -ltalloc ../../src/libosmocore.la ../../src/vty/libosmovty.la ../../src/gsm/libosmogsm.la ) libtool: install: /usr/bin/install -c .libs/libosmogb.so.6.1.0T libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so.6 || { rm -f libosmogb.so.6 && ln -s libosmogb.so.6.1.0 libosmogb.so.6; }; }) libtool: install: (cd && { ln -s -f libosmogb.so.6.1.0 libosmogb.so || { rm -f libosmogb.so && ln -s libosmogb.so.6.1.0 libosmogb.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogb.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/ctrl make[2]: Entering directory ' CC control_cmd.lo CC fsm_ctrl_commands.lo CC control_if.lo CC control_vty.lo /bin/bash: line 2: 29804 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -DBUILDING_LIBOSMOCORE -Wall -Wall -I../../include -I../../include -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT fsm_ctrl_commands.lo -MD -MP -MF $depbase.Tpo -c -o fsm_ctrl_commands.lo fsm_ctrl_commands.c Makefile:484: recipe for target 'fsm_ctrl_commands.lo' failed make[2]: *** [fsm_ctrl_commands.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:19:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:19:43 +0000 Subject: Change in osmo-bsc[master]: LCLS: tighten GCR check In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11689 ) Change subject: LCLS: tighten GCR check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9690e1b2d14e41471413bb35eb22fa6c4c4d67fd Gerrit-Change-Number: 11689 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:19:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:19:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:19:45 +0000 Subject: Change in osmo-bsc[master]: LCLS: tighten GCR check In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11689 ) Change subject: LCLS: tighten GCR check ...................................................................... LCLS: tighten GCR check Use stricter checks for received Global Call Reference. Change-Id: I9690e1b2d14e41471413bb35eb22fa6c4c4d67fd Related: OS#2487 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 13 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 6b7a682..f03fb6e 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -520,19 +520,20 @@ static void bssmap_handle_ass_req_lcls(struct gsm_subscriber_connection *conn, const struct tlv_parsed *tp) { - const struct tlv_p_entry *tlv; - const uint8_t *config, *control; + const uint8_t *config, *control, *gcr, gcr_len = TLVP_LEN(tp, GSM0808_IE_GLOBAL_CALL_REF); - tlv = TLVP_GET(tp, GSM0808_IE_GLOBAL_CALL_REF); - if (tlv) { - if (tlv->len > sizeof(conn->lcls.global_call_ref)) - LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too long\n", - tlv->len); - else { - LOGPFSM(conn->fi, "Setting GCR to %s\n", osmo_hexdump_nospc(tlv->val, tlv->len)); - memcpy(&conn->lcls.global_call_ref, tlv->val, tlv->len); - conn->lcls.global_call_ref_len = tlv->len; - } + if (gcr_len > sizeof(conn->lcls.global_call_ref)) + LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too long\n", + gcr_len); + else { + gcr = TLVP_VAL_MINLEN(tp, GSM0808_IE_GLOBAL_CALL_REF, 13); + if (gcr) { + LOGPFSM(conn->fi, "Setting GCR to %s\n", osmo_hexdump_nospc(gcr, gcr_len)); + memcpy(&conn->lcls.global_call_ref, gcr, gcr_len); + conn->lcls.global_call_ref_len = gcr_len; + } else + LOGPFSML(conn->fi, LOGL_ERROR, "Global Call Ref IE of %u bytes is too short\n", + gcr_len); } config = TLVP_VAL_MINLEN(tp, GSM0808_IE_LCLS_CONFIG, 1); -- To view, visit https://gerrit.osmocom.org/11689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9690e1b2d14e41471413bb35eb22fa6c4c4d67fd Gerrit-Change-Number: 11689 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:20:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 20:20:30 +0000 Subject: Change in osmocom-bb[master]: mobile: add header for MS' MNCC functions In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11816 ) Change subject: mobile: add header for MS' MNCC functions ...................................................................... mobile: add header for MS' MNCC functions This simplifies adding new functions and re-using them from other parts of the code. Change-Id: Ibad400a99afe052f011f54fc706836b6bf89f4b9 --- M src/host/layer23/include/osmocom/bb/mobile/Makefile.am A src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 12 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 12cf24b..8e4be1a 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -1,3 +1,3 @@ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ gsm48_rr.h mncc.h settings.h subscriber.h support.h \ - transaction.h vty.h mncc_sock.h primitives.h + transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h new file mode 100644 index 0000000..49ce1a4 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h @@ -0,0 +1,9 @@ +#pragma once + +int mncc_call(struct osmocom_ms *ms, char *number); +int mncc_hangup(struct osmocom_ms *ms); +int mncc_answer(struct osmocom_ms *ms); +int mncc_hold(struct osmocom_ms *ms); +int mncc_retrieve(struct osmocom_ms *ms, int number); +int mncc_dtmf(struct osmocom_ms *ms, char *dtmf); + diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 9be9c8f..9f58112 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -30,15 +30,14 @@ #include #include #include +#include #include static uint32_t new_callref = 1; static LLIST_HEAD(call_list); -void mncc_set_cause(struct gsm_mncc *data, int loc, int val); static int dtmf_statemachine(struct gsm_call *call, struct gsm_mncc *mncc); static void timeout_dtmf(void *arg); -int mncc_answer(struct osmocom_ms *ms); /* * support functions diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 12c32a5..a0ad993 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -43,13 +44,6 @@ #include #include -int mncc_call(struct osmocom_ms *ms, char *number); -int mncc_hangup(struct osmocom_ms *ms); -int mncc_answer(struct osmocom_ms *ms); -int mncc_hold(struct osmocom_ms *ms); -int mncc_retrieve(struct osmocom_ms *ms, int number); -int mncc_dtmf(struct osmocom_ms *ms, char *dtmf); - extern struct llist_head ms_list; extern struct llist_head active_connections; -- To view, visit https://gerrit.osmocom.org/11816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibad400a99afe052f011f54fc706836b6bf89f4b9 Gerrit-Change-Number: 11816 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:20:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:20:23 +0000 Subject: Change in osmo-bts[master]: prevent potential NULL dereference in virtbts's tx_tchh_fn In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11632 ) Change subject: prevent potential NULL dereference in virtbts's tx_tchh_fn ...................................................................... prevent potential NULL dereference in virtbts's tx_tchh_fn If chan_state->ongoing_facch is set, this code's logic suggests that both msg_facch and msg_tch could be NULL. Don't dereference msg_tch unconditionally. Change-Id: Icf5584396c5b925d55ca9380dd4f869ae5d72da3 Related: CID#172047 --- M src/osmo-bts-virtual/scheduler_virtbts.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 2248afc..25f6583 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -463,7 +463,7 @@ if (msg_facch) { tx_to_virt_um(l1t, tn, fn, chan, msg_facch); msgb_free(msg_tch); - } else + } else if (msg_tch) tx_to_virt_um(l1t, tn, fn, chan, msg_tch); send_burst: -- To view, visit https://gerrit.osmocom.org/11632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icf5584396c5b925d55ca9380dd4f869ae5d72da3 Gerrit-Change-Number: 11632 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:20:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 20:20:31 +0000 Subject: Change in osmocom-bb[master]: mobile: use proper type for boolean flags In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11817 ) Change subject: mobile: use proper type for boolean flags ...................................................................... mobile: use proper type for boolean flags This makes reading code easier and simplifies further modifications. Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d --- M src/host/layer23/include/osmocom/bb/mobile/mncc.h M src/host/layer23/src/mobile/mnccms.c 2 files changed, 11 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index cad1883..8ec9358 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -36,9 +36,9 @@ uint32_t callref; - uint8_t init; /* call initiated, no response yet */ - uint8_t hold; /* call on hold */ - uint8_t ring; /* call ringing/knocking */ + bool init; /* call initiated, no response yet */ + bool hold; /* call on hold */ + bool ring; /* call ringing/knocking */ struct osmo_timer_list dtmf_timer; uint8_t dtmf_state; diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 9f58112..2243291 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -294,7 +294,7 @@ } /* not in initiated state anymore */ - call->init = 0; + call->init = false; switch (msg_type) { case MNCC_DISC_IND: @@ -478,9 +478,9 @@ LOGP(DMNCC, LOGL_INFO, "Ring!\n"); else { LOGP(DMNCC, LOGL_INFO, "Knock!\n"); - call->hold = 1; + call->hold = true; } - call->ring = 1; + call->ring = true; memset(&mncc, 0, sizeof(struct gsm_mncc)); mncc.callref = call->callref; mncc_tx_to_cc(ms, MNCC_ALERT_REQ, &mncc); @@ -498,7 +498,7 @@ vty_notify(ms, NULL); vty_notify(ms, "Call is on hold\n"); LOGP(DMNCC, LOGL_INFO, "Call is on hold\n"); - call->hold = 1; + call->hold = true; break; case MNCC_HOLD_REJ: vty_notify(ms, NULL); @@ -509,7 +509,7 @@ vty_notify(ms, NULL); vty_notify(ms, "Call is retrieved\n"); LOGP(DMNCC, LOGL_INFO, "Call is retrieved\n"); - call->hold = 0; + call->hold = false; break; case MNCC_RETRIEVE_REJ: vty_notify(ms, NULL); @@ -554,7 +554,7 @@ return -ENOMEM; call->ms = ms; call->callref = new_callref++; - call->init = 1; + call->init = true; llist_add_tail(&call->entry, &call_list); memset(&setup, 0, sizeof(struct gsm_mncc)); @@ -646,8 +646,8 @@ vty_notify(ms, "Please put active call on hold first!\n"); return -EBUSY; } - alerting->ring = 0; - alerting->hold = 0; + alerting->ring = false; + alerting->hold = false; memset(&rsp, 0, sizeof(struct gsm_mncc)); rsp.callref = alerting->callref; -- To view, visit https://gerrit.osmocom.org/11817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d Gerrit-Change-Number: 11817 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:20:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:20:42 +0000 Subject: Change in osmo-bsc[master]: check return value of gsm48_multirate_config() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11629 ) Change subject: check return value of gsm48_multirate_config() ...................................................................... check return value of gsm48_multirate_config() Check the return value of gsm48_multirate_config() in function lchan_set_single_amr_mode(). This prevents an invalid AMR mode from being configured for a logical channel. Because the VTY parsier limits the AMR mode range to 0-7 this is just a theoretical issue. However, this fact is beyond the understanding of a static code analyzer, and the absence of error handling was indeed setting a bad example. Change-Id: I61153a44e8b7a38332bf38718397be9b339d5f25 Related: CID#188940 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 21 insertions(+), 6 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index b9a5268..f4f5838 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -4493,10 +4493,11 @@ } /* configure the lchan for a single AMR mode (as specified) */ -static int lchan_set_single_amr_mode(struct gsm_lchan *lchan, uint8_t amr_mode) +static int lchan_set_single_amr_mode(struct vty *vty, struct gsm_lchan *lchan, uint8_t amr_mode) { struct amr_multirate_conf mr; struct gsm48_multi_rate_conf *mr_conf; + int rc, vty_rc = CMD_SUCCESS; mr_conf = (struct gsm48_multi_rate_conf *) &mr.gsm48_ie; if (amr_mode > 7) @@ -4515,10 +4516,22 @@ /* encode this configuration into the lchan for both uplink and * downlink direction */ - gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes); - gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes); + rc = gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (%s, amr mode %d, ms) - check parameters%s", + gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE); + vty_rc = CMD_WARNING; + } + rc = gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes); + if (rc != 0) { + vty_out(vty, + "Invalid AMR multirate configuration (%s, amr mode %d, bts) - check parameters%s", + gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE); + vty_rc = CMD_WARNING; + } - return 0; + return vty_rc; } /* Debug/Measurement command to activate a given logical channel @@ -4574,14 +4587,16 @@ else if (!strcmp(codec_str, "efr")) lchan->tch_mode = GSM48_CMODE_SPEECH_EFR; else if (!strcmp(codec_str, "amr")) { - int amr_mode; + int amr_mode, vty_rc; if (argc < 7) { vty_out(vty, "%% AMR requires specification of AMR mode%s", VTY_NEWLINE); return CMD_WARNING; } amr_mode = atoi(argv[6]); lchan->tch_mode = GSM48_CMODE_SPEECH_AMR; - lchan_set_single_amr_mode(lchan, amr_mode); + vty_rc = lchan_set_single_amr_mode(vty, lchan, amr_mode); + if (vty_rc != CMD_SUCCESS) + return vty_rc; } vty_out(vty, "%% activating lchan %s%s", gsm_lchan_name(lchan), VTY_NEWLINE); rsl_tx_chan_activ(lchan, RSL_ACT_TYPE_INITIAL, 0); -- To view, visit https://gerrit.osmocom.org/11629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I61153a44e8b7a38332bf38718397be9b339d5f25 Gerrit-Change-Number: 11629 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:20:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 20:20:49 +0000 Subject: Change in libosmocore[master]: Update GSM0808_LCLS enums In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11678 ) Change subject: Update GSM0808_LCLS enums ...................................................................... Update GSM0808_LCLS enums Add values indicating that LCLS control/config/status value has not been received yet. Change-Id: I52dc6a52f5ee043ed2c1625ffecfd495e3c746b1 Related: OS#2487 --- M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 2317e78..cb9fe01 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -576,6 +576,7 @@ GSM0808_LCLS_CFG_BOTH_WAY_AND_SEND_DL_BLOCK_LOCAL_DL = 0x03, GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL = 0x04, GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL_BLOCK_LOCAL_DL = 0x05, + GSM0808_LCLS_CFG_NA = 0xFF }; /* TS 48.008 3.2.2.117 */ @@ -585,6 +586,7 @@ GSM0808_LCLS_CSC_RELEASE_LCLS = 0x02, GSM0808_LCLS_CSC_BICAST_UL_AT_HANDOVER = 0x03, GSM0808_LCLS_CSC_BICAST_UL_AND_RECV_DL_AT_HANDOVER = 0x04, + GSM0808_LCLS_CSC_NA = 0xFF }; /* TS 48.008 3.2.2.119 */ @@ -594,4 +596,5 @@ GSM0808_LCLS_STS_NO_LONGER_LS = 0x02, GSM0808_LCLS_STS_REQ_LCLS_NOT_SUPP = 0x03, GSM0808_LCLS_STS_LOCALLY_SWITCHED = 0x04, + GSM0808_LCLS_STS_NA = 0xFF }; diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 791ebc2..c413688 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -1307,6 +1307,7 @@ "Connect both-way, bi-cast UL to CN, send access DL from CN" }, { GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL_BLOCK_LOCAL_DL, "Connect both-way, bi-cast UL to CN, send access DL from CN, block local DL" }, + { GSM0808_LCLS_CFG_NA, "Not available" }, { 0, NULL } }; @@ -1316,6 +1317,7 @@ { GSM0808_LCLS_CSC_RELEASE_LCLS, "Release LCLS" }, { GSM0808_LCLS_CSC_BICAST_UL_AT_HANDOVER, "Bi-cast UL at Handover" }, { GSM0808_LCLS_CSC_BICAST_UL_AND_RECV_DL_AT_HANDOVER, "Bi-cast UL and receive DL at Handover" }, + { GSM0808_LCLS_CSC_NA, "Not available" }, { 0, NULL } }; @@ -1325,6 +1327,7 @@ { GSM0808_LCLS_STS_NO_LONGER_LS, "Call is no longer locally switched" }, { GSM0808_LCLS_STS_REQ_LCLS_NOT_SUPP, "Requested LCLS configuration is not supported" }, { GSM0808_LCLS_STS_LOCALLY_SWITCHED, "Call is locally switched with requested LCLS config" }, + { GSM0808_LCLS_STS_NA, "Not available" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/11678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I52dc6a52f5ee043ed2c1625ffecfd495e3c746b1 Gerrit-Change-Number: 11678 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:21:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:21:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Sun, 18 Nov 2018 20:21:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:22:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:22:40 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11710 ) Change subject: osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieeb27fdb06c965fa6b70aeb0f3b3f5169b1f2012 Gerrit-Change-Number: 11710 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:22:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:22:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:22:42 +0000 Subject: Change in osmo-bsc[master]: osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11710 ) Change subject: osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init ...................................................................... osmo-bsc: gsm_timers_vty: Set global T_defs during vty_init Otherwise any use of functions in gsm_timers_vty.c will fail because g_vty_T_defs is never set (so it is NULL). Change-Id: Ieeb27fdb06c965fa6b70aeb0f3b3f5169b1f2012 --- M src/osmo-bsc/gsm_timers_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/gsm_timers_vty.c b/src/osmo-bsc/gsm_timers_vty.c index 8a13259..de61e24 100644 --- a/src/osmo-bsc/gsm_timers_vty.c +++ b/src/osmo-bsc/gsm_timers_vty.c @@ -102,6 +102,7 @@ /* Install GSM timer configuration commands in the VTY. */ void T_defs_vty_init(struct T_def *T_defs, int cfg_parent_node) { + g_vty_T_defs = T_defs; install_element_ve(&show_timer_cmd); install_element(cfg_parent_node, &cfg_timer_cmd); } -- To view, visit https://gerrit.osmocom.org/11710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ieeb27fdb06c965fa6b70aeb0f3b3f5169b1f2012 Gerrit-Change-Number: 11710 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:23:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:23:23 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 20:23:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:25:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:25:07 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11552 ) Change subject: LCLS: add bts-loop variant ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 20:25:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:25:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:25:59 +0000 Subject: Change in osmo-bsc[master]: always directly send BSSMAP Clear Request In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11700 ) Change subject: always directly send BSSMAP Clear Request ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39fae24260a4bb7a6af704ebe760f93fff566536 Gerrit-Change-Number: 11700 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sun, 18 Nov 2018 20:25:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:26:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:26:01 +0000 Subject: Change in osmo-bsc[master]: always directly send BSSMAP Clear Request In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11700 ) Change subject: always directly send BSSMAP Clear Request ...................................................................... always directly send BSSMAP Clear Request When a gscon wants to send a BSSMAP Clear Request, it makes no sense to do it conditionally depending on the current conn state. Just send it: don't call gscon_sigtran_send(), directly go for osmo_bsc_sigtran_send(). In particular, if an incoming inter-BSC handover ends in failure, the gscon state is still ST_INIT, but if the MSC fails to give us a Clear Command, we may want to ask with a BSSMAP Clear Request. Change-Id: I39fae24260a4bb7a6af704ebe760f93fff566536 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index d2ca03e..074c238 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -134,7 +134,14 @@ enum gsm0808_cause cause) { struct msgb *resp = gsm0808_create_clear_rqst(cause); - gscon_sigtran_send(conn, resp); + int rc; + if (!resp) { + LOGPFSML(conn->fi, LOGL_ERROR, "Unable to compose BSSMAP Clear Request message\n"); + return; + } + rc = osmo_bsc_sigtran_send(conn, resp); + if (rc < 0) + LOGPFSML(conn->fi, LOGL_ERROR, "Unable to deliver BSSMAP Clear Request message\n"); } /* forward MO DTAP from RSL side to BSSAP side */ -- To view, visit https://gerrit.osmocom.org/11700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I39fae24260a4bb7a6af704ebe760f93fff566536 Gerrit-Change-Number: 11700 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:26:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:26:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add inter-bsc ho incoming failure tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11699 ) Change subject: bsc: add inter-bsc ho incoming failure tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe Gerrit-Change-Number: 11699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: osmith Gerrit-Comment-Date: Sun, 18 Nov 2018 20:26:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:26:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:26:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add inter-bsc ho incoming failure tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11699 ) Change subject: bsc: add inter-bsc ho incoming failure tests ...................................................................... Patch Set 1: great, but indeed the whitespaces could be removed before merge. up to you! -- To view, visit https://gerrit.osmocom.org/11699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe Gerrit-Change-Number: 11699 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: osmith Gerrit-Comment-Date: Sun, 18 Nov 2018 20:26:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:27:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:27:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: support odd-length calling MSISDN in MSC tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11743 ) Change subject: support odd-length calling MSISDN in MSC tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34439c8750f588802a5403375e2a3d6e74dae70c Gerrit-Change-Number: 11743 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 20:27:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:27:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:27:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: support odd-length calling MSISDN in MSC tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11743 ) Change subject: support odd-length calling MSISDN in MSC tests ...................................................................... support odd-length calling MSISDN in MSC tests MSC tests were unable to match odd-length digit strings in a CallingPartyBCD_Number template created by tr_Calling(). This happens because the raw encoder for CallingPartyBCD_Number pads odd-length digits with 1-bits ('F'H). Do the same when constructing such a template in our own code to ensure that we'll match the actual data received. Change-Id: I34439c8750f588802a5403375e2a3d6e74dae70c Related: OS#2930 --- M library/L3_Templates.ttcn M msc/MSC_Tests.ttcn 2 files changed, 12 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 52d4a2a..e109fde 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -838,11 +838,20 @@ digits := digits } +private function f_pad_digits(hexstring digits) return hexstring { + if (lengthof(digits) mod 2 != 0) { + /* Add trailing nibble of 1-bit padding, like the CallingPartyBCD_Number encoder would do. + * Otherwise our template won't match the data received (see OS#2930). */ + return digits & 'F'H; + } + return digits; +} + template CallingPartyBCD_Number tr_Calling(template hexstring digits) := { elementIdentifier := '5C'O, lengthIndicator := ?, oct3 := ?, - digits := digits + digits := f_pad_digits(valueof(digits)) } type integer SpeechVer; diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index c0cd9d3..2a6c034 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1722,8 +1722,7 @@ /* LU followed by MT call (including paging) */ private function f_tc_lu_and_mt_call(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { f_init_handler(pars); - //FIXME: odd digits var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); - var CallParameters cpars := valueof(t_CallParams('123456'H, 0)); + var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); cpars.bss_rtp_port := 1110; cpars.mgcp_connection_id_bss := '10004'H; cpars.mgcp_connection_id_mss := '10005'H; @@ -1845,8 +1844,7 @@ /* LU followed by MT call (including paging) */ private function f_tc_lu_and_mt_call_no_dlcx_resp(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { f_init_handler(pars); - //FIXME: odd digits var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); - var CallParameters cpars := valueof(t_CallParams('123456'H, 0)); + var CallParameters cpars := valueof(t_CallParams('12345'H, 0)); cpars.bss_rtp_port := 1110; cpars.mgcp_connection_id_bss := '10004'H; cpars.mgcp_connection_id_mss := '10005'H; -- To view, visit https://gerrit.osmocom.org/11743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I34439c8750f588802a5403375e2a3d6e74dae70c Gerrit-Change-Number: 11743 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:29:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:29:38 +0000 Subject: Change in osmo-bts[master]: bts: Allocate TRX for BTS dynamically, deprecate -t In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11735 ) Change subject: bts: Allocate TRX for BTS dynamically, deprecate -t ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c Gerrit-Change-Number: 11735 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 20:29:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:29:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:29:40 +0000 Subject: Change in osmo-bts[master]: bts: Allocate TRX for BTS dynamically, deprecate -t In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11735 ) Change subject: bts: Allocate TRX for BTS dynamically, deprecate -t ...................................................................... bts: Allocate TRX for BTS dynamically, deprecate -t No need to pass -t num_trx anymore to specify number of TRX to use. It is calculated based on dynamic allocation from VTY config. Using parameter -t is flagged as deprecated and is transformed into a NOOP por backward compatibility. As a result, TRX now are allocated after the BTS is allocated and initial config (pre-VTY) is applied. A new function bts_trx_init() is added, to set default config on each TRX during allocation and before setting VTY config on it. A new per BTS model function bts_model_trx_init() is added, to allow per model specific default configuration of each TRX. Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c --- M include/osmo-bts/bts.h M include/osmo-bts/bts_model.h M src/common/bts.c M src/common/main.c M src/common/vty.c M src/osmo-bts-litecell15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c M tests/handover/handover_test.c M tests/meas/meas_test.c M tests/stubs.c M tests/sysmobts/sysmobts_test.c 16 files changed, 119 insertions(+), 61 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 34ba956..d7c4bbf 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -27,6 +27,7 @@ extern void *tall_bts_ctx; int bts_init(struct gsm_bts *bts); +int bts_trx_init(struct gsm_bts_trx *trx); void bts_shutdown(struct gsm_bts *bts, const char *reason); struct gsm_bts *create_bts(uint8_t num_trx, char *id); diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h index 7a87d78..f1f6830 100644 --- a/include/osmo-bts/bts_model.h +++ b/include/osmo-bts/bts_model.h @@ -14,6 +14,7 @@ /* BTS model specific functions needed by the common code */ int bts_model_init(struct gsm_bts *bts); +int bts_model_trx_init(struct gsm_bts_trx *trx); int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type, struct tlv_parsed *old_attr, struct tlv_parsed *new_attr, diff --git a/src/common/bts.c b/src/common/bts.c index c251fdd..68cb167 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -105,11 +105,10 @@ bts_ctr_desc }; -/* Initialize the BTS (and TRX) data structures, called before config +/* Initialize the BTS data structures, called before config * file reading */ int bts_init(struct gsm_bts *bts) { - struct gsm_bts_trx *trx; int rc, i; static int initialized = 0; void *tall_rtp_ctx; @@ -167,26 +166,6 @@ oml_mo_state_init(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_DEPENDENCY); oml_mo_state_init(&bts->gprs.nsvc[1].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); - /* initialize bts data structure */ - llist_for_each_entry(trx, &bts->trx_list, list) { - struct trx_power_params *tpp = &trx->power_params; - int i; - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - int k; - - for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) { - struct gsm_lchan *lchan = &ts->lchan[k]; - INIT_LLIST_HEAD(&lchan->dl_tch_queue); - } - } - /* Default values for the power adjustments */ - tpp->ramp.max_initial_pout_mdBm = to_mdB(0); - tpp->ramp.step_size_mdB = to_mdB(2); - tpp->ramp.step_interval_sec = 1; - } - /* allocate a talloc pool for ORTP to ensure it doesn't have to go back * to the libc malloc all the time */ tall_rtp_ctx = talloc_pool(tall_bts_ctx, 262144); @@ -215,6 +194,36 @@ return rc; } +/* Initialize the TRX data structures, called before config + * file reading */ +int bts_trx_init(struct gsm_bts_trx *trx) +{ + /* initialize bts data structure */ + struct trx_power_params *tpp = &trx->power_params; + int rc, i; + + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + int k; + + for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) { + struct gsm_lchan *lchan = &ts->lchan[k]; + INIT_LLIST_HEAD(&lchan->dl_tch_queue); + } + } + /* Default values for the power adjustments */ + tpp->ramp.max_initial_pout_mdBm = to_mdB(0); + tpp->ramp.step_size_mdB = to_mdB(2); + tpp->ramp.step_interval_sec = 1; + + rc = bts_model_trx_init(trx); + if (rc < 0) { + llist_del(&trx->list); + return rc; + } + return 0; +} + static void shutdown_timer_cb(void *data) { fprintf(stderr, "Shutdown timer expired\n"); diff --git a/src/common/main.c b/src/common/main.c index 9121a2a..f90a4d4 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -59,7 +59,6 @@ static const char *config_file = "osmo-bts.cfg"; static int daemonize = 0; static int rt_prio = -1; -static int trx_num = 1; static char *gsmtap_ip = 0; extern int g_vty_port_num; @@ -76,8 +75,6 @@ " -e --log-level Set a global log-level\n" " -r --realtime PRIO Use SCHED_RR with the specified priority\n" " -i --gsmtap-ip The destination IP used for GSMTAP.\n" - " -t --trx-num Set number of TRX (default=%d)\n", - trx_num ); bts_model_print_help(); } @@ -152,9 +149,8 @@ gsmtap_ip = optarg; break; case 't': - trx_num = atoi(optarg); - if (trx_num < 1) - trx_num = 1; + fprintf(stderr, "Parameter -t is deprecated and does nothing, " + "TRX num is calculated from VTY\n"); break; case '?': case 1: @@ -228,7 +224,7 @@ { struct gsm_bts_trx *trx; struct e1inp_line *line; - int rc, i; + int rc; printf("((*))\n |\n / \\ OsmoBTS\n"); @@ -251,13 +247,7 @@ fprintf(stderr, "Failed to create BTS structure\n"); exit(1); } - for (i = 1; i < trx_num; i++) { - trx = gsm_bts_trx_alloc(bts); - if (!trx) { - fprintf(stderr, "Failed to create TRX structure\n"); - exit(1); - } - } + e1inp_vty_init(); bts_vty_init(bts, &bts_log_info); diff --git a/src/common/vty.c b/src/common/vty.c index f918f57..f305413 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -227,12 +227,22 @@ struct gsm_bts *bts = vty->index; struct gsm_bts_trx *trx; - trx = gsm_bts_trx_num(bts, trx_nr); + + if (trx_nr > bts->num_trx) { + vty_out(vty, "%% The next unused TRX number is %u%s", + bts->num_trx, VTY_NEWLINE); + return CMD_WARNING; + } else if (trx_nr == bts->num_trx) { + /* allocate a new one */ + trx = gsm_bts_trx_alloc(bts); + if (trx) + bts_trx_init(trx); + } else + trx = gsm_bts_trx_num(bts, trx_nr); + if (!trx) { - vty_out(vty, "Unknown TRX %u. Available TRX are: 0..%u%s", - trx_nr, bts->num_trx - 1, VTY_NEWLINE); - vty_out(vty, "Hint: Check if commandline option -t matches the" - "number of available transceivers!%s", VTY_NEWLINE); + vty_out(vty, "%% Unable to allocate TRX %u%s", + trx_nr, VTY_NEWLINE); return CMD_WARNING; } diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c index de175e3..e4f9a56 100644 --- a/src/osmo-bts-litecell15/main.c +++ b/src/osmo-bts-litecell15/main.c @@ -79,11 +79,6 @@ exit(1); } - llist_for_each_entry(trx, &bts->trx_list, list) { - trx->nominal_power = 40; - trx->power_params.trx_p_max_out_mdBm = to_mdB(bts->c0->nominal_power); - } - if (stat(LC15BTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); exit(23); @@ -104,6 +99,13 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + trx->nominal_power = 40; + trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power); + return 0; +} + void bts_model_phy_link_set_defaults(struct phy_link *plink) { } diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index 9777c09..574bc72 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -105,11 +105,6 @@ exit(1); } - llist_for_each_entry(trx, &bts->trx_list, list) { - trx->nominal_power = 40; - trx->power_params.trx_p_max_out_mdBm = to_mdB(bts->c0->nominal_power); - } - if (stat(OC2GBTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); exit(23); @@ -130,6 +125,13 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + trx->nominal_power = 40; + trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power); + return 0; +} + void bts_model_phy_link_set_defaults(struct phy_link *plink) { } diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 40d5300..f149c04 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -792,6 +792,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + /*********************************************************************** * handling of messages coming up from PHY ***********************************************************************/ diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 9ade2c6..fa1aaf4 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -179,6 +179,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + void bts_model_print_help() { } diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index b63d07e..221e8e8 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -91,6 +91,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + int bts_model_oml_estab(struct gsm_bts *bts) { return 0; diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 61610f7..98f460e 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -118,6 +118,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + void bts_model_phy_link_set_defaults(struct phy_link *plink) { plink->u.osmotrx.local_ip = talloc_strdup(plink, "127.0.0.1"); diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index b66a3ff..88041fd 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -72,6 +72,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + void bts_model_print_help() { LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index c7bd8f8..407ed95 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -75,14 +75,18 @@ fprintf(stderr, "Failed to create BTS structure\n"); exit(1); } - trx = gsm_bts_trx_alloc(bts); - if (!trx) { - fprintf(stderr, "Failed to TRX structure\n"); + if (bts_init(bts) < 0) { + fprintf(stderr, "unable to init BTS\n"); exit(1); } - if (bts_init(bts) < 0) { - fprintf(stderr, "unable to to open bts\n"); + trx = gsm_bts_trx_alloc(bts); + if (!trx) { + fprintf(stderr, "Failed to alloc TRX structure\n"); + exit(1); + } + if (bts_trx_init(trx) < 0) { + fprintf(stderr, "unable to init TRX\n"); exit(1); } @@ -268,6 +272,7 @@ int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { return 0; } int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj, uint8_t adm_state) { return 0; } int bts_model_init(struct gsm_bts *bts) { return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) { return 0; } int bts_model_trx_deact_rf(struct gsm_bts_trx *trx) { return 0; } int bts_model_trx_close(struct gsm_bts_trx *trx) { return 0; } void trx_get_hlayer1(void) {} diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index d4f3fe6..f580374 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -519,14 +519,18 @@ fprintf(stderr, "Failed to create BTS structure\n"); exit(1); } - trx = gsm_bts_trx_alloc(bts); - if (!trx) { - fprintf(stderr, "Failed to TRX structure\n"); + if (bts_init(bts) < 0) { + fprintf(stderr, "unable to init BTS\n"); exit(1); } - if (bts_init(bts) < 0) { - fprintf(stderr, "unable to to open bts\n"); + trx = gsm_bts_trx_alloc(bts); + if (!trx) { + fprintf(stderr, "Failed to alloc TRX structure\n"); + exit(1); + } + if (bts_trx_init(trx) < 0) { + fprintf(stderr, "unable to init TRX\n"); exit(1); } @@ -626,6 +630,11 @@ return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ + return 0; +} + int bts_model_trx_deact_rf(struct gsm_bts_trx *trx) { return 0; diff --git a/tests/stubs.c b/tests/stubs.c index f969cb3..d6f4d3d 100644 --- a/tests/stubs.c +++ b/tests/stubs.c @@ -13,6 +13,8 @@ { return 0; } int bts_model_init(struct gsm_bts *bts) { return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ return 0; } int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, struct tlv_parsed *new_attr, int kind, void *obj) { return 0; } diff --git a/tests/sysmobts/sysmobts_test.c b/tests/sysmobts/sysmobts_test.c index 02490be..4b01ed7 100644 --- a/tests/sysmobts/sysmobts_test.c +++ b/tests/sysmobts/sysmobts_test.c @@ -198,6 +198,8 @@ int bts_model_init(struct gsm_bts *bts) { return 0; } +int bts_model_trx_init(struct gsm_bts_trx *trx) +{ return 0; } int bts_model_oml_estab(struct gsm_bts *bts) { return 0; } void bts_model_abis_close(struct gsm_bts *bts) -- To view, visit https://gerrit.osmocom.org/11735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c Gerrit-Change-Number: 11735 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:30:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:30:02 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Enable tests for LimeSDR-USB In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11745 ) Change subject: default-suites: Enable tests for LimeSDR-USB ...................................................................... default-suites: Enable tests for LimeSDR-USB Change-Id: I896ea76f1d2847ec014a62c87220d184b95d1dd2 --- M example/default-suites.conf 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index df79232..07b8a5f 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -74,6 +74,26 @@ - dynts:trx-umtrx+mod-bts0-dynts67-ipa+cfg-codec-fr-any - dynts:trx-umtrx+mod-bts0-dynts67-osmo +- nitb_sms:trx-lms +- sms:trx-lms +- nitb_ussd:trx-lms +- ussd:trx-lms +- voice:trx-lms+mod-bts0-ts-tchf+cfg-codec-fr1 +- voice:trx-lms+mod-bts0-ts-tchf+cfg-codec-fr2 +- voice:trx-lms+mod-bts0-ts-tchf+cfg-codec-fr3 +- voice:trx-lms+mod-bts0-ts-tchh+cfg-codec-hr1 +- voice:trx-lms+mod-bts0-ts-tchh+cfg-codec-hr3 +- voice:trx-lms+mod-bts0-dynts-ipa+cfg-codec-fr-any +- voice:trx-lms+mod-bts0-dynts-osmo +- voice:trx-lms+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- gprs:trx-lms +- gprs:trx-lms+mod-bts0-egprs +- gprs:trx-lms+mod-bts0-dynts-ipa +- gprs:trx-lms+mod-bts0-dynts-osmo +- gprs:trx-lms+mod-bts0-numtrx2+mod-bts0-chanallocdescend +- dynts:trx-lms+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:trx-lms+mod-bts0-dynts67-osmo + - nitb_sms:nanobts - sms:nanobts+band-1900 - nitb_ussd:nanobts+band-1900 -- To view, visit https://gerrit.osmocom.org/11745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I896ea76f1d2847ec014a62c87220d184b95d1dd2 Gerrit-Change-Number: 11745 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:30:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:30:00 +0000 Subject: Change in osmo-gsm-tester[master]: default-suites: Enable tests for LimeSDR-USB In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11745 ) Change subject: default-suites: Enable tests for LimeSDR-USB ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I896ea76f1d2847ec014a62c87220d184b95d1dd2 Gerrit-Change-Number: 11745 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:30:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:30:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 20:30:08 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11601 to look at the new patch set (#7). Change subject: Support cipher mode reject with extended cause ...................................................................... Support cipher mode reject with extended cause * add function to generate cipher mode reject with extended (2-byte) Cause IE * add function to get (extended) Cause value * add corresponding (extended cause) test * update existing (non-extended cause) test * use enum as a parameter for existing non-extended version to make interface more unified Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Related: OS#3187 --- M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 89 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/11601/7 -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:32:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:32:37 +0000 Subject: Change in osmo-msc[master]: Store subscriber's cell identity In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11746 ) Change subject: Store subscriber's cell identity ...................................................................... Patch Set 1: can you please point me to the spec reference that states the CI is part of the GCR? -- To view, visit https://gerrit.osmocom.org/11746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e Gerrit-Change-Number: 11746 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 18 Nov 2018 20:32:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:33:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:33:05 +0000 Subject: Change in osmo-remsim[master]: add ATR as command line argument In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11753 ) Change subject: add ATR as command line argument ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id1084abdf2318e96c22f8e69cc1ef161b12ef5ea Gerrit-Change-Number: 11753 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:33:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:33:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:33:06 +0000 Subject: Change in osmo-remsim[master]: add ATR as command line argument In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11753 ) Change subject: add ATR as command line argument ...................................................................... add ATR as command line argument we could add a function checking the ATR validity also before updating the (conditional) checksum we should check if it is actually present in the ATR Change-Id: Id1084abdf2318e96c22f8e69cc1ef161b12ef5ea --- M src/simtrace2-remsim_client.c 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index 365acb4..f033e7d 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -245,6 +245,7 @@ return st_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_DT_CEMU_TX_DATA); } +// FIXME check if the ATR actually includes a checksum static void atr_update_csum(uint8_t *atr, unsigned int atr_len) { uint8_t csum = 0; @@ -617,6 +618,7 @@ "\t-S\t--usb-altsetting ALTSETTING_ID\n" "\t-A\t--usb-address\tADDRESS\n" "\t-H\t--usb-path\tPATH\n" + "\t-a\t--atr\tATR\n" "\n" ); } @@ -636,6 +638,7 @@ { "usb-altsetting", 1, 0, 'S' }, { "usb-address", 1, 0, 'A' }, { "usb-path", 1, 0, 'H' }, + { "atr", 1, 0, 'a' }, { NULL, 0, 0, 0 } }; @@ -652,13 +655,15 @@ int config_id = -1, altsetting = 0, addr = -1; char *bankd_host = "127.0.0.1"; char *path = NULL; + uint8_t atr_data[33] = { 0x3B, 0x00 }; // the shortest simplest ATR possible + uint8_t atr_len = 2; print_welcome(); while (1) { int option_index = 0; - c = getopt_long(argc, argv, "b:p:c:s:hi:V:P:C:I:S:A:H:k", opts, &option_index); + c = getopt_long(argc, argv, "b:p:c:s:hi:V:P:C:I:S:A:H:a:k", opts, &option_index); if (c == -1) break; switch (c) { @@ -705,6 +710,14 @@ case 'H': path = optarg; break; + case 'a': + rc = osmo_hexparse(optarg, atr_data, ARRAY_SIZE(atr_data)); + if (rc < 2 || rc > ARRAY_SIZE(atr_data)) { + fprintf(stderr, "ATR matlformed\n"); + goto do_exit; + } + atr_len = rc; + break; } } @@ -839,9 +852,8 @@ st_modem_sim_select_remote(ci->slot); /* set the ATR */ - uint8_t real_atr[] = { 0x3B, 0x00 }; // the shortest simplest ATR possible - atr_update_csum(real_atr, sizeof(real_atr)); - cardem_request_set_atr(ci, real_atr, sizeof(real_atr)); + //atr_update_csum(real_atr, sizeof(real_atr)); + cardem_request_set_atr(ci, atr_data, atr_len); /* select remote (forwarded) SIM */ st_modem_reset_pulse(ci->slot, 300); -- To view, visit https://gerrit.osmocom.org/11753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id1084abdf2318e96c22f8e69cc1ef161b12ef5ea Gerrit-Change-Number: 11753 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:33:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:33:15 +0000 Subject: Change in osmo-remsim[master]: minor: show USB error message instead of number In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11754 ) Change subject: minor: show USB error message instead of number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I272ac1be82b7432934969ea4d204dd20067d9428 Gerrit-Change-Number: 11754 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:33:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:33:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:33:18 +0000 Subject: Change in osmo-remsim[master]: minor: show USB error message instead of number In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11754 ) Change subject: minor: show USB error message instead of number ...................................................................... minor: show USB error message instead of number Change-Id: I272ac1be82b7432934969ea4d204dd20067d9428 --- M src/simtrace2-remsim_client.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c index f033e7d..1cf09a6 100644 --- a/src/simtrace2-remsim_client.c +++ b/src/simtrace2-remsim_client.c @@ -465,7 +465,7 @@ if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT && rc != LIBUSB_ERROR_INTERRUPTED && rc != LIBUSB_ERROR_IO) { - fprintf(stderr, "BULK IN transfer error; rc=%d\n", rc); + fprintf(stderr, "BULK IN transfer error: %s\n", libusb_error_name(rc)); return; } /* dispatch any incoming data */ -- To view, visit https://gerrit.osmocom.org/11754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I272ac1be82b7432934969ea4d204dd20067d9428 Gerrit-Change-Number: 11754 Gerrit-PatchSet: 1 Gerrit-Owner: K?vin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:33:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:33:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add missing field in tr_BSSMAP_HandoverPerformed te... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11731 ) Change subject: BSSMAP_Templates: Add missing field in tr_BSSMAP_HandoverPerformed template ...................................................................... BSSMAP_Templates: Add missing field in tr_BSSMAP_HandoverPerformed template tr_BSSMAP_HandoverPerformed lacks the field speechVersion, lets add it to make the template complete. Change-Id: Id73c0aef5caa0936aa44308faf2aae1c20c7446c Related OS#3645 --- M library/BSSMAP_Templates.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index d00a5ab..5b943e9 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -833,6 +833,7 @@ cellIdentifier := ?, chosenChannel := omit, chosenEncryptionAlgorithm := omit, + speechVersion := omit, lSAIdentifier := omit, talkerPriority := omit, codecList := omit, -- To view, visit https://gerrit.osmocom.org/11731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id73c0aef5caa0936aa44308faf2aae1c20c7446c Gerrit-Change-Number: 11731 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:34:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:34:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11733 ) Change subject: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10f4e578c96a90317939ba49b61b14a3c7e488a7 Gerrit-Change-Number: 11733 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Sun, 18 Nov 2018 20:34:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:36:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:36:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 3: Code-Review-1 where does that restriction come from? I'm not aware that we can only accept a single CTRL client from the libosmocore.git implementation ?!? -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Sun, 18 Nov 2018 20:36:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:37:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:37:16 +0000 Subject: Change in osmo-bts[master]: common: Implement OML for trx_set_available(1) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11767 ) Change subject: common: Implement OML for trx_set_available(1) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a Gerrit-Change-Number: 11767 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:37:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:37:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:37:32 +0000 Subject: Change in osmo-bts[master]: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11768 ) Change subject: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 Gerrit-Change-Number: 11768 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:37:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:39:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:39:21 +0000 Subject: Change in osmo-bts[master]: bts-trx: setup timer once at creation time In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11766 ) Change subject: bts-trx: setup timer once at creation time ...................................................................... Patch Set 1: commit log could be more verbose. It describes the *what* but not the *why* -- To view, visit https://gerrit.osmocom.org/11766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 Gerrit-Change-Number: 11766 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sun, 18 Nov 2018 20:39:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun Nov 18 20:39:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 18 Nov 2018 20:39:52 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-osmo-sip-connector_=C2=BB?= =?UTF-8?Q?_a1=3Ddefault,a2=3Ddefault,a3=3Ddefa?= =?UTF-8?Q?ult,osmocom-master-debian9_#881?= In-Reply-To: <825423316.649.1542572375379.JavaMail.jenkins@jenkins.osmocom.org> References: <825423316.649.1542572375379.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <405852299.650.1542573592759.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:40:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:40:16 +0000 Subject: Change in osmo-bts[master]: bts-trx: trx_if: Use struct to store CTRL msg parsed responses In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11765 ) Change subject: bts-trx: trx_if: Use struct to store CTRL msg parsed responses ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icb84bce0621042afa4301678ba1cc58d8e3662bb Gerrit-Change-Number: 11765 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 20:40:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:40:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:40:55 +0000 Subject: Change in osmo-gsm-manuals[master]: ggsn: update vty reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11584 ) Change subject: ggsn: update vty reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a5c37505c0180d5c04c7792d6d0afdb0dffb282 Gerrit-Change-Number: 11584 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:40:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:01 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBSC: update VTY reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11582 ) Change subject: OsmoBSC: update VTY reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia9ba8d5eba531b1156de57573ab42517e0c1ca15 Gerrit-Change-Number: 11582 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:05 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: update vty reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11585 ) Change subject: hlr: update vty reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a2322c0488cb36b089303bbfec5d4db18c41099 Gerrit-Change-Number: 11585 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:08 +0000 Subject: Change in osmo-gsm-manuals[master]: mgw: update vty reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11586 ) Change subject: mgw: update vty reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib30ea8b02f8a950648b85e7ebc96a40ba5a36b34 Gerrit-Change-Number: 11586 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:12 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:16 +0000 Subject: Change in osmo-gsm-manuals[master]: sgsn: update vty reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11588 ) Change subject: sgsn: update vty reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64d775efa6791aca025d116905e951e10ffa5d04 Gerrit-Change-Number: 11588 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:20 +0000 Subject: Change in osmo-gsm-manuals[master]: sip-connector: update vty reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11589 ) Change subject: sip-connector: update vty reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I79b91847337b6022f8f750533301b3bf0eb086df Gerrit-Change-Number: 11589 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:23 +0000 Subject: Change in osmo-gsm-manuals[master]: stp: update vty reference In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11590 ) Change subject: stp: update vty reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5f1067760db7a11ec380a541bfe7357a21a3bb3 Gerrit-Change-Number: 11590 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:27 +0000 Subject: Change in osmo-gsm-manuals[master]: stp: update vty reference with added SCCP commands In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11591 ) Change subject: stp: update vty reference with added SCCP commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id941b8e31d3b4cfdb3f912beedc1e7af321a0113 Gerrit-Change-Number: 11591 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:29 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoBSC: update VTY reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11582 ) Change subject: OsmoBSC: update VTY reference ...................................................................... OsmoBSC: update VTY reference Re-generate bsc_vty_reference.xml from osmo-bsc, including updates to: - handover and neighbor config - SCCP timers - logging Change-Id: Ia9ba8d5eba531b1156de57573ab42517e0c1ca15 --- M OsmoBSC/vty/bsc_vty_reference.xml 1 file changed, 508 insertions(+), 450 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoBSC/vty/bsc_vty_reference.xml b/OsmoBSC/vty/bsc_vty_reference.xml index 29a61bc..f56b951 100644 --- a/OsmoBSC/vty/bsc_vty_reference.xml +++ b/OsmoBSC/vty/bsc_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -125,6 +119,12 @@ + + + + + + @@ -138,6 +138,12 @@ + + + + + + @@ -182,22 +188,10 @@ - - - - - - - - - - - - - + @@ -282,7 +276,7 @@ - + @@ -290,6 +284,7 @@ + @@ -299,30 +294,18 @@ - - - - - - - - - - + - - - + - @@ -330,6 +313,10 @@ + + + + @@ -348,7 +335,6 @@ - @@ -356,6 +342,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -406,6 +424,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -537,6 +575,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable @@ -590,12 +679,6 @@ - - - - - - @@ -643,6 +726,12 @@ + + + + + + @@ -656,6 +745,12 @@ + + + + + + @@ -700,6 +795,21 @@ + + + + + + + + + + + + + + + @@ -712,19 +822,16 @@ - + - - - - - - - - - - - + + + + + + + + @@ -800,7 +907,7 @@ - + @@ -808,6 +915,7 @@ + @@ -817,30 +925,18 @@ - - - - - - - - - - + - - - + - @@ -848,6 +944,10 @@ + + + + @@ -866,7 +966,6 @@ - @@ -874,6 +973,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -924,6 +1055,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -1249,6 +1400,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config @@ -1577,7 +1779,7 @@ - + @@ -1585,23 +1787,21 @@ + - + - - - + - @@ -1609,6 +1809,10 @@ + + + + @@ -1627,7 +1831,6 @@ - @@ -1635,6 +1838,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1903,15 +2138,6 @@ - - - - - - - - - @@ -1925,6 +2151,21 @@ + + + + + + + + + + + + + + + config-cs7-as @@ -2214,11 +2455,27 @@ - + - - - + + + + + + + + + + + + + + + + + + + @@ -2228,109 +2485,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2410,8 +2564,8 @@ - - + + @@ -2470,8 +2624,8 @@ - - + + @@ -2487,7 +2641,7 @@ - + @@ -2496,7 +2650,7 @@ - + @@ -2505,7 +2659,7 @@ - + @@ -2514,34 +2668,34 @@ - + - + - + - + - + - + - + @@ -2550,7 +2704,7 @@ - + @@ -2559,7 +2713,7 @@ - + @@ -2567,7 +2721,7 @@ - + @@ -2576,7 +2730,7 @@ - + @@ -2585,7 +2739,7 @@ - + @@ -2594,75 +2748,15 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2739,12 +2833,6 @@ - - - - - - @@ -3780,6 +3868,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3878,8 +4057,8 @@ - - + + @@ -3938,8 +4117,8 @@ - - + + @@ -3955,7 +4134,7 @@ - + @@ -3964,7 +4143,7 @@ - + @@ -3973,7 +4152,7 @@ - + @@ -3982,34 +4161,34 @@ - + - + - + - + - + - + - + @@ -4018,7 +4197,7 @@ - + @@ -4027,7 +4206,7 @@ - + @@ -4035,7 +4214,7 @@ - + @@ -4044,7 +4223,7 @@ - + @@ -4053,7 +4232,7 @@ - + @@ -4062,71 +4241,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-net-bts-trx @@ -4218,12 +4337,6 @@ - - - - - - @@ -4340,54 +4453,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4508,6 +4573,20 @@ + + + + + + + + + + + + + + @@ -4532,6 +4611,14 @@ + + + + + + + + @@ -4575,47 +4662,18 @@ - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + -- To view, visit https://gerrit.osmocom.org/11582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia9ba8d5eba531b1156de57573ab42517e0c1ca15 Gerrit-Change-Number: 11582 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:29 +0000 Subject: Change in osmo-gsm-manuals[master]: ggsn: update vty reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11584 ) Change subject: ggsn: update vty reference ...................................................................... ggsn: update vty reference Change-Id: I8a5c37505c0180d5c04c7792d6d0afdb0dffb282 --- M OsmoGGSN/vty/ggsn_vty_reference.xml 1 file changed, 118 insertions(+), 44 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoGGSN/vty/ggsn_vty_reference.xml b/OsmoGGSN/vty/ggsn_vty_reference.xml index 7a43263..7460026 100644 --- a/OsmoGGSN/vty/ggsn_vty_reference.xml +++ b/OsmoGGSN/vty/ggsn_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -175,7 +169,7 @@ - + @@ -183,6 +177,7 @@ + @@ -192,20 +187,10 @@ - - - - - - - - - - + - @@ -229,7 +214,6 @@ - @@ -237,6 +221,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -310,6 +326,12 @@ + + + + + + @@ -389,12 +411,6 @@ - - - - - - @@ -492,7 +508,7 @@ - + @@ -500,6 +516,7 @@ + @@ -509,20 +526,10 @@ - - - - - - - - - - + - @@ -546,7 +553,6 @@ - @@ -554,6 +560,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -627,6 +665,12 @@ + + + + + + @@ -777,8 +821,7 @@ - - + @@ -966,7 +1009,7 @@ - + @@ -974,13 +1017,13 @@ + - + - @@ -1004,7 +1047,6 @@ - @@ -1012,6 +1054,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats -- To view, visit https://gerrit.osmocom.org/11584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8a5c37505c0180d5c04c7792d6d0afdb0dffb282 Gerrit-Change-Number: 11584 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:29 +0000 Subject: Change in osmo-gsm-manuals[master]: hlr: update vty reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11585 ) Change subject: hlr: update vty reference ...................................................................... hlr: update vty reference Change-Id: I5a2322c0488cb36b089303bbfec5d4db18c41099 --- M OsmoHLR/vty/hlr_vty_reference.xml 1 file changed, 184 insertions(+), 46 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoHLR/vty/hlr_vty_reference.xml b/OsmoHLR/vty/hlr_vty_reference.xml index 8d161d4..cc97dc4 100644 --- a/OsmoHLR/vty/hlr_vty_reference.xml +++ b/OsmoHLR/vty/hlr_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -175,7 +169,7 @@ - + @@ -183,6 +177,7 @@ + @@ -192,23 +187,14 @@ - - - - - - - - - - + - + @@ -227,7 +213,6 @@ - @@ -235,6 +220,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -285,6 +302,12 @@ + + + + + + @@ -348,12 +371,6 @@ - - - - - - @@ -451,7 +468,7 @@ - + @@ -459,6 +476,7 @@ + @@ -468,23 +486,14 @@ - - - - - - - - - - + - + @@ -503,7 +512,6 @@ - @@ -511,6 +519,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -561,6 +601,12 @@ + + + + + + @@ -574,9 +620,9 @@ - + - + @@ -837,8 +883,7 @@ - - + @@ -929,7 +974,7 @@ - + @@ -937,16 +982,17 @@ + - + - + @@ -965,7 +1011,6 @@ - @@ -973,6 +1018,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line @@ -1010,6 +1087,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-hlr-gsup @@ -1021,4 +1156,7 @@ + + config-hlr-euse + -- To view, visit https://gerrit.osmocom.org/11585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5a2322c0488cb36b089303bbfec5d4db18c41099 Gerrit-Change-Number: 11585 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:30 +0000 Subject: Change in osmo-gsm-manuals[master]: mgw: update vty reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11586 ) Change subject: mgw: update vty reference ...................................................................... mgw: update vty reference Change-Id: Ib30ea8b02f8a950648b85e7ebc96a40ba5a36b34 --- M OsmoMGW/vty/mgw_vty_reference.xml 1 file changed, 146 insertions(+), 14 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoMGW/vty/mgw_vty_reference.xml b/OsmoMGW/vty/mgw_vty_reference.xml index f11f484..834db04 100644 --- a/OsmoMGW/vty/mgw_vty_reference.xml +++ b/OsmoMGW/vty/mgw_vty_reference.xml @@ -169,7 +169,7 @@ - + @@ -177,6 +177,7 @@ + @@ -186,12 +187,12 @@ - + - + @@ -210,7 +211,6 @@ - @@ -218,6 +218,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -304,6 +336,24 @@ + + + + + + + + + + + + + + + + + + enable @@ -454,7 +504,7 @@ - + @@ -462,6 +512,7 @@ + @@ -471,12 +522,12 @@ - + - + @@ -495,7 +546,6 @@ - @@ -503,6 +553,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -589,6 +671,24 @@ + + + + + + + + + + + + + + + + + + @@ -929,7 +1029,7 @@ - + @@ -937,14 +1037,15 @@ + - + - + @@ -963,7 +1064,6 @@ - @@ -971,6 +1071,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats @@ -1360,8 +1492,8 @@ - - + + -- To view, visit https://gerrit.osmocom.org/11586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib30ea8b02f8a950648b85e7ebc96a40ba5a36b34 Gerrit-Change-Number: 11586 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:31 +0000 Subject: Change in osmo-gsm-manuals[master]: msc: update vty reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11587 ) Change subject: msc: update vty reference ...................................................................... msc: update vty reference Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 --- M OsmoMSC/vty/msc_vty_reference.xml 1 file changed, 311 insertions(+), 157 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified Objections: Max: I would prefer this is not merged as is diff --git a/OsmoMSC/vty/msc_vty_reference.xml b/OsmoMSC/vty/msc_vty_reference.xml index 7cf57c0..bb7e958 100644 --- a/OsmoMSC/vty/msc_vty_reference.xml +++ b/OsmoMSC/vty/msc_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -143,6 +137,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -216,7 +261,7 @@ - + @@ -224,6 +269,7 @@ + @@ -233,20 +279,10 @@ - - - - - - - - - - + - @@ -282,7 +318,6 @@ - @@ -290,6 +325,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -363,6 +430,12 @@ + + + + + + @@ -391,11 +464,12 @@ - + - + + @@ -443,17 +517,19 @@ - + - + + - + + @@ -462,17 +538,19 @@ - + - + + - + + @@ -481,10 +559,11 @@ - + - + + @@ -497,10 +576,11 @@ - + - + + @@ -509,10 +589,11 @@ - + - + + @@ -524,10 +605,11 @@ - + - + + @@ -543,10 +625,11 @@ - + - + + @@ -555,15 +638,16 @@ - + - + + - + @@ -646,12 +730,6 @@ - - - - - - @@ -717,6 +795,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -790,7 +919,7 @@ - + @@ -798,6 +927,7 @@ + @@ -807,20 +937,10 @@ - - - - - - - - - - + - @@ -856,7 +976,6 @@ - @@ -864,6 +983,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -937,6 +1088,12 @@ + + + + + + @@ -965,11 +1122,12 @@ - + - + + @@ -1017,17 +1175,19 @@ - + - + + - + + @@ -1036,17 +1196,19 @@ - + - + + - + + @@ -1055,10 +1217,11 @@ - + - + + @@ -1071,10 +1234,11 @@ - + - + + @@ -1083,10 +1247,11 @@ - + - + + @@ -1098,10 +1263,11 @@ - + - + + @@ -1117,10 +1283,11 @@ - + - + + @@ -1129,15 +1296,16 @@ - + - + + - + @@ -1160,10 +1328,11 @@ - + - + + @@ -1171,21 +1340,6 @@ - - - - - - - - - - - - - - - @@ -1212,10 +1366,11 @@ - + - + + @@ -1563,7 +1718,7 @@ - + @@ -1571,13 +1726,13 @@ + - + - @@ -1613,7 +1768,6 @@ - @@ -1621,6 +1775,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1818,15 +2004,6 @@ - - - - - - - - - @@ -1840,6 +2017,21 @@ + + + + + + + + + + + + + + + config-cs7-as @@ -2176,6 +2368,12 @@ + + + + + + @@ -2265,49 +2463,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2413,8 +2568,7 @@ - - + -- To view, visit https://gerrit.osmocom.org/11587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I31f1d388b5323af8ece8a71a82c1b91f80d404e1 Gerrit-Change-Number: 11587 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:31 +0000 Subject: Change in osmo-gsm-manuals[master]: sgsn: update vty reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11588 ) Change subject: sgsn: update vty reference ...................................................................... sgsn: update vty reference Change-Id: I64d775efa6791aca025d116905e951e10ffa5d04 --- M OsmoSGSN/vty/sgsn_vty_reference.xml 1 file changed, 252 insertions(+), 55 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSGSN/vty/sgsn_vty_reference.xml b/OsmoSGSN/vty/sgsn_vty_reference.xml index f6e4016..52d4213 100644 --- a/OsmoSGSN/vty/sgsn_vty_reference.xml +++ b/OsmoSGSN/vty/sgsn_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -175,7 +169,7 @@ - + @@ -183,6 +177,7 @@ + @@ -192,20 +187,10 @@ - - - - - - - - - - + - @@ -237,7 +222,6 @@ - @@ -245,6 +229,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -318,6 +334,12 @@ + + + + + + @@ -396,6 +418,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -545,12 +618,6 @@ - - - - - - @@ -648,7 +715,7 @@ - + @@ -656,6 +723,7 @@ + @@ -665,20 +733,10 @@ - - - - - - - - - - + - @@ -710,7 +768,6 @@ - @@ -718,6 +775,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -791,6 +880,12 @@ + + + + + + @@ -933,6 +1028,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1342,8 +1488,7 @@ - - + @@ -1362,7 +1507,7 @@ - + @@ -1370,13 +1515,13 @@ + - + - @@ -1408,7 +1553,6 @@ - @@ -1416,6 +1560,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,15 +1919,6 @@ - - - - - - - - - @@ -1765,6 +1932,21 @@ + + + + + + + + + + + + + + + config-cs7-as @@ -2009,6 +2191,22 @@ + + + + + + + + + + + + + + + + @@ -2127,8 +2325,7 @@ - - + -- To view, visit https://gerrit.osmocom.org/11588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I64d775efa6791aca025d116905e951e10ffa5d04 Gerrit-Change-Number: 11588 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:32 +0000 Subject: Change in osmo-gsm-manuals[master]: sip-connector: update vty reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11589 ) Change subject: sip-connector: update vty reference ...................................................................... sip-connector: update vty reference Change-Id: I79b91847337b6022f8f750533301b3bf0eb086df --- M OsmoSIPConnector/vty/sipconn_vty_reference.xml 1 file changed, 106 insertions(+), 14 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSIPConnector/vty/sipconn_vty_reference.xml b/OsmoSIPConnector/vty/sipconn_vty_reference.xml index 35aad6b..dee42e6 100644 --- a/OsmoSIPConnector/vty/sipconn_vty_reference.xml +++ b/OsmoSIPConnector/vty/sipconn_vty_reference.xml @@ -188,7 +188,7 @@ - + @@ -196,6 +196,7 @@ + @@ -205,11 +206,10 @@ - + - @@ -232,7 +232,6 @@ - @@ -240,6 +239,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -308,8 +339,7 @@ - - + @@ -451,7 +481,7 @@ - + @@ -459,6 +489,7 @@ + @@ -468,11 +499,10 @@ - + - @@ -495,7 +525,6 @@ - @@ -503,6 +532,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -855,7 +916,7 @@ - + @@ -863,13 +924,13 @@ + - + - @@ -892,7 +953,6 @@ - @@ -900,6 +960,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats -- To view, visit https://gerrit.osmocom.org/11589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I79b91847337b6022f8f750533301b3bf0eb086df Gerrit-Change-Number: 11589 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:32 +0000 Subject: Change in osmo-gsm-manuals[master]: stp: update vty reference In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11590 ) Change subject: stp: update vty reference ...................................................................... stp: update vty reference Change-Id: Id5f1067760db7a11ec380a541bfe7357a21a3bb3 --- M OsmoSTP/vty/osmo-stp_vty_reference.xml 1 file changed, 130 insertions(+), 55 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSTP/vty/osmo-stp_vty_reference.xml b/OsmoSTP/vty/osmo-stp_vty_reference.xml index 4ab24f5..cbda3fc 100644 --- a/OsmoSTP/vty/osmo-stp_vty_reference.xml +++ b/OsmoSTP/vty/osmo-stp_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -175,7 +169,7 @@ - + @@ -183,6 +177,7 @@ + @@ -192,20 +187,10 @@ - - - - - - - - - - + - @@ -224,7 +209,6 @@ - @@ -232,6 +216,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,6 +302,16 @@ + + + + + + + + + + @@ -376,12 +402,6 @@ - - - - - - @@ -446,7 +466,8 @@ - + + @@ -478,7 +499,7 @@ - + @@ -486,6 +507,7 @@ + @@ -495,20 +517,10 @@ - - - - - - - - - - + - @@ -527,7 +539,6 @@ - @@ -535,6 +546,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -589,6 +632,16 @@ + + + + + + + + + + @@ -891,7 +944,7 @@ - + @@ -899,13 +952,13 @@ + - + - @@ -924,7 +977,6 @@ - @@ -932,6 +984,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line @@ -983,8 +1067,7 @@ - - + @@ -1043,15 +1126,6 @@ - - - - - - - - - @@ -1310,7 +1384,8 @@ - + + -- To view, visit https://gerrit.osmocom.org/11590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id5f1067760db7a11ec380a541bfe7357a21a3bb3 Gerrit-Change-Number: 11590 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:32 +0000 Subject: Change in osmo-gsm-manuals[master]: stp: update vty reference with added SCCP commands In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11591 ) Change subject: stp: update vty reference with added SCCP commands ...................................................................... stp: update vty reference with added SCCP commands After I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 which adds the missing sccp_vty_init(), update VTY reference with the new SCCP show / config commands. Depends: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 Change-Id: Id941b8e31d3b4cfdb3f912beedc1e7af321a0113 --- M OsmoSTP/vty/osmo-stp_vty_reference.xml 1 file changed, 99 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSTP/vty/osmo-stp_vty_reference.xml b/OsmoSTP/vty/osmo-stp_vty_reference.xml index cbda3fc..308c369 100644 --- a/OsmoSTP/vty/osmo-stp_vty_reference.xml +++ b/OsmoSTP/vty/osmo-stp_vty_reference.xml @@ -321,6 +321,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -651,6 +692,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1067,7 +1149,8 @@ - + + @@ -1164,6 +1247,21 @@ + + + + + + + + + + + + + + + config-cs7-as -- To view, visit https://gerrit.osmocom.org/11591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id941b8e31d3b4cfdb3f912beedc1e7af321a0113 Gerrit-Change-Number: 11591 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:46 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.rnd: gobi2k changed by ec20 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11770 ) Change subject: resources.conf.rnd: gobi2k changed by ec20 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2df38547978c7d2b1a1309f6e73b5a59413e08ff Gerrit-Change-Number: 11770 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:51 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Allow changing port of iperf3 server In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11771 ) Change subject: iperf3: Allow changing port of iperf3 server ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4eae7cefbb1a18ecf2676f9cb22c60cc91cec7c Gerrit-Change-Number: 11771 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:55 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: implement str() method in iperf3 server In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11772 ) Change subject: iperf3: implement str() method in iperf3 server ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I699f0a9a8d263ac9f02ea9594a28ca9fd8d48db6 Gerrit-Change-Number: 11772 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:41:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:41:58 +0000 Subject: Change in osmo-gsm-tester[master]: tests: iperf3: Support testing parallel iperf3 clients in test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11773 ) Change subject: tests: iperf3: Support testing parallel iperf3 clients in test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I57799fde49e6845379cca332eec0a1f70aaecd2b Gerrit-Change-Number: 11773 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 20:41:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:42:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:42:57 +0000 Subject: Change in libosmocore[master]: gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11788 ) Change subject: gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9bc694f10fa9cef0bb7fc791bb40e7602459b16b Gerrit-Change-Number: 11788 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 20:42:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:44:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:44:01 +0000 Subject: Change in libosmocore[master]: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11785 ) Change subject: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8e3afff737211ded3c5689f2c83b1a544b42f9d Gerrit-Change-Number: 11785 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sun, 18 Nov 2018 20:44:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:44:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:44:04 +0000 Subject: Change in libosmocore[master]: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11785 ) Change subject: gsm48: gsm48_decode_freq_list: Improve documentation of paramter f ...................................................................... gsm48: gsm48_decode_freq_list: Improve documentation of paramter f Change-Id: Id8e3afff737211ded3c5689f2c83b1a544b42f9d --- M src/gsm/gsm48_ie.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c index 1baf287..ffe3eba 100644 --- a/src/gsm/gsm48_ie.c +++ b/src/gsm/gsm48_ie.c @@ -807,7 +807,7 @@ } /*! Decode TS 04.08 Cell Channel Description IE (10.5.2.1b) and other frequency lists - * \param[out] f Caller-provided output memory + * \param[out] f Caller-provided output memory, an array of 1024 elements * \param[in] cd Cell Channel Description IE * \param[in] len Length of \a cd in bytes * \returns 0 on success; negative on error */ -- To view, visit https://gerrit.osmocom.org/11785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id8e3afff737211ded3c5689f2c83b1a544b42f9d Gerrit-Change-Number: 11785 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:44:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:44:55 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11781 ) Change subject: add missing 'break' in switch statement ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 18 Nov 2018 20:44:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 20:44:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 18 Nov 2018 20:44:57 +0000 Subject: Change in osmo-bsc[master]: add missing 'break' in switch statement In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11781 ) Change subject: add missing 'break' in switch statement ...................................................................... add missing 'break' in switch statement Coverity points out that abis_nm_rcvmsg_sw() contains a switch statement with suspicious looking missing break statements. It is unclear to me if the code intends to process some types of messages in more than one state, or of all messages which affect a particular state already appear in the state's corresponding switch block. Can someone else tell what is supposed to happen here? If this code is falling through intentionally, I will suggest a patch adding /* fallthrough */ comments for clarity. Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Related: CID#57703 Related: CID#57704 --- M src/osmo-bsc/abis_nm.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 8f5a514..c1a26ac 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1463,6 +1463,7 @@ abis_nm_queue_send_next(sign_link->trx->bts); break; } + break; case SW_STATE_WAIT_ACTACK: switch (foh->msg_type) { case NM_MT_ACTIVATE_SW_ACK: @@ -1487,6 +1488,7 @@ abis_nm_queue_send_next(sign_link->trx->bts); break; } + break; case SW_STATE_NONE: switch (foh->msg_type) { case NM_MT_ACTIVATE_SW_ACK: -- To view, visit https://gerrit.osmocom.org/11781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1ea4221fadf30074156e9d17d94a5cb065242584 Gerrit-Change-Number: 11781 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 21:01:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 21:01:13 +0000 Subject: Change in libosmo-sccp[master]: Make pointcode width function public In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11709 ) Change subject: Make pointcode width function public ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf Gerrit-Change-Number: 11709 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 21:01:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 21:01:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 21:01:33 +0000 Subject: Change in osmo-bsc[master]: LCLS: explicitly check for mode before closing the loop In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11565 ) Change subject: LCLS: explicitly check for mode before closing the loop ...................................................................... LCLS: explicitly check for mode before closing the loop Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Related: OS#3659 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 13 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index a406643..a25faa4 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -238,7 +238,6 @@ static void lcls_break_local_switching(struct gsm_subscriber_connection *conn) { - struct mgcp_conn_peer mdcx_info; LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS(%s)\n", bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); @@ -249,11 +248,13 @@ return; } - mdcx_info = (struct mgcp_conn_peer){ - .port = conn->user_plane.msc_assigned_rtp_port, - }; - osmo_strlcpy(mdcx_info.addr, conn->user_plane.msc_assigned_rtp_addr, sizeof(mdcx_info.addr)); - lcls_mdcx(conn, &mdcx_info); + if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP) { + struct mgcp_conn_peer mdcx_info = (struct mgcp_conn_peer){ + .port = conn->user_plane.msc_assigned_rtp_port, + }; + osmo_strlcpy(mdcx_info.addr, conn->user_plane.msc_assigned_rtp_addr, sizeof(mdcx_info.addr)); + lcls_mdcx(conn, &mdcx_info); + } } static bool lcls_enable_possible(struct gsm_subscriber_connection *conn) @@ -579,7 +580,6 @@ struct gsm_subscriber_connection *conn = fi->priv; struct gsm_subscriber_connection *conn_other = conn->lcls.other; const struct mgcp_conn_peer *other_mgw_info; - struct mgcp_conn_peer mdcx_info; OSMO_ASSERT(conn_other); @@ -601,10 +601,12 @@ return; } - mdcx_info = *other_mgw_info; - /* Make sure the request doesn't want to use the other side's endpoint string. */ - mdcx_info.endpoint[0] = 0; - lcls_mdcx(conn, &mdcx_info); + if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP) { + struct mgcp_conn_peer mdcx_info = *other_mgw_info; + /* Make sure the request doesn't want to use the other side's endpoint string. */ + mdcx_info.endpoint[0] = 0; + lcls_mdcx(conn, &mdcx_info); + } } static void lcls_locally_switched_wait_break_fn(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/11565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie91cc70de20ade2bfa3a1a108c731341f5e739bb Gerrit-Change-Number: 11565 Gerrit-PatchSet: 6 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 21:01:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 21:01:34 +0000 Subject: Change in osmo-bsc[master]: LCLS: move mode check into separate function In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11551 ) Change subject: LCLS: move mode check into separate function ...................................................................... LCLS: move mode check into separate function Before closing or breaking the loop in LCLS we do preliminary checks. To facilitate adding new LCLS modes it's restructured as follows: * move check into dedicated static function * explicitly check for MGW mode in endpoint check * check for mode mismatch Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Related: OS#3659 --- M src/osmo-bsc/osmo_bsc_lcls.c 1 file changed, 25 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index a25faa4..81daaf0 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -227,6 +227,26 @@ osmo_fsm_inst_dispatch(conn->lcls.fi, LCLS_EV_APPLY_CFG_CSC, NULL); } +static inline bool lcls_check_toggle_allowed(const struct gsm_subscriber_connection *conn, bool enable) +{ + if (conn->lcls.other && + conn->sccp.msc->lcls_mode != conn->lcls.other->sccp.msc->lcls_mode) { + LOGPFSM(conn->lcls.fi, "FIXME: LCLS connection mode mismatch: %s != %s\n", + get_value_string(bsc_lcls_mode_names, conn->sccp.msc->lcls_mode), + get_value_string(bsc_lcls_mode_names, conn->lcls.other->sccp.msc->lcls_mode)); + return false; + } + + if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP && !conn->user_plane.mgw_endpoint_ci_msc) { + /* the MGCP FSM has died, e.g. due to some MGCP/SDP parsing error */ + LOGPFSML(conn->lcls.fi, LOGL_NOTICE, "Cannot %s LCLS without MSC-side MGCP FSM\n", + enable ? "enable" : "disable"); + return false; + } + + return true; +} + /* Close the loop for LCLS using MGCP */ static inline void lcls_mdcx(const struct gsm_subscriber_connection *conn, struct mgcp_conn_peer *mdcx_info) { @@ -242,11 +262,8 @@ LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS(%s)\n", bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); - if (!conn->user_plane.mgw_endpoint_ci_msc) { - /* the MGCP FSM has died, e.g. due to some MGCP/SDP parsing error */ - LOGPFSML(conn->lcls.fi, LOGL_NOTICE, "Cannot disable LCLS without MSC-side MGCP FSM\n"); + if (!lcls_check_toggle_allowed(conn, false)) return; - } if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP) { struct mgcp_conn_peer mdcx_info = (struct mgcp_conn_peer){ @@ -583,12 +600,12 @@ OSMO_ASSERT(conn_other); + if (!lcls_check_toggle_allowed(conn, true)) + return; + LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS(%s)\n", bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); - if (!conn->user_plane.mgw_endpoint_ci_msc) { - LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without MSC-side MGCP FSM. FIXME\n"); - return; - } + if (!conn_other->user_plane.mgw_endpoint_ci_msc) { LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without MSC-side MGCP FSM. FIXME\n"); return; -- To view, visit https://gerrit.osmocom.org/11551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I32ba232ad802625d97a0ad9d0511edc6ac7f251c Gerrit-Change-Number: 11551 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun Nov 18 21:12:20 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 18 Nov 2018 21:12:20 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5bf1d5c0d9f6d_1c59afe68c4773e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 16s] [ 16s] [1/1] preinstalling libdevmapper1.02.1... [ 16s] copying packages... [ 19s] reordering...cycle: libc6 -> libgcc1 [ 19s] breaking dependency libgcc1 -> libc6 [ 19s] cycle: dh-python -> python3 [ 19s] breaking dependency python3 -> dh-python [ 19s] cycle: debhelper -> dh-autoreconf [ 19s] breaking dependency debhelper -> dh-autoreconf [ 19s] cycle: debhelper -> dh-strip-nondeterminism [ 19s] breaking dependency debhelper -> dh-strip-nondeterminism [ 19s] done [ 19s] objdump: /boot/Image.guest32: file format not recognized [ 19s] Warning: cross compile not possible due to missing static binaries. please install build-initvm package for that purpose. [ 19s] check that the right architecture is available for your build host, you need initvm.armv8l for this one. [ 19s] booting kvm... [ 19s] ### VM INTERACTION START ### [ 19s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host,aarch64=off -M virt,gic-version=host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -mem-prealloc -mem-path /dev/hugepages -net none -kernel /boot/Image.guest32 -initrd /boot/initrd.guest32 -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime ext4.allow_unsupported=1 kpti=off pti=off spectre_v2=off panic=1 quiet no-kvmclock elevator=noop nmi_watchdog=0 rw rd.driver.pre=binfmt_misc console=ttyAMA0 init=/.build/build -m 9216 -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_12/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 19s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_12/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 19s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_12/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 325s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 325s] /var/cache/obs/worker/root_12/root: 64661 [ 325s] qemu-system-aarch64: terminating on signal 15 from pid 12596 () [ 325s] ### VM INTERACTION END ### [ 325s] /var/run/obs/worker/12/build/build-vm: line 462: kill: (64657) - No such process [ 325s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 325s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Nov 18 21:12:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 21:12:38 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: print TRX socket addresses in 'show transceiver' In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11764 ) Change subject: osmo-bts-trx: print TRX socket addresses in 'show transceiver' ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I081305d730cbdb14b5ce1dbfee18673328225b66 Gerrit-Change-Number: 11764 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 21:12:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 21:44:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 21:44:56 +0000 Subject: Change in libosmo-sccp[master]: Log ip:port for created SS7 server In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11708 ) Change subject: Log ip:port for created SS7 server ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2ae093175d64000490a2be31ecfea265ca3853d Gerrit-Change-Number: 11708 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 18 Nov 2018 21:44:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 21:51:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 21:51:34 +0000 Subject: Change in osmo-sgsn[master]: Use safer functions for IMSI ACL Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11819 Change subject: Use safer functions for IMSI ACL ...................................................................... Use safer functions for IMSI ACL Avoid explicit memset which confuses coverity, use strnlen() and osmo_strlcpy() to handle strings. Change-Id: I73fd54ad3a4ab8be5aff0fee5c722597ad766e9d Fixes: CID163626 --- M src/gprs/sgsn_vty.c 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/19/11819/1 diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index f57a2b9..601b3c5 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -634,19 +634,21 @@ "Remove IMSI from ACL\n" "IMSI of subscriber\n") { - char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS+1]; + char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS + 1] = { '0' }; const char *op = argv[0]; const char *imsi = imsi_sanitized; + size_t len = strnlen(argv[1], GSM23003_IMSI_MAX_DIGITS + 1); int rc; /* Sanitize IMSI */ - if (strlen(argv[1]) > GSM23003_IMSI_MAX_DIGITS) { - vty_out(vty, "%% IMSI (%s) too long -- ignored!%s", - argv[1], VTY_NEWLINE); + if (len > GSM23003_IMSI_MAX_DIGITS) { + vty_out(vty, "%% IMSI (%s) too long (max %u digits) -- ignored!%s", + argv[1], GSM23003_IMSI_MAX_DIGITS, VTY_NEWLINE); return CMD_WARNING; } - memset(imsi_sanitized, '0', sizeof(imsi_sanitized)); - strcpy(imsi_sanitized+GSM23003_IMSI_MAX_DIGITS-strlen(argv[1]),argv[1]); + + osmo_strlcpy(imsi_sanitized + GSM23003_IMSI_MAX_DIGITS - len, argv[1], + sizeof(imsi_sanitized) - (GSM23003_IMSI_MAX_DIGITS - len)); if (!strcmp(op, "add")) rc = sgsn_acl_add(imsi, g_cfg); -- To view, visit https://gerrit.osmocom.org/11819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I73fd54ad3a4ab8be5aff0fee5c722597ad766e9d Gerrit-Change-Number: 11819 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 21:52:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 21:52:26 +0000 Subject: Change in libosmocore[master]: Move msgb_push helpers to public header In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11679 ) Change subject: Move msgb_push helpers to public header ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37e91d031fba28cf1c6735b8069b0265746f55e6 Gerrit-Change-Number: 11679 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 18 Nov 2018 21:52:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 18 23:48:55 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 18 Nov 2018 23:48:55 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11820 Change subject: LCLS: update parameter representation ...................................................................... LCLS: update parameter representation * use osmo_lcls struct from libosmocore * use enum values instead of magic numbers Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Related: OS#3659 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/osmo_bsc_lcls.c 3 files changed, 12 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/11820/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7897fea..6be8b7b 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -275,8 +275,8 @@ struct { uint8_t global_call_ref[15]; uint8_t global_call_ref_len; /* length of global_call_ref */ - uint8_t config; /* TS 48.008 3.2.2.116 */ - uint8_t control;/* TS 48.008 3.2.2.117 */ + enum gsm0808_lcls_config config; /* TS 48.008 3.2.2.116 */ + enum gsm0808_lcls_control control;/* TS 48.008 3.2.2.117 */ /* LCLS FSM */ struct osmo_fsm_inst *fi; /* pointer to "other" connection, if Call Leg Relocation was successful */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index bca9e1f..cc32d8a 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -857,8 +857,8 @@ } /* initialize to some magic values that indicate "IE not [yet] received" */ - conn->lcls.config = 0xff; - conn->lcls.control = 0xff; + conn->lcls.config = GSM0808_LCLS_CFG_NA; + conn->lcls.control = GSM0808_LCLS_CSC_NA; conn->lcls.fi = osmo_fsm_inst_alloc_child(&lcls_fsm, conn->fi, GSCON_EV_LCLS_FAIL); if (!conn->lcls.fi) { osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_ERROR, NULL); diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index a406643..f457617 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -155,18 +155,12 @@ return 0; } - -struct lcls_cfg_csc { - enum gsm0808_lcls_config config; - enum gsm0808_lcls_control control; -}; - /* Update the connections LCLS configuration and return old/previous configuration. * \returns (staticallly allocated) old configuration; NULL if new config not supported */ -static struct lcls_cfg_csc *update_lcls_cfg_csc(struct gsm_subscriber_connection *conn, - struct lcls_cfg_csc *new_cfg_csc) +static struct osmo_lcls *update_lcls_cfg_csc(struct gsm_subscriber_connection *conn, + struct osmo_lcls *new_cfg_csc) { - static struct lcls_cfg_csc old_cfg_csc; + static struct osmo_lcls old_cfg_csc; old_cfg_csc.config = conn->lcls.config; old_cfg_csc.control = conn->lcls.control; @@ -192,9 +186,9 @@ * unsupported, change into LCLS NOT SUPPORTED state and return -EINVAL. */ static int lcls_handle_cfg_update(struct gsm_subscriber_connection *conn, void *data) { - struct lcls_cfg_csc *new_cfg_csc, *old_cfg_csc; + struct osmo_lcls *new_cfg_csc, *old_cfg_csc; - new_cfg_csc = (struct lcls_cfg_csc *) data; + new_cfg_csc = (struct osmo_lcls *) data; old_cfg_csc = update_lcls_cfg_csc(conn, new_cfg_csc); if (!old_cfg_csc) { osmo_fsm_inst_state_chg(conn->lcls.fi, ST_REQ_LCLS_NOT_SUPP, 0, 0); @@ -207,9 +201,9 @@ void lcls_update_config(struct gsm_subscriber_connection *conn, const uint8_t *config, const uint8_t *control) { - struct lcls_cfg_csc new_cfg = { - .config = 0xff, - .control = 0xff, + struct osmo_lcls new_cfg = { + .config = GSM0808_LCLS_CFG_NA, + .control = GSM0808_LCLS_CSC_NA, }; /* nothing to update, skip it */ if (!config && !control) -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 01:57:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 01:57:07 +0000 Subject: Change in osmo-dev[master]: fill_config.py: add ${foreach(FOO)} In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11810 ) Change subject: fill_config.py: add ${foreach(FOO)} ...................................................................... fill_config.py: add ${foreach(FOO)} This patch indicates that we should rather use a proper templating python library instead of re-inventing this stuff. But now that we're here... Add a construct ${foreach(BTS)} bts ${BTSn} location_area_code ${BTSn_LAC} ${foreach_end} that repeats for each BTS variable found, e.g. BTS0_LAC=23 BTS1_LAC=24 BTS2_LAC=25 would result in three blocks of the above. I am using this to avoid copy-pasting for configuring N BTSes for 35c3. Change-Id: Ie1139a017f42cea5bf7ebbbe457bbc3bfe06944c --- M net/fill_config.py 1 file changed, 100 insertions(+), 32 deletions(-) diff --git a/net/fill_config.py b/net/fill_config.py index c33e6b7..6aa3829 100755 --- a/net/fill_config.py +++ b/net/fill_config.py @@ -99,30 +99,109 @@ print('Stale: %r is newer than %r' % (src_path, target_path)) exit(1) -def insert_includes(tmpl, tmpl_dir, tmpl_src): +def replace_vars(tmpl, tmpl_dir, tmpl_src, local_config, strict=True): + used_vars = set() + for m in replace_re.finditer(tmpl): + name = m.group(1) + if not name in local_config: + if strict: + print('Error: undefined var %r in %r' % (name, tmpl_src)) + exit(1) + else: + continue + used_vars.add(name) + + for var in used_vars: + tmpl = tmpl.replace('${%s}' % var, local_config.get(var)) + + return tmpl + +def insert_includes(tmpl, tmpl_dir, tmpl_src, local_config, arg): + include_path = os.path.join(tmpl_dir, arg) + if not os.path.isfile(include_path): + print('Error: included file does not exist: %r in %r' % (include_path, tmpl_src)) + exit(1) + try: + incl = open(include_path).read() + except: + print('Cannot read %r for %r' % (include_path, tmpl_src)) + raise + if args.check_stale: + check_stale(include_path, dst) + + # recurse, to follow the paths that the included bits come from + incl = handle_commands(incl, os.path.dirname(include_path), include_path, local_config) + + return tmpl.replace('${include(%s)}' % arg, incl) + +def insert_foreach(tmpl, tmpl_dir, tmpl_src, match, local_config, arg): + + # figure out section to handle + start_span = match.span() + + if tmpl[start_span[1]] == '\n': + start_span = (start_span[0], start_span[1] + 1) + + end_str = '${foreach_end}\n' + + end_at = tmpl.find(end_str, start_span[1]) + if end_at < 0: + end_str = end_str[:-1] + end_at = tmpl.find(end_str, start_span[1]) + + if end_at < 0: + raise Exception('%r: unmatched %r' % (tmpl_src, match.string)) + + end_span = (end_at, end_at + len(end_str)) + + before_block = tmpl[:start_span[0]] + foreach_block = tmpl[start_span[1]:end_span[0]] + after_block = tmpl[end_span[1]:] + + # figure out what items matching the foreach(FOO) there are + item_re = re.compile('(^%s([0-9]+))_.*' % arg) + items = set() + for item in local_config.keys(): + item_m = item_re.match(item) + if not item_m: + continue + items.add((item_m.group(1), item_m.group(2))) + + items = sorted(list(items)) + + expanded = [before_block] + for item, nr in items: + expanded_block = foreach_block + + while True: + expanded_block_was = expanded_block + + expanded_block = expanded_block.replace('${%sn_' % arg, '${%s_' % item) + expanded_block = expanded_block.replace('${%sn}' % arg, nr) + expanded_block = replace_vars(expanded_block, tmpl_dir, tmpl_src, local_config) + + if expanded_block_was == expanded_block: + break + + expanded.append(expanded_block) + + expanded.extend(after_block) + return ''.join(expanded) + +def handle_commands(tmpl, tmpl_dir, tmpl_src, local_config): + handled = 0 for m in command_re.finditer(tmpl): + handled += 1 cmd = m.group(1) arg = m.group(2) if cmd == 'include': - include_path = os.path.join(tmpl_dir, arg) - if not os.path.isfile(include_path): - print('Error: included file does not exist: %r in %r' % (include_path, tmpl_src)) - exit(1) - try: - incl = open(include_path).read() - except: - print('Cannot read %r for %r' % (include_path, tmpl_src)) - raise - if args.check_stale: - check_stale(include_path, dst) - - # recurse, to follow the paths that the included bits come from - incl = insert_includes(incl, os.path.dirname(include_path), include_path) - - tmpl = tmpl.replace('${%s(%s)}' % (cmd, arg), incl) + tmpl = insert_includes(tmpl, tmpl_dir, tmpl_src, local_config, arg) + elif cmd == 'foreach': + tmpl = insert_foreach(tmpl, tmpl_dir, tmpl_src, m, local_config, arg) else: print('Error: unknown command: %r in %r' % (cmd, tmpl_src)) exit(1) + return tmpl for tmpl_name in sorted(os.listdir(tmpl_dir)): @@ -151,23 +230,12 @@ raise while True: - used_vars = set() - - result = insert_includes(result, tmpl_dir, tmpl_src) - - for m in replace_re.finditer(result): - name = m.group(1) - if not name in local_config: - print('Error: undefined var %r in %r' % (name, tmpl_src)) - exit(1) - used_vars.add(name) - - if not used_vars: + result_was = result + result = handle_commands(result, tmpl_dir, tmpl_src, local_config) + result = replace_vars(result, tmpl_dir, tmpl_src, local_config) + if result_was == result: break - for var in used_vars: - result = result.replace('${%s}' % var, local_config.get(var)) - if not args.check_stale: with open(dst, 'w') as dst_file: dst_file.write(result) -- To view, visit https://gerrit.osmocom.org/11810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie1139a017f42cea5bf7ebbbe457bbc3bfe06944c Gerrit-Change-Number: 11810 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:43:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:43:28 +0000 Subject: Change in osmo-bsc[master]: LCLS: make config and control redable in 'sh conns' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11815 ) Change subject: LCLS: make config and control redable in 'sh conns' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibc2525d453e3aa845fe6f3a98f908c2b6b49f1f0 Gerrit-Change-Number: 11815 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 05:43:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:43:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:43:31 +0000 Subject: Change in osmo-bsc[master]: LCLS: make config and control redable in 'sh conns' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11815 ) Change subject: LCLS: make config and control redable in 'sh conns' ...................................................................... LCLS: make config and control redable in 'sh conns' Display LCLS config and control state as text in "show conns" command. Change-Id: Ibc2525d453e3aa845fe6f3a98f908c2b6b49f1f0 Related: OS#3659 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index f4f5838..3ac592c 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1532,8 +1532,10 @@ vty_out(vty, " LCLS GCR: %s%s", osmo_hexdump_nospc(conn->lcls.global_call_ref, conn->lcls.global_call_ref_len), VTY_NEWLINE); - vty_out(vty, " LCLS Config: 0x%02x, LCLS Control: 0x%02x, LCLS BSS Status: %s%s", - conn->lcls.config, conn->lcls.control, osmo_fsm_inst_state_name(conn->lcls.fi), + vty_out(vty, " LCLS Config: %s, LCLS Control: %s, LCLS BSS Status: %s%s", + gsm0808_lcls_config_name(conn->lcls.config), + gsm0808_lcls_control_name(conn->lcls.control), + osmo_fsm_inst_state_name(conn->lcls.fi), VTY_NEWLINE); } if (conn->lchan) -- To view, visit https://gerrit.osmocom.org/11815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibc2525d453e3aa845fe6f3a98f908c2b6b49f1f0 Gerrit-Change-Number: 11815 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:44:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:44:34 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: print TRX socket addresses in 'show transceiver' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11764 ) Change subject: osmo-bts-trx: print TRX socket addresses in 'show transceiver' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I081305d730cbdb14b5ce1dbfee18673328225b66 Gerrit-Change-Number: 11764 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 05:44:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:44:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:44:36 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: print TRX socket addresses in 'show transceiver' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11764 ) Change subject: osmo-bts-trx: print TRX socket addresses in 'show transceiver' ...................................................................... osmo-bts-trx: print TRX socket addresses in 'show transceiver' Change-Id: I081305d730cbdb14b5ce1dbfee18673328225b66 --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 1dfc617..e9710ac 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -65,8 +66,10 @@ llist_for_each_entry(trx, &bts->trx_list, list) { struct phy_instance *pinst = trx_phy_instance(trx); + char *sname = osmo_sock_get_name(NULL, pinst->phy_link->u.osmotrx.trx_ofd_clk.fd); l1h = pinst->u.osmotrx.hdl; - vty_out(vty, "TRX %d%s", trx->nr, VTY_NEWLINE); + vty_out(vty, "TRX %d %s%s", trx->nr, sname, VTY_NEWLINE); + talloc_free(sname); vty_out(vty, " %s%s", (l1h->config.poweron) ? "poweron":"poweroff", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/11764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I081305d730cbdb14b5ce1dbfee18673328225b66 Gerrit-Change-Number: 11764 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:46:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:46:22 +0000 Subject: Change in osmo-sgsn[master]: Use safer functions for IMSI ACL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11819 ) Change subject: Use safer functions for IMSI ACL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73fd54ad3a4ab8be5aff0fee5c722597ad766e9d Gerrit-Change-Number: 11819 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 05:46:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:46:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:46:24 +0000 Subject: Change in osmo-sgsn[master]: Use safer functions for IMSI ACL In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11819 ) Change subject: Use safer functions for IMSI ACL ...................................................................... Use safer functions for IMSI ACL Avoid explicit memset which confuses coverity, use strnlen() and osmo_strlcpy() to handle strings. Change-Id: I73fd54ad3a4ab8be5aff0fee5c722597ad766e9d Fixes: CID163626 --- M src/gprs/sgsn_vty.c 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index f57a2b9..601b3c5 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -634,19 +634,21 @@ "Remove IMSI from ACL\n" "IMSI of subscriber\n") { - char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS+1]; + char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS + 1] = { '0' }; const char *op = argv[0]; const char *imsi = imsi_sanitized; + size_t len = strnlen(argv[1], GSM23003_IMSI_MAX_DIGITS + 1); int rc; /* Sanitize IMSI */ - if (strlen(argv[1]) > GSM23003_IMSI_MAX_DIGITS) { - vty_out(vty, "%% IMSI (%s) too long -- ignored!%s", - argv[1], VTY_NEWLINE); + if (len > GSM23003_IMSI_MAX_DIGITS) { + vty_out(vty, "%% IMSI (%s) too long (max %u digits) -- ignored!%s", + argv[1], GSM23003_IMSI_MAX_DIGITS, VTY_NEWLINE); return CMD_WARNING; } - memset(imsi_sanitized, '0', sizeof(imsi_sanitized)); - strcpy(imsi_sanitized+GSM23003_IMSI_MAX_DIGITS-strlen(argv[1]),argv[1]); + + osmo_strlcpy(imsi_sanitized + GSM23003_IMSI_MAX_DIGITS - len, argv[1], + sizeof(imsi_sanitized) - (GSM23003_IMSI_MAX_DIGITS - len)); if (!strcmp(op, "add")) rc = sgsn_acl_add(imsi, g_cfg); -- To view, visit https://gerrit.osmocom.org/11819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I73fd54ad3a4ab8be5aff0fee5c722597ad766e9d Gerrit-Change-Number: 11819 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:47:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:47:21 +0000 Subject: Change in libosmocore[master]: Move msgb_push helpers to public header In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11679 ) Change subject: Move msgb_push helpers to public header ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37e91d031fba28cf1c6735b8069b0265746f55e6 Gerrit-Change-Number: 11679 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 05:47:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:47:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:47:25 +0000 Subject: Change in libosmocore[master]: Move msgb_push helpers to public header In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11679 ) Change subject: Move msgb_push helpers to public header ...................................................................... Move msgb_push helpers to public header The msgb_wrap_with_TL() is generally useful so it make sense to make it public to facilitate code re-use. Other helpers can be implemented as trivial wrappers over existing tlv.h functions. Update headers and code accordingly. Change-Id: I37e91d031fba28cf1c6735b8069b0265746f55e6 --- M include/osmocom/core/msgb.h M include/osmocom/gsm/tlv.h M src/gsm/gsm0480.c 3 files changed, 25 insertions(+), 39 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 8843db0..2449151 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -366,6 +366,15 @@ osmo_store32be(word, space); } +static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) +{ + uint8_t *data = msgb_push(msgb, 2); + + data[0] = tag; + data[1] = msgb->len - 2; + return data; +} + /*! remove (pull) a header from the front of the message buffer * \param[in] msgb message buffer * \param[in] len number of octets to be pulled diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 84fd511..1ab964a 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -341,6 +341,12 @@ return buf; } +/*! push 1-byte tagged value */ +static inline uint8_t *msgb_tlv1_push(struct msgb *msg, uint8_t tag, uint8_t val) +{ + return msgb_tlv_push(msg, tag, 1, &val); +} + /*! push (prepend) a TV field to a \ref msgb * \returns pointer to first byte of newly-pushed information */ static inline uint8_t *msgb_tv_push(struct msgb *msg, uint8_t tag, uint8_t val) diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 7756ecb..021db62 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -68,35 +68,6 @@ { 0, NULL } }; -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - -static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, - uint8_t value) -{ - uint8_t *data = msgb_push(msgb, 3); - - data[0] = tag; - data[1] = 1; - data[2] = value; - return data; -} - -static inline unsigned char *msgb_push_NULL(struct msgb *msgb) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = ASN1_NULL_TYPE_TAG; - data[1] = 0; - return data; -} - /* wrap an invoke around it... the other way around * * 1.) Invoke Component tag @@ -107,10 +78,10 @@ int gsm0480_wrap_invoke(struct msgb *msg, int op, int link_id) { /* 3. operation */ - msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, op); + msgb_tlv1_push(msg, GSM0480_OPERATION_CODE, op); /* 2. invoke id tag */ - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, link_id); + msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, link_id); /* 1. component tag */ msgb_wrap_with_TL(msg, GSM0480_CTYPE_INVOKE); @@ -825,20 +796,20 @@ msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); /* Pre-pend the DCS octet string */ - msgb_push_TLV1(msg, ASN1_OCTET_STRING_TAG, 0x0F); + msgb_tlv1_push(msg, ASN1_OCTET_STRING_TAG, 0x0F); /* Then wrap these as a Sequence */ msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the operation code */ - msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, + msgb_tlv1_push(msg, GSM0480_OPERATION_CODE, GSM0480_OP_CODE_PROCESS_USS_REQ); /* Wrap the operation code and IA5 string as a sequence */ msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the invoke ID */ - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); + msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Return Result component */ msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); @@ -889,10 +860,10 @@ return NULL; /* First insert the problem code */ - msgb_push_TLV1(msg, GSM_0480_ERROR_CODE_TAG, error_code); + msgb_tlv1_push(msg, GSM_0480_ERROR_CODE_TAG, error_code); /* Before it, insert the invoke ID */ - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); + msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Reject component */ msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_ERROR); @@ -919,13 +890,13 @@ return NULL; /* First insert the problem code */ - msgb_push_TLV1(msg, problem_tag, problem_code); + msgb_tlv1_push(msg, problem_tag, problem_code); /* If the Invoke ID is not available, Universal NULL (table 3.9) with length=0 shall be used */ if (invoke_id < 0 || invoke_id > 255) - msgb_push_NULL(msg); + msgb_tv_push(msg, ASN1_NULL_TYPE_TAG, 0); else - msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); + msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id); /* Wrap this up as a Reject component */ msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT); -- To view, visit https://gerrit.osmocom.org/11679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I37e91d031fba28cf1c6735b8069b0265746f55e6 Gerrit-Change-Number: 11679 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 05:48:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 05:48:30 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sys?= =?UTF-8?Q?mo,master,default,osmocom-master-debian9_#1428?= Message-ID: <984521195.661.1542606510120.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [laforge] osmo-bts-trx: print TRX socket addresses in 'show transceiver' ------------------------------------------ [...truncated 39.48 KB...] GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit16gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC timer_clockgettime.lo CC select.lo CC bits.lo CC signal.lo CC msgb.lo CC bitvec.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC utils.lo CC write_queue.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC conv.lo CC backtrace.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC stat_item.lo CC macaddr.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC command.lo CC logging_vty.lo CC vector.lo CC telnet_interface.lo CC buffer.lo CC vty.lo CC utils.lo CC stats_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm690.lo CC gsm660.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai /bin/bash: line 11: 6799 Illegal instruction /bin/bash ../../libtool --mode=install /usr/bin/install -c $list2 " Makefile:405: recipe for target 'install-libLTLIBRARIES' failed make[3]: *** [install-libLTLIBRARIES] Error 132 make[3]: Leaving directory ' Makefile:579: recipe for target 'install-am' failed make[2]: *** [install-am] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:49:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:49:51 +0000 Subject: Change in libosmo-sccp[master]: Log ip:port for created SS7 server In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11708 ) Change subject: Log ip:port for created SS7 server ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2ae093175d64000490a2be31ecfea265ca3853d Gerrit-Change-Number: 11708 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 05:49:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:50:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:50:15 +0000 Subject: Change in libosmo-sccp[master]: Log ip:port for created SS7 server In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11708 ) Change subject: Log ip:port for created SS7 server ...................................................................... Log ip:port for created SS7 server Change-Id: If2ae093175d64000490a2be31ecfea265ca3853d --- M src/osmo_ss7.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 73f8127..6fb8180 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -23,7 +23,7 @@ #include #include #include - +#include #include #include #include @@ -1829,6 +1829,9 @@ osmo_stream_srv_link_set_port(oxs->server, oxs->cfg.local.port); osmo_stream_srv_link_set_proto(oxs->server, asp_proto_to_ip_proto(proto)); + LOGP(DLSS7, LOGL_INFO, "Created %s server on %s:%" PRIu16 "\n", + get_value_string(osmo_ss7_asp_protocol_vals, proto), local_host, local_port); + oxs->inst = inst; llist_add_tail(&oxs->list, &inst->xua_servers); -- To view, visit https://gerrit.osmocom.org/11708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If2ae093175d64000490a2be31ecfea265ca3853d Gerrit-Change-Number: 11708 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:50:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:50:09 +0000 Subject: Change in libosmo-sccp[master]: Make pointcode width function public In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11709 ) Change subject: Make pointcode width function public ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf Gerrit-Change-Number: 11709 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 05:50:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:50:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:50:13 +0000 Subject: Change in libosmo-sccp[master]: Make pointcode width function public In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11709 ) Change subject: Make pointcode width function public ...................................................................... Make pointcode width function public That's useful for external programs veryfying pointcode validity. For example if used as part of BSS-related identity in GCR construction by LCLS code we should be able to double.check that no significant bits off pointcode are lost/ignored. Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 2 files changed, 5 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 414606a..a97e236 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -113,6 +113,8 @@ struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst); +uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt); + /*********************************************************************** * MTP Users (Users of MTP, such as SCCP or ISUP) ***********************************************************************/ diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index f97876c..73f8127 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -179,7 +179,7 @@ } /* get the total width (in bits) of the point-codes in this ss7_instance */ -static unsigned int get_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt) +uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt) { return pc_fmt->component_len[0] + pc_fmt->component_len[1] + pc_fmt->component_len[2]; } @@ -189,7 +189,7 @@ static unsigned int get_pc_comp_shift(const struct osmo_ss7_pc_fmt *pc_fmt, unsigned int comp_num) { - uint32_t pc_width = get_pc_width(pc_fmt); + uint32_t pc_width = osmo_ss7_pc_width(pc_fmt); switch (comp_num) { case 0: return pc_width - pc_fmt->component_len[0]; @@ -287,7 +287,7 @@ int osmo_ss7_pointcode_parse_mask_or_len(struct osmo_ss7_instance *inst, const char *in) { - unsigned int width = get_pc_width(inst ? &inst->cfg.pc_fmt : &default_pc_fmt); + unsigned int width = osmo_ss7_pc_width(inst ? &inst->cfg.pc_fmt : &default_pc_fmt); if (in[0] == '/') { /* parse mask by length */ -- To view, visit https://gerrit.osmocom.org/11709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5a9981dd2c1d78966c61a3f6b50c7c0d9b542caf Gerrit-Change-Number: 11709 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:52:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:52:27 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11601 ) Change subject: Support cipher mode reject with extended cause ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 05:52:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:52:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:52:29 +0000 Subject: Change in libosmocore[master]: Support cipher mode reject with extended cause In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11601 ) Change subject: Support cipher mode reject with extended cause ...................................................................... Support cipher mode reject with extended cause * add function to generate cipher mode reject with extended (2-byte) Cause IE * add function to get (extended) Cause value * add corresponding (extended cause) test * update existing (non-extended cause) test * use enum as a parameter for existing non-extended version to make interface more unified Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Related: OS#3187 --- M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 89 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 66f7c27..9b19d69 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -51,6 +51,7 @@ const uint8_t *cipher_response_mode); struct msgb *gsm0808_create_cipher_complete(struct msgb *layer3, uint8_t alg_id); struct msgb *gsm0808_create_cipher_reject(enum gsm0808_cause cause); +struct msgb *gsm0808_create_cipher_reject_ext(enum gsm0808_cause_class class, uint8_t ext); struct msgb *gsm0808_create_classmark_request(); struct msgb *gsm0808_create_classmark_update(const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index b56e263..c22d0a9 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -120,6 +120,8 @@ return (cause & 0x80) && !(cause & 0x0F); } +int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); + /*! \returns 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) { diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index c413688..a84e717 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -283,6 +283,30 @@ return msg; } +/*! Create BSSMAP Cipher Mode Reject message + * \param[in] class 3GPP TS 08.08 ?3.2.2.5 cause's class + * \param[in] ext 3GPP TS 08.08 ?3.2.2.5 cause value (national application extension) + * \returns callee-allocated msgb with BSSMAP Cipher Mode Reject message */ +struct msgb *gsm0808_create_cipher_reject_ext(enum gsm0808_cause_class class, uint8_t ext) +{ + uint8_t c[2]; + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "bssmap: cipher mode reject"); + if (!msg) + return NULL; + + c[0] = 0x80 | (class << 4); /* set the high bit to indicate extended cause */ + c[1] = ext; + + msgb_v_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT); + + msgb_tlv_put(msg, GSM0808_IE_CAUSE, 2, c); + + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + /*! Create BSSMAP LCLS CONNECT CONTROL message (TS 48.008 3.2.1.91). * \param[in] config LCLS Configuration * \param[in] control LCLS Connection Status Control diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 2348105..c58d828 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1235,6 +1235,22 @@ cfg->icmi = 1; } +int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp) +{ + const uint8_t *buf = TLVP_VAL_MINLEN(tp, GSM0808_IE_CAUSE, 1); + + if (!buf) + return -EBADMSG; + + if (TLVP_LEN(tp, GSM0808_IE_CAUSE) > 1) { + if (!gsm0808_cause_ext(buf[0])) + return -EINVAL; + return buf[1]; + } + + return buf[0]; +} + /*! Print a human readable name of the cell identifier to the char buffer. * This is useful both for struct gsm0808_cell_id and struct gsm0808_cell_id_list2. * See also gsm0808_cell_id_name() and gsm0808_cell_id_list_name(). diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 32e4ce9..217dcc3 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -157,6 +157,8 @@ gsm0808_create_cipher; gsm0808_create_cipher_complete; gsm0808_create_cipher_reject; +gsm0808_create_cipher_reject_ext; +gsm0808_get_cipher_reject_cause; gsm0808_create_classmark_request; gsm0808_create_classmark_update; gsm0808_create_clear_command; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 671b839..197ec06 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -250,14 +250,55 @@ msgb_free(l3); } +static inline void parse_cipher_reject(struct msgb *msg, uint8_t exp) +{ + struct tlv_parsed tp; + int rc; + + /* skip header and message type so we can parse Cause IE directly */ + msg->l2h = msgb_data(msg) + sizeof(struct bssmap_header) + 1; + + rc = osmo_bssap_tlv_parse(&tp, msg->l2h, msgb_l2len(msg)); + if (rc < 0) + printf("FIXME: failed (%d) to parse created message %s\n", rc, msgb_hexdump(msg)); + + rc = gsm0808_get_cipher_reject_cause(&tp); + if (rc < 0) + printf("FIXME: failed (%s) to extract Cause from created message %s\n", + strerror(-rc), msgb_hexdump(msg)); + + if (exp != (enum gsm0808_cause)rc) + printf("FIXME: wrong Cause %d != %u (" OSMO_BIN_SPEC ") extracted from created message %s\n", + rc, exp, OSMO_BIT_PRINT(exp), msgb_hexdump(msg)); +} + static void test_create_cipher_reject() { static const uint8_t res[] = { 0x00, 0x04, 0x59, 0x04, 0x01, 0x23 }; + enum gsm0808_cause cause = GSM0808_CAUSE_CCCH_OVERLOAD; struct msgb *msg; printf("Testing creating Cipher Reject\n"); - msg = gsm0808_create_cipher_reject(GSM0808_CAUSE_CCCH_OVERLOAD); + msg = gsm0808_create_cipher_reject(cause); VERIFY(msg, res, ARRAY_SIZE(res)); + + parse_cipher_reject(msg, cause); + + msgb_free(msg); +} + +static void test_create_cipher_reject_ext() +{ + static const uint8_t res[] = { 0x00, 0x05, 0x59, 0x04, 0x02, 0xd0, 0xFA }; + uint8_t cause = 0xFA; + struct msgb *msg; + + printf("Testing creating Cipher Reject (extended)\n"); + msg = gsm0808_create_cipher_reject_ext(GSM0808_CAUSE_CLASS_INVAL, cause); + VERIFY(msg, res, ARRAY_SIZE(res)); + + parse_cipher_reject(msg, cause); + msgb_free(msg); } @@ -1738,6 +1779,7 @@ test_create_cipher(); test_create_cipher_complete(); test_create_cipher_reject(); + test_create_cipher_reject_ext(); test_create_cm_u(); test_create_sapi_reject(); test_create_ass(); diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 58bc509..a48cf1d 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -8,6 +8,7 @@ Testing creating Chipher Mode Command Testing creating Cipher Complete Testing creating Cipher Reject +Testing creating Cipher Reject (extended) Testing creating CM U Testing creating SAPI Reject Testing creating Assignment Request -- To view, visit https://gerrit.osmocom.org/11601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id5509b94a18180a44f45300caaa02b843c166fa3 Gerrit-Change-Number: 11601 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 05:54:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 05:54:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmocom-bb_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#948?= Message-ID: <124682727.662.1542606855864.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 83.56 KB...] Makefile.am:15: but option 'subdir-objects' is disabled Makefile.am: installing './depcomp' + ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: executing depfiles commands + make echo 0.0.0.2232-d4450 > .version-t && mv .version-t .version make all-am make[1]: Entering directory ' CC gsmmap.o gsmmap.c:22:2: warning: #warning todo bsic [-Wcpp] #warning todo bsic ^~~~~~~ CC geo.o CC locate.o CC log.o CC sysinfo.o CC networks.o CC logging.o CCLD gsmmap make[1]: Leaving directory ' + cd + autoreconf -fi configure.ac:10: installing './compile' configure.ac:3: installing './install-sh' configure.ac:3: installing './missing' src/common/Makefile.am: installing './depcomp' src/misc/Makefile.am:7: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:7: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/misc/Makefile.am:13: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:13: but option 'subdir-objects' is disabled src/misc/Makefile.am:8: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:8: but option 'subdir-objects' is disabled src/misc/Makefile.am:11: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:11: but option 'subdir-objects' is disabled src/misc/Makefile.am:11: warning: source file '../../../gsmmap/geo.c' is in a subdirectory, src/misc/Makefile.am:11: but option 'subdir-objects' is disabled src/misc/Makefile.am:9: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:9: but option 'subdir-objects' is disabled + ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for ranlib... ranlib checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o CC gsm480_ss.o gsm480_ss.c:311:30: error: redefinition of ?msgb_wrap_with_TL? static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^~~~~~~~~~~~~~~~~ In file included from gsm480_ss.c:28:0: :369:30: note: previous definition of ?msgb_wrap_with_TL? was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^~~~~~~~~~~~~~~~~ Makefile:423: recipe for target 'gsm480_ss.o' failed make[2]: *** [gsm480_ss.o] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:54:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:54:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: add bts-loop tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11559 ) Change subject: BSC LCLS: add bts-loop tests ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I40e786b430591899c722d99d685db26efa868508 Gerrit-Change-Number: 11559 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 05:54:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:54:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:54:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC LCLS: add bts-loop tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11559 ) Change subject: BSC LCLS: add bts-loop tests ...................................................................... BSC LCLS: add bts-loop tests Add basic establishment and teardown tests for 'bts-loop' mode of LCLS: * add explicit vty init for desired LCLS kind * add necessary IPA RSL MDCX functions * explicitly pass LCLS kind as a parameter to shared functions (defaulting to 'mgw-loop') Change-Id: I40e786b430591899c722d99d685db26efa868508 Related: OS#3659 --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_LCLS.ttcn M bsc/expected-results.xml 3 files changed, 127 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 21ec0ff..13535ce 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -289,7 +289,7 @@ vc_MGCP.start(MGCP_Emulation.main(ops, mgcp_pars, id)); } -private function f_init_vty(charstring id := "foo") runs on test_CT { +function f_init_vty(charstring id := "foo") runs on test_CT { if (BSCVTY.checkstate("Mapped")) { /* skip initialization if already executed once */ return; diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 585059e..c401206 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -36,6 +36,7 @@ import from MGCP_Emulation all; import from MGCP_Templates all; import from SDP_Types all; +import from Native_Functions all; import from Osmocom_CTRL_Functions all; import from Osmocom_CTRL_Types all; @@ -226,13 +227,20 @@ } } -private function f_lcls_init(integer nr_bts := 1) runs on lcls_test_CT +private function f_lcls_init(boolean bts_mode := false, integer nr_bts := 1) runs on lcls_test_CT { var default d; d := activate(as_ignore()); f_init(nr_bts, true); f_sleep(1.0); + + f_init_vty(); + if (bts_mode == true) { + f_vty_config(BSCVTY, "msc", "lcls-mode bts-loop"); + } else { + f_vty_config(BSCVTY, "msc", "lcls-mode mgw-loop"); + } } @@ -273,12 +281,62 @@ } } -private function f_tc_lcls_gcr_bway_connect(boolean hr) runs on lcls_test_CT { +private function f_tc_lcls_ack_rsl_mdcx(RSL_Message rsl_msg, boolean send_on_a) runs on lcls_test_CT { + var boolean fixme_unused; + var RSL_IE_Body ie; + var RslChannelNr chan_nr; + var uint16_t conn_id; + var uint7_t rtp_pt := 0; + var HostName host; + var PortNumber port_num; + + if (f_rsl_find_ie(rsl_msg, RSL_IE_CHAN_NR, ie) == true) { + chan_nr := ie.chan_nr; + } else { + log("Unable to find chan# in ", rsl_msg); + } + + fixme_unused := f_rsl_find_ie(rsl_msg, RSL_IE_IPAC_CONN_ID, ie); + conn_id := ie.ipa_conn_id; + + /* mandatory fields */ + fixme_unused := f_rsl_find_ie(rsl_msg, RSL_IE_IPAC_REMOTE_IP, ie); + host := f_inet_ntoa(int2oct(ie.ipa_remote_ip, 4)); + + fixme_unused := f_rsl_find_ie(rsl_msg, RSL_IE_IPAC_REMOTE_PORT, ie); + port_num := ie.ipa_remote_port; + log("LCLS IPA MDCX for lchan ", chan_nr, " connection ID ", conn_id, " host ", host, ":", port_num); + + /* optional */ + if (f_rsl_find_ie(rsl_msg, RSL_IE_IPAC_RTP_PAYLOAD, ie)) { + rtp_pt := ie.ipa_rtp_pt; + } + + if (send_on_a == true) { + CONN_A.send(ts_RSL_IPA_MDCX_ACK(chan_nr, conn_id, oct2int(f_inet_addr(host)), port_num, rtp_pt)); + } else { + CONN_B.send(ts_RSL_IPA_MDCX_ACK(chan_nr, conn_id, oct2int(f_inet_addr(host)), port_num, rtp_pt)); + } +} + +private function f_tc_lcls_recv_ls_exp_rsl() runs on lcls_test_CT { + var RSL_Message rsl_msg; + interleave { + [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_yet_ls)) {} + [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_locally_switched)) {} + [] CONN_B.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL) {} + [] CONN_A.receive(tr_RSL_IPA_MDCX(?, ?)) -> value rsl_msg { + f_tc_lcls_ack_rsl_mdcx(rsl_msg, true) + } + } +} + +private function f_tc_lcls_gcr_bway_connect(boolean hr, boolean bts_mode := false) runs on lcls_test_CT { var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_b; var MSC_ConnHdlr vc_conn; - f_lcls_init(); + f_lcls_init(bts_mode); if (hr == true) { pars_a.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); @@ -288,6 +346,7 @@ pars_a.lcls.gcr := valueof(ts_GCR('010203'O, '0405'O, '060708090a'O)); pars_a.lcls.cfg := LCLS_CFG_both_way; pars_a.lcls.csc := LCLS_CSC_connect; + pars_a.lcls.adjust_cx_exp := not bts_mode; pars_b := pars_a; /* first call is not possible to be LS (no second leg yet) */ @@ -299,7 +358,11 @@ CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - f_tc_lcls_recv_ls_exp_mgcp(); + if (bts_mode == true) { + f_tc_lcls_recv_ls_exp_rsl(); + } else { + f_tc_lcls_recv_ls_exp_mgcp(); + } f_lcls_test_fini(); } @@ -311,7 +374,17 @@ /* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect connect both-way (half rate) */ testcase TC_lcls_gcr_bway_connect_hr() runs on lcls_test_CT { - f_tc_lcls_gcr_bway_connect(true) + f_tc_lcls_gcr_bway_connect(true) +} + +/* BTS-loop: send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect connect both-way (full rate)*/ +testcase TC_lcls_bts_gcr_bway_connect() runs on lcls_test_CT { + f_tc_lcls_gcr_bway_connect(false, true) +} + +/* BTS-loop: send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect connect both-way (half rate) */ +testcase TC_lcls_bts_gcr_bway_connect_hr() runs on lcls_test_CT { + f_tc_lcls_gcr_bway_connect(true, true) } /* Unless explicitly enabled, osmo-bsc will avoid LCLSs when the codecs or rates @@ -470,6 +543,26 @@ } } +private function f_lcls_sts_rsl(BIT4 expected_status) runs on lcls_test_CT { + var RSL_Message rsl_msg; + + interleave { + [] CONN_B.receive(tr_BSSMAP_LclsConnCtrlAck(tr_BSSMAP_IE_LclsSts(expected_status))); + [] CONN_A.receive(tr_BSSMAP_LclsNotificationSts(expected_status)); + /* + [] CONN_A.receive(RSL_Message:?) -> value rsl_msg { + log("f_lcls_sts_rsl CONN_A top RSL is ", rsl_msg) + } + Ex. placeholder to catch any RSL message */ + [] CONN_A.receive(tr_RSL_IPA_MDCX(?, ?)) -> value rsl_msg { + f_tc_lcls_ack_rsl_mdcx(rsl_msg, true) + } + [] CONN_B.receive(tr_RSL_IPA_MDCX(?, ?)) -> value rsl_msg { + f_tc_lcls_ack_rsl_mdcx(rsl_msg, false) + } + } +} + /* Send an ASSIGNMENT REQ with "do not connect" and enable later using LCLS CTRL */ testcase TC_lcls_gcr_bway_dont_connect_csc() runs on lcls_test_CT { var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); @@ -523,18 +616,18 @@ return valueof(ts_MDCX_ACK(mdcx.line.trans_id, conn_id, sdp_out)); } -/* Establish LCLS "connect" followed by a MSC-initiated break */ -testcase TC_lcls_connect_break() runs on lcls_test_CT { +private function f_lcls_connect_break(boolean bts_mode := false) runs on lcls_test_CT { var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_b; var MSC_ConnHdlr vc_conn; - f_lcls_init(); + f_lcls_init(bts_mode); pars_a.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); pars_a.lcls.gcr := valueof(ts_GCR('010203'O, '0405'O, '060708090a'O)); pars_a.lcls.cfg := LCLS_CFG_both_way; pars_a.lcls.csc := LCLS_CSC_connect; + pars_a.lcls.adjust_cx_exp := not bts_mode; pars_b := pars_a; /* first call is not possible to be LS (no second leg yet) */ @@ -546,7 +639,11 @@ f_lcls_test_init(pars_a, pars_b); CONN_A.receive(LclsCompSync:LCLS_COMP_SYNC_ASS_COMPL); - f_tc_lcls_recv_ls_exp_mgcp() + if (bts_mode == true) { + f_tc_lcls_recv_ls_exp_rsl(); + } else { + f_tc_lcls_recv_ls_exp_mgcp(); + } /* request LS release on "A" side; call continues to be locally switched */ CONN_A.send(ts_BSSMAP_LclsConnCtrl(omit, ts_BSSMAP_IE_LclsCsc(LCLS_CSC_release_lcls))); @@ -556,11 +653,24 @@ /* request LS release on "B" side; call LS is released */ CONN_B.send(ts_BSSMAP_LclsConnCtrl(omit, ts_BSSMAP_IE_LclsCsc(LCLS_CSC_release_lcls))); - f_lcls_sts_mgcp(LCLS_STS_no_longer_ls) + if (bts_mode == true) { + f_lcls_sts_rsl(LCLS_STS_no_longer_ls); + } else { + f_lcls_sts_mgcp(LCLS_STS_no_longer_ls); + } f_lcls_test_fini(); } +/* Establish LCLS "connect" followed by a MSC-initiated break */ +testcase TC_lcls_connect_break() runs on lcls_test_CT { + f_lcls_connect_break() +} + +testcase TC_lcls_bts_connect_break() runs on lcls_test_CT { + f_lcls_connect_break(true) +} + /* Establish LCLS "connect" followed by a SCCP-level release of one leg */ testcase TC_lcls_connect_clear() runs on lcls_test_CT { var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); @@ -640,7 +750,9 @@ execute( TC_lcls_connect_break() ); execute( TC_lcls_connect_clear() ); - + execute( TC_lcls_bts_gcr_bway_connect() ); + execute( TC_lcls_bts_gcr_bway_connect_hr() ); + execute( TC_lcls_bts_connect_break() ); } diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index cd808d8..ff50990 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -94,4 +94,7 @@ + + + -- To view, visit https://gerrit.osmocom.org/11559 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I40e786b430591899c722d99d685db26efa868508 Gerrit-Change-Number: 11559 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 05:57:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 05:57:00 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_?= =?UTF-8?Q?=C2=BB_sysmo,master,default,osmocom-master-debian9_#1429?= In-Reply-To: <984521195.661.1542606510120.JavaMail.jenkins@jenkins.osmocom.org> References: <984521195.661.1542606510120.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1552990828.663.1542607020845.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:58:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:58:30 +0000 Subject: Change in osmo-dev[master]: Add expect script: 'vty' for easy access to all vtys In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11811 ) Change subject: Add expect script: 'vty' for easy access to all vtys ...................................................................... Patch Set 2: Code-Review+1 I think it should come with a bit of documentation in the start of the file (like in your commit log message) and it could very well be part of libosmocore/contrib, which is presumably a more frequented/visible location than here? -- To view, visit https://gerrit.osmocom.org/11811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec Gerrit-Change-Number: 11811 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 19 Nov 2018 05:58:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:58:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:58:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 7 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 05:58:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 05:59:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 05:59:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler: make VTY interface available In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11701 ) Change subject: BSC_ConnectionHandler: make VTY interface available ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I684f0a3a435924d81bc5a793cb7b43a3ab9ef842 Gerrit-Change-Number: 11701 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 19 Nov 2018 05:59:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 06:00:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 06:00:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/11488/3/msc/MSC_Tests.default File msc/MSC_Tests.default: https://gerrit.osmocom.org/#/c/11488/3/msc/MSC_Tests.default at 25 PS3, Line 25: why did you remove the SGsAP.sctp_stack setting? is it not required? -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 7 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 06:00:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 06:00:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 19 Nov 2018 06:00:29 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 7 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 06:00:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 06:02:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:02:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4183?= Message-ID: <1536821426.664.1542607328374.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 679.68 KB...] doc/Makefile.am:32: warning: '%'-style pattern rules are a GNU make extension src/ipaccess/Makefile.am:62: warning: source file '$(top_srcdir)/src/osmo-bsc/gsm_data.c' is in a subdirectory, src/ipaccess/Makefile.am:62: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/ipaccess/Makefile.am: installing './depcomp' + ./configure --enable-sanitize --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for ANSI C header files... (cached) yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bsc/Makefile config.status: creating src/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/codec_pref/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating tests/handover/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0.186-ec4d > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in bsc make[4]: Entering directory '/build/include/osmocom/bsc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/bsc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libfilter make[3]: Entering directory '/build/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/src/libfilter' Making all in osmo-bsc make[3]: Entering directory '/build/src/osmo-bsc' CC a_reset.o CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o CC arfcn_range_encode.o CC assignment_fsm.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_init.o CC bsc_rf_ctrl.o CC bsc_rll.o CC bsc_subscr_conn_fsm.o CC bsc_subscriber.o CC bsc_vty.o CC bts_ericsson_rbs2000.o CC bts_init.o CC bts_ipaccess_nanobts.o CC bts_ipaccess_nanobts_omlattr.o CC bts_nokia_site.o CC bts_siemens_bs11.o CC bts_sysmobts.o CC bts_unknown.o CC chan_alloc.o CC codec_pref.o In file included from codec_pref.c:24:0: /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: 'struct tlv_parsed' declared inside parameter list [-Werror] int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); ^ /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] CC e1_config.o CC gsm_04_08_rr.o cc1: all warnings being treated as errors Makefile:611: recipe for target 'codec_pref.o' failed make[3]: *** [codec_pref.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/osmo-bsc' make[2]: *** [all-recursive] Error 1 Makefile:396: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:434: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:365: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:02:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:02:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6924?= Message-ID: <334825709.665.1542607372537.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 758.02 KB...] + set +x =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_reset.o CC a_iface_bssap.o CC gsm_04_11.o CC gsm_04_08.o CC gsm_04_08_cc.o CC msc_vty.o CC db.o CC a_iface.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_09_11.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:04:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:04:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3213?= Message-ID: <543318082.666.1542607444018.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 753.92 KB...] config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC debug.o CC common_vty.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC socket.o CC oap_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_network.o CC mgcp_protocol.o CC mgcp_osmux.o CC mgcp_sdp.o CC mgcp_transcode.o CC mgcp_vty.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_om2000.o CC abis_om2000_vty.o CC abis_nm_vty.o CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_siemens_bs11.o CC bts_ipaccess_nanobts.o CC bts_nokia_site.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC db.o CC auth.o CC mncc.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_subscriber.o gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ make[3]: Leaving directory '/build/openbsc/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:04:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:04:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3213?= Message-ID: <261625596.667.1542607462017.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 753.67 KB...] config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC socket.o CC gsm_data.o CC gsup_client.o CC debug.o CC gsm_data_shared.o CC oap_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o CC mgcp_protocol.o CC mgcp_sdp.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC bsc_subscriber.o CC abis_om2000.o CC bsc_rll.o CC acc_ramp.o CC abis_om2000_vty.o CC abis_rsl.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC mncc.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_80.o CC gsm_04_14.o CC gsm_subscriber.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make: *** [all] Error 2 Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:04:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:04:41 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6924?= Message-ID: <72565935.668.1542607481895.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.04 MB...] + cd /build + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o CC vlr_access_req_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_08.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:05:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:05:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4184?= In-Reply-To: <1536821426.664.1542607328374.JavaMail.jenkins@jenkins.osmocom.org> References: <1536821426.664.1542607328374.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <445921773.669.1542607529649.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 703.45 KB...] configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' doc/Makefile.am:29: warning: '%'-style pattern rules are a GNU make extension doc/Makefile.am:32: warning: '%'-style pattern rules are a GNU make extension src/ipaccess/Makefile.am:62: warning: source file '$(top_srcdir)/src/osmo-bsc/gsm_data.c' is in a subdirectory, src/ipaccess/Makefile.am:62: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/ipaccess/Makefile.am: installing './depcomp' + ./configure --enable-sanitize --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for ANSI C header files... (cached) yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bsc/Makefile config.status: creating src/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/codec_pref/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating tests/handover/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0.186-ec4d > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in bsc make[4]: Entering directory '/build/include/osmocom/bsc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/bsc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libfilter make[3]: Entering directory '/build/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/src/libfilter' Making all in osmo-bsc make[3]: Entering directory '/build/src/osmo-bsc' CC a_reset.o CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o CC arfcn_range_encode.o CC assignment_fsm.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_init.o CC bsc_rf_ctrl.o CC bsc_rll.o CC bsc_subscr_conn_fsm.o CC bsc_subscriber.o CC bsc_vty.o CC bts_ericsson_rbs2000.o CC bts_init.o CC bts_ipaccess_nanobts.o CC bts_ipaccess_nanobts_omlattr.o CC bts_nokia_site.o CC bts_siemens_bs11.o CC bts_sysmobts.o CC bts_unknown.o CC chan_alloc.o CC codec_pref.o In file included from codec_pref.c:24:0: /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: 'struct tlv_parsed' declared inside parameter list [-Werror] int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); ^ /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] CC e1_config.o cc1: all warnings being treated as errors CC gsm_04_08_rr.o make[3]: *** [codec_pref.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:611: recipe for target 'codec_pref.o' failed make[3]: Leaving directory '/build/src/osmo-bsc' Makefile:396: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:434: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:365: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:05:39 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:05:39 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmocom-bb_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#949?= In-Reply-To: <124682727.662.1542606855864.JavaMail.jenkins@jenkins.osmocom.org> References: <124682727.662.1542606855864.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1883123741.670.1542607539847.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 83.54 KB...] Makefile.am:15: but option 'subdir-objects' is disabled Makefile.am: installing './depcomp' + ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: executing depfiles commands + make echo 0.0.0.2232-d4450 > .version-t && mv .version-t .version make all-am make[1]: Entering directory ' CC gsmmap.o gsmmap.c:22:2: warning: #warning todo bsic [-Wcpp] #warning todo bsic ^~~~~~~ CC geo.o CC locate.o CC log.o CC sysinfo.o CC networks.o CC logging.o CCLD gsmmap make[1]: Leaving directory ' + cd + autoreconf -fi configure.ac:10: installing './compile' configure.ac:3: installing './install-sh' configure.ac:3: installing './missing' src/common/Makefile.am: installing './depcomp' src/misc/Makefile.am:7: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:7: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/misc/Makefile.am:13: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:13: but option 'subdir-objects' is disabled src/misc/Makefile.am:8: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:8: but option 'subdir-objects' is disabled src/misc/Makefile.am:11: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:11: but option 'subdir-objects' is disabled src/misc/Makefile.am:11: warning: source file '../../../gsmmap/geo.c' is in a subdirectory, src/misc/Makefile.am:11: but option 'subdir-objects' is disabled src/misc/Makefile.am:9: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:9: but option 'subdir-objects' is disabled + ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for ranlib... ranlib checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o CC gsm480_ss.o gsm480_ss.c:311:30: error: redefinition of ?msgb_wrap_with_TL? static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^~~~~~~~~~~~~~~~~ In file included from gsm480_ss.c:28:0: :369:30: note: previous definition of ?msgb_wrap_with_TL? was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^~~~~~~~~~~~~~~~~ Makefile:423: recipe for target 'gsm480_ss.o' failed make[2]: *** [gsm480_ss.o] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:06:12 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:06:12 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6925?= In-Reply-To: <334825709.665.1542607372537.JavaMail.jenkins@jenkins.osmocom.org> References: <334825709.665.1542607372537.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <64161726.671.1542607572567.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 786.53 KB...] + enable_werror=--enable-werror + set +x =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC msc_vty.o CC a_reset.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:382: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:07:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:07:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6925?= In-Reply-To: <72565935.668.1542607481895.JavaMail.jenkins@jenkins.osmocom.org> References: <72565935.668.1542607481895.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <965110073.672.1542607645731.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.05 MB...] + set +x =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_reset.o CC a_iface_bssap.o CC msc_vty.o CC gsm_04_11.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:07:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:07:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6926?= In-Reply-To: <64161726.671.1542607572567.JavaMail.jenkins@jenkins.osmocom.org> References: <64161726.671.1542607572567.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <67502353.673.1542607653606.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 760.03 KB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:382: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:08:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:08:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3214?= In-Reply-To: <261625596.667.1542607462017.JavaMail.jenkins@jenkins.osmocom.org> References: <261625596.667.1542607462017.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1488649216.674.1542607703114.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.12 KB...] config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC common_vty.o CC bsc_version.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC socket.o CC oap_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_sdp.o CC mgcp_vty.o CC mgcp_osmux.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_om2000.o CC abis_nm.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC e1_config.o CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o CC gsm_subscriber.o CC mncc.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ CC mncc_builtin.o Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:08:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:08:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4185?= In-Reply-To: <445921773.669.1542607529649.JavaMail.jenkins@jenkins.osmocom.org> References: <445921773.669.1542607529649.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2025569344.675.1542607713245.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 681.16 KB...] configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' doc/Makefile.am:29: warning: '%'-style pattern rules are a GNU make extension doc/Makefile.am:32: warning: '%'-style pattern rules are a GNU make extension src/ipaccess/Makefile.am:62: warning: source file '$(top_srcdir)/src/osmo-bsc/gsm_data.c' is in a subdirectory, src/ipaccess/Makefile.am:62: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/ipaccess/Makefile.am: installing './depcomp' + ./configure --enable-sanitize --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for ANSI C header files... (cached) yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bsc/Makefile config.status: creating src/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/codec_pref/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating tests/handover/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0.186-ec4d > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in bsc make[4]: Entering directory '/build/include/osmocom/bsc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/bsc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libfilter make[3]: Entering directory '/build/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/src/libfilter' Making all in osmo-bsc make[3]: Entering directory '/build/src/osmo-bsc' CC a_reset.o CC abis_om2000_vty.o CC abis_om2000.o CC acc_ramp.o CC arfcn_range_encode.o CC abis_rsl.o CC abis_nm.o CC abis_nm_vty.o CC assignment_fsm.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_init.o CC bsc_rf_ctrl.o CC bsc_rll.o CC bsc_subscr_conn_fsm.o CC bsc_subscriber.o CC bsc_vty.o CC bts_ericsson_rbs2000.o CC bts_init.o CC bts_ipaccess_nanobts.o CC bts_ipaccess_nanobts_omlattr.o CC bts_nokia_site.o CC bts_siemens_bs11.o CC bts_sysmobts.o CC bts_unknown.o CC chan_alloc.o CC codec_pref.o In file included from codec_pref.c:24:0: /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: 'struct tlv_parsed' declared inside parameter list [-Werror] int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); ^ /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] CC e1_config.o CC gsm_04_08_rr.o cc1: all warnings being treated as errors Makefile:611: recipe for target 'codec_pref.o' failed make[3]: *** [codec_pref.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/osmo-bsc' make[2]: *** [all-recursive] Error 1 Makefile:396: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:434: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:365: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:09:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:09:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3214?= In-Reply-To: <543318082.666.1542607444018.JavaMail.jenkins@jenkins.osmocom.org> References: <543318082.666.1542607444018.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1569763709.676.1542607744285.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.13 KB...] config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC oap_client.o CC gsup_client.o CC socket.o CC gsm_data_shared.o CC gsm_data.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_osmux.o CC mgcp_vty.o CC mgcp_network.o CC mgcp_sdp.o CC mgcp_transcode.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000_vty.o CC abis_om2000.o CC bsc_subscriber.o CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_sysmobts.o CC chan_alloc.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC db.o CC auth.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_80.o CC gsm_04_14.o CC mncc.o CC gsm_subscriber.o gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ make[3]: Leaving directory '/build/openbsc/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' Makefile:514: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:09:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:09:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6926?= In-Reply-To: <965110073.672.1542607645731.JavaMail.jenkins@jenkins.osmocom.org> References: <965110073.672.1542607645731.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <679342477.677.1542607753071.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_reset.o CC a_iface_bssap.o CC gsm_04_08_cc.o CC gsm_04_08.o CC gsm_04_11.o CC msc_vty.o CC db.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:382: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:15:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:15:55 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6927?= In-Reply-To: <67502353.673.1542607653606.JavaMail.jenkins@jenkins.osmocom.org> References: <67502353.673.1542607653606.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <491022532.678.1542608155694.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 758.62 KB...] =============================== osmo-msc =============================== + enable_werror= + '[' x--disable-iu = x--enable-iu ']' + enable_werror=--enable-werror + set +x + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_lu_fsm.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_08_cc.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:382: recipe for target 'all' failed make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:17:28 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:17:28 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6927?= In-Reply-To: <679342477.677.1542607753071.JavaMail.jenkins@jenkins.osmocom.org> References: <679342477.677.1542607753071.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <505533528.679.1542608248507.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + set +x + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC msc_vty.o CC a_reset.o CC db.o CC gsm_04_11.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:382: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:21:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:21:36 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3215?= In-Reply-To: <1569763709.676.1542607744285.JavaMail.jenkins@jenkins.osmocom.org> References: <1569763709.676.1542607744285.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1542933728.680.1542608496588.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 756.25 KB...] config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_osmux.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC mgcp_sdp.o CC mgcp_transcode.o AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_om2000_vty.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o CC paging.o CC bts_ericsson_rbs2000.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC gsm_04_11.o CC gsm_04_08.o CC db.o CC auth.o db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:21:40 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:21:40 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4186?= In-Reply-To: <2025569344.675.1542607713245.JavaMail.jenkins@jenkins.osmocom.org> References: <2025569344.675.1542607713245.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <45505133.681.1542608500887.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 703.32 KB...] configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' doc/Makefile.am:29: warning: '%'-style pattern rules are a GNU make extension doc/Makefile.am:32: warning: '%'-style pattern rules are a GNU make extension src/ipaccess/Makefile.am:62: warning: source file '$(top_srcdir)/src/osmo-bsc/gsm_data.c' is in a subdirectory, src/ipaccess/Makefile.am:62: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/ipaccess/Makefile.am: installing './depcomp' + ./configure --enable-sanitize --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for ANSI C header files... (cached) yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bsc/Makefile config.status: creating src/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/codec_pref/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating tests/handover/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0.186-ec4d > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in bsc make[4]: Entering directory '/build/include/osmocom/bsc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/bsc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libfilter make[3]: Entering directory '/build/src/libfilter' CC bsc_msg_acc.o CC bsc_msg_filter.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/src/libfilter' Making all in osmo-bsc make[3]: Entering directory '/build/src/osmo-bsc' CC a_reset.o CC abis_nm.o CC abis_rsl.o CC abis_nm_vty.o CC acc_ramp.o CC arfcn_range_encode.o CC abis_om2000_vty.o CC abis_om2000.o CC assignment_fsm.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_init.o CC bsc_rf_ctrl.o CC bsc_rll.o CC bsc_subscr_conn_fsm.o CC bsc_subscriber.o CC bsc_vty.o CC bts_ericsson_rbs2000.o CC bts_init.o CC bts_ipaccess_nanobts.o CC bts_ipaccess_nanobts_omlattr.o CC bts_nokia_site.o CC bts_siemens_bs11.o CC bts_sysmobts.o CC bts_unknown.o CC chan_alloc.o CC codec_pref.o In file included from codec_pref.c:24:0: /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: 'struct tlv_parsed' declared inside parameter list [-Werror] int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); ^ /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] CC e1_config.o CC gsm_04_08_rr.o CC gsm_04_80_utils.o cc1: all warnings being treated as errors make[3]: *** [codec_pref.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:611: recipe for target 'codec_pref.o' failed make[3]: Leaving directory '/build/src/osmo-bsc' Makefile:396: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:434: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:365: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:22:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:22:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3215?= In-Reply-To: <1488649216.674.1542607703114.JavaMail.jenkins@jenkins.osmocom.org> References: <1488649216.674.1542607703114.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1886897832.682.1542608540163.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.12 KB...] config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC socket.o CC gsup_client.o CC gsm_data_shared.o CC oap_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_osmux.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC bsc_subscriber.o CC abis_om2000_vty.o CC acc_ramp.o CC bsc_rll.o CC abis_rsl.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC gsm_04_11.o CC db.o CC gsm_04_08.o CC gsm_subscriber.o CC gsm_04_14.o CC mncc.o CC gsm_04_80.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ make[3]: Leaving directory '/build/openbsc/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:22:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:22:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6928?= In-Reply-To: <491022532.678.1542608155694.JavaMail.jenkins@jenkins.osmocom.org> References: <491022532.678.1542608155694.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <906635955.683.1542608555363.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 786.75 KB...] + enable_werror=--enable-werror + set +x =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC msc_vty.o CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC db.o CC gsm_04_11.o CC gsm_04_08_cc.o CC gsm_04_08.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:23:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:23:18 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4187?= In-Reply-To: <45505133.681.1542608500887.JavaMail.jenkins@jenkins.osmocom.org> References: <45505133.681.1542608500887.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <797565112.684.1542608598105.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 703.50 KB...] configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' doc/Makefile.am:29: warning: '%'-style pattern rules are a GNU make extension doc/Makefile.am:32: warning: '%'-style pattern rules are a GNU make extension src/ipaccess/Makefile.am:62: warning: source file '$(top_srcdir)/src/osmo-bsc/gsm_data.c' is in a subdirectory, src/ipaccess/Makefile.am:62: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/ipaccess/Makefile.am: installing './depcomp' + ./configure --enable-sanitize --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for ANSI C header files... (cached) yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bsc/Makefile config.status: creating src/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/codec_pref/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating tests/handover/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0.186-ec4d > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in bsc make[4]: Entering directory '/build/include/osmocom/bsc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/bsc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libfilter make[3]: Entering directory '/build/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_vty.o CC bsc_msg_acc.o AR libfilter.a make[3]: Leaving directory '/build/src/libfilter' Making all in osmo-bsc make[3]: Entering directory '/build/src/osmo-bsc' CC abis_nm.o CC abis_om2000.o CC a_reset.o CC abis_om2000_vty.o CC abis_nm_vty.o CC acc_ramp.o CC abis_rsl.o CC arfcn_range_encode.o CC assignment_fsm.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_init.o CC bsc_rf_ctrl.o CC bsc_rll.o CC bsc_subscr_conn_fsm.o CC bsc_subscriber.o CC bsc_vty.o CC bts_ericsson_rbs2000.o CC bts_init.o CC bts_ipaccess_nanobts.o CC bts_ipaccess_nanobts_omlattr.o CC bts_nokia_site.o CC bts_siemens_bs11.o CC bts_sysmobts.o CC bts_unknown.o CC chan_alloc.o CC codec_pref.o In file included from codec_pref.c:24:0: /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: 'struct tlv_parsed' declared inside parameter list [-Werror] int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); ^ /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] CC e1_config.o CC gsm_04_08_rr.o cc1: all warnings being treated as errors Makefile:611: recipe for target 'codec_pref.o' failed make[3]: *** [codec_pref.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/osmo-bsc' make[2]: *** [all-recursive] Error 1 Makefile:396: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:434: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:365: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:23:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:23:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6929?= In-Reply-To: <906635955.683.1542608555363.JavaMail.jenkins@jenkins.osmocom.org> References: <906635955.683.1542608555363.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1542605288.685.1542608609414.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 786.72 KB...] + enable_werror=--enable-werror + set +x + cd /build + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:23:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:23:48 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6928?= In-Reply-To: <505533528.679.1542608248507.JavaMail.jenkins@jenkins.osmocom.org> References: <505533528.679.1542608248507.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1645003586.686.1542608628630.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface_bssap.o CC a_iface.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:24:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:24:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6929?= In-Reply-To: <1645003586.686.1542608628630.JavaMail.jenkins@jenkins.osmocom.org> References: <1645003586.686.1542608628630.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <556002405.687.1542608663456.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.05 MB...] =============================== osmo-msc =============================== + set +x + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o CC vlr.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:25:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:25:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3216?= In-Reply-To: <1886897832.682.1542608540163.JavaMail.jenkins@jenkins.osmocom.org> References: <1886897832.682.1542608540163.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <867956065.688.1542608723812.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 754.25 KB...] config.status: creating src/libcommon/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_vty.o CC mgcp_network.o CC mgcp_osmux.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC mgcp_sdp.o AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm.o CC abis_om2000.o CC abis_nm_vty.o CC abis_om2000_vty.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o CC paging.o CC bts_ericsson_rbs2000.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o CC bts_sysmobts.o CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC e1_config.o CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_08.o CC gsm_04_11.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make: *** [all] Error 2 Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:25:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:25:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4188?= In-Reply-To: <797565112.684.1542608598105.JavaMail.jenkins@jenkins.osmocom.org> References: <797565112.684.1542608598105.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <507835478.689.1542608752859.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 679.67 KB...] configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' doc/Makefile.am:29: warning: '%'-style pattern rules are a GNU make extension doc/Makefile.am:32: warning: '%'-style pattern rules are a GNU make extension src/ipaccess/Makefile.am:62: warning: source file '$(top_srcdir)/src/osmo-bsc/gsm_data.c' is in a subdirectory, src/ipaccess/Makefile.am:62: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/ipaccess/Makefile.am: installing './depcomp' + ./configure --enable-sanitize --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for ANSI C header files... (cached) yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bsc/Makefile config.status: creating src/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/codec_pref/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating tests/handover/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.3.0.186-ec4d > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in bsc make[4]: Entering directory '/build/include/osmocom/bsc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/bsc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libfilter make[3]: Entering directory '/build/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/src/libfilter' Making all in osmo-bsc make[3]: Entering directory '/build/src/osmo-bsc' CC abis_nm.o CC abis_om2000_vty.o CC arfcn_range_encode.o CC abis_nm_vty.o CC abis_om2000.o CC abis_rsl.o CC acc_ramp.o CC a_reset.o CC assignment_fsm.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_init.o CC bsc_rf_ctrl.o CC bsc_rll.o CC bsc_subscr_conn_fsm.o CC bsc_subscriber.o CC bsc_vty.o CC bts_ericsson_rbs2000.o CC bts_init.o CC bts_ipaccess_nanobts.o CC bts_ipaccess_nanobts_omlattr.o CC bts_nokia_site.o CC bts_siemens_bs11.o CC bts_sysmobts.o CC bts_unknown.o CC chan_alloc.o CC codec_pref.o In file included from codec_pref.c:24:0: /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: 'struct tlv_parsed' declared inside parameter list [-Werror] int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); ^ /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] CC e1_config.o CC gsm_04_08_rr.o cc1: all warnings being treated as errors make[3]: *** [codec_pref.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:611: recipe for target 'codec_pref.o' failed make[3]: Leaving directory '/build/src/osmo-bsc' make[2]: *** [all-recursive] Error 1 Makefile:396: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[1]: *** [all-recursive] Error 1 Makefile:434: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:365: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:26:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:26:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6930?= In-Reply-To: <1542605288.685.1542608609414.JavaMail.jenkins@jenkins.osmocom.org> References: <1542605288.685.1542608609414.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <981807765.690.1542608776811.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 758.29 KB...] + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:26:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:26:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3216?= In-Reply-To: <1542933728.680.1542608496588.JavaMail.jenkins@jenkins.osmocom.org> References: <1542933728.680.1542608496588.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <858510838.691.1542608807178.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 754.20 KB...] config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC gsm_data_shared.o CC gsup_client.o CC oap_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_transcode.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC abis_om2000_vty.o CC bsc_rll.o CC acc_ramp.o CC bsc_subscriber.o CC abis_om2000.o CC abis_rsl.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ipaccess_nanobts.o CC bts_ericsson_rbs2000.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o CC chan_alloc.o CC bts_sysmobts.o CC handover_logic.o CC handover_decision.o CC meas_rep.o CC pcu_sock.o CC bsc_msc.o CC system_information.o CC bsc_api.o CC rest_octets.o CC bsc_vty.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_14.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_subscriber.o CC gsm_04_80.o CC mncc.o gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ CC mncc_builtin.o CC mncc_sock.o CC rrlp.o CC silent_call.o CC sms_queue.o CC token_auth.o Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:422: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:27:45 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:27:45 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6930?= In-Reply-To: <556002405.687.1542608663456.JavaMail.jenkins@jenkins.osmocom.org> References: <556002405.687.1542608663456.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1455386299.692.1542608865341.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_auth_fsm.o CC vlr_lu_fsm.o CC vlr.o CC vlr_access_req_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:28:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:28:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6931?= In-Reply-To: <981807765.690.1542608776811.JavaMail.jenkins@jenkins.osmocom.org> References: <981807765.690.1542608776811.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1698820056.693.1542608903533.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 787.87 KB...] + enable_werror=--enable-werror + set +x + cd /build + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_lu_fsm.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:382: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:29:44 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:29:44 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4189?= In-Reply-To: <507835478.689.1542608752859.JavaMail.jenkins@jenkins.osmocom.org> References: <507835478.689.1542608752859.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <70858832.695.1542608984472.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 700.84 KB...] configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' doc/Makefile.am:29: warning: '%'-style pattern rules are a GNU make extension doc/Makefile.am:32: warning: '%'-style pattern rules are a GNU make extension src/ipaccess/Makefile.am:62: warning: source file '$(top_srcdir)/src/osmo-bsc/gsm_data.c' is in a subdirectory, src/ipaccess/Makefile.am:62: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/ipaccess/Makefile.am: installing './depcomp' + ./configure --enable-sanitize --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for ANSI C header files... (cached) yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bsc/Makefile config.status: creating src/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/codec_pref/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating tests/handover/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0.186-ec4d > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in bsc make[4]: Entering directory '/build/include/osmocom/bsc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/bsc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libfilter make[3]: Entering directory '/build/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/src/libfilter' Making all in osmo-bsc make[3]: Entering directory '/build/src/osmo-bsc' CC a_reset.o CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o CC arfcn_range_encode.o CC assignment_fsm.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_init.o CC bsc_rf_ctrl.o CC bsc_rll.o CC bsc_subscr_conn_fsm.o CC bsc_subscriber.o CC bsc_vty.o CC bts_ericsson_rbs2000.o CC bts_init.o CC bts_ipaccess_nanobts.o CC bts_ipaccess_nanobts_omlattr.o CC bts_nokia_site.o CC bts_siemens_bs11.o CC bts_sysmobts.o CC bts_unknown.o CC chan_alloc.o CC codec_pref.o CC e1_config.o In file included from codec_pref.c:24:0: /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: 'struct tlv_parsed' declared inside parameter list [-Werror] int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); ^ /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] CC gsm_04_08_rr.o cc1: all warnings being treated as errors Makefile:611: recipe for target 'codec_pref.o' failed make[3]: *** [codec_pref.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/osmo-bsc' Makefile:396: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:434: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:365: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:30:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:30:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6931?= In-Reply-To: <1455386299.692.1542608865341.JavaMail.jenkins@jenkins.osmocom.org> References: <1455386299.692.1542608865341.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1834203085.696.1542609021990.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] + cd /build + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_reset.o CC a_iface_bssap.o CC gsm_04_08.o CC msc_vty.o CC db.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:382: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:38:46 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:38:46 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6932?= In-Reply-To: <1698820056.693.1542608903533.JavaMail.jenkins@jenkins.osmocom.org> References: <1698820056.693.1542608903533.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1516293335.698.1542609527015.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 788.96 KB...] + enable_werror=--enable-werror + set +x + cd /build + autoreconf --install --force =============================== osmo-msc =============================== libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 06:40:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 06:40:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6932?= In-Reply-To: <1834203085.696.1542609021990.JavaMail.jenkins@jenkins.osmocom.org> References: <1834203085.696.1542609021990.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1841301472.699.1542609635918.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_auth_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC gsm_04_08_cc.o CC gsm_04_08.o CC msc_vty.o CC gsm_04_11.o CC a_reset.o CC db.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 08:33:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 08:33:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4190?= In-Reply-To: <70858832.695.1542608984472.JavaMail.jenkins@jenkins.osmocom.org> References: <70858832.695.1542608984472.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <512483779.701.1542616427595.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 701.95 KB...] doc/Makefile.am:29: warning: '%'-style pattern rules are a GNU make extension doc/Makefile.am:32: warning: '%'-style pattern rules are a GNU make extension src/ipaccess/Makefile.am:62: warning: source file '$(top_srcdir)/src/osmo-bsc/gsm_data.c' is in a subdirectory, src/ipaccess/Makefile.am:62: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/ipaccess/Makefile.am: installing './depcomp' + ./configure --enable-sanitize --enable-external-tests --enable-werror checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for library containing dlopen... -ldl checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for ANSI C header files... (cached) yes checking pcap/pcap.h usability... yes checking pcap/pcap.h presence... yes checking for pcap/pcap.h... yes checking cdk/cdk.h usability... no checking cdk/cdk.h presence... no checking for cdk/cdk.h... no checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking for python2... yes checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bsc/Makefile config.status: creating src/Makefile config.status: creating src/libfilter/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/codec_pref/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating tests/handover/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 4 echo 1.3.0.186-ec4d > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch bscconfig.h.in cd . && /bin/bash ./config.status bscconfig.h config.status: creating bscconfig.h config.status: bscconfig.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in bsc make[4]: Entering directory '/build/include/osmocom/bsc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/bsc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libfilter make[3]: Entering directory '/build/src/libfilter' CC bsc_msg_filter.o CC bsc_msg_acc.o CC bsc_msg_vty.o AR libfilter.a make[3]: Leaving directory '/build/src/libfilter' Making all in osmo-bsc make[3]: Entering directory '/build/src/osmo-bsc' CC a_reset.o CC abis_nm.o CC abis_nm_vty.o CC abis_om2000.o CC abis_om2000_vty.o CC abis_rsl.o CC acc_ramp.o CC arfcn_range_encode.o CC assignment_fsm.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC bsc_init.o CC bsc_rf_ctrl.o CC bsc_rll.o CC bsc_subscr_conn_fsm.o CC bsc_subscriber.o CC bsc_vty.o CC bts_ericsson_rbs2000.o CC bts_init.o CC bts_ipaccess_nanobts.o CC bts_ipaccess_nanobts_omlattr.o CC bts_nokia_site.o CC bts_siemens_bs11.o CC bts_sysmobts.o CC bts_unknown.o CC chan_alloc.o CC codec_pref.o In file included from codec_pref.c:24:0: /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: 'struct tlv_parsed' declared inside parameter list [-Werror] int gsm0808_get_cipher_reject_cause(const struct tlv_parsed *tp); ^ /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h:123:50: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] CC e1_config.o cc1: all warnings being treated as errors Makefile:611: recipe for target 'codec_pref.o' failed make[3]: *** [codec_pref.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/osmo-bsc' make[2]: *** [all-recursive] Error 1 Makefile:396: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:434: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:365: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 08:34:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 08:34:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6933?= In-Reply-To: <1516293335.698.1542609527015.JavaMail.jenkins@jenkins.osmocom.org> References: <1516293335.698.1542609527015.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <556558960.702.1542616487552.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 784.53 KB...] + enable_werror=--enable-werror + set +x =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC db.o CC a_iface_bssap.o CC gsm_04_11.o CC msc_vty.o CC a_reset.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 08:35:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 08:35:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6933?= In-Reply-To: <1841301472.699.1542609635918.JavaMail.jenkins@jenkins.osmocom.org> References: <1841301472.699.1542609635918.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1723599143.703.1542616534747.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.69-ba8a0 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr_access_req_fsm.o CC vlr.o CC vlr_lu_fsm.o CC vlr_auth_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC gsm_04_08.o CC db.o CC gsm_04_11.o CC gsm_04_08_cc.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/src/libmsc' make[2]: *** [all-recursive] Error 1 Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' Makefile:451: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/build' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:16:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:16:54 +0000 Subject: Change in osmocom-bb[master]: mobile: log socket path on error In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11812 ) Change subject: mobile: log socket path on error ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I18eb46743e4c0e4e8f8032883f39fec355f03c78 Gerrit-Change-Number: 11812 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 09:16:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:16:57 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:16:57 +0000 Subject: Change in osmocom-bb[master]: osmocon: log error cause for socket opening In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11813 ) Change subject: osmocon: log error cause for socket opening ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f871cb16e5e1033e42863a9e12459057004782c Gerrit-Change-Number: 11813 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 09:16:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:17:00 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:17:00 +0000 Subject: Change in osmocom-bb[master]: l1l2 interface: use LOGP for socket errors In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11814 ) Change subject: l1l2 interface: use LOGP for socket errors ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id205bcd9bdb7c3e4b96493d50be8381a6fa80ac6 Gerrit-Change-Number: 11814 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 09:17:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:17:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:17:10 +0000 Subject: Change in osmocom-bb[master]: mobile: log socket path on error In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11812 ) Change subject: mobile: log socket path on error ...................................................................... mobile: log socket path on error Change-Id: I18eb46743e4c0e4e8f8032883f39fec355f03c78 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index b0e2a13..f53445a 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -213,7 +213,7 @@ rc = layer2_open(ms, ms->settings.layer2_socket_path); if (rc < 0) { - LOGP(DMOB, LOGL_ERROR, "Failed during layer2_open()\n"); + LOGP(DMOB, LOGL_ERROR, "Failed during layer2_open(%s)\n", ms->settings.layer2_socket_path); ms->l2_wq.bfd.fd = -1; mobile_exit(ms, 1); return rc; -- To view, visit https://gerrit.osmocom.org/11812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I18eb46743e4c0e4e8f8032883f39fec355f03c78 Gerrit-Change-Number: 11812 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:17:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:17:10 +0000 Subject: Change in osmocom-bb[master]: osmocon: log error cause for socket opening In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11813 ) Change subject: osmocon: log error cause for socket opening ...................................................................... osmocon: log error cause for socket opening Change-Id: I2f871cb16e5e1033e42863a9e12459057004782c --- M src/host/osmocon/osmoload.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/osmocon/osmoload.c b/src/host/osmocon/osmoload.c index decdc13..d320b29 100644 --- a/src/host/osmocon/osmoload.c +++ b/src/host/osmocon/osmoload.c @@ -499,7 +499,8 @@ rc = osmo_sock_unix_init_ofd(conn, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); + fprintf(stderr, "Failed to create unix domain socket %s: %s\n", + socket_path, strerror(-rc)); exit(1); } -- To view, visit https://gerrit.osmocom.org/11813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2f871cb16e5e1033e42863a9e12459057004782c Gerrit-Change-Number: 11813 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:17:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:17:11 +0000 Subject: Change in osmocom-bb[master]: l1l2 interface: use LOGP for socket errors In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11814 ) Change subject: l1l2 interface: use LOGP for socket errors ...................................................................... l1l2 interface: use LOGP for socket errors Log via LOGP() like the rest of the file instead of fprintf() for consistency. While at it, also print error cause. Change-Id: Id205bcd9bdb7c3e4b96493d50be8381a6fa80ac6 --- M src/host/layer23/src/common/l1l2_interface.c M src/host/layer23/src/common/sap_interface.c 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index b366d51..c07b0a1 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -109,7 +109,8 @@ rc = osmo_sock_unix_init_ofd(&ms->l2_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); + LOGP(DL1C, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n", + socket_path, strerror(-rc)); return rc; } diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c index cab3c6b..936beb3 100644 --- a/src/host/layer23/src/common/sap_interface.c +++ b/src/host/layer23/src/common/sap_interface.c @@ -503,7 +503,8 @@ rc = osmo_sock_unix_init_ofd(&ms->sap_wq.bfd, SOCK_STREAM, 0, socket_path, OSMO_SOCK_F_CONNECT); if (rc < 0) { - fprintf(stderr, "Failed to create unix domain socket %s\n", socket_path); + LOGP(DSAP, LOGL_ERROR, "Failed to create unix domain socket %s: %s\n", + socket_path, strerror(-rc)); ms->sap_entity.sap_state = SAP_SOCKET_ERROR; return rc; } -- To view, visit https://gerrit.osmocom.org/11814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id205bcd9bdb7c3e4b96493d50be8381a6fa80ac6 Gerrit-Change-Number: 11814 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 09:20:47 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 09:20:47 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmocom-bb_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#950?= In-Reply-To: <1883123741.670.1542607539847.JavaMail.jenkins@jenkins.osmocom.org> References: <1883123741.670.1542607539847.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <79312690.705.1542619248012.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Max] mobile: log socket path on error [Max] osmocon: log error cause for socket opening [Max] l1l2 interface: use LOGP for socket errors ------------------------------------------ [...truncated 88.10 KB...] Makefile.am:15: but option 'subdir-objects' is disabled Makefile.am: installing './depcomp' + ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating Makefile config.status: executing depfiles commands + make echo 0.0.0.2235-bfa7 > .version-t && mv .version-t .version make all-am make[1]: Entering directory ' CC gsmmap.o gsmmap.c:22:2: warning: #warning todo bsic [-Wcpp] #warning todo bsic ^~~~~~~ CC geo.o CC locate.o CC log.o CC sysinfo.o CC networks.o CC logging.o CCLD gsmmap make[1]: Leaving directory ' + cd + autoreconf -fi configure.ac:10: installing './compile' configure.ac:3: installing './install-sh' configure.ac:3: installing './missing' src/common/Makefile.am: installing './depcomp' src/misc/Makefile.am:7: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:7: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/misc/Makefile.am:13: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:13: but option 'subdir-objects' is disabled src/misc/Makefile.am:8: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:8: but option 'subdir-objects' is disabled src/misc/Makefile.am:11: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:11: but option 'subdir-objects' is disabled src/misc/Makefile.am:11: warning: source file '../../../gsmmap/geo.c' is in a subdirectory, src/misc/Makefile.am:11: but option 'subdir-objects' is disabled src/misc/Makefile.am:9: warning: source file '../common/main.c' is in a subdirectory, src/misc/Makefile.am:9: but option 'subdir-objects' is disabled + ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for ranlib... ranlib checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOCODEC... yes checking for gps_waiting in -lgps... yes checking for LIBLUA... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating src/Makefile config.status: creating src/common/Makefile config.status: creating src/misc/Makefile config.status: creating src/mobile/Makefile config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/bb/Makefile config.status: creating include/osmocom/bb/common/Makefile config.status: creating include/osmocom/bb/misc/Makefile config.status: creating include/osmocom/bb/mobile/Makefile config.status: creating Makefile config.status: executing depfiles commands + make Making all in include make[1]: Entering directory ' Making all in osmocom make[2]: Entering directory ' Making all in bb make[3]: Entering directory ' Making all in common make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in misc make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' Making all in mobile make[4]: Entering directory ' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' Making all in src make[1]: Entering directory ' Making all in common make[2]: Entering directory ' CC l1ctl.o CC l1l2_interface.o CC sap_interface.o CC logging.o CC networks.o CC sim.o sim.c: In function ?gsm_sim_reply?: sim.c:149:11: warning: variable ?payload? set but not used [-Wunused-but-set-variable] uint8_t *payload; ^~~~~~~ CC sysinfo.o CC gps.o CC l1ctl_lapdm_glue.o CC utils.o AR liblayer23.a ar: `u' modifier ignored since `D' is the default (see `U') make[2]: Leaving directory ' Making all in misc make[2]: Entering directory ' CC main.o CC app_bcch_scan.o app_bcch_scan.c: In function ?signal_cb?: app_bcch_scan.c:48:10: warning: implicit declaration of function ?fps_start? [-Wimplicit-function-declaration] return fps_start(ms); ^~~~~~~~~ app_bcch_scan.c: In function ?l23_app_init?: app_bcch_scan.c:56:2: warning: implicit declaration of function ?fps_init? [-Wimplicit-function-declaration] fps_init(ms); ^~~~~~~~ CC bcch_scan.o bcch_scan.c: In function ?cinfo_timer_cb?: bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_NONE? not handled in switch [-Wswitch] switch (fps.state) { ^~~~~~ bcch_scan.c:198:2: warning: enumeration value ?BSCAN_S_DONE? not handled in switch [-Wswitch] bcch_scan.c: In function ?rx_sch_info?: bcch_scan.c:236:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ bcch_scan.c: In function ?bscan_sig_cb?: bcch_scan.c:263:3: warning: enumeration value ?FPS_S_NONE? not handled in switch [-Wswitch] switch (fps.fps_state) { ^~~~~~ bcch_scan.c:263:3: warning: enumeration value ?FPS_S_BINFO? not handled in switch [-Wswitch] bcch_scan.c:241:20: warning: unused variable ?ci? [-Wunused-variable] struct cell_info *ci = fps.cur_cell; ^~ At top level: bcch_scan.c:233:12: warning: ?rx_sch_info? defined but not used [-Wunused-function] static int rx_sch_info() ^~~~~~~~~~~ bcch_scan.c:206:12: warning: ?rx_bcch_info? defined but not used [-Wunused-function] static int rx_bcch_info(const uint8_t *data) ^~~~~~~~~~~~ CCLD bcch_scan CC app_ccch_scan.o CC rslms.o CCLD ccch_scan CC app_echo_test.o CCLD echo_test CC app_cell_log.o CC cell_log.o CC geo.o CCLD cell_log CC app_cbch_sniff.o CCLD cbch_sniff make[2]: Leaving directory ' Making all in mobile make[2]: Entering directory ' CC gsm322.o CC gsm480_ss.o gsm480_ss.c:311:30: error: redefinition of ?msgb_wrap_with_TL? static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^~~~~~~~~~~~~~~~~ In file included from gsm480_ss.c:28:0: :369:30: note: previous definition of ?msgb_wrap_with_TL? was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^~~~~~~~~~~~~~~~~ Makefile:423: recipe for target 'gsm480_ss.o' failed make[2]: *** [gsm480_ss.o] Error 1 make[2]: Leaving directory ' Makefile:325: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:351: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:22:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:22:23 +0000 Subject: Change in osmo-msc[master]: Fix build with latest libosmocore Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11821 Change subject: Fix build with latest libosmocore ...................................................................... Fix build with latest libosmocore Remove locally defined function which conflicts with the one in libosmocore. Change-Id: I464c16034b76e4599ac42857f60442c3fd000c75 --- M src/libmsc/gsm_04_80.c 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/11821/1 diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index 0adf059..81f2001 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -33,15 +33,6 @@ #include #include -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - /*! Send a MT RELEASE COMPLETE message with Reject component * (see section 3.6.1) and given error code (see section 3.6.7). * -- To view, visit https://gerrit.osmocom.org/11821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I464c16034b76e4599ac42857f60442c3fd000c75 Gerrit-Change-Number: 11821 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:26:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:26:33 +0000 Subject: Change in osmocom-bb[master]: Fix build with latest libosmocore Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11822 Change subject: Fix build with latest libosmocore ...................................................................... Fix build with latest libosmocore Remove locally defined function which conflicts with the one in libosmocore. Change-Id: I1be1d39f7c93c959ca33f6296ecda71996865cca --- M src/host/layer23/src/mobile/gsm480_ss.c 1 file changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/22/11822/1 diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index 2869ce6..116c72f 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -307,16 +307,6 @@ return data; } -/* support function taken from OpenBSC */ -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - static inline void msgb_wrap_with_TL_asn(struct msgb *msg, uint8_t tag) { int len = msg->len; -- To view, visit https://gerrit.osmocom.org/11822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1be1d39f7c93c959ca33f6296ecda71996865cca Gerrit-Change-Number: 11822 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:26:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:26:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log BTS number on failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11809 ) Change subject: BSC: log BTS number on failure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib813635862c04d51a30e7bbcca4ec05ce664f7e9 Gerrit-Change-Number: 11809 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 09:26:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:27:17 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:27:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC: log BTS number on failure In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11809 ) Change subject: BSC: log BTS number on failure ...................................................................... BSC: log BTS number on failure It's useful to see which BTS exactly has failed the test in configuration with multiple BTS on single BSC. Change-Id: Ib813635862c04d51a30e7bbcca4ec05ce664f7e9 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 13535ce..29961e5 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -243,7 +243,7 @@ } f_sleep(0.1); if (not T.running) { - setverdict(fail, "Timeout waiting for oml-connection-state ", status); + setverdict(fail, "Timeout waiting for BTS" & int2str(bts_nr) & " oml-connection-state ", status); mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/11809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib813635862c04d51a30e7bbcca4ec05ce664f7e9 Gerrit-Change-Number: 11809 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:27:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:27:49 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 09:27:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:30:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:30:14 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11790 ) Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... Patch Set 2: It doesn't help jenkins figure it out, it helps people looking at gerrit patch or looking at git history understand better interaction between different commits. -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Keith Whyte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 09:30:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:31:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Nov 2018 09:31:45 +0000 Subject: Change in osmo-gsm-manuals[master]: copy NITB's osmobsc-usermanual.adoc to OsmoBSC In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11805 ) Change subject: copy NITB's osmobsc-usermanual.adoc to OsmoBSC ...................................................................... Patch Set 1: > You could also move it to common/, but fine. It was only used by OsmoBSC, so I figured that would be the better place. Thanks for reviewing all the patches! -- To view, visit https://gerrit.osmocom.org/11805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad Gerrit-Change-Number: 11805 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Nov 2018 09:31:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:31:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Nov 2018 09:31:58 +0000 Subject: Change in osmo-gsm-manuals[master]: make check: properly reference dependencies In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11794 ) Change subject: make check: properly reference dependencies ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11794/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11794/1//COMMIT_MSG at 13 PS1, Line 13: This allows creating a tests folder without its own chapters subfolder > I tend to think "folder" is a windows specific concept, while usually called directories in Unix dom [?] Oh you are right: https://superuser.com/questions/169457/directory-vs-folder. I've never realized that. Thank you for pointing this out! -- To view, visit https://gerrit.osmocom.org/11794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 Gerrit-Change-Number: 11794 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Nov 2018 09:31:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:32:20 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 19 Nov 2018 09:32:20 +0000 Subject: Change in osmo-msc[master]: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11792 ) Change subject: libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ...................................................................... libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. When using smpp-first, after the ESME accepts our STATUS REPORT, we were sending it locally into gsm340_rx_sms_submit() anyway. In the case of the ESME mirroring the report back to us, this would result in two copies of the status report in the SMS database, which were also both then delivered to the MS. This causes no visible error to the user but is a waste of radio resources. With this patch, we check if it is the sms_report that has had receiver set in sms_route_mt_sms() and not the original SMS we are reporting on, which of course already has receiver set. Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be --- M src/libmsc/gsm_04_11.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Keith Whyte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 8d9169b..52edcd6 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -691,7 +691,7 @@ } /* No route via SMPP, send the GSM 03.40 status-report now. */ - if (gsms->receiver) + if (sms_report->receiver) gsm340_rx_sms_submit(sms_report); LOGP(DLSMS, LOGL_NOTICE, "Status report has been sent\n"); -- To view, visit https://gerrit.osmocom.org/11792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3529b89535800eaa1127721d613fa7bbcb8b23be Gerrit-Change-Number: 11792 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 09:38:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 09:38:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--disable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6934?= In-Reply-To: <556558960.702.1542616487552.JavaMail.jenkins@jenkins.osmocom.org> References: <556558960.702.1542616487552.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1224979036.706.1542620303464.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [keith] libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ------------------------------------------ [...truncated 783.97 KB...] + set +x =============================== osmo-msc =============================== + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-werror --enable-smpp --disable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.70-bea25 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC db.o CC gsm_04_08.o CC gsm_04_08_cc.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user keith at rhizomatica.org From jenkins at lists.osmocom.org Mon Nov 19 09:39:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 09:39:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6934?= In-Reply-To: <1723599143.703.1542616534747.JavaMail.jenkins@jenkins.osmocom.org> References: <1723599143.703.1542616534747.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <720986411.707.1542620347459.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [keith] libmsc: Don't send SMS STATUS REPORT locally if the ESME accepted it. ------------------------------------------ [...truncated 1.14 MB...] =============================== osmo-msc =============================== + set +x + cd /build + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/libmsc/Makefile.am: installing './depcomp' tests/smpp/Makefile.am:31: warning: source file '$(top_builddir)/src/libmsc/smpp_utils.c' is in a subdirectory, tests/smpp/Makefile.am:31: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. + ./configure --enable-sanitize --enable-smpp --enable-iu --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for LIBOSMOGSM... yes checking for LIBOSMOABIS... yes checking for LIBOSMONETIF... yes checking for LIBOSMOSIGTRAN... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOMGCPCLIENT... yes checking for LIBOSMOGSUPCLIENT... yes checking for LIBSMPP34... yes checking for LIBASN1C... yes checking for LIBOSMORANAP... yes checking for ANSI C header files... (cached) yes checking dbi/dbd.h usability... yes checking dbi/dbd.h presence... yes checking for dbi/dbd.h... yes checking for SQLITE3... yes checking if gcc supports -fvisibility=hidden... yes checking whether C compiler accepts -Werror=implicit... yes checking whether C compiler accepts -Werror=maybe-uninitialized... yes checking whether C compiler accepts -Werror=memset-transposed-args... yes checking whether C compiler accepts -Werror=null-dereference... no checking whether C compiler accepts -Werror=sizeof-array-argument... no checking whether C compiler accepts -Werror=sizeof-pointer-memaccess... yes checking whether to enable code coverage support... no checking whether struct tm has tm_gmtoff member... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY/CTRL tests... yes CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Werror=sizeof-pointer-memaccess" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/osmocom/Makefile config.status: creating include/osmocom/msc/Makefile config.status: creating src/Makefile config.status: creating src/libmsc/Makefile config.status: creating src/libvlr/Makefile config.status: creating src/osmo-msc/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/smpp/Makefile config.status: creating tests/sms_queue/Makefile config.status: creating tests/msc_vlr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.2.0.70-bea25 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in doc make[2]: Entering directory '/build/doc' Making all in examples make[3]: Entering directory '/build/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/doc/examples' make[3]: Entering directory '/build/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/doc' make[2]: Leaving directory '/build/doc' Making all in include make[2]: Entering directory '/build/include' Making all in osmocom make[3]: Entering directory '/build/include/osmocom' Making all in msc make[4]: Entering directory '/build/include/osmocom/msc' make[4]: Nothing to be done for 'all'. make[4]: Leaving directory '/build/include/osmocom/msc' make[4]: Entering directory '/build/include/osmocom' make[4]: Nothing to be done for 'all-am'. make[4]: Leaving directory '/build/include/osmocom' make[3]: Leaving directory '/build/include/osmocom' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' Making all in libvlr make[3]: Entering directory '/build/src/libvlr' CC vlr.o CC vlr_auth_fsm.o CC vlr_access_req_fsm.o CC vlr_lu_fsm.o AR libvlr.a make[3]: Leaving directory '/build/src/libvlr' Making all in libmsc make[3]: Entering directory '/build/src/libmsc' CC a_iface.o CC a_iface_bssap.o CC a_reset.o CC msc_vty.o CC gsm_04_08.o CC gsm_04_08_cc.o CC db.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_80.o gsm_04_80.c:36:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from ../../include/osmocom/msc/msc_ifaces.h:3:0, from gsm_04_80.c:29: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:492: recipe for target 'gsm_04_80.o' failed make[3]: Leaving directory '/build/src/libmsc' Makefile:411: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:451: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:382: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user keith at rhizomatica.org From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:40:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:40:25 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf.rnd: gobi2k changed by ec20 In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11770 ) Change subject: resources.conf.rnd: gobi2k changed by ec20 ...................................................................... resources.conf.rnd: gobi2k changed by ec20 Given current bad support of most features used, gobi2k modem was removed and an EC20 was added instead. Change-Id: I2df38547978c7d2b1a1309f6e73b5a59413e08ff --- M example/resources.conf.rnd 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 61c328e..dc0251a 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -82,19 +82,19 @@ ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'sim'] -- label: ec20 +- label: ec20_1 path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.6' ki: 'BB70807226393CDBAC8DD3439FF54252' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] -- label: gobi2k +- label: ec20_2 path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.5' ki: '2F70DCA43C45ACB97E947FDD0C7CA30A' auth_algo: 'comp128v1' ciphers: [a5_0, a5_1] - features: ['sim'] + features: ['sms', 'voice', 'ussd', 'gprs', 'sim'] osmocon_phone: - serial_device: '/dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_0089279D-if00-port0' -- To view, visit https://gerrit.osmocom.org/11770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2df38547978c7d2b1a1309f6e73b5a59413e08ff Gerrit-Change-Number: 11770 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:40:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:40:26 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: Allow changing port of iperf3 server In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11771 ) Change subject: iperf3: Allow changing port of iperf3 server ...................................................................... iperf3: Allow changing port of iperf3 server This way several servers can run sharing same IP address. default port variable is moved inside class to be available to tests. Change-Id: Id4eae7cefbb1a18ecf2676f9cb22c60cc91cec7c --- M src/osmo_gsm_tester/iperf3.py 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index 894b10f..d0cf806 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -22,9 +22,6 @@ from . import log, util, process, pcap_recorder -DEFAULT_SRV_PORT = 5003 - - def iperf3_result_to_json(file): with open(file) as f: # Sometimes iperf3 provides 2 dictionaries, the 2nd one being an error about being interrupted (by us). @@ -37,6 +34,8 @@ class IPerf3Server(log.Origin): + DEFAULT_SRV_PORT = 5003 + def __init__(self, suite_run, ip_address): super().__init__(log.C_RUN, 'iperf3-srv_%s' % ip_address.get('addr')) self.run_dir = None @@ -44,7 +43,7 @@ self.process = None self.suite_run = suite_run self.ip_address = ip_address - self._port = DEFAULT_SRV_PORT + self._port = IPerf3Server.DEFAULT_SRV_PORT def start(self): self.log('Starting iperf3-srv') @@ -62,6 +61,9 @@ self.suite_run.remember_to_stop(self.process) self.process.launch() + def set_port(self, port): + self._port = port + def stop(self): self.suite_run.stop_process(self.process) -- To view, visit https://gerrit.osmocom.org/11771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id4eae7cefbb1a18ecf2676f9cb22c60cc91cec7c Gerrit-Change-Number: 11771 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:40:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:40:27 +0000 Subject: Change in osmo-gsm-tester[master]: iperf3: implement str() method in iperf3 server In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11772 ) Change subject: iperf3: implement str() method in iperf3 server ...................................................................... iperf3: implement str() method in iperf3 server This way it can be logged easily during test runs. Change-Id: I699f0a9a8d263ac9f02ea9594a28ca9fd8d48db6 --- M src/osmo_gsm_tester/iperf3.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index d0cf806..8f0cddb 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -76,6 +76,9 @@ def port(self): return self._port + def __str__(self): + return "%s:%u" %(self.addr(), self.port()) + def running(self): return not self.process.terminated() -- To view, visit https://gerrit.osmocom.org/11772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I699f0a9a8d263ac9f02ea9594a28ca9fd8d48db6 Gerrit-Change-Number: 11772 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:40:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:40:29 +0000 Subject: Change in osmo-gsm-tester[master]: tests: iperf3: Support testing parallel iperf3 clients in test In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11773 ) Change subject: tests: iperf3: Support testing parallel iperf3 clients in test ...................................................................... tests: iperf3: Support testing parallel iperf3 clients in test Since tests running a single MS and several of them are really similar, generic code handling the test for N concurrent iperf3 sessions is writen an moved to testlib, and existing and new test use that code. Change-Id: I57799fde49e6845379cca332eec0a1f70aaecd2b --- M src/osmo_gsm_tester/iperf3.py M suites/gprs/iperf3.py A suites/gprs/iperf3m4.py A suites/gprs/lib/testlib.py M suites/gprs/suite.conf 5 files changed, 128 insertions(+), 72 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py index 8f0cddb..55cb546 100644 --- a/src/osmo_gsm_tester/iperf3.py +++ b/src/osmo_gsm_tester/iperf3.py @@ -95,7 +95,7 @@ self.server = iperf3srv self.suite_run = suite_run - def run_test(self, netns=None): + def prepare_test_proc(self, netns=None): self.log('Starting iperf3-client connecting to %s:%d' % (self.server.addr(), self.server.port())) self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) @@ -110,6 +110,10 @@ self.process = process.NetNSProcess(self.name(), self.run_dir, netns, popen_args, env={}) else: self.process = process.Process(self.name(), self.run_dir, popen_args, env={}) + return self.process + + def run_test_sync(self, netns=None): + self.prepare_test_proc(netns) self.process.launch_sync() return self.get_results() diff --git a/suites/gprs/iperf3.py b/suites/gprs/iperf3.py index a1dd62c..e25519a 100755 --- a/suites/gprs/iperf3.py +++ b/suites/gprs/iperf3.py @@ -1,74 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -def print_results(cli_res, srv_res): - cli_sent = cli_res['end']['sum_sent'] - cli_recv = cli_res['end']['sum_received'] - print("RESULT client:") - print("\tSEND: %d KB, %d kbps, %d seconds (%d retrans)" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'], cli_sent['retransmits'])) - print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) - print("RESULT server:") - print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'])) - print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import setup_run_iperf3_test_parallel -hlr = suite.hlr() -bts = suite.bts() -pcu = bts.pcu() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -ggsn = suite.ggsn() -sgsn = suite.sgsn(hlr, ggsn) -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) -ms = suite.modem() -iperf3srv = suite.iperf3srv() -iperf3cli = iperf3srv.create_client() - -bsc.bts_add(bts) -sgsn.bts_add(bts) - -print('start iperfv3 server...') -iperf3srv.start() - -print('start network...') -hlr.start() -stp.start() -ggsn.start() -sgsn.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.start() - -bts.start() -wait(bsc.bts_is_connected, bts) -print('Waiting for bts to be ready...') -wait(bts.ready_for_pcu) -pcu.start() - -hlr.subscriber_add(ms) - -ms.connect(msc.mcc_mnc()) -ms.attach() - -ms.log_info() - -print('waiting for modems to attach...') -wait(ms.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms) - -print('waiting for modems to attach to data services...') -wait(ms.is_attached) - -# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) -ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) -print("Setting up data plan for %r" % repr(ctx_id_v4)) -ms.setup_context_data_plane(ctx_id_v4) - -print("Running iperf3 client to %s through %r" % (iperf3srv.addr(),repr(ctx_id_v4))) -res = iperf3cli.run_test(ms.netns()) -iperf3srv.stop() -print_results(res, iperf3srv.get_results()) - -ms.deactivate_context(ctx_id_v4) +setup_run_iperf3_test_parallel(1) diff --git a/suites/gprs/iperf3m4.py b/suites/gprs/iperf3m4.py new file mode 100755 index 0000000..1cc27ed --- /dev/null +++ b/suites/gprs/iperf3m4.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import setup_run_iperf3_test_parallel + +setup_run_iperf3_test_parallel(4) diff --git a/suites/gprs/lib/testlib.py b/suites/gprs/lib/testlib.py new file mode 100644 index 0000000..13a6671 --- /dev/null +++ b/suites/gprs/lib/testlib.py @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def print_results(cli_res, srv_res): + cli_sent = cli_res['end']['sum_sent'] + cli_recv = cli_res['end']['sum_received'] + print("RESULT client:") + print("\tSEND: %d KB, %d kbps, %d seconds (%d retrans)" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'], cli_sent['retransmits'])) + print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) + print("RESULT server:") + print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000, cli_sent['seconds'])) + print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000, cli_recv['bits_per_second']/1000, cli_recv['seconds'])) + +def run_iperf3_cli_parallel(iperf3clients, ms_li): + assert len(iperf3clients) == len(ms_li) + procs = [] + for i in range(len(iperf3clients)): + print("Running iperf3 client to %s through %r" % (str(iperf3clients[i]), repr(ms_li[i].tmp_ctx_id))) + procs.append(iperf3clients[i].prepare_test_proc(ms_li[i].netns())) + try: + for proc in procs: + proc.launch() + for proc in procs: + proc.wait() + except Exception as e: + for proc in procs: + proc.terminate() + raise e + + +def setup_run_iperf3_test_parallel(num_ms): + hlr = suite.hlr() + bts = suite.bts() + pcu = bts.pcu() + mgw_msc = suite.mgw() + mgw_bsc = suite.mgw() + stp = suite.stp() + ggsn = suite.ggsn() + sgsn = suite.sgsn(hlr, ggsn) + msc = suite.msc(hlr, mgw_msc, stp) + bsc = suite.bsc(msc, mgw_bsc, stp) + + iperf3srv_addr = suite.ip_address() + servers = [] + clients = [] + ms_li = [] + for i in range(num_ms): + iperf3srv = suite.iperf3srv(iperf3srv_addr) + iperf3srv.set_port(iperf3srv.DEFAULT_SRV_PORT + i) + servers.append(iperf3srv) + + iperf3cli = iperf3srv.create_client() + clients.append(iperf3cli) + + ms = suite.modem() + ms_li.append(ms) + + bsc.bts_add(bts) + sgsn.bts_add(bts) + + for iperf3srv in servers: + print('start iperfv3 server %s...' % str(iperf3srv) ) + iperf3srv.start() + + print('start network...') + hlr.start() + stp.start() + ggsn.start() + sgsn.start() + msc.start() + mgw_msc.start() + mgw_bsc.start() + bsc.start() + + bts.start() + wait(bsc.bts_is_connected, bts) + print('Waiting for bts to be ready...') + wait(bts.ready_for_pcu) + pcu.start() + + for ms in ms_li: + hlr.subscriber_add(ms) + ms.connect(msc.mcc_mnc()) + ms.attach() + ms.log_info() + + print('waiting for modems to attach...') + for ms in ms_li: + wait(ms.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, *ms_li) + + print('waiting for modems to attach to data services...') + for ms in ms_li: + wait(ms.is_attached) + # We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) + ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) + print("Setting up data plan for %r" % repr(ctx_id_v4)) + ms.setup_context_data_plane(ctx_id_v4) + setattr(ms, 'tmp_ctx_id', ctx_id_v4) + + run_iperf3_cli_parallel(clients, ms_li) + + for i in range(num_ms): + servers[i].stop() + print("Results for %s through %r" % (str(servers[i]), repr(ms_li[i].tmp_ctx_id))) + print_results(clients[i].get_results(), servers[i].get_results()) + + for ms in ms_li: + ms.deactivate_context(ms.tmp_ctx_id) + delattr(ms, 'tmp_ctx_id') diff --git a/suites/gprs/suite.conf b/suites/gprs/suite.conf index a24bc5d..3d4fe48 100644 --- a/suites/gprs/suite.conf +++ b/suites/gprs/suite.conf @@ -4,6 +4,6 @@ bts: - times: 1 modem: - - times: 1 + - times: 4 features: - gprs -- To view, visit https://gerrit.osmocom.org/11773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I57799fde49e6845379cca332eec0a1f70aaecd2b Gerrit-Change-Number: 11773 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:46:34 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 09:46:34 +0000 Subject: Change in libosmocore[master]: Add missing header include Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11823 Change subject: Add missing header include ...................................................................... Add missing header include That's necessary for 'struct tlv_parsed' definition although lack of it does not cause build failure in libosmocore for me but does so for osmo-bsc. Change-Id: I3b2d3955d02b07dc7ec5e9f0c66cc477196703ed --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/11823/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index c22d0a9..edae853 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -29,6 +29,7 @@ #include #include #include +#include /*! (225-1)/2 is the maximum number of elements in a cell identifier list. */ #define GSM0808_CELL_ID_LIST2_MAXLEN 127 -- To view, visit https://gerrit.osmocom.org/11823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b2d3955d02b07dc7ec5e9f0c66cc477196703ed Gerrit-Change-Number: 11823 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:48:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:48:09 +0000 Subject: Change in osmo-msc[master]: Fix build with latest libosmocore In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11821 ) Change subject: Fix build with latest libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I464c16034b76e4599ac42857f60442c3fd000c75 Gerrit-Change-Number: 11821 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 09:48:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:48:22 +0000 Subject: Change in osmo-msc[master]: Fix build with latest libosmocore In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11821 ) Change subject: Fix build with latest libosmocore ...................................................................... Fix build with latest libosmocore Remove locally defined function which conflicts with the one in libosmocore. Change-Id: I464c16034b76e4599ac42857f60442c3fd000c75 --- M src/libmsc/gsm_04_80.c 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index 0adf059..81f2001 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -33,15 +33,6 @@ #include #include -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - /*! Send a MT RELEASE COMPLETE message with Reject component * (see section 3.6.1) and given error code (see section 3.6.7). * -- To view, visit https://gerrit.osmocom.org/11821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I464c16034b76e4599ac42857f60442c3fd000c75 Gerrit-Change-Number: 11821 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:48:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:48:59 +0000 Subject: Change in osmocom-bb[master]: Fix build with latest libosmocore In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11822 ) Change subject: Fix build with latest libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1be1d39f7c93c959ca33f6296ecda71996865cca Gerrit-Change-Number: 11822 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 09:48:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:49:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:49:23 +0000 Subject: Change in osmocom-bb[master]: Fix build with latest libosmocore In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11822 ) Change subject: Fix build with latest libosmocore ...................................................................... Fix build with latest libosmocore Remove locally defined function which conflicts with the one in libosmocore. Change-Id: I1be1d39f7c93c959ca33f6296ecda71996865cca --- M src/host/layer23/src/mobile/gsm480_ss.c 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index 2869ce6..116c72f 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -307,16 +307,6 @@ return data; } -/* support function taken from OpenBSC */ -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - static inline void msgb_wrap_with_TL_asn(struct msgb *msg, uint8_t tag) { int len = msg->len; -- To view, visit https://gerrit.osmocom.org/11822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1be1d39f7c93c959ca33f6296ecda71996865cca Gerrit-Change-Number: 11822 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 09:51:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 09:51:09 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_nor?= =?UTF-8?Q?mal_:_master-osmocom-bb_=C2=BB_a1=3D?= =?UTF-8?Q?default,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#951?= In-Reply-To: <79312690.705.1542619248012.JavaMail.jenkins@jenkins.osmocom.org> References: <79312690.705.1542619248012.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <694401887.708.1542621069873.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:52:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:52:23 +0000 Subject: Change in libosmocore[master]: Add missing header include In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11823 ) Change subject: Add missing header include ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b2d3955d02b07dc7ec5e9f0c66cc477196703ed Gerrit-Change-Number: 11823 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 09:52:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 09:52:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 09:52:25 +0000 Subject: Change in libosmocore[master]: Add missing header include In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11823 ) Change subject: Add missing header include ...................................................................... Add missing header include That's necessary for 'struct tlv_parsed' definition although lack of it does not cause build failure in libosmocore for me but does so for osmo-bsc. Change-Id: I3b2d3955d02b07dc7ec5e9f0c66cc477196703ed --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index c22d0a9..edae853 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -29,6 +29,7 @@ #include #include #include +#include /*! (225-1)/2 is the maximum number of elements in a cell identifier list. */ #define GSM0808_CELL_ID_LIST2_MAXLEN 127 -- To view, visit https://gerrit.osmocom.org/11823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3b2d3955d02b07dc7ec5e9f0c66cc477196703ed Gerrit-Change-Number: 11823 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 09:55:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 09:55:02 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6935?= In-Reply-To: <1224979036.706.1542620303464.JavaMail.jenkins@jenkins.osmocom.org> References: <1224979036.706.1542620303464.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <500753396.709.1542621302892.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Nov 19 09:55:54 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 09:55:54 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6935?= In-Reply-To: <720986411.707.1542620347459.JavaMail.jenkins@jenkins.osmocom.org> References: <720986411.707.1542620347459.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1239789288.710.1542621354560.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Nov 19 10:09:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 10:09:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master?= =?UTF-8?Q?-openbsc_=C2=BB_--disable-iu,--disab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3217?= In-Reply-To: <867956065.688.1542608723812.JavaMail.jenkins@jenkins.osmocom.org> References: <867956065.688.1542608723812.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <948428841.711.1542622174830.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 762.82 KB...] config.status: creating src/libiu/Makefile config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC debug.o CC gsm_data.o CC oap_client.o CC gsm_data_shared.o CC socket.o CC gsup_client.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_vty.o CC mgcp_network.o CC mgcp_osmux.o CC mgcp_sdp.o mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_om2000.o CC abis_nm.o CC abis_om2000_vty.o CC acc_ramp.o CC abis_rsl.o CC bsc_rll.o CC bsc_subscriber.o abis_om2000_vty.c: In function 'cfg_bts_alt_mode': In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o CC bts_siemens_bs11.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_nokia_site.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_unknown.o CC bts_sysmobts.o bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o CC handover_decision.o CC handover_logic.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o CC bsc_api.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC auth.o CC db.o CC gsm_04_11.o CC gsm_04_14.o CC gsm_04_08.o CC gsm_subscriber.o CC mncc.o CC gsm_04_80.o auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:471: recipe for target 'gsm_04_80.o' failed db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 10:09:41 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 10:09:41 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_maste?= =?UTF-8?Q?r-openbsc_=C2=BB_--disable-iu,--enab?= =?UTF-8?Q?le-mgcp-transcoding,--enable-smpp,osmocom-master-debian9_#3217?= In-Reply-To: <858510838.691.1542608807178.JavaMail.jenkins@jenkins.osmocom.org> References: <858510838.691.1542608807178.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <629739400.712.1542622181215.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 763.36 KB...] config.status: creating src/libcommon-cs/Makefile config.status: creating src/osmo-nitb/Makefile config.status: creating src/osmo-bsc/Makefile config.status: creating src/osmo-bsc_nat/Makefile config.status: creating src/osmo-bsc_mgcp/Makefile config.status: creating src/ipaccess/Makefile config.status: creating src/utils/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating tests/gsm0408/Makefile config.status: creating tests/db/Makefile config.status: creating tests/channel/Makefile config.status: creating tests/bsc/Makefile config.status: creating tests/bsc-nat/Makefile config.status: creating tests/bsc-nat-trie/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/abis/Makefile config.status: creating tests/smpp/Makefile config.status: creating tests/trau/Makefile config.status: creating tests/subscr/Makefile config.status: creating tests/mm_auth/Makefile config.status: creating tests/nanobts_omlattr/Makefile config.status: creating doc/Makefile config.status: creating doc/examples/Makefile config.status: creating contrib/Makefile config.status: creating contrib/systemd/Makefile config.status: creating Makefile config.status: creating bscconfig.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 echo 1.1.0.76-0bbb9 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build/openbsc' Making all in doc make[2]: Entering directory '/build/openbsc/doc' Making all in examples make[3]: Entering directory '/build/openbsc/doc/examples' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/doc/examples' make[3]: Entering directory '/build/openbsc/doc' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/doc' make[2]: Leaving directory '/build/openbsc/doc' Making all in include make[2]: Entering directory '/build/openbsc/include' Making all in openbsc make[3]: Entering directory '/build/openbsc/include/openbsc' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/openbsc/include/openbsc' make[3]: Entering directory '/build/openbsc/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/openbsc/include' make[2]: Leaving directory '/build/openbsc/include' Making all in src make[2]: Entering directory '/build/openbsc/src' Making all in libcommon make[3]: Entering directory '/build/openbsc/src/libcommon' CC bsc_version.o CC common_vty.o CC gsm_data.o CC debug.o CC oap_client.o CC gsm_data_shared.o CC gsup_client.o CC socket.o CC talloc_ctx.o CC gsm_subscriber_base.o CC gsup_test_client.o gsup_test_client.c: In function 'main': gsup_test_client.c:276:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&gsup_test_client_log_info); ^ AR libcommon.a CCLD gsup_test_client make[3]: Leaving directory '/build/openbsc/src/libcommon' Making all in libmgcp make[3]: Entering directory '/build/openbsc/src/libmgcp' CC mgcp_protocol.o CC mgcp_network.o CC mgcp_vty.o CC mgcp_sdp.o CC mgcp_osmux.o CC mgcp_transcode.o mgcp_network.c:44:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp_osmux.c: In function 'osmux_send_dummy': mgcp_osmux.c:556:35: warning: passing argument 2 of 'endp_osmux_state_check' from incompatible pointer type if (endp_osmux_state_check(endp, &endp->net_end.addr, true) < 0) ^ mgcp_osmux.c:265:12: note: expected 'struct sockaddr_in *' but argument is of type 'struct in_addr *' static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct sockaddr_in *addr, bool sending) ^ mgcp_network.c: In function 'receive_from': mgcp_network.c:697:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ AR libmgcp.a make[3]: Leaving directory '/build/openbsc/src/libmgcp' Making all in libbsc make[3]: Entering directory '/build/openbsc/src/libbsc' CC abis_nm_vty.o CC abis_nm.o CC abis_om2000.o CC abis_rsl.o CC acc_ramp.o CC bsc_rll.o CC bsc_subscriber.o CC abis_om2000_vty.o In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:9:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from abis_nm.c:37: abis_nm.c: In function 'abis_nm_rx_get_attr_resp': /build/deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h:450:25: warning: passing argument 2 of 'parse_attr_resp_info_unreported' discards 'const' qualifier from pointer target type #define TLVP_VAL(x, y) (x)->lv[y].val ^ abis_nm.c:560:50: note: in expansion of macro 'TLVP_VAL' data = parse_attr_resp_info_unreported(bts->nr, TLVP_VAL(&tp, NM_ATT_GET_ARI), TLVP_LEN(&tp, NM_ATT_GET_ARI), ^ abis_nm.c:458:24: note: expected 'uint8_t *' but argument is of type 'const uint8_t *' static inline uint8_t *parse_attr_resp_info_unreported(uint8_t bts_nr, uint8_t *ari, uint16_t ari_len, uint16_t *out_len) ^ abis_om2000_vty.c: In function 'cfg_bts_alt_mode': abis_om2000_vty.c:427:20: warning: unused variable 'cg' [-Wunused-variable] struct con_group *cg; ^ CC paging.o CC bts_ericsson_rbs2000.o CC bts_ipaccess_nanobts.o bts_ericsson_rbs2000.c: In function 'inp_sig_cb': bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_ericsson_rbs2000.c:121:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC bts_siemens_bs11.o CC bts_nokia_site.o CC bts_unknown.o CC bts_sysmobts.o bts_siemens_bs11.c: In function 'inp_sig_cb': bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_siemens_bs11.c:573:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] bts_nokia_site.c: In function 'inp_sig_cb': bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_NONE' not handled in switch [-Wswitch] switch (isd->link_type) { ^ bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_RSL' not handled in switch [-Wswitch] bts_nokia_site.c:156:3: warning: enumeration value 'E1INP_SIGN_OSMO' not handled in switch [-Wswitch] CC chan_alloc.o CC handover_logic.o CC handover_decision.o CC meas_rep.o CC pcu_sock.o CC rest_octets.o CC system_information.o CC e1_config.o pcu_sock.c: In function 'pcu_tx_info_ind': pcu_sock.c:208:2: warning: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c:210:2: warning: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Wcpp] #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" ^ pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:409:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] tlli = *((uint32_t *)data_req->data); ^ pcu_sock.c:362:25: warning: unused variable 'ts' [-Wunused-variable] struct gsm_bts_trx_ts *ts; ^ pcu_sock.c:361:22: warning: unused variable 'trx' [-Wunused-variable] struct gsm_bts_trx *trx; ^ pcu_sock.c:360:10: warning: unused variable 'is_ptcch' [-Wunused-variable] uint8_t is_ptcch; ^ CC bsc_api.o CC bsc_msc.o CC bsc_vty.o CC gsm_04_08_utils.o CC gsm_04_80_utils.o CC bsc_init.o CC bts_init.o CC bsc_rf_ctrl.o CC arfcn_range_encode.o CC bsc_ctrl_commands.o CC bsc_ctrl_lookup.o CC net_init.o CC bsc_dyn_ts.o CC bts_ipaccess_nanobts_omlattr.o AR libbsc.a make[3]: Leaving directory '/build/openbsc/src/libbsc' Making all in libmsc make[3]: Entering directory '/build/openbsc/src/libmsc' CC db.o CC auth.o CC gsm_04_08.o CC gsm_04_11.o CC gsm_04_14.o CC mncc.o CC gsm_04_80.o CC gsm_subscriber.o db.c: In function 'db_init': db.c:604:2: warning: 'dbi_initialize' is deprecated (declared at /usr/include/dbi/dbi.h:169) [-Wdeprecated-declarations] dbi_initialize(NULL); ^ db.c:606:2: warning: 'dbi_conn_new' is deprecated (declared at /usr/include/dbi/dbi.h:199) [-Wdeprecated-declarations] conn = dbi_conn_new("sqlite3"); ^ db.c: In function 'db_fini': db.c:670:2: warning: 'dbi_shutdown' is deprecated (declared at /usr/include/dbi/dbi.h:171) [-Wdeprecated-declarations] dbi_shutdown(); ^ auth.c: In function '_use_comp128': auth.c:76:3: warning: 'comp128' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h:22): Use generic API from osmocom/crypt/auth.h instead [-Wdeprecated-declarations] comp128(ainfo->a3a8_ki, atuple->vec.rand, ^ gsm_04_80.c:42:30: error: redefinition of 'msgb_wrap_with_TL' static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ In file included from /build/deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h:7:0, from ../../include/openbsc/gsm_04_08.h:4, from ../../include/openbsc/rest_octets.h:5, from ../../include/openbsc/gsm_data.h:18, from gsm_04_80.c:32: /build/deps/install/stow/libosmocore/include/osmocom/core/msgb.h:369:30: note: previous definition of 'msgb_wrap_with_TL' was here static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) ^ Makefile:471: recipe for target 'gsm_04_80.o' failed make[3]: *** [gsm_04_80.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/openbsc/src/libmsc' Makefile:438: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/openbsc/src' make[2]: *** [all-recursive] Error 1 Makefile:514: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build/openbsc' make[1]: *** [all-recursive] Error 1 Makefile:422: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 10:10:05 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 10:10:05 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#4191?= In-Reply-To: <512483779.701.1542616427595.JavaMail.jenkins@jenkins.osmocom.org> References: <512483779.701.1542616427595.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <221456059.713.1542622205935.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:12:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:12:39 +0000 Subject: Change in osmo-msc[master]: msc: vty: Fix integer printf formatting Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11824 Change subject: msc: vty: Fix integer printf formatting ...................................................................... msc: vty: Fix integer printf formatting | ../../../git/src/libmsc/msc_vty.c:1202:44: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'uint64_t {aka long long unsigned int}' [-Wformat=] | vty_out(vty, "Location Update : %lu attach, %lu normal, %lu periodic%s", | ^ Change-Id: Iae1c0b20a519ce71a21f72cea3c63694ef10adb4 --- M src/libmsc/msc_vty.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/24/11824/1 diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 840559a..cdf3184 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1199,42 +1199,42 @@ "show statistics", SHOW_STR "Display network statistics\n") { - vty_out(vty, "Location Update : %lu attach, %lu normal, %lu periodic%s", + vty_out(vty, "Location Update : %" PRIu64 " attach, %" PRIu64 " normal, %" PRIu64 " periodic%s", gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_ATTACH].current, gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_NORMAL].current, gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_PERIODIC].current, VTY_NEWLINE); - vty_out(vty, "IMSI Detach Indications : %lu%s", + vty_out(vty, "IMSI Detach Indications : %" PRIu64 "%s", gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_DETACH].current, VTY_NEWLINE); - vty_out(vty, "Location Updating Results: %lu completed, %lu failed%s", + vty_out(vty, "Location Updating Results: %" PRIu64 " completed, %" PRIu64 " failed%s", gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_COMPLETED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_FAILED].current, VTY_NEWLINE); - vty_out(vty, "SMS MO : %lu submitted, %lu no receiver%s", + vty_out(vty, "SMS MO : %" PRIu64 " submitted, %" PRIu64 " no receiver%s", gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_SUBMITTED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER].current, VTY_NEWLINE); - vty_out(vty, "SMS MT : %lu delivered, %lu no memory, %lu other error%s", + vty_out(vty, "SMS MT : %" PRIu64 " delivered, %" PRIu64 " no memory, %" PRIu64 " other error%s", gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_DELIVERED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_RP_ERR_MEM].current, gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_RP_ERR_OTHER].current, VTY_NEWLINE); - vty_out(vty, "MO Calls : %lu setup, %lu connect ack%s", + vty_out(vty, "MO Calls : %" PRIu64 " setup, %" PRIu64 " connect ack%s", gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MO_SETUP].current, gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MO_CONNECT_ACK].current, VTY_NEWLINE); - vty_out(vty, "MT Calls : %lu setup, %lu connect%s", + vty_out(vty, "MT Calls : %" PRIu64 " setup, %" PRIu64 " connect%s", gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MT_SETUP].current, gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MT_CONNECT].current, VTY_NEWLINE); - vty_out(vty, "MO NC SS/USSD : %lu requests, %lu established, %lu rejected%s", + vty_out(vty, "MO NC SS/USSD : %" PRIu64 " requests, %" PRIu64 " established, %" PRIu64 " rejected%s", gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_REQUESTS].current, gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_ESTABLISHED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_REQUESTS].current - gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_ESTABLISHED].current, VTY_NEWLINE); - vty_out(vty, "MT NC SS/USSD : %lu requests, %lu established, %lu rejected%s", + vty_out(vty, "MT NC SS/USSD : %" PRIu64 " requests, %" PRIu64 " established, %" PRIu64 " rejected%s", gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MT_REQUESTS].current, gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MT_ESTABLISHED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MT_REQUESTS].current -- To view, visit https://gerrit.osmocom.org/11824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iae1c0b20a519ce71a21f72cea3c63694ef10adb4 Gerrit-Change-Number: 11824 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:13:28 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Nov 2018 10:13:28 +0000 Subject: Change in osmo-gsm-manuals[master]: prepare for autotools: add git-version-gen In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11797 ) Change subject: prepare for autotools: add git-version-gen ...................................................................... Patch Set 1: > Worth checking if we do modifications to the upstream script ourselves. Most osmocom projects use scriptversion=2010-01-28.01. I figured out that the real upstream source is here, the autoconf.git repo just pulls in the files from there every now and then: https://git.savannah.gnu.org/cgit/gnulib.git/tree/build-aux/git-version-gen But I could not find a version that had 2010-01-28.01 in the version string in the repository's history. I'll just copy paste the version that most other Osmocom projects use then, so it behaves the same. -- To view, visit https://gerrit.osmocom.org/11797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 Gerrit-Change-Number: 11797 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Nov 2018 10:13:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:14:07 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 10:14:07 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 10:14:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:14:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 10:14:10 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11552 ) Change subject: LCLS: add bts-loop variant ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 10:14:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:26:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:26:11 +0000 Subject: Change in osmo-bts[master]: bts-trx: setup timer once at creation time In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11766 to look at the new patch set (#2). Change subject: bts-trx: setup timer once at creation time ...................................................................... bts-trx: setup timer once at creation time The setup is only needed once, so no need to set it every time we want to shecule it. Furthermore, it will ease new code introduced in follow-up patches, which will schedule this timer under some circumstances without need to send a message at the same time (because re-try of a cmd after a delay is wanted). Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 5 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/11766/2 -- To view, visit https://gerrit.osmocom.org/11766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 Gerrit-Change-Number: 11766 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:26:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:26:11 +0000 Subject: Change in osmo-bts[master]: common: Implement OML for trx_set_available(1) In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11767 to look at the new patch set (#2). Change subject: common: Implement OML for trx_set_available(1) ...................................................................... common: Implement OML for trx_set_available(1) Related: OS#3692 Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a --- M src/common/bts.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/11767/2 -- To view, visit https://gerrit.osmocom.org/11767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a Gerrit-Change-Number: 11767 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:26:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:26:11 +0000 Subject: Change in osmo-bts[master]: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11768 to look at the new patch set (#2). Change subject: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx ...................................................................... bts-trx: Allow re-try without exit if POWERON fails in osmo-trx If POWERON fails, announce to BSC that the TRX is not available, and announce it as available as soon as POWERON success is received. Related: OS#3692 Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 45 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/11768/2 -- To view, visit https://gerrit.osmocom.org/11768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 Gerrit-Change-Number: 11768 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:26:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 10:26:40 +0000 Subject: Change in openbsc[master]: Fix build with latest libosmocore Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11825 Change subject: Fix build with latest libosmocore ...................................................................... Fix build with latest libosmocore Remove locally defined function which conflicts with the one in libosmocore. Change-Id: Ifcc13c4f8998af7680fc17414b2720feee7d386a --- M openbsc/src/libmsc/gsm_04_80.c 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/25/11825/1 diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index 479d6fb..dc9ae23 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -39,15 +39,6 @@ #include #include -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, uint8_t value) { -- To view, visit https://gerrit.osmocom.org/11825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifcc13c4f8998af7680fc17414b2720feee7d386a Gerrit-Change-Number: 11825 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:37:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:37:25 +0000 Subject: Change in openbsc[master]: Fix build with latest libosmocore In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11825 ) Change subject: Fix build with latest libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifcc13c4f8998af7680fc17414b2720feee7d386a Gerrit-Change-Number: 11825 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 10:37:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:37:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:37:27 +0000 Subject: Change in openbsc[master]: Fix build with latest libosmocore In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11825 ) Change subject: Fix build with latest libosmocore ...................................................................... Fix build with latest libosmocore Remove locally defined function which conflicts with the one in libosmocore. Change-Id: Ifcc13c4f8998af7680fc17414b2720feee7d386a --- M openbsc/src/libmsc/gsm_04_80.c 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index 479d6fb..dc9ae23 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -39,15 +39,6 @@ #include #include -static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag) -{ - uint8_t *data = msgb_push(msgb, 2); - - data[0] = tag; - data[1] = msgb->len - 2; - return data; -} - static inline unsigned char *msgb_push_TLV1(struct msgb *msgb, uint8_t tag, uint8_t value) { -- To view, visit https://gerrit.osmocom.org/11825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifcc13c4f8998af7680fc17414b2720feee7d386a Gerrit-Change-Number: 11825 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:43:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:43:56 +0000 Subject: Change in osmo-bts[master]: bts-trx: trx_if: Use struct to store CTRL msg parsed responses In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11765 ) Change subject: bts-trx: trx_if: Use struct to store CTRL msg parsed responses ...................................................................... bts-trx: trx_if: Use struct to store CTRL msg parsed responses Change-Id: Icb84bce0621042afa4301678ba1cc58d8e3662bb --- M src/osmo-bts-trx/trx_if.c 1 file changed, 28 insertions(+), 22 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index f3de245..4bcdfc6 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -368,8 +368,13 @@ return trx_ctrl_cmd(l1h, 1, "NOHANDOVER", "%d %d", tn, ss); } -static int parse_rsp(const char *buf_in, size_t len_in, char *cmdname_out, size_t cmdname_len, - char *params_out, size_t params_len, int *status) +struct trx_ctrl_rsp { + char cmd[50]; + char params[100]; + int status; +}; + +static int parse_rsp(const char *buf_in, size_t len_in, struct trx_ctrl_rsp *rsp) { char *p, *k; @@ -380,18 +385,18 @@ if (!(p = strchr(buf_in + 4, ' '))) goto parse_err; - if (p - buf_in >= cmdname_len) { - LOGP(DTRX, LOGL_ERROR, "cmdname buffer too small %lu >= %lu\n", - p - buf_in, cmdname_len); + if (p - buf_in >= sizeof(rsp->cmd)) { + LOGP(DTRX, LOGL_ERROR, "cmd buffer too small %lu >= %lu\n", + p - buf_in, sizeof(rsp->cmd)); goto parse_err; } - cmdname_out[0] = '\0'; - strncat(cmdname_out, buf_in + 4, p - buf_in - 4); + rsp->cmd[0] = '\0'; + strncat(rsp->cmd, buf_in + 4, p - buf_in - 4); /* Now comes the status code of the response */ p++; - if (sscanf(p, "%d", status) != 1) + if (sscanf(p, "%d", &rsp->status) != 1) goto parse_err; /* Now copy back the parameters */ @@ -401,13 +406,13 @@ else k = p + strlen(p); - if (strlen(k) >= params_len) { + if (strlen(k) >= sizeof(rsp->params)) { LOGP(DTRX, LOGL_ERROR, "params buffer too small %lu >= %lu\n", - strlen(k), params_len); + strlen(k), sizeof(rsp->params)); goto parse_err; } - params_out[0] = '\0'; - strcat(params_out, k); + rsp->params[0] = '\0'; + strcat(rsp->params, k); return 0; parse_err: @@ -416,15 +421,15 @@ return -1; } -static bool cmd_matches_rsp(struct trx_ctrl_msg *tcm, char *rspname, char* params) +static bool cmd_matches_rsp(struct trx_ctrl_msg *tcm, struct trx_ctrl_rsp *rsp) { - if (strcmp(tcm->cmd, rspname)) + if (strcmp(tcm->cmd, rsp->cmd)) return false; /* For SETSLOT we also need to check if it's the response for the specific timeslot. For other commands such as SETRXGAIN, it is expected that they can return different values */ - if (strcmp(tcm->cmd, "SETSLOT") == 0 && strcmp(tcm->params, params)) + if (strcmp(tcm->cmd, "SETSLOT") == 0 && strcmp(tcm->params, rsp->params)) return false; return true; @@ -435,8 +440,9 @@ { struct trx_l1h *l1h = ofd->data; struct phy_instance *pinst = l1h->phy_inst; - char buf[1500], cmdname[50], params[100]; - int len, resp; + char buf[1500]; + struct trx_ctrl_rsp rsp; + int len; struct trx_ctrl_msg *tcm; len = recv(ofd->fd, buf, sizeof(buf) - 1, 0); @@ -444,7 +450,7 @@ return len; buf[len] = '\0'; - if (parse_rsp(buf, len, cmdname, sizeof(cmdname), params, sizeof(params), &resp) < 0) + if (parse_rsp(buf, len, &rsp) < 0) return 0; LOGP(DTRX, LOGL_INFO, "Response message: '%s'\n", buf); @@ -456,7 +462,7 @@ /* get command for response message */ if (llist_empty(&l1h->trx_ctrl_list)) { /* RSP from a retransmission, skip it */ - if (l1h->last_acked && cmd_matches_rsp(l1h->last_acked, cmdname, params)) { + if (l1h->last_acked && cmd_matches_rsp(l1h->last_acked, &rsp)) { LOGP(DTRX, LOGL_NOTICE, "Discarding duplicated RSP " "from old CMD '%s'\n", buf); return 0; @@ -469,9 +475,9 @@ list); /* check if response matches command */ - if (!cmd_matches_rsp(tcm, cmdname, params)) { + if (!cmd_matches_rsp(tcm, &rsp)) { /* RSP from a retransmission, skip it */ - if (l1h->last_acked && cmd_matches_rsp(l1h->last_acked, cmdname, params)) { + if (l1h->last_acked && cmd_matches_rsp(l1h->last_acked, &rsp)) { LOGP(DTRX, LOGL_NOTICE, "Discarding duplicated RSP " "from old CMD '%s'\n", buf); return 0; @@ -484,7 +490,7 @@ } /* check for response code */ - if (resp) { + if (rsp.status) { LOGP(DTRX, (tcm->critical) ? LOGL_FATAL : LOGL_NOTICE, "transceiver (%s) rejected TRX command " "with response: '%s'\n", -- To view, visit https://gerrit.osmocom.org/11765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icb84bce0621042afa4301678ba1cc58d8e3662bb Gerrit-Change-Number: 11765 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 10:45:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 10:45:22 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?disable-mgcp-transcoding,--enable?= =?UTF-8?Q?-smpp,osmocom-master-debian9_#3218?= In-Reply-To: <948428841.711.1542622174830.JavaMail.jenkins@jenkins.osmocom.org> References: <948428841.711.1542622174830.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <269190600.714.1542624322729.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Nov 19 10:45:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 10:45:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:?= =?UTF-8?Q?_master-openbsc_=C2=BB_--disable-iu,--?= =?UTF-8?Q?enable-mgcp-transcoding,--enable-?= =?UTF-8?Q?smpp,osmocom-master-debian9_#3218?= In-Reply-To: <629739400.712.1542622181215.JavaMail.jenkins@jenkins.osmocom.org> References: <629739400.712.1542622181215.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1741478097.715.1542624323984.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:47:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:47:40 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11571 to look at the new patch set (#3). Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... UHDDevice: setRxGain on chan 0 when using multi-arfcn When using multi-arfcn feature, several logical channels (arfcn) are multiplxed into one physical transceiver, as can be seen in uhd_device::set_channels. As a result, when multi-arfcn is enabled some properties are actually shared for those logical channels, and internally mapped to the first (only existing) channel, and per-channel internal array variables are allocated accordingly (size() == 1). When setting RxGain, we need to set the correct existing physical channel. Same check is done in getRxGain, and then we apply the RxGain correctly and we avoid outputing an error "Requested non-existent channel" immediatelly after. Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/71/11571/3 -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:50:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Nov 2018 10:50:20 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11725 ) Change subject: use autotools to add "make install" target ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11725/5/configure.ac File configure.ac: https://gerrit.osmocom.org/#/c/11725/5/configure.ac at 22 PS5, Line 22: if ! $srcdir/check-depends.sh > I think this should be builddir instead, and make sure check-depends.sh is added to EXTRA_DIST. [?] Good point with "make distcheck", I'll update the patches to make sure that this works. -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Nov 2018 10:50:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:52:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 10:52:20 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11826 Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... LCLS: add gsm0808_create_ass_ext() It allows setting additional assingment parameters explicitly. Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 135 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/11826/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index cdbb273..b85908f 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -60,6 +60,12 @@ const struct sockaddr_storage *ss, const struct gsm0808_speech_codec_list *scl, const uint32_t *ci); +struct msgb *gsm0808_create_ass_ext(const struct gsm0808_channel_type *ct, + const uint16_t *cic, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec_list *scl, + const uint32_t *ci, + const uint8_t *kc, const struct osmo_lcls *lcls); struct msgb *gsm0808_create_ass_compl(uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, uint8_t speech_mode, const struct sockaddr_storage *ss, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e5c3e30..caf37a9 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -400,18 +400,21 @@ return msg; } -/*! Create BSSMAP Assignment Request message +/*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 ?3.2.1.1 * \param[in] ct Channel Type * \param[in] cic Circuit Identity Code (Classic A only) * \param[in] ss Socket Address of MSC-side RTP socket (AoIP only) * \param[in] scl Speech Codec List (AoIP only) - * \param[in] ci Call Identifier (Optional, LCLS) + * \param[in] ci Call Identifier (Optional, LCLS), ?3.2.2.105 + * \param[in] kc Kc128 ciphering key (Optional, A5/4), ?3.2.2.109 + * \param[in] lcls Optional LCLS parameters * \returns callee-allocated msgb with BSSMAP Assignment Request message */ -struct msgb *gsm0808_create_ass(const struct gsm0808_channel_type *ct, - const uint16_t *cic, - const struct sockaddr_storage *ss, - const struct gsm0808_speech_codec_list *scl, - const uint32_t *ci) +struct msgb *gsm0808_create_ass_ext(const struct gsm0808_channel_type *ct, + const uint16_t *cic, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec_list *scl, + const uint32_t *ci, + const uint8_t *kc, const struct osmo_lcls *lcls) { /* See also: 3GPP TS 48.008 3.2.1.1 ASSIGNMENT REQUEST */ struct msgb *msg; @@ -452,8 +455,33 @@ /* AoIP: Call Identifier 3.2.2.105 */ if (ci) { ci_sw = osmo_htonl(*ci); - msgb_tv_fixed_put(msg, GSM0808_IE_CALL_ID, sizeof(ci_sw), - (uint8_t *) & ci_sw); + msgb_tv_fixed_put(msg, GSM0808_IE_CALL_ID, sizeof(ci_sw), (uint8_t *) & ci_sw); + } + + if (kc) { + msgb_tv_fixed_put(msg, GSM0808_IE_KC_128, 16, kc); + } + + if (lcls) { + + /* LCLS: ?3.2.2.115 Global Call Reference */ + if (lcls->gcr) { + struct msgb *g = gsm0808_create_gcr(lcls->gcr); + msgb_tlv_put(msg, GSM0808_IE_GLOBAL_CALL_REF, msgb_length(g), msgb_data(g)); + msgb_free(g); + } + + /* LCLS: ?3.2.2.116 Configuration */ + if (lcls->config != GSM0808_LCLS_CFG_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, lcls->config); + + /* LCLS: ?3.2.2.117 Connection Status Control */ + if (lcls->control != GSM0808_LCLS_CSC_NA) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONN_STATUS_CTRL, lcls->control); + + /* LCLS: ?3.2.2.118 Correlation-Not-Needed */ + if (!lcls->corr_needed) + msgb_v_put(msg, GSM0808_IE_LCLS_CORR_NOT_NEEDED); } /* push the bssmap header */ @@ -463,6 +491,22 @@ return msg; } +/*! Create BSSMAP Assignment Request message + * \param[in] ct Channel Type + * \param[in] cic Circuit Identity Code (Classic A only) + * \param[in] ss Socket Address of MSC-side RTP socket (AoIP only) + * \param[in] scl Speech Codec List (AoIP only) + * \param[in] ci Call Identifier (Optional, LCLS) + * \returns callee-allocated msgb with BSSMAP Assignment Request message */ +struct msgb *gsm0808_create_ass(const struct gsm0808_channel_type *ct, + const uint16_t *cic, + const struct sockaddr_storage *ss, + const struct gsm0808_speech_codec_list *scl, + const uint32_t *ci) +{ + return gsm0808_create_ass_ext(ct, cic, ss, scl, ci, NULL, NULL); +} + /*! Create BSSMAP Assignment Completed message * \param[in] rr_cause GSM 04.08 RR Cause value * \param[in] chosen_channel Chosen Channel diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 4813e13..82ec8d4 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -149,6 +149,7 @@ gsm0808_bssmap_name; gsm0808_cause_name; gsm0808_create_ass; +gsm0808_create_ass_ext; gsm0808_create_assignment_completed; gsm0808_create_ass_compl; gsm0808_create_assignment_failure; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 671b839..869fe97 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -344,6 +344,79 @@ msgb_free(msg); } +static void test_create_ass_ext() +{ + static const uint8_t res[] = { 0x00, 0x45, 0x01, 0x0b, 0x04, 0x01, 0x0b, 0x91, 0x15, 0x01, 0x00, 0x04, + GSM0808_IE_AOIP_TRASP_ADDR, + 0x06, + 0xac, 0x0c, 0x65, 0x0d, /* IPv4 */ + 0x02, 0x9a, + GSM0808_IE_SPEECH_CODEC_LIST, + 0x07, + GSM0808_SCT_FR3 | 0x50, + 0xef, 0xcd, + GSM0808_SCT_FR2 | 0xa0, + 0x9f, + GSM0808_SCT_CSD | 0x90, + 0xc0, + GSM0808_IE_CALL_ID, + 0xde, 0xad, 0xfa, 0xce, + 0x83, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, 0x45, /* Kc */ + GSM0808_IE_GLOBAL_CALL_REF, 0x0d, /*GCR, length */ + 0x03, 0x44, 0x44, 0x44, /* GCR, Net ID */ + 0x02, 0xfe, 0xed, /* GCR, Node ID */ + 0x05, 0x41, 0x41, 0x41, 0x41, 0x41, /* GCR, Call ref. ID */ + GSM0808_IE_LCLS_CONFIG, GSM0808_LCLS_CFG_BOTH_WAY, + GSM0808_IE_LCLS_CONN_STATUS_CTRL, GSM0808_LCLS_CSC_CONNECT, + GSM0808_IE_LCLS_CORR_NOT_NEEDED, + }; + struct msgb *msg; + struct gsm0808_channel_type ct; + uint16_t cic = 4; + struct sockaddr_storage ss; + struct sockaddr_in sin; + struct gsm0808_speech_codec_list sc_list; + uint32_t call_id = 0xDEADFACE; + struct gsm0808_gcr gcr = { .net_len = 3, .node = 0xFEED }; + uint8_t Kc[16], net[gcr.net_len], cr[5]; + struct osmo_lcls lcls = { + .config = GSM0808_LCLS_CFG_BOTH_WAY, + .control = GSM0808_LCLS_CSC_CONNECT, + .gcr = &gcr, + .corr_needed = false + }; + + gcr.net = net; + gcr.cr = cr; + memset(cr, 'A', 5); + memset(net, 'D', gcr.net_len); + memset(Kc, 'E', 16); + + memset(&ct, 0, sizeof(ct)); + ct.ch_indctr = GSM0808_CHAN_SPEECH; + ct.ch_rate_type = GSM0808_SPEECH_HALF_PREF; + ct.perm_spch[0] = GSM0808_PERM_FR2; + ct.perm_spch[1] = GSM0808_PERM_HR2; + ct.perm_spch_len = 2; + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_port = htons(666); + inet_aton("172.12.101.13", &sin.sin_addr); + + memset(&ss, 0, sizeof(ss)); + memcpy(&ss, &sin, sizeof(sin)); + + setup_codec_list(&sc_list); + + printf("Testing creating extended Assignment Request\n"); + + msg = gsm0808_create_ass_ext(&ct, &cic, &ss, &sc_list, &call_id, Kc, &lcls); + OSMO_ASSERT(msg); + VERIFY(msg, res, ARRAY_SIZE(res)); + msgb_free(msg); +} + static void test_create_ass_compl() { static const uint8_t res1[] = { @@ -1741,6 +1814,7 @@ test_create_cm_u(); test_create_sapi_reject(); test_create_ass(); + test_create_ass_ext(); test_create_ass_compl(); test_create_ass_compl_aoip(); test_create_ass_fail(); diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index 58bc509..89704c9 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -11,6 +11,7 @@ Testing creating CM U Testing creating SAPI Reject Testing creating Assignment Request +Testing creating extended Assignment Request Testing creating Assignment Complete Testing creating Assignment Complete (AoIP) Testing creating Assignment Failure -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:53:00 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 10:53:00 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11703 ) Change subject: LCLS: add 48.008 parameter structure ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 10:53:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 10:54:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 10:54:43 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... Patch Set 1: I could change the commit to name the new API "gsm_arfcn2band_validate", or actually use "osmo_gsm_arfcn2band". -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 10:54:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:06:22 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 19 Nov 2018 11:06:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 3: > where does that restriction come from? I'm not aware that we can > only accept a single CTRL client from the libosmocore.git > implementation ?!? I have tested with bsc_control.py and the monitor option. From the libosmocore perspective there seems to be no problem in having two connection at a time. As soon as I try to run f_ipa_ctrl_start() a second time to get the second connection It fails with the following error: 11:25:55.814654 14 IPA_Emulation.ttcnpp:229 setverdict(fail): none -> fail reason: "Could not connect IPA socket from "" port -1 to "127.0.0.1" port 4255; check your configuration", new component reason: "Could not connect IPA socket from "" port -1 to "127.0.0.1" port 4255; check your configuration" I have discussed the problem recently with daniel, he thinks that this may be related to the test ports and we might need a special message routing (like in VTY) to resolve this. -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 19 Nov 2018 11:06:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:08:32 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 19 Nov 2018 11:08:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#8) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... WIP: MSC_Tests: First SGs testcases This extens MSC_Tests.ttcn with the first couple of SGs interface test cases for RESET, LU, DETACH, PAGING and SMS procedures In particular the following testcases are added: - TC_sgsap_reset: isolated reset procedure test - TC_sgsap_lu: isolated location update with TMSI realloc - TC_sgsap_lu_imsi_reject: location update, reject case - TC_sgsap_lu_and_nothing: location update with failed TMSI realloc - TC_sgsap_expl_imsi_det_eps: detach from EPS serveces - TC_sgsap_expl_imsi_det_noneps: detach from non-EPS services - TC_sgsap_paging_rej: isolated paging, reject case - TC_sgsap_paging_subscr_rej, isolated paging, subscr rejects call - TC_sgsap_paging_ue_unr, isolated paging, ue is unreachable - WIP: TC_sgsap_mt_sms, send SMS via VTY through SGs iface Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Related: OS#3645 --- M library/SGsAP_Emulation.ttcn M library/SGsAP_Templates.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 7 files changed, 582 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/11488/8 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 8 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:10:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 11:10:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... start implementing the TC_paging() PCU test Implement a basic paging test for the PCU, which is passing for paging via TMSI (but only if osmo-pcu is started after the test is started). Previously, this test code amounted to a debugging loop which never terminated. Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Related: OS#2404 --- M library/L3_Templates.ttcn M pcu/PCU_Tests.ttcn M pcu/expected-results.xml 3 files changed, 67 insertions(+), 15 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index e109fde..3918f3d 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -303,6 +303,22 @@ } } +/* Template for receiving a Paging Request Type1 message with a given TMSI in the first mobile identity. */ +template MobileL3_CommonIE_Types.MobileIdentityLV tr_PAGING_REQ1_MI1_TMSI(octetstring tmsi) := { + lengthIndicator := 5, + mobileIdentityV := { + typeOfIdentity := '100'B, + oddEvenInd_identity := { + tmsi_ptmsi := { + oddevenIndicator := '0'B, + fillerDigit := '1111'B, + octets := tmsi + } + } + } + +} + template PDU_ML3_NW_MS tr_PAGING_REQ2(template TMSIP_TMSI_V mi1 := ?, template TMSIP_TMSI_V mi2 := ?, template MobileIdentityTLV mi3 := *) := { diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index adbc73e..6e8185d 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -17,6 +17,9 @@ import from GPRS_Context all; import from GPRS_TBF all; import from L1CTL_PortType all; + import from MobileL3_Types all; + import from MobileL3_CommonIE_Types all; + import from L3_Templates all; modulepar { BssgpConfig mp_gb_cfg := { @@ -207,27 +210,58 @@ log("BSSGP successfully initialized"); } + function f_wait_paging_req_type1(hexstring expected_tmsi) runs on dummy_CT { + var LAPDm_ph_data ph_data; + timer T := 5.0; + + T.start; + alt { + [] L1.receive(LAPDm_ph_data:{sacch:=?,sapi:=0,lapdm:={bbis:=?}}) -> value ph_data { + var octetstring payload := substr(ph_data.lapdm.bbis.payload, 1, lengthof(ph_data.lapdm.bbis.payload) - 1); + var PDU_ML3_NW_MS pdu; + + if (dec_PDU_ML3_NW_MS_backtrack(payload, pdu) != 0) { + repeat; + } + + if (not ischosen(pdu.msgs.rrm)) { + repeat; + } + + if (match(pdu, tr_PAGING_REQ1(tr_PAGING_REQ1_MI1_TMSI(hex2oct(expected_tmsi))))) { + setverdict(pass); + } else { + repeat; + } + } + [] L1.receive { repeat; } + [] T.timeout { setverdict(fail); } + } + } + /* Send PS-PAGING via BSSGP to PCU, expect it to show up on L1/Um */ testcase TC_paging() runs on dummy_CT { - var GsmTmsi tmsi := hex2int('01234567'H); + var hexstring tmsi_hex := '01234567'H; + var GsmTmsi tmsi := hex2int(tmsi_hex); + g_mmctx.imsi := '262420123456789'H; g_mmctx.tlli := f_random_tlli(); f_init(); - /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ - BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); - BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); + var BCCH_tune_req tune_req := { { false, 871 }, true }; + L1.send(tune_req); + /* FIXME: wait for confirm */ - while (true) { - var BssgpDecoded bd; - alt { - [] BSSGP[0].receive(tr_BD_L3_MT(?)) -> value bd { - log("BSSGP Rx: ", bd); - } - [] BSSGP[0].receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } - [] BSSGP[0].receive { repeat; } - } - } + /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ + /* + TODO: Paging by IMSI does not work yet because osmo-pcu does not copy IMSI into paging requests. + BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); + f_wait_paging_req_type1(hex2oct(g_mmctx.imsi)); + */ + + /* Page by TMSI */ + BSSGP_SIG[0].send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); + f_wait_paging_req_type1(tmsi_hex); } /* Establish an UL TBF: Tune to ARFCN, send RACH, receive AGCH, enable TBF Rx */ @@ -633,5 +667,6 @@ execute(TC_selftest_ns()); execute(TC_ul_tbf_single_llc_sizes()); execute(TC_ul_tbf()); + execute(TC_paging()); } }; diff --git a/pcu/expected-results.xml b/pcu/expected-results.xml index aec661d..e9610bd 100644 --- a/pcu/expected-results.xml +++ b/pcu/expected-results.xml @@ -1,6 +1,7 @@ - + + -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:10:37 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 11:10:37 +0000 Subject: Change in osmo-bts[master]: properly initialize si3 in test_is_ccch_for_agch_setup() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11784 ) Change subject: properly initialize si3 in test_is_ccch_for_agch_setup() ...................................................................... properly initialize si3 in test_is_ccch_for_agch_setup() Prevent potential use of uninitialized memory in paging test. Change-Id: Ie8f8fc3c4a9e4cc18fc85b6822110de79da4246b Related: CID#188828 --- M tests/paging/paging_test.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c index 18708e2..f112404 100644 --- a/tests/paging/paging_test.c +++ b/tests/paging/paging_test.c @@ -116,7 +116,7 @@ { static struct gsm_bts_trx trx; static struct gsm_bts bts; - struct gsm48_system_information_type_3 si3; + struct gsm48_system_information_type_3 si3 = { 0 }; si3.control_channel_desc.bs_ag_blks_res = bs_ag_blks_res; trx.bts = &bts; bts.si_valid |= 0x8; -- To view, visit https://gerrit.osmocom.org/11784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie8f8fc3c4a9e4cc18fc85b6822110de79da4246b Gerrit-Change-Number: 11784 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:11:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 11:11:30 +0000 Subject: Change in libasn1c[master]: remove a redundant assertion In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11625 ) Change subject: remove a redundant assertion ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > I don't think we should diverge more from upstream asn1c than needed. If at all, fixes should be made upstream. OK, makes sense. I'll abandon this change. -- To view, visit https://gerrit.osmocom.org/11625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib81e76cfb339838f5e8981d175176557f1a8a63f Gerrit-Change-Number: 11625 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 19 Nov 2018 11:11:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:11:42 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 11:11:42 +0000 Subject: Change in libasn1c[master]: remove a redundant assertion In-Reply-To: References: Message-ID: Stefan Sperling has abandoned this change. ( https://gerrit.osmocom.org/11625 ) Change subject: remove a redundant assertion ...................................................................... Abandoned fix should be made upstream -- To view, visit https://gerrit.osmocom.org/11625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ib81e76cfb339838f5e8981d175176557f1a8a63f Gerrit-Change-Number: 11625 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:21:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 11:21:22 +0000 Subject: Change in osmo-bts[master]: add missing check of osmo_wqueue_enqueue() return value In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11783 to look at the new patch set (#2). Change subject: add missing check of osmo_wqueue_enqueue() return value ...................................................................... add missing check of osmo_wqueue_enqueue() return value The return value of osmo_wqueue_enqueue() isn't checked. This can result in a memory leak if the message cannot be enqueued. Log an error an free the message upon failure, as done elsewhere. Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Related: CID#57662 --- M src/osmo-bts-sysmo/l1_if.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/83/11783/2 -- To view, visit https://gerrit.osmocom.org/11783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Gerrit-Change-Number: 11783 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:23:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 11:23:41 +0000 Subject: Change in osmo-bts[master]: add missing check of osmo_wqueue_enqueue() return value In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11783 ) Change subject: add missing check of osmo_wqueue_enqueue() return value ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11783/1/src/osmo-bts-sysmo/l1_if.c File src/osmo-bts-sysmo/l1_if.c: https://gerrit.osmocom.org/#/c/11783/1/src/osmo-bts-sysmo/l1_if.c at 555 PS1, Line 555: return -ENOBUFS; > IMHO doesn't make much sense to use -EAGAIN while freeing the parameter passed from caller (msg). [?] I agree, thanks. Fixed in next patch set. For what it's worth: I used EAGAIN because EAGAIN is already used by another caller of osmo_wqueue_enqueue() on failure; see l1if_set_trace_flags(). -- To view, visit https://gerrit.osmocom.org/11783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Gerrit-Change-Number: 11783 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 11:23:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:24:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 19 Nov 2018 11:24:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed... In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11732 ) Change subject: BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed template ...................................................................... BSSMAP_Templates: do not match on omit in tr_BSSMAP_HandoverPerformed template tr_BSSMAP_HandoverPerformed matches all optional fields on "omit". This does not make much sense as a safe default. Lets match on "*" instead. (See also other tr_ templates) Related OS#3645 Change-Id: Icd55afdaebdda8ba98431f358148035f7d220b8a --- M library/BSSMAP_Templates.ttcn 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 5b943e9..ff151f0 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -831,14 +831,14 @@ messageType := '17'O, cause := ?, cellIdentifier := ?, - chosenChannel := omit, - chosenEncryptionAlgorithm := omit, - speechVersion := omit, - lSAIdentifier := omit, - talkerPriority := omit, - codecList := omit, - speechCodec := omit, - lCLS_BSS_Status := omit + chosenChannel := *, + chosenEncryptionAlgorithm := *, + speechVersion := *, + lSAIdentifier := *, + talkerPriority := *, + codecList := *, + speechCodec := *, + lCLS_BSS_Status := * } } } -- To view, visit https://gerrit.osmocom.org/11732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icd55afdaebdda8ba98431f358148035f7d220b8a Gerrit-Change-Number: 11732 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:34:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 11:34:32 +0000 Subject: Change in osmo-bts[master]: add missing check of osmo_wqueue_enqueue() return value In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11783 ) Change subject: add missing check of osmo_wqueue_enqueue() return value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Gerrit-Change-Number: 11783 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 11:34:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:39:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 19 Nov 2018 11:39:54 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 4: (1 comment) > (1 comment) (making sure my comment gets posted) https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 116 PS4, Line 116: [MGCP_DLCX_FAIL_NO_RTP] = {"dlcx:no_rtp", "no rtp stream associated with connection."}, > I don't think this makes sense from a user perspective ... [?] I have checked this. When I get the things right, this counter would increment when some call agent tries to delete a connection, but issues a wrong call-id. >From my perspective it would be ok to count this one as well as an increased amount of such errors would point out a call id handling bug in the call agent so I think its useful enough to keep it. What I would check is if the naming is consistant. Above I can see a MGCP_MDCX_FAIL_INVALID_CALLID for mdcx. Maybe this can be coherent. -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 19 Nov 2018 11:39:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:40:12 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 19 Nov 2018 11:40:12 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 4: Code-Review+1 > (1 comment) > > > (1 comment) > > (making sure my comment gets posted) -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 19 Nov 2018 11:40:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:41:54 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 11:41:54 +0000 Subject: Change in osmo-bsc[master]: don't remove socket path in rf_create_socket() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: don't remove socket path in rf_create_socket() ...................................................................... Patch Set 4: > Patch Set 4: > > How do tests fail? Why not fixing the tests instead of removing unlink()? OK I have figured out what the test is doing. The problem is that unlink fails if the socket path does not yet exist. So we will probably need to catch ENOENT and ignore it. stsp at fintan:~/osmo/osmo-bsc$ osmo-bsc -r tmp_dummy_sock -c doc/examples/osmo-bsc/osmo-bsc.cfg logging level cc (debug|info|notice|error|fatal) logging level mgcp (debug|info|notice|error|fatal) % dyn_ts_allow_tch_f is deprecated, rather use msc/codec-list to pick codecs T3212 = 5 * 6min (Periodic Location Update timer, sent to MS (1 = 6 minutes)) <0013> telnet_interface.c:104 Available via telnet 127.0.0.1 4242 <0015> input/ipaccess.c:844 enabling ipaccess BSC mode on 0.0.0.0 with OML 3002 and RSL 3003 TCP ports <001a> control_if.c:911 CTRL at 127.0.0.1 4249 <0015> bsc_rf_ctrl.c:460 Could not unlink socket path tmp_dummy_sock: 2/No such file or directory Failed to create the RF service. -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 19 Nov 2018 11:41:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:50:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 11:50:57 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11782 to look at the new patch set (#5). Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... unlink socket path correctly in rf_create_socket() In commit 65c62e50335b500ac9e4658530ca5a1b4f5328d8 a call to unlink() was erroneously moved up. Since then unlink() has been called with an uninitialized path variable. The problem went unnoticed because the return value of unlink() was never checked. Ensure that unlink() is called with an initialized argument and verify success of the unlink() operation if the socket exists. Related: CID#188836 Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Fixes: 65c62e50335b500ac9e4658530ca5a1b4f5328d8 --- M src/osmo-bsc/bsc_rf_ctrl.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/11782/5 -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:53:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 11:53:04 +0000 Subject: Change in libosmocore[master]: Add GCR routines Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11827 Change subject: Add GCR routines ...................................................................... Add GCR routines Add functions to create and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1, add corresponding tests Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 7 files changed, 119 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11827/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 9b19d69..7777c23 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -52,6 +52,9 @@ struct msgb *gsm0808_create_cipher_complete(struct msgb *layer3, uint8_t alg_id); struct msgb *gsm0808_create_cipher_reject(enum gsm0808_cause cause); struct msgb *gsm0808_create_cipher_reject_ext(enum gsm0808_cause_class class, uint8_t ext); + +struct msgb *gsm0808_create_gcr(const struct gsm0808_gcr *g); + struct msgb *gsm0808_create_classmark_request(); struct msgb *gsm0808_create_classmark_update(const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index c5bf280..59d8985 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -66,6 +66,16 @@ bool corr_needed; /* ?3.2.2.118 Correlation-Not-Needed */ }; +/*! Parsed representation of Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 */ +struct gsm0808_gcr { + uint8_t *net; /* Network ID, ITU-T Q.1902.3 */ + uint8_t net_len; /* length (3-5 octets) of \a net */ + uint16_t node; /* Node ID */ + uint8_t *cr; /* Call Reference ID (5 octets) */ +}; + +int gsm0808_dec_gcr(struct gsm0808_gcr *gcr, const struct msgb *m); + extern const struct value_string gsm0808_cell_id_discr_names[]; static inline const char *gsm0808_cell_id_discr_name(enum CELL_IDENT id_discr) { return get_value_string(gsm0808_cell_id_discr_names, id_discr); } diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index a84e717..3a2c551 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -405,6 +405,30 @@ return msg; } +/*! Create BSSMAP Global Call Reference + * \param[in] g Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 + * \returns callee-allocated msgb with GCR */ +struct msgb *gsm0808_create_gcr(const struct gsm0808_gcr *g) +{ + uint8_t buf[2]; + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "global call reference"); + if (!msg || !g) + return NULL; + + if (g->net_len < 3 || g->net_len > 5) + return NULL; + + msgb_lv_put(msg, g->net_len, g->net); + + osmo_store16be(g->node, &buf); + msgb_lv_put(msg, 2, buf); + + msgb_lv_put(msg, 5, g->cr); + + return msg; +} + /*! Create BSSMAP SAPI N Reject message * \param[in] link_id Link Identifier * \returns callee-allocated msgb with BSSMAP SAPI N Reject message */ diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index c58d828..c73114d 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #define IP_V4_ADDR_LEN 4 @@ -667,6 +668,43 @@ return *tlv_len + 2; } +/*! Decode BSSMAP Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 + * \param[out] gcr Caller-provided memory to store Global Call Reference + * \param[in] m message buffer to be decoded + * \returns number of bytes parsed; negative on error */ +int gsm0808_dec_gcr(struct gsm0808_gcr *gcr, const struct msgb *msg) +{ + struct tlv_parsed tp; + const uint8_t *buf; + uint16_t len, point = 1; + int rc = osmo_bssap_tlv_parse(&tp, msgb_data(msg), msgb_length(msg)); + if (rc < 0) + return -EINVAL; + + buf = TLVP_VAL_MINLEN(&tp, GSM0808_IE_GLOBAL_CALL_REF, 13); + if (!buf) + return -EBADMSG; + + len = TLVP_LEN(&tp, GSM0808_IE_GLOBAL_CALL_REF); + + gcr->net_len = buf[0]; + if (gcr->net_len < 3 || gcr->net_len > 5) + return -E2BIG; + + memcpy(gcr->net, buf + point, gcr->net_len); + point += (gcr->net_len + 1); + + gcr->node = osmo_load16be(buf + point); + point += 2; + + if (buf[point] != 5) /* see Table B 2.1.9.2 */ + return -EBADSLT; + + memcpy(gcr->cr, buf + point + 1, 5); + + return len; +} + /* Decode 5-byte LAI list element data (see TS 08.08 3.2.2.27) into MCC/MNC/LAC. */ static void decode_lai(const uint8_t *data, struct osmo_location_area_id *decoded) { diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 217dcc3..85739b6 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -154,6 +154,8 @@ gsm0808_create_ass_compl; gsm0808_create_assignment_failure; gsm0808_create_ass_fail; +gsm0808_create_gcr; +gsm0808_dec_gcr; gsm0808_create_cipher; gsm0808_create_cipher_complete; gsm0808_create_cipher_reject; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 197ec06..d2f7250 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -130,6 +130,46 @@ msgb_free(in_msg); } +static void test_create_gcr() +{ + static const uint8_t res[] = { 0x89, 0x0d, 0x03, 0x55, 0x55, 0x55, 0x02, 0xde, 0xad, 0x05, 0x46, 0x46, 0x46, 0x46, 0x46 }; + struct msgb *msg; + struct gsm0808_gcr g = { .net_len = 3, .node = 0xDEAD }, p; + uint8_t net[g.net_len], pnet[g.net_len], cr[5], pcr[5] = { 0 }; + int rc; + + g.net = net; + g.cr = cr; + p.net = pnet; + p.cr = pcr; + memset(pcr, 0, 5); + memset(cr, 'F', 5); + memset(net, 'U', g.net_len); + + printf("Testing creating Global Call Reference\n"); + msg = gsm0808_create_gcr(&g); + msg->l3h = msgb_wrap_with_TL(msg, GSM0808_IE_GLOBAL_CALL_REF); + VERIFY(msg, res, ARRAY_SIZE(res)); + + rc = gsm0808_dec_gcr(&p, msg); + if (rc < 0) + printf("parsing failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); + + if (p.net_len != g.net_len) + printf("Network ID length parsed wrong: %u != %u\n", p.net_len, g.net_len); + + if (p.node != g.node) + printf("Node ID parsed wrong: 0x%X != 0x%X\n", p.node, g.node); + + if (memcmp(p.net, g.net, g.net_len) != 0) + printf("Network ID parsed wrong: %s\n", osmo_hexdump(p.net, p.net_len)); + + if (memcmp(p.cr, g.cr, 5) != 0) + printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(p.cr, 5)); + + msgb_free(msg); +} + static void test_create_reset() { static const uint8_t res[] = { 0x00, 0x04, 0x30, 0x04, 0x01, 0x20 }; @@ -1774,6 +1814,7 @@ test_create_layer3_aoip(); test_create_reset(); test_create_reset_ack(); + test_create_gcr(); test_create_clear_command(); test_create_clear_complete(); test_create_cipher(); diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index a48cf1d..db36594 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -3,6 +3,7 @@ Testing creating Layer3 (AoIP) Testing creating Reset Testing creating Reset Ack +Testing creating Global Call Reference Testing creating Clear Command Testing creating Clear Complete Testing creating Chipher Mode Command -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 11:58:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 11:58:42 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11782 ) Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 19 Nov 2018 11:58:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:04:58 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 12:04:58 +0000 Subject: Change in osmo-bsc[master]: unlink socket path correctly in rf_create_socket() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11782 ) Change subject: unlink socket path correctly in rf_create_socket() ...................................................................... unlink socket path correctly in rf_create_socket() In commit 65c62e50335b500ac9e4658530ca5a1b4f5328d8 a call to unlink() was erroneously moved up. Since then unlink() has been called with an uninitialized path variable. The problem went unnoticed because the return value of unlink() was never checked. Ensure that unlink() is called with an initialized argument and verify success of the unlink() operation if the socket exists. Related: CID#188836 Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Fixes: 65c62e50335b500ac9e4658530ca5a1b4f5328d8 --- M src/osmo-bsc/bsc_rf_ctrl.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index ac87fb9..791abf6 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -450,12 +450,16 @@ } local.sun_family = AF_UNIX; - unlink(local.sun_path); if (osmo_strlcpy(local.sun_path, path, sizeof(local.sun_path)) >= sizeof(local.sun_path)) { LOGP(DLINP, LOGL_ERROR, "Socket path exceeds maximum length of %zd bytes: %s\n", sizeof(local.sun_path), path); return -1; } + if (unlink(local.sun_path) < 0 && errno != ENOENT) { + LOGP(DLINP, LOGL_ERROR, "Could not unlink socket path %s: %d/%s\n", + path, errno, strerror(errno)); + return -1; + } /* we use the same magic that X11 uses in Xtranssock.c for * calculating the proper length of the sockaddr */ -- To view, visit https://gerrit.osmocom.org/11782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia0c873da305cbb47aef0562f61ec21057363f294 Gerrit-Change-Number: 11782 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:05:17 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 12:05:17 +0000 Subject: Change in osmo-bts[master]: add missing check of osmo_wqueue_enqueue() return value In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11783 ) Change subject: add missing check of osmo_wqueue_enqueue() return value ...................................................................... add missing check of osmo_wqueue_enqueue() return value The return value of osmo_wqueue_enqueue() isn't checked. This can result in a memory leak if the message cannot be enqueued. Log an error an free the message upon failure, as done elsewhere. Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Related: CID#57662 --- M src/osmo-bts-sysmo/l1_if.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index f682ffd..87cf25a 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -549,7 +549,11 @@ empty_req_from_l1sap(l1p, fl1, u8Tn, u32Fn, sapi, subCh, u8BlockNbr); } /* send message to DSP's queue */ - osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg); + if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg) != 0) { + LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full. Dropping msg.\n"); + msgb_free(nmsg); + return -ENOBUFS; + } if (dtx_is_first_p1(lchan)) dtx_dispatch(lchan, E_FIRST); else -- To view, visit https://gerrit.osmocom.org/11783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5671ca364f31d98f2b28d028e7bf1797386de2ec Gerrit-Change-Number: 11783 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 12:08:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 12:08:30 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_oc?= =?UTF-8?Q?t,master,default,osmocom-master-debian9_#1434?= Message-ID: <447246567.716.1542629310694.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Stefan Sperling] add missing check of osmo_wqueue_enqueue() return value ------------------------------------------ [...truncated 59.48 KB...] CC sercomm.lo CC conv_acc_generic.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la ' libtool: install: /usr/bin/install -c .libs/libosmocore.so.11.0.0 libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so.11 || { rm -f libosmocore.so.11 && ln -s libosmocore.so.11.0.0 libosmocore.so.11; }; }) libtool: install: (cd && { ln -s -f libosmocore.so.11.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.11.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC stats_vty.lo CC vty.lo CC telnet_interface.lo CC utils.lo CC vector.lo CC logging_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm660.lo CC ecu_fr.lo CC gsm620.lo CC gsm690.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC tlv_parser.lo CC comp128.lo CC comp128v23.lo CC gsm_utils.lo CC gsm48.lo CC rsl.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gsm0480.lo CC gprs_rlc.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la /bin/bash: line 1: 5782 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=link gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -no-undefined -o libgsmint.la a5.lo rxlev_stat.lo tlv_parser.lo comp128.lo comp128v23.lo gsm_utils.lo rsl.lo gsm48.lo gsm48_ie.lo gsm0808.lo sysinfo.lo gprs_cipher_core.lo gprs_rlc.lo gsm0480.lo abis_nm.lo gsm0502.lo gsm0411_utils.lo gsm0411_smc.lo gsm0411_smr.lo gsm0414.lo lapd_core.lo lapdm.lo kasumi.lo gsm_04_08_gprs.lo auth_core.lo auth_comp128v1.lo auth_comp128v23.lo auth_milenage.lo milenage/aes-encblock.lo gea.lo milenage/aes-internal.lo milenage/aes-internal-enc.lo milenage/milenage.lo gan.lo ipa.lo gsm0341.lo apn.lo gsup.lo gprs_gea.lo gsm0503_conv.lo oap.lo gsm0808_utils.lo gsm23003.lo mncc.lo bts_features.lo oap_client.lo gsm29118.lo ../../src/libosmocore.la Makefile:515: recipe for target 'libgsmint.la' failed make[3]: *** [libgsmint.la] Error 139 make[3]: Leaving directory ' Makefile:698: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon Nov 19 12:08:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 12:08:31 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_lc1?= =?UTF-8?Q?5,v2017.01,default,osmocom-master-debian9_#1434?= Message-ID: <263849197.717.1542629311262.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Stefan Sperling] add missing check of osmo_wqueue_enqueue() return value ------------------------------------------ [...truncated 55.45 KB...] make[2]: Leaving directory ' Making install in src/vty make[2]: Entering directory ' CC buffer.lo CC command.lo CC vty.lo CC vector.lo CC utils.lo CC stats_vty.lo CC logging_vty.lo CC telnet_interface.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la ' libtool: warning: relinking 'libosmovty.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 5:0:1 -no-undefined -o libosmovty.la -rpath buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.1.0T libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.1.0 libosmovty.so.4; }; }) libtool: install: (cd && { ln -s -f libosmovty.so.4.1.0 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.1.0 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:1:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.1T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.1 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.1 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.1 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC comp128.lo CC a5.lo CC gsm_utils.lo CC rxlev_stat.lo CC tlv_parser.lo CC rsl.lo CC gsm48.lo CC comp128v23.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo CC gsm0503_conv.lo ipa.c: In function ?ipa_ccm_idtag_parse?: ipa.c:103:2: warning: ?ipa_ccm_idtag_parse_off? is deprecated: Use ipa_ccm_id_{get,resp}_parse instead [-Wdeprecated-declarations] return ipa_ccm_idtag_parse_off(dec, buf, len, 0); ^~~~~~ In file included from ipa.c:45:0: ../../include/osmocom/gsm/ipa.h:31:5: note: declared here int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset) ^~~~~~~~~~~~~~~~~~~~~~~ CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC oap_client.lo CC gsm29118.lo CC milenage/aes-encblock.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 10:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.10.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so.10 || { rm -f libosmogsm.so.10 && ln -s libosmogsm.so.10.0.0 libosmogsm.so.10; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.10.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.10.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_tables.lo CC gsm0503_parity.lo CC gsm0503_coding.lo /bin/bash: line 2: 5812 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I"../../include" -I"../../include" -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gsm0503_mapping.lo -MD -MP -MF $depbase.Tpo -c -o gsm0503_mapping.lo gsm0503_mapping.c Makefile:491: recipe for target 'gsm0503_mapping.lo' failed make[2]: *** [gsm0503_mapping.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:25:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 12:25:28 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS: add GCR routines ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 12:25:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:25:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 12:25:39 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 12:25:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:30:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 12:30:32 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... Patch Set 7: > Is it a different message from the existing function? It's the same, I've added spec. ref. to clarify. > Isn't ci inside lcls structure? It's not. Moreover, from my understanding of the spec it's not related to LCLS - I've updated confusing comment. The rest should be fixed in latest revision hence removed WIP mark. -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 12:30:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:37:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 12:37:59 +0000 Subject: Change in osmo-dev[master]: gits: fix MODS marks by timestamp-only changes In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11807 ) Change subject: gits: fix MODS marks by timestamp-only changes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6726190912a1b3eb865cda77fbea6bf58a635d6e Gerrit-Change-Number: 11807 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 19 Nov 2018 12:37:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:38:29 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 12:38:29 +0000 Subject: Change in libosmo-sccp[master]: SS7: safeguard against wrong number of pointcode component In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11707 ) Change subject: SS7: safeguard against wrong number of pointcode component ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib24cdbcf614bad68f3cfa9776a451c5c1e45ae6e Gerrit-Change-Number: 11707 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 12:38:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:50:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 12:50:39 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 12:50:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:51:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Nov 2018 12:51:21 +0000 Subject: Change in osmo-dev[master]: gits: fix MODS marks by timestamp-only changes In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11807 ) Change subject: gits: fix MODS marks by timestamp-only changes ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6726190912a1b3eb865cda77fbea6bf58a635d6e Gerrit-Change-Number: 11807 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Nov 2018 12:51:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 12:51:25 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 19 Nov 2018 12:51:25 +0000 Subject: Change in osmo-dev[master]: gits: fix MODS marks by timestamp-only changes In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11807 ) Change subject: gits: fix MODS marks by timestamp-only changes ...................................................................... gits: fix MODS marks by timestamp-only changes Use 'git diff' instead of 'git diff-index'. The latter does not look at the content. It listed a file with an updated timestap as modified (indicated in gits with "MODS"), whereas 'git diff' and 'git status' did not (and we want this behavior, not marking it as modified). This was a regression from b93f50 ("gits: use git plumbing commands"). Change-Id: I6726190912a1b3eb865cda77fbea6bf58a635d6e --- M src/gits 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved osmith: Verified diff --git a/src/gits b/src/gits index 8b75278..bd53cb5 100755 --- a/src/gits +++ b/src/gits @@ -99,7 +99,7 @@ def git_has_modifications(git_dir): - return not git_bool(git_dir, 'diff-index', '--quiet', 'HEAD') + return not git_bool(git_dir, 'diff', '--quiet', 'HEAD') def git_can_fast_forward(git_dir, branch='master', remote='origin'): -- To view, visit https://gerrit.osmocom.org/11807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6726190912a1b3eb865cda77fbea6bf58a635d6e Gerrit-Change-Number: 11807 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 13:16:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 13:16:59 +0000 Subject: Change in osmo-bsc[master]: vty: add command to show TRX selectively In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11721 ) Change subject: vty: add command to show TRX selectively ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a Gerrit-Change-Number: 11721 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 13:16:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 13:36:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 13:36:32 +0000 Subject: Change in osmo-bsc[master]: bsc: Prefix log string with related SI type during call to list_arfcn Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11828 Change subject: bsc: Prefix log string with related SI type during call to list_arfcn ...................................................................... bsc: Prefix log string with related SI type during call to list_arfcn SI2 and SI5 "same band" strings already contain the prefix. Change-Id: Ie466abedce630ef0a8e7a8021383a1a612a0da8a --- M src/osmo-bsc/system_information.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/11828/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 2104e92..086b8e9 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -773,7 +773,7 @@ if (rc < 0) return rc; n = list_arfcn(si2b->bcch_frequency_list, 0xce, - "Neighbour cells in same band, but outside P-GSM:"); + "SI2bis Neighbour cells in same band, but outside P-GSM:"); if (n) { /* indicate in SI2 and SI2bis: there is an extension */ struct gsm48_system_information_type_2 *si2 = @@ -811,7 +811,7 @@ if (rc < 0) return rc; n = list_arfcn(si2t->ext_bcch_frequency_list, 0x8e, - "Neighbour cells in different band:"); + "SI2ter Neighbour cells in different band:"); if (!n) bts->si_valid &= ~(1 << SYSINFO_TYPE_2ter); @@ -1046,7 +1046,7 @@ if (rc < 0) return rc; n = list_arfcn(si5b->bcch_frequency_list, 0xce, - "Neighbour cells in same band, but outside P-GSM:"); + "SI5bis Neighbour cells in same band, but outside P-GSM:"); if (n) { /* indicate in SI5 and SI5bis: there is an extension */ struct gsm48_system_information_type_5 *si5 = @@ -1090,7 +1090,7 @@ if (rc < 0) return rc; n = list_arfcn(si5t->bcch_frequency_list, 0x8e, - "Neighbour cells in different band:"); + "SI5ter Neighbour cells in different band:"); if (!n) bts->si_valid &= ~(1 << SYSINFO_TYPE_5ter); -- To view, visit https://gerrit.osmocom.org/11828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie466abedce630ef0a8e7a8021383a1a612a0da8a Gerrit-Change-Number: 11828 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 13:36:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 13:36:33 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2bis L2 pseudo length Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11829 Change subject: bsc: si: Fix SI2bis L2 pseudo length ...................................................................... bsc: si: Fix SI2bis L2 pseudo length 3GPP TS 04.08 V7.21.0, section "9.1.33 System information type 2bis" states: "This message has a L2 pseudo length of 21.". Change-Id: I623c64c446c0973e939e9f1cba0a4d4d2f4f7237 --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/11829/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 086b8e9..18c609b 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -764,7 +764,7 @@ memset(si2b, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); - si2b->header.l2_plen = GSM48_LEN2PLEN(22); + si2b->header.l2_plen = GSM48_LEN2PLEN(21); si2b->header.rr_protocol_discriminator = GSM48_PDISC_RR; si2b->header.skip_indicator = 0; si2b->header.system_information = GSM48_MT_RR_SYSINFO_2bis; -- To view, visit https://gerrit.osmocom.org/11829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I623c64c446c0973e939e9f1cba0a4d4d2f4f7237 Gerrit-Change-Number: 11829 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 13:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 13:36:34 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2ter L2 pseudo length Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11830 Change subject: bsc: si: Fix SI2ter L2 pseudo length ...................................................................... bsc: si: Fix SI2ter L2 pseudo length 3GPP TS 04.08 V7.21.0, section "9.1.34 System information type 2ter" states: """ This message has a L2 pseudo length of 18. This message may be sent by the network with either a L2 pseudo length of 18 or some other value. A mobile station that does not ignore this message shall not discard the message due to a received L2 pseudo length different from 18. """ Change-Id: I45cb217ebdf89b82b0f37f38eef7a1e3a651f541 --- M src/osmo-bsc/system_information.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/30/11830/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 18c609b..0148ac3 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -802,7 +802,7 @@ memset(si2t, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); - si2t->header.l2_plen = GSM48_LEN2PLEN(22); + si2t->header.l2_plen = GSM48_LEN2PLEN(18); si2t->header.rr_protocol_discriminator = GSM48_PDISC_RR; si2t->header.skip_indicator = 0; si2t->header.system_information = GSM48_MT_RR_SYSINFO_2ter; -- To view, visit https://gerrit.osmocom.org/11830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I45cb217ebdf89b82b0f37f38eef7a1e3a651f541 Gerrit-Change-Number: 11830 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 13:46:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 13:46:51 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2bis L2 pseudo length In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11829 to look at the new patch set (#2). Change subject: bsc: si: Fix SI2bis L2 pseudo length ...................................................................... bsc: si: Fix SI2bis L2 pseudo length 3GPP TS 04.08 V7.21.0, section "9.1.33 System information type 2bis" states: "This message has a L2 pseudo length of 21.". Change-Id: I623c64c446c0973e939e9f1cba0a4d4d2f4f7237 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/11829/2 -- To view, visit https://gerrit.osmocom.org/11829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I623c64c446c0973e939e9f1cba0a4d4d2f4f7237 Gerrit-Change-Number: 11829 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 13:46:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 13:46:51 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2ter L2 pseudo length In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11830 to look at the new patch set (#2). Change subject: bsc: si: Fix SI2ter L2 pseudo length ...................................................................... bsc: si: Fix SI2ter L2 pseudo length 3GPP TS 04.08 V7.21.0, section "9.1.34 System information type 2ter" states: """ This message has a L2 pseudo length of 18. This message may be sent by the network with either a L2 pseudo length of 18 or some other value. A mobile station that does not ignore this message shall not discard the message due to a received L2 pseudo length different from 18. """ Change-Id: I45cb217ebdf89b82b0f37f38eef7a1e3a651f541 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/30/11830/2 -- To view, visit https://gerrit.osmocom.org/11830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I45cb217ebdf89b82b0f37f38eef7a1e3a651f541 Gerrit-Change-Number: 11830 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:06:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 14:06:41 +0000 Subject: Change in osmo-msc[master]: Use BSSAP-specific TLV parser from libosmocore Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11831 Change subject: Use BSSAP-specific TLV parser from libosmocore ...................................................................... Use BSSAP-specific TLV parser from libosmocore Change-Id: Iae1a3ffcebf1b0b95e61cd5dffe7ef734796fcfc --- M src/libmsc/a_iface_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/11831/1 diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 282fd73..f24fb05 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -611,7 +611,7 @@ } msg_type = msg->l3h[0]; - rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l3h + 1, msgb_l3len(msg) - 1, 0, 0); + rc = osmo_bssap_tlv_parse(&tp, msg->l3h + 1, msgb_l3len(msg) - 1); if (rc < 0) { LOGP(DBSSAP, LOGL_ERROR, "Failed parsing TLV -- discarding message! %s\n", osmo_hexdump(msg->l3h, msgb_l3len(msg))); -- To view, visit https://gerrit.osmocom.org/11831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iae1a3ffcebf1b0b95e61cd5dffe7ef734796fcfc Gerrit-Change-Number: 11831 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:06:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 14:06:41 +0000 Subject: Change in osmo-msc[master]: Use libosmocore to function to parse cipher mode reject cause Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11832 Change subject: Use libosmocore to function to parse cipher mode reject cause ...................................................................... Use libosmocore to function to parse cipher mode reject cause This allow us to handle both regular and extended cause transparently. Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Related: OS#3187 --- M src/libmsc/a_iface_bssap.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/11832/1 diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index f24fb05..14bdcea 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -427,6 +427,7 @@ static int bssmap_rx_ciph_rej(struct gsm_subscriber_connection *conn, struct msgb *msg, struct tlv_parsed *tp) { + int rc; enum gsm0808_cause cause; struct rate_ctr_group *msc = conn->network->msc_ctrs; @@ -437,10 +438,15 @@ return -EINVAL; } - rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]); + rc = gsm0808_get_cipher_reject_cause(tp); + if (rc < 0) { + LOGPCONN(conn, LOGL_ERROR, "failed (%s) to extract Cause from Cipher mode reject: %s\n", + strerror(-rc), msgb_hexdump(msg)); + return rc; + } - /* FIXME: add support for 2-byte Cause values using libosmocore functions */ - cause = *TLVP_VAL(tp, GSM0808_IE_CAUSE); + rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]); + cause = (enum gsm0808_cause)rc; LOGPCONN(conn, LOGL_NOTICE, "Cipher mode rejection cause: %s\n", gsm0808_cause_name(cause)); /* FIXME: Can we do something meaningful here? e.g. report to the -- To view, visit https://gerrit.osmocom.org/11832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Gerrit-Change-Number: 11832 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:12:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 14:12:39 +0000 Subject: Change in osmo-msc[master]: Use BSSAP-specific TLV parser from libosmocore In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11831 ) Change subject: Use BSSAP-specific TLV parser from libosmocore ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae1a3ffcebf1b0b95e61cd5dffe7ef734796fcfc Gerrit-Change-Number: 11831 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 14:12:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:15:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 14:15:14 +0000 Subject: Change in osmo-msc[master]: Use libosmocore to function to parse cipher mode reject cause In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11832 ) Change subject: Use libosmocore to function to parse cipher mode reject cause ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11832/1/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11832/1/src/libmsc/a_iface_bssap.c at 448 PS1, Line 448: rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]); ctr_inc should go at the start of the function imho, after first LOGPCONN. At least don't put it even lower than it was. -- To view, visit https://gerrit.osmocom.org/11832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Gerrit-Change-Number: 11832 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 14:15:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:20:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 14:20:54 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11571 ) Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 14:20:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:21:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 14:21:55 +0000 Subject: Change in osmo-msc[master]: Use BSSAP-specific TLV parser from libosmocore In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11831 ) Change subject: Use BSSAP-specific TLV parser from libosmocore ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae1a3ffcebf1b0b95e61cd5dffe7ef734796fcfc Gerrit-Change-Number: 11831 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 14:21:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:38:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 14:38:46 +0000 Subject: Change in libosmocore[master]: gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11788 ) Change subject: gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie ...................................................................... gsm_44_318.h: remove #if 0 from struct gan_cch_desc_ie These are actually parts of the struct in big endian order, which will soon be done automatically by struct_endianess.py. Change-Id: I9bc694f10fa9cef0bb7fc791bb40e7602459b16b --- M include/osmocom/gsm/protocol/gsm_44_318.h 1 file changed, 0 insertions(+), 17 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_44_318.h b/include/osmocom/gsm/protocol/gsm_44_318.h index 76e8396..6ac02cf 100644 --- a/include/osmocom/gsm/protocol/gsm_44_318.h +++ b/include/osmocom/gsm/protocol/gsm_44_318.h @@ -170,15 +170,6 @@ dtm:1, att:1, mscr:1; -#if 0 - uint8_t mscr:1, - att:1, - dtm:1, - gprs:1, - nmo:2, - ecmc:1, - spare:1; -#endif uint8_t t3212; uint8_t rac; uint8_t sgsnr:1, @@ -187,13 +178,5 @@ pfcfm:1, tgecs:2, spare2:2; -#if 0 - uint8_t spare2:2, - tgecs:2, - pfcfm:1, - re:1, - ecmp:1, - sgsnr:1; -#endif uint8_t access_class[2]; } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/11788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9bc694f10fa9cef0bb7fc791bb40e7602459b16b Gerrit-Change-Number: 11788 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:45:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 14:45:24 +0000 Subject: Change in osmo-msc[master]: Use libosmocore to function to parse cipher mode reject cause In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11832 ) Change subject: Use libosmocore to function to parse cipher mode reject cause ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11832/1/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11832/1/src/libmsc/a_iface_bssap.c at 448 PS1, Line 448: rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]); > ctr_inc should go at the start of the function imho, after first LOGPCONN. [?] It should count the number of valid CMR messages that's why it's after the error handling. Having it in the beginning would defeat the purpose of having this counter in a first place: we would be unable to distinguish between proper and broken CMR messages in TTCN tests. -- To view, visit https://gerrit.osmocom.org/11832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Gerrit-Change-Number: 11832 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 14:45:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 14:46:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 14:46:30 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts?= =?UTF-8?Q?_=C2=BB_oct,master,default,osmocom-master-debian9_#1435?= In-Reply-To: <447246567.716.1542629310694.JavaMail.jenkins@jenkins.osmocom.org> References: <447246567.716.1542629310694.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <620707541.718.1542638790841.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon Nov 19 14:47:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 14:47:42 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB?= =?UTF-8?Q?_lc15,v2017.01,default,osmocom-master-debian9_#1435?= In-Reply-To: <263849197.717.1542629311262.JavaMail.jenkins@jenkins.osmocom.org> References: <263849197.717.1542629311262.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <345982050.719.1542638862891.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon Nov 19 14:56:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 14:56:21 +0000 Subject: Change in osmo-msc[master]: Use libosmocore to function to parse cipher mode reject cause In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11832 ) Change subject: Use libosmocore to function to parse cipher mode reject cause ...................................................................... Patch Set 1: -Code-Review (2 comments) https://gerrit.osmocom.org/#/c/11832/1/src/libmsc/a_iface_bssap.c File src/libmsc/a_iface_bssap.c: https://gerrit.osmocom.org/#/c/11832/1/src/libmsc/a_iface_bssap.c at 436 PS1, Line 436: if (!TLVP_PRES_LEN(tp, GSM0808_IE_CAUSE, 1)) { BTW, is this required now that gsm0808_get_cipher_reject_cause is used? I guess it's not. https://gerrit.osmocom.org/#/c/11832/1/src/libmsc/a_iface_bssap.c at 448 PS1, Line 448: rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]); > It should count the number of valid CMR messages that's why it's after the error handling. [?] Do we count "broken" CMR messages in some place? I don't see this counter being called "MSC_CTR_BSSMAP_CIPHER_MODE_REJECT_VALID", so I expect all of them are counted, irrespective of whether they contain a correct cause code or not. -- To view, visit https://gerrit.osmocom.org/11832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Gerrit-Change-Number: 11832 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 14:56:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 19 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 19 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#312?= In-Reply-To: <367700345.648.1542553807677.JavaMail.jenkins@jenkins.osmocom.org> References: <367700345.648.1542553807677.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1732378421.720.1542640207639.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:31:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:31:00 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11786 ) Change subject: add contrib/struct_endianess.py ...................................................................... Patch Set 2: (6 comments) more replies in the form of comments in the next patch set... in general, let's cut the time spent here (at least sysmocom time) since we don't really have a need to support big endian. Free time is a different matter. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py File contrib/struct_endianess.py: https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 80 PS2, Line 80: # now the interesting part, go over the defs, and reverse the sub-byte ints > You can probably split into a different function starting from here. you're right style wise, but it doesn't really have a practical benefit https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 118 PS2, Line 118: raise Exception('sub-byte int breaks clean byte bounds: %s -- %d + %d = %d bits' > what about eg. [?] Even if you use uint16_t, it must still reverse at byte boundaries. Technically we parse any integer types, including uint16_t, but this is identical: uint8_t a:3, b:5; and uint16_t a:3, b:5; and in practice *all* of our sub-byte integers today are defined by uint8_t. https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 189 PS2, Line 189: if not 'packed' in struct[-1]: > probably better/easier to look for __atribute((packed)) or whatever is called, and check all lines [?] the regex for top-level structs only matches the end-of-struct being at the line start }; or } __attribute....; This condition only exists because in some places we have weird booleans in the form of integer flag:1; and these don't add up to bytes, and cause errors. So I thought let's skip all non-packed structs, then all of those are out of the picture. For the current code base that holds true... https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 248 PS2, Line 248: j += 1 > Not sure if this j += 1 in here applied for all cases is correct. Have a look. it is correct, all ifs break, this is the iteration case https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 276 PS2, Line 276: end_def() > afaiu this end_def() should be one lne above and indented one more level (inside while). nope. it flushes what is left at the end https://gerrit.osmocom.org/#/c/11786/2/contrib/struct_endianess.py at 308 PS2, Line 308: raise Exception('do not know where to include osmocom/core/endian.h in %r' % f) > Just add it around first empty line (to avoid adding if before guard IFDEF or pragma once). there are currently no cases where this would be needed... am reluctant to add dead code -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 15:31:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:31:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 15:31:01 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... Patch Set 1: > osmo_gsm_arfcn2band That sounds better. -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Mon, 19 Nov 2018 15:31:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:31:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:31:44 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11786 to look at the new patch set (#3). Change subject: add contrib/struct_endianess.py ...................................................................... add contrib/struct_endianess.py In libosmocore (and likely elsewhere) we have scores of packed structs with sub-byte integer members that lack the necessary member reversal shims to be able to work on big endian architectures. Instead of manually editing each one of them and probably introduce errors in the process, this script handles the change automatically, and in the future allows us to verify correctness in gerrit verifications. Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 --- A contrib/struct_endianess.py 1 file changed, 369 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/11786/3 -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:34:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:34:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add inter-bsc ho incoming failure tests In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11699 to look at the new patch set (#2). Change subject: bsc: add inter-bsc ho incoming failure tests ...................................................................... bsc: add inter-bsc ho incoming failure tests Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe --- M bsc/BSC_Tests.ttcn 1 file changed, 348 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/11699/2 -- To view, visit https://gerrit.osmocom.org/11699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe Gerrit-Change-Number: 11699 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:35:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:35:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add inter-bsc ho incoming failure tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11699 ) Change subject: bsc: add inter-bsc ho incoming failure tests ...................................................................... Patch Set 2: Code-Review+2 whitespace fixed -- To view, visit https://gerrit.osmocom.org/11699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe Gerrit-Change-Number: 11699 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: osmith Gerrit-Comment-Date: Mon, 19 Nov 2018 15:35:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:35:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:35:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add inter-bsc ho incoming failure tests In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11699 ) Change subject: bsc: add inter-bsc ho incoming failure tests ...................................................................... bsc: add inter-bsc ho incoming failure tests Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe --- M bsc/BSC_Tests.ttcn 1 file changed, 348 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 29961e5..9b445f5 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2578,6 +2578,348 @@ vc_conn.done; } +private function f_tc_ho_in_fail_msc_clears(charstring id) runs on MSC_ConnHdlr { + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. In this case, the MS + * reports a Handover Failure to the old BSS, which forwards a BSSMAP + * Handover Failure to the MSC. The procedure according to 3GPP TS + * 48.008 3.1.5.3.2 "Handover Failure" is then that the MSC sends a + * BSSMAP Clear Command: */ + + var myBSSMAP_Cause cause_val := GSM0808_CAUSE_RADIO_INTERFACE_FAILURE_REVERSION; + var BssmapCause cause := enum2int(cause_val); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); + + setverdict(pass); +} +testcase TC_ho_in_fail_msc_clears() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_in_fail_msc_clears), pars); + vc_conn.done; +} + +private function f_tc_ho_in_fail_msc_clears_after_ho_detect(charstring id) runs on MSC_ConnHdlr { + /* Hack: the proper way would be to wait for the BSSMAP Handover Request ACK and extract the + * actual assigned chan_nr from its L3 (RR Handover Command) message. But osmo-bsc starts acting + * on the lchan even before we get a chance to evaluate the BSSMAP Handover Request ACK. So we + * need to assume that osmo-bsc will activate TS 1 and already set up this lchan's RSL emulation + * before we get started. */ + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. Here comes the new MS on + * the new lchan with a Handover RACH: */ + + /* send handover detect */ + + RSL.send(ts_RSL_HANDO_DET(new_chan_nr)); + + BSSAP.receive(tr_BSSMAP_HandoverDetect); + + /* The MSC chooses to clear the connection now, maybe we got the + * Handover RACH on the new cell but the MS still signaled Handover + * Failure to the old BSS? */ + + var myBSSMAP_Cause cause_val := GSM0808_CAUSE_RADIO_INTERFACE_FAILURE_REVERSION; + var BssmapCause cause := enum2int(cause_val); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_in_fail_msc_clears_after_ho_detect() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_in_fail_msc_clears_after_ho_detect), pars); + vc_conn.done; +} + +/* The new BSS's lchan times out before the MSC decides that handover failed. */ +private function f_tc_ho_in_fail_no_detect(charstring id) runs on MSC_ConnHdlr { + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. But the MS never shows up + * on the new lchan. */ + + BSSAP.receive(tr_BSSMAP_HandoverFailure); + + /* Did osmo-bsc also send a Clear Request? */ + timer T := 0.5; + T.start; + alt { + [] BSSAP.receive(tr_BSSMAP_ClearRequest); + [] T.timeout { } + } + + /* MSC plays along with a Clear Command (no matter whether osmo-bsc + * asked for it, this is a Handover Failure after all). */ + + var myBSSMAP_Cause cause_val := GSM0808_CAUSE_RADIO_INTERFACE_FAILURE_REVERSION; + var BssmapCause cause := enum2int(cause_val); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); + + setverdict(pass); +} +testcase TC_ho_in_fail_no_detect() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_in_fail_no_detect), pars); + vc_conn.done; +} + +/* Same as f_tc_ho_in_fail_no_detect, but MSC fails to send a Clear Command */ +private function f_tc_ho_in_fail_no_detect2(charstring id) runs on MSC_ConnHdlr { + var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); + f_rslem_register(0, new_chan_nr); + g_chan_nr := new_chan_nr; + f_sleep(1.0); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); + activate(as_Media()); + + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, + f_gen_handover_req())); + BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + + /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ + + var PDU_BSSAP rx_bssap; + var octetstring ho_command_str; + + BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; + + ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; + log("Received L3 Info in HO Request Ack: ", ho_command_str); + var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str); + log("L3 Info in HO Request Ack is ", ho_command); + + var GsmArfcn arfcn; + var RslChannelNr actual_new_chan_nr; + f_ChDesc2RslChanNr(ho_command.msgs.rrm.handoverCommand.channelDescription2, + actual_new_chan_nr, arfcn); + + if (actual_new_chan_nr != new_chan_nr) { + log("ERROR: osmo-bsc assigned a different lchan than we assumed above -- this test will fail now.", + " Assumed: ", new_chan_nr, " Assigned: ", actual_new_chan_nr); + setverdict(fail); + return; + } + log("Handover Command chan_nr is", actual_new_chan_nr); + + /* Now the MSC forwards the RR Handover Command to the other BSC, which + * tells the MS to handover to the new lchan. But the MS never shows up + * on the new lchan. */ + + BSSAP.receive(tr_BSSMAP_HandoverFailure); + + /* MSC plays dumb and sends no Clear Command */ + + /* Expecting MGCP to DLCX the endpoint's two connections: towards BTS and towards MSC */ + var PDU_BSSAP rx_clear_request; + var MgcpCommand mgcp; + interleave { + [] BSSAP.receive(tr_BSSMAP_ClearRequest) -> value rx_clear_request { + var BssmapCause cause := bit2int(rx_clear_request.pdu.bssmap.clearRequest.cause.causeValue); + BSSAP.send(ts_BSSMAP_ClearCommand(cause)); + }; + [] BSSAP.receive(tr_BSSMAP_ClearComplete); + + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got first DLCX: ", mgcp); + } + [] MGCP.receive(tr_DLCX()) -> value mgcp { + log("Got second DLCX: ", mgcp); + } + } + setverdict(pass); + f_sleep(1.0); +} +testcase TC_ho_in_fail_no_detect2() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + + pars.handover.sccp_addr_msc := g_bssap.sccp_addr_own; + pars.handover.sccp_addr_bsc := g_bssap.sccp_addr_peer; + + vc_conn := f_start_handler(refers(f_tc_ho_in_fail_no_detect2), pars); + vc_conn.done; +} /* OS#3041: Open and close N connections in a normal fashion, and expect no * BSSMAP Reset just because of that. */ @@ -3079,11 +3421,17 @@ execute( TC_err_84_unknown_msg() ); execute( TC_ho_int() ); + execute( TC_ho_out_of_this_bsc() ); execute( TC_ho_out_fail_no_msc_response() ); execute( TC_ho_out_fail_rr_ho_failure() ); execute( TC_ho_out_fail_no_ho_detect() ); + execute( TC_ho_into_this_bsc() ); + execute( TC_ho_in_fail_msc_clears() ); + execute( TC_ho_in_fail_msc_clears_after_ho_detect() ); + execute( TC_ho_in_fail_no_detect() ); + execute( TC_ho_in_fail_no_detect2() ); execute( TC_bssap_rlsd_does_not_cause_bssmap_reset() ); execute( TC_bssmap_clear_does_not_cause_bssmap_reset() ); -- To view, visit https://gerrit.osmocom.org/11699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I849e4c0a14cc091195d948adb8df7a0b7414ecfe Gerrit-Change-Number: 11699 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:45:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:45:18 +0000 Subject: Change in osmo-dev[master]: gits: fix git_can_fast_forward: use arg instead of HEAD In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11755 ) Change subject: gits: fix git_can_fast_forward: use arg instead of HEAD ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca Gerrit-Change-Number: 11755 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Nov 2018 15:45:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:45:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:45:20 +0000 Subject: Change in osmo-dev[master]: gits: fix git_can_fast_forward: use arg instead of HEAD In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11755 ) Change subject: gits: fix git_can_fast_forward: use arg instead of HEAD ...................................................................... gits: fix git_can_fast_forward: use arg instead of HEAD Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca --- M src/gits 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/src/gits b/src/gits index bd53cb5..cb2cf59 100755 --- a/src/gits +++ b/src/gits @@ -103,7 +103,7 @@ def git_can_fast_forward(git_dir, branch='master', remote='origin'): - return git_bool(git_dir, 'merge-base', '--is-ancestor', 'HEAD', remote + '/' + branch) + return git_bool(git_dir, 'merge-base', '--is-ancestor', branch, remote + '/' + branch) def format_branch_ahead_behind(branch, ahead, behind): -- To view, visit https://gerrit.osmocom.org/11755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idec9c9b9b7eddea2dc574fe41f73c0ac570630ca Gerrit-Change-Number: 11755 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:53:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:53:44 +0000 Subject: Change in osmo-dev[master]: gits: remove code dup: ask_reset_hard() In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11757 to look at the new patch set (#3). Change subject: gits: remove code dup: ask_reset_hard() ...................................................................... gits: remove code dup: ask_reset_hard() Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a --- M src/gits 1 file changed, 15 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/57/11757/3 -- To view, visit https://gerrit.osmocom.org/11757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a Gerrit-Change-Number: 11757 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:53:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:53:44 +0000 Subject: Change in osmo-dev[master]: gits: when asking for reset --hard, also offer push -f In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11758 to look at the new patch set (#3). Change subject: gits: when asking for reset --hard, also offer push -f ...................................................................... gits: when asking for reset --hard, also offer push -f Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 --- M src/gits 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/58/11758/3 -- To view, visit https://gerrit.osmocom.org/11758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 Gerrit-Change-Number: 11758 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:54:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:54:43 +0000 Subject: Change in osmo-dev[master]: gits: use @{u} to get upstream branch, not origin/%s In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11756 ) Change subject: gits: use @{u} to get upstream branch, not origin/%s ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11756/1/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11756/1/src/gits at 61 PS1, Line 61: return subprocess.check_output(['git', '-C', git_dir, ] + list(args), stderr=subprocess.STDOUT).decode('utf-8') > why is this needed? because every time we parse a remote ref (git ref-parse --abbrev-ref '%s{u}') and there is no remote branch, git prints 'Fatal: there is no remote bla bla' on stdout, and that error is expected / ok to happen, so it just clutters the 'gits' output. In the other cases, if there is an error, subprocess raises an exception and we see that an error happens. In the ref-parse case we can simply catch the exception and be quiet. -- To view, visit https://gerrit.osmocom.org/11756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 Gerrit-Change-Number: 11756 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Nov 2018 15:54:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:57:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:57:12 +0000 Subject: Change in osmo-dev[master]: gits: use @{u} to get upstream branch, not origin/%s In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11756 to look at the new patch set (#4). Change subject: gits: use @{u} to get upstream branch, not origin/%s ...................................................................... gits: use @{u} to get upstream branch, not origin/%s git has an internal concept of a branch's upstream branch, and the remote need not be 'origin', and also, the upstream branch name may differ completely. So, use git's {u} keyword to obtain the upstream branch name. This removes all 'origin' strings from gits. Also, git_branch_exists() is no longer needed, drop it. Also remove a couple of default arguments which aren't ever used because we always pass arguments anyway. In the case of git_ahead_behind(), we would have use for a default branch_upstream=None to imply calling git_branch_upstream(), but then during rebase, if no upstream exists, we would invoke it twice to get None a second time. So just call the function explicitly. I thought about returning an empty string instead of None, but it's too convoluted. In git_output(), pipe STDERR to STDOUT, because every time we parse a remote ref (git ref-parse --abbrev-ref '%s{u}') and there is no remote branch, git prints 'Fatal: there is no remote bla bla' on stdout, and that error is expected / ok to happen, so it just clutters the 'gits' output. The easiest way to achieve silence then is to pipe to STDOUT, IIUC otherwise we'd have to use Popen() and communicate()... In the case of error, subprocess raises an exception and we see that an error happens. In the ref-parse case we can simply catch the exception and be quiet. Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 --- M src/gits 1 file changed, 30 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/56/11756/4 -- To view, visit https://gerrit.osmocom.org/11756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 Gerrit-Change-Number: 11756 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:57:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:57:12 +0000 Subject: Change in osmo-dev[master]: gits: remove code dup: ask_reset_hard() In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11757 to look at the new patch set (#4). Change subject: gits: remove code dup: ask_reset_hard() ...................................................................... gits: remove code dup: ask_reset_hard() Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a --- M src/gits 1 file changed, 15 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/57/11757/4 -- To view, visit https://gerrit.osmocom.org/11757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a Gerrit-Change-Number: 11757 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 15:57:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 15:57:12 +0000 Subject: Change in osmo-dev[master]: gits: when asking for reset --hard, also offer push -f In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11758 to look at the new patch set (#4). Change subject: gits: when asking for reset --hard, also offer push -f ...................................................................... gits: when asking for reset --hard, also offer push -f Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 --- M src/gits 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/58/11758/4 -- To view, visit https://gerrit.osmocom.org/11758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 Gerrit-Change-Number: 11758 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:00:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 16:00:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: remove unused control interface In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11690 ) Change subject: MSC_Tests: remove unused control interface ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11690/4/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11690/4/msc/MSC_Tests.ttcn at a20 PS4, Line 20: You remove those 2 here and introduce them in next patch. Why not simply leaving it as is and only remove init function below? -- To view, visit https://gerrit.osmocom.org/11690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I204b2e96057d13342f4bd4fdaf08fb7b88b6b11d Gerrit-Change-Number: 11690 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 19 Nov 2018 16:00:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:09:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 16:09:52 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gprs/protocol/gsm_04_60.h File include/osmocom/gprs/protocol/gsm_04_60.h: https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gprs/protocol/gsm_04_60.h at 33 PS2, Line 33: uint8_t tfi_hi:2, cv:4, si:1, r:1; > Please change the script to add lines/formatting like in the little endian case. that's "impossible" since the order is reversed. Doing it the tivial way it usually is done so far with whitespace carried along in the regexes, it would end up as: uint8_t tfi_hi:8; cv:4, si:1, r:1, (sic) and I'm positively not going to spend time on that: it would involve interpreting indenting levels and open a whole nother chapter of pseudo intelligence. I actually also prefer the packed output in the big-endian section, so no matter what formatting the original author invented, the big-endian part is "one line per byte" and more compact; whitespace changes then (mostly) don't affect the big-endian part. To read the struct for human understanding, just read above. https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gsm/protocol/gsm_03_41.h File include/osmocom/gsm/protocol/gsm_03_41.h: https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gsm/protocol/gsm_03_41.h at 36 PS2, Line 36: uint8_t language:4; > Be careful here!! [?] no, the struct is packed. They are both a single byte. If you want to have ignored bits, you need to add 'padding' members. (but you had me for a second there) try this: cat > /tmp/x.c < Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 16:09:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:21:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 16:21:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11733 ) Change subject: BSC_Tests: expect a HANDOVER PERFORMED message on internal handover ...................................................................... Patch Set 3: let's see... OK you're right. The spec says that during Assignment we send no HANDOVER PERFORMED message (duh!), but even during a handover within the same cell (not even changing the BTS), we actually *do* send a HANDOVER PERFORMED message: 48.008 3.1.1.1 (Assignment / success) "If an intra-BSS cell change has occurred during the assignment, the new cell identity is included in the ASSIGNMENT COMPLETE message and a HANDOVER PERFORMED message is not required." 3.1.6 Internal Intra-Cell Handover Procedure and same at 3.1.7 Internal Inter-Cell Handover Procedure Internal {intra,inter}-cell handover [...] is decided and executed autonomously by the BSS, so that no message is generated at the BSS-MSC interface, until the completion of the handover execution, when the BSS sends a HANDOVER PERFORMED message over the SCCP and terrestrial resources that are presently assigned to that call. Changes in type of resources (for instance channel rate change, speech version change, ciphering algorithm change) are indicated in the HANDOVER PERFORMED message. -- To view, visit https://gerrit.osmocom.org/11733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I10f4e578c96a90317939ba49b61b14a3c7e488a7 Gerrit-Change-Number: 11733 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 19 Nov 2018 16:21:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:26:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 16:26:27 +0000 Subject: Change in osmocom-bb[master]: mobile: fix vty bind ip override In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 16:26:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:31:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 19 Nov 2018 16:31:02 +0000 Subject: Change in libosmocore[master]: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11833 Change subject: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK ...................................................................... send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In gprs_ns_process_msg(), we were dispatching the S_NS_UNBLOCK signal before sending out the NS_POUT_UNBLOCK_ACK message. Signal handlers might send messages to the other side, assuming that NS is now unblocked. However, since such messages will arrive before the UNBLOCK_ACK message the receiver might discard them. This problem has been observed with our TTCN3 BSSGP_Emulation as a peer to osmo-pcu. This patch makes TTCN3 PCU TC_paging() test pass regardless of whether the test or osmo-pcu is started first. Before this patch, this test would only pass if the test was started before osmo-pcu. A remaining problem is that the test does not yet keep passing reliably unless osmo-pcu is restarted between test runs. Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Related: OS#2890 Related: OS#2388 --- M src/gb/gprs_ns.c M tests/gb/gprs_ns_test.ok 2 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/11833/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 198ead1..0780f2b 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1413,8 +1413,10 @@ /* Section 7.2: unblocking procedure */ LOGP(DNS, LOGL_INFO, "NSEI=%u Rx NS UNBLOCK\n", (*nsvc)->nsei); ns_mark_unblocked(*nsvc); - ns_osmo_signal_dispatch(*nsvc, S_NS_UNBLOCK, 0); rc = gprs_ns_tx_simple(*nsvc, NS_PDUT_UNBLOCK_ACK); + if (rc < 0) + break; + ns_osmo_signal_dispatch(*nsvc, S_NS_UNBLOCK, 0); break; case NS_PDUT_UNBLOCK_ACK: LOGP(DNS, LOGL_INFO, "NSEI=%u Rx NS UNBLOCK ACK\n", (*nsvc)->nsei); diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 669e182..3cb1dfc 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -133,10 +133,10 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1122/1.2.3.4:1111 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1122/1.2.3.4:1111 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -277,10 +277,10 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -318,10 +318,10 @@ PROCESSING UNBLOCK from 0x01020304:2222 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -421,10 +421,10 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -597,10 +597,10 @@ PROCESSING UNBLOCK from 0x01020304:2222 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:2222 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:2222 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 -- To view, visit https://gerrit.osmocom.org/11833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Gerrit-Change-Number: 11833 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:34:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 19 Nov 2018 16:34:04 +0000 Subject: Change in libosmocore[master]: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11833 ) Change subject: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Gerrit-Change-Number: 11833 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Max Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 19 Nov 2018 16:34:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 16:36:34 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 894 PS1, Line 894: > Can you give me some more information on this. [?] frankly I'm not sure at all; and also it seems we don't really care about big endian after all... I don't really understand why then we have so many #if OSMO_IS_BIG_ENDIAN around the code in the first place, but seems we're generally broken on big endian. So if it works on L.E. maybe not bother... https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 897 PS1, Line 897: > I oriented myself on gsm0808_create_layer3_2(), which does the encoding the same way. [?] the gsm0808_create_layer3 precedes the cell identity encoding API. I wasn't consciously aware of that other implementation in that function, and you're right that that should probably also be fixed to use the new cell identity encoding function gsm0808_enc_cell_id(). The point being here: you can make this code both more flexible and simpler by just asking the caller to provide a struct gsm0808_cell_id and passing it on to gsm0808_enc_cell_id(). thanks! -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 16:36:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:39:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 16:39:32 +0000 Subject: Change in osmocom-bb[master]: mobile: fix vty bind ip override In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 16:39:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:51:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 16:51:27 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... Patch Set 1: Hi, > I could change the commit to name the new API > "gsm_arfcn2band_validate", or actually use > "osmo_gsm_arfcn2band". A possible way to go is to introduce the new osmo_gsm_arfcn2band(), introduce GSM_BAND_INVAL = 0x00, and return GSM_BAND_INVAL for 'out of band' values from there. The old gsm_arfcn2band() could then just call osmo_gsm_arfcn2band(), and replace GSM_BAND_INVAL by GSM_BAND_1800. And of course, it would be marked as deprecated. What do you think? -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Mon, 19 Nov 2018 16:51:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 16:56:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 16:56:18 +0000 Subject: Change in osmo-bsc[master]: bsc: Enable force-combined-si on nanoBTS by default Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11834 Change subject: bsc: Enable force-combined-si on nanoBTS by default ...................................................................... bsc: Enable force-combined-si on nanoBTS by default Some nanoBTS firmwares (if not all) are known to not work properly with SI2ter. If BSC enables SI2ter through RSL, SI3 bit announcing SI2ter available will be forwarded by nanoBTS to MS, but will still only send SI2 message instead of expected SI2ter during TC=5 (see GSM 05.02 sec 6.3.4 "Mapping of BCCH data"). As a result, some MS won't allow registering to the network. To avoid this kind of scenario, enable force-combined-si by default on nanoBTS while still allowing to overwrite the feature through VTY. Other BTS models are kept with force-combined-si disabled by default as usually, since they seems to be working fine when SI2ter is enabled. Related: OS#3063 Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/system_information.c 7 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/11834/1 diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 750b089..eec154d 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -40,7 +40,6 @@ oml ip.access stream_id 255 line 0 codec-support fr gprs mode none - no force-combined-si trx 0 rf_locked 0 arfcn 871 diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index d1b3678..fd3a349 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -39,7 +39,6 @@ oml ip.access stream_id 255 line 0 codec-support fr gprs mode none - no force-combined-si trx 0 rf_locked 0 arfcn 871 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4d8a4d0..ba52c99 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -756,6 +756,9 @@ void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts); + /* Should SI2bis and SI2ter be disabled by default on this BTS model? */ + bool force_combined_si; + struct tlv_definition nm_att_tlvdef; /* features of a given BTS model set via gsm_bts_model_register() locally */ @@ -1046,6 +1049,7 @@ /* SI related items */ int force_combined_si; + bool force_combined_si_set; int bcch_change_mark; /* Abis NM queue */ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 3ac592c..931db5b 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -985,8 +985,9 @@ if (bts->excl_from_rf_lock) vty_out(vty, " rf-lock-exclude%s", VTY_NEWLINE); - vty_out(vty, " %sforce-combined-si%s", - bts->force_combined_si ? "" : "no ", VTY_NEWLINE); + if (bts->force_combined_si_set) + vty_out(vty, " %sforce-combined-si%s", + bts->force_combined_si ? "" : "no ", VTY_NEWLINE); for (i = 0; i < ARRAY_SIZE(bts->depends_on); ++i) { int j; @@ -3411,6 +3412,7 @@ { struct gsm_bts *bts = vty->index; bts->force_combined_si = 1; + bts->force_combined_si_set = true; return CMD_SUCCESS; } @@ -3421,6 +3423,7 @@ { struct gsm_bts *bts = vty->index; bts->force_combined_si = 0; + bts->force_combined_si_set = true; return CMD_SUCCESS; } diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 1fffd89..f427e2d 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -63,7 +63,11 @@ .start = bts_model_nanobts_start, .oml_rcvmsg = &abis_nm_rcvmsg, .oml_status = &get_oml_status, - .e1line_bind_ops = bts_model_nanobts_e1line_bind_ops, + .e1line_bind_ops = bts_model_nanobts_e1line_bind_ops, + /* some nanoBTS firmwares (if not all) don't support SI2ter and cause + problems on some MS if it is enabled, see OS#3063. Disable it by + default, can still be enabled through VTY cmd with same name. */ + .force_combined_si = true, .nm_att_tlvdef = { .def = { /* ip.access specifics */ diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c index 91d1118..2f7a190 100644 --- a/src/osmo-bsc/bts_sysmobts.c +++ b/src/osmo-bsc/bts_sysmobts.c @@ -48,6 +48,9 @@ model_sysmobts.name = "sysmobts"; model_sysmobts.type = GSM_BTS_TYPE_OSMOBTS; + /* Unlinke nanoBTS, sysmoBTS supports SI2bis and SI2ter fine */ + model_sysmobts.force_combined_si = false; + model_sysmobts.features.data = &model_sysmobts._features_data[0]; model_sysmobts.features.data_len = sizeof(model_sysmobts._features_data); diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 2104e92..ddcbcec 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -327,7 +327,7 @@ static inline int use_arfcn(const struct gsm_bts *bts, const bool bis, const bool ter, const bool pgsm, const int arfcn) { - if (bts->force_combined_si) + if (bts->force_combined_si_set ? bts->force_combined_si : bts->model->force_combined_si) return !bis && !ter; if (!bis && !ter && band_compatible(bts, arfcn)) return 1; -- To view, visit https://gerrit.osmocom.org/11834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d Gerrit-Change-Number: 11834 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:01:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 17:01:36 +0000 Subject: Change in libosmocore[master]: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11833 ) Change subject: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11833/1/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/#/c/11833/1/src/gb/gprs_ns.c at 1417 PS1, Line 1417: if (rc < 0) Worth explaining here in a comment why are we breaking (because we don't want to send messages if we didn't notify the peer correctly). Maybe also a log, not sure if callee already logs something. -- To view, visit https://gerrit.osmocom.org/11833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Gerrit-Change-Number: 11833 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 17:01:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:03:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 17:03:52 +0000 Subject: Change in libosmocore[master]: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11833 ) Change subject: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Gerrit-Change-Number: 11833 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 17:03:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:05:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 17:05:57 +0000 Subject: Change in libosmocore[master]: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11833 ) Change subject: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Gerrit-Change-Number: 11833 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 17:05:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:09:02 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 17:09:02 +0000 Subject: Change in osmo-bsc[master]: bsc: Prefix log string with related SI type during call to list_arfcn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11828 ) Change subject: bsc: Prefix log string with related SI type during call to list_arfcn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie466abedce630ef0a8e7a8021383a1a612a0da8a Gerrit-Change-Number: 11828 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 17:09:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:09:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 17:09:43 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2bis L2 pseudo length In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11829 ) Change subject: bsc: si: Fix SI2bis L2 pseudo length ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I623c64c446c0973e939e9f1cba0a4d4d2f4f7237 Gerrit-Change-Number: 11829 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 17:09:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:10:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 17:10:03 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2ter L2 pseudo length In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11830 ) Change subject: bsc: si: Fix SI2ter L2 pseudo length ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45cb217ebdf89b82b0f37f38eef7a1e3a651f541 Gerrit-Change-Number: 11830 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 17:10:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:13:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 17:13:36 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gsm/protocol/gsm_03_41.h File include/osmocom/gsm/protocol/gsm_03_41.h: https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gsm/protocol/gsm_03_41.h at 36 PS2, Line 36: uint8_t language:4; > no, the struct is packed. They are both a single byte. [?] Ah nice, I didn't know the behaviour in packet structus was also to remove padding intra-byte wise. Still I think it'd be a good idea to merge this kind of stuff into a single uint8_t, but not critical. -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 17:13:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:16:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 17:16:39 +0000 Subject: Change in osmocom-bb[master]: mobile: fix vty bind ip override In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 19 Nov 2018 17:16:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:22:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 17:22:05 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... Patch Set 1: > Hi, > > > I could change the commit to name the new API > > "gsm_arfcn2band_validate", or actually use > > "osmo_gsm_arfcn2band". > > A possible way to go is to introduce the new osmo_gsm_arfcn2band(), > introduce GSM_BAND_INVAL = 0x00, and return GSM_BAND_INVAL for 'out > of band' values from there. > > The old gsm_arfcn2band() could then just call osmo_gsm_arfcn2band(), > and replace GSM_BAND_INVAL by GSM_BAND_1800. And of course, it > would > be marked as deprecated. What do you think? No, I want old API (deprecated in this commit) to really stop returning wrong band from invalid arfcn, so we can really spot messy places (I did that, it was the way to find out some code using that function was wrong in osmo-bsc and doing unexpected stuff which was difficult to spot). And as discussed here and on IRC, I'm also reluctant to add a new GSM_BAND_INVAL value which is really only be used here, and then we need to adapt all switch cases to handle this case which actually should never happen with the new API (because it returns an error). Let's not add this kind of hacks like adding an enum value to indicate error and better decouple correct values and error codes when input of a function is wrong. -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Mon, 19 Nov 2018 17:22:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 19 Nov 2018 17:32:21 +0000 Subject: Change in osmo-msc[master]: osmo_msc: remove unused parameter from msc_dtap() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11835 Change subject: osmo_msc: remove unused parameter from msc_dtap() ...................................................................... osmo_msc: remove unused parameter from msc_dtap() The parameter link_id in the function msc_dtap() is unused. Lets remove it. Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface_bssap.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_tests.c 4 files changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/11835/1 diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 3ffb65c..a757a99 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -63,8 +63,7 @@ int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause); int msc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint16_t chosen_channel); -void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, - struct msgb *msg); +void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg); int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 282fd73..e1ba6ce 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -685,7 +685,7 @@ OMSC_LINKID_CB(msg) = dtap->link_id; /* Forward dtap payload into the msc */ - msc_dtap(conn, conn->a.conn_id, msg); + msc_dtap(conn, msg); return 0; } diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index c9ecb64..f2c84e6 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -121,7 +121,7 @@ } /* Receive a DTAP message from BSC */ -void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) +void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg) { msc_subscr_conn_get(conn, MSC_CONN_USE_DTAP); gsm0408_dispatch(conn, msg); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index fd196c8..fb3b4ea 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -232,7 +232,7 @@ && (gsm48_hdr_msg_type(gh) == GSM48_MT_RR_CIPH_M_COMPL)) msc_cipher_mode_compl(g_conn, msg, 0); else - msc_dtap(g_conn, 23, msg); + msc_dtap(g_conn, msg); } if (!conn_exists(g_conn)) -- To view, visit https://gerrit.osmocom.org/11835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da Gerrit-Change-Number: 11835 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:33:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 17:33:21 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11703 ) Change subject: LCLS: add 48.008 parameter structure ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11703/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11703/3//COMMIT_MSG at 12 PS3, Line 12: This will be used in follow-up patch handling Assingment Request with I'm learning your classic typo: Assignment -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 17:33:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 17:39:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 19 Nov 2018 17:39:41 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR routines In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS: add GCR routines ...................................................................... Patch Set 4: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11827/4/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/11827/4/include/osmocom/gsm/gsm0808_utils.h at 71 PS4, Line 71: uint8_t *net; /* Network ID, ITU-T Q.1902.3 */ Same, here, why not using net[5]? https://gerrit.osmocom.org/#/c/11827/4/include/osmocom/gsm/gsm0808_utils.h at 74 PS4, Line 74: uint8_t *cr; /* Call Reference ID (5 octets) */ if it's 5 octets, why not using uint8_t cr[5] ? https://gerrit.osmocom.org/#/c/11827/4/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11827/4/src/gsm/gsm0808.c at 416 PS4, Line 416: if (!msg || !g) if g==NULL and alloc works --> memory leak. No need to check for !g, just remove it, I think we can assume we don't pass NULL to it since it makes no sense. https://gerrit.osmocom.org/#/c/11827/4/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/11827/4/tests/gsm0808/gsm0808_test.c at 138 PS4, Line 138: uint8_t net[g.net_len], pnet[g.net_len], cr[5], pcr[5] = { 0 }; See? no need for all this, just define arrays in the struct instead of pointers. -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 19 Nov 2018 17:39:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 20:28:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 20:28:35 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11836 Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... chapters/gsup.adoc: document MO-/MT-forwardSM messages Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 225 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/36/11836/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index e87d979..7568fe2 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -504,6 +504,129 @@ can be used to notify the MSC that a structured supplementary service is successfully activated or deactivated, etc. +==== MO-forwardSM Request + +Direction: SGSN / MSC => ESME (through VLR and HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|41|SM-RP-DA (Destination Address)|<>|M|TLV|2-... +|42|SM-RP-OA (Originating Address)|<>|M|TLV|2-... +|43|SM-RP-UI (SM TPDU)|<>|M|TLV|1-... +|=== + +This message is used to forward _MO (Mobile Originated)_ short messages +from SGSN (PS domain) / MSC (CS domain) to an ESME (External Short Message +Entity). The corresponding MAP service (defined in 3GPP TS 29.002) is +*MAP-MO-FORWARD-SHORT-MESSAGE*, described in section 12.2. + +_MO-forwardSM Request_ is triggered by both _RP-DATA_ message transfer +attempt and _RP-SMMA_ notification attempt on the _SM-RL (Relay Layer)_. + +==== MO-forwardSM Error + +Direction: ESME (through VLR and HLR) => SGSN / MSC + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|44|SM-RP-Cause (Cause value)|<>|M|TLV|1 +|43|SM-RP-UI (diagnostic field)|<>|O|TLV|1-... +|=== + +This message is used to indicate a negative result of a _MO (Mobile Originated)_ +short message delivery from SGSN (PS domain) / MSC (CS domain) to an ESME +(External Short Message Entity). Thus it triggers an _RP-ERROR_ on the _SM-RL +(Relay Layer)_ of SGSN (PS domain) / MSC (CS domain). The corresponding MAP +service (defined in 3GPP TS 29.002) is *MAP-MO-FORWARD-SHORT-MESSAGE*, +described in section 12.2. + +==== MO-forwardSM Result + +Direction: ESME (through VLR and HLR) => SGSN / MSC + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|=== + +This message is used to indicate a successful result of a _MO (Mobile Originated)_ +short message delivery from SGSN (PS domain) / MSC (CS domain) to an ESME +(External Short Message Entity). Thus it triggers an _RP-ACK_ on the _SM-RL +(Relay Layer)_ of SGSN (PS domain) / MSC (CS domain). The corresponding MAP +service (defined in 3GPP TS 29.002) is *MAP-MO-FORWARD-SHORT-MESSAGE*, +described in section 12.2. + +==== MT-forwardSM Request + +Direction: ESME (through VLR and HLR) => SGSN / MSC + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|41|SM-RP-DA (Destination Address)|<>|M|TLV|2-... +|42|SM-RP-OA (Originating Address)|<>|M|TLV|2-... +|43|SM-RP-UI (SM TPDU)|<>|M|TLV|1-... +|=== + +This message is used to forward _MT (Mobile Terminated)_ short messages +from an ESME (External Short Message Entity) to SGSN (PS domain) / MSC +(CS domain). The corresponding MAP service (defined in 3GPP TS 29.002) is +*MAP-MT-FORWARD-SHORT-MESSAGE*, described in section 12.9. + +==== MT-forwardSM Error + +Direction: SGSN / MSC => ESME (through VLR and HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|44|SM-RP-Cause (Cause value)|<>|M|TLV|1 +|43|SM-RP-UI (diagnostic field)|<>|O|TLV|1-... +|=== + +This message is used to indicate a negative result of a _MT (Mobile Terminated)_ +short message delivery from an ESME (External Short Message Entity) to SGSN +(PS domain) / MSC (CS domain). The corresponding MAP service (defined in 3GPP +TS 29.002) is *MAP-MT-FORWARD-SHORT-MESSAGE*, described in section 12.9. + +_MT-forwardSM Error_ is triggered by _RP-ERROR_ on the _SM-RL (Relay Layer)_. + +==== MT-forwardSM Result + +Direction: SGSN / MSC => ESME (through VLR and HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|=== + +This message is used to indicate a successful result of a _MT (Mobile Terminated)_ +short message delivery from an ESME (External Short Message Entity) to SGSN +(PS domain) / MSC (CS domain). The corresponding MAP service (defined in 3GPP +TS 29.002) is *MAP-MT-FORWARD-SHORT-MESSAGE*, described in section 12.9. + +_MT-forwardSM Result_ is triggered by _RP-ACK_ on the _SM-RL (Relay Layer)_. + === Information Elements [[gsup-ie-msgtype]] @@ -534,6 +657,12 @@ |0x20|Supplementary Service Request |0x21|Supplementary Service Error |0x22|Supplementary Service Result +|0x24|MO-forwardSM Request +|0x25|MO-forwardSM Error +|0x26|MO-forwardSM Result +|0x28|MT-forwardSM Request +|0x29|MT-forwardSM Error +|0x2a|MT-forwardSM Result |=== [[gsup-ie-ipaddr]] @@ -760,6 +889,11 @@ |0x30|Session ID|<> |0x31|Session State|<> |0x35|Supplementary Service Info|<> +|0x40|SM-RP-MR (Message Reference)|<> +|0x41|SM-RP-DA (Destination Address)|<> +|0x42|SM-RP-OA (Originating Address)|<> +|0x43|SM-RP-UI (SM TPDU)|<> +|0x44|SM-RP-Cause (RP Cause value)|<> |=== [[gsup-ie-empty]] @@ -952,3 +1086,94 @@ |0x02|CONTINUE|Used to continue an existing session |0x03|END|Used to terminate an existing session |=== + +[[gsup-ie-sm-rp-mr]] +==== SM-RP-MR (Message Reference) + +According to TS GSM 04.11, every single message on the _SM-RL (SM +Relay Layer)_ has an unique _message reference (see 8.2.3)_, that +is used to link an _RP-ACK_ or _RP-ERROR_ message to the associated +(preceding) _RP-DATA_ or _RP-SMMA_ message transfer attempt. + +In case of TCAP/MAP, this message reference is being mapped to the +_Invoke ID_. But since GSUP has no _Invoke ID IE_, and it is not +required for other applications (other than SMS), a special +<> is used to carry the message reference +value \'as-is' (i.e. in range 0 through 255). + +[[gsup-ie-sm-rp-da]] +==== SM-RP-DA (Destination Address) + +This IE represents the destination address used by the short message service +relay sub-layer protocol. It can be either of the following: + +* IMSI (see clause 7.6.2.1); +* LMSI (see clause 7.6.2.16, not implemented!); +* MSISDN (see clause 7.6.2.17); +* roaming number (see clause 7.6.2.19, not implemented!); +* service centre address (see clause 7.6.2.27). + +Coding of this IE is described in <>. +See 3GPP TS 29.002, section 7.6.8.1 for details. + +[[gsup-ie-sm-rp-oa]] +==== SM-RP-OA (Originating Address) + +This IE represents the originating address used by the short message service +relay sub-layer protocol. It can be either of the following: + +* MSISDN (see clause 7.6.2.17); +* service centre address (see clause 7.6.2.27). + +Coding of this IE is described in <>. +See 3GPP TS 29.002, section 7.6.8.2 for details. + +[[gsup-sm-rp-oda]] +==== Coding of SM-RP-DA / SM-RP-OA IEs + +Basically, both <> / <> IEs contain a single +nested TLV of the following format: + +.Coding of SM-RP-DA / SM-RP-OA IEs +[options="header",cols="5%,5%,10%,80%"] +|=== +|Field|Presence|Length|Description +|T|M|1|Identity type +|L|M|1|Identity length +|V|O|...|Encoded identity itself +|=== + +where the identity type can be one of the following: + +.Identity types of SM-RP-DA / SM-RP-OA IEs +[options="header",cols="15%,85%"] +|=== +|Type|Description +|0x00|Special value in libosmocore's API +|0x01|IMSI (see clause 7.6.2.1) +|0x02|MSISDN (see clause 7.6.2.17) +|0x03|Service centre address (see clause 7.6.2.27) +|0xff|Special (means omit) value for noSM-RP-DA and noSM-RP-OA +|=== + +[[gsup-ie-sm-rp-ui]] +==== SM-RP-UI (SM TPDU) + +This IE represents the user data field carried by the short message service +relay sub-layer (i.e. _SM-TL (Transfer Layer)_) protocol. In case of errors +(i.e. _MO-/MT-forwardSM Error_ messages), this IE may contain optional +diagnostic field payload from _RP-ERROR_ message. + +See 3GPP TS 29.002, section 7.6.8.4 for details. + +[[gsup-ie-sm-rp-cause]] +==== SM-RP-Cause (RP Cause value) + +According to TS GSM 04.11, _RP-Cause_ is a variable length element always +included in the _RP-ERROR_ message, conveying a negative result of an +_RP-DATA_ message transfer attempt or _RP-SMMA_ notification attempt. + +The mapping between error causes in TS GSM 04.11 and TS GSM 09.02 (MAP) +is specified in TS GSM 03.40. But since GSUP has no generic _User Error IE_, +and it is not required for other applications (other than SMS), a special +<> is used to carry the cause value \'as-is'. -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 20:28:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 20:28:36 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11837 Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... chapters/gsup.adoc: document READY-FOR-SM message Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/37/11837/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 7568fe2..237a4fd 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -627,6 +627,63 @@ _MT-forwardSM Result_ is triggered by _RP-ACK_ on the _SM-RL (Relay Layer)_. +==== READY-FOR-SM Request + +Direction: SGSN / MSC => ESME (through VLR and HLR) + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|45|SM Alert Reason|<>|M|TLV|1-... +|=== + +This message is used between the SGSN (PS domain) / MSC (CS domain) +and an ESME (External Short Message Entity) when a subscriber indicates +memory available situation (see TS GSM 04.11, section 7.3.2) using the +_RP-SMMA_ message. The corresponding MAP service (defined in 3GPP TS 29.002) +is *MAP-READY-FOR-SM*, described in section 12.4. + +==== READY-FOR-SM Error + +Direction: ESME / HLR / VLR => SGSN / MSC + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|44|SM-RP-Cause (Cause value)|<>|M|TLV|1 +|43|SM-RP-UI (diagnostic field)|<>|O|TLV|1-... +|=== + +This message is used to indicate a negative result of a _MO (Mobile Originated)_ +_SMMA (SM Memory Available)_ notification from SGSN (PS domain) / MSC (CS domain) +to an ESME (External Short Message Entity). Thus it triggers an _RP-ERROR_ on +the _SM-RL (Relay Layer)_ of SGSN (PS domain) / MSC (CS domain). The corresponding MAP +service (defined in 3GPP TS 29.002) is *MAP-READY-FOR-SM*, described in section 12.4. + +==== READY-FOR-SM Result + +Direction: ESME / HLR / VLR => SGSN / MSC + +[options="header",cols="5%,45%,20%,10%,10%,10%"] +|=== +|IEI|IE|Type|Presence|Format|Length +| |Message Type|<>|M|V|1 +|01|IMSI|<>|M|TLV|2-10 +|40|SM-RP-MR (Message Reference)|<>|M|TLV|1 +|=== + +This message is used to indicate a successful result of a _MO (Mobile Originated)_ +_SMMA (SM Memory Available)_ notification from SGSN (PS domain) / MSC (CS domain) +to an ESME (External Short Message Entity). Thus it triggers an _RP-ERROR_ on +the _SM-RL (Relay Layer)_ of SGSN (PS domain) / MSC (CS domain). The corresponding MAP +service (defined in 3GPP TS 29.002) is *MAP-READY-FOR-SM*, described in section 12.4. + === Information Elements [[gsup-ie-msgtype]] @@ -663,6 +720,9 @@ |0x28|MT-forwardSM Request |0x29|MT-forwardSM Error |0x2a|MT-forwardSM Result +|0x2c|READY-FOR-SM Request +|0x2d|READY-FOR-SM Error +|0x2e|READY-FOR-SM Result |=== [[gsup-ie-ipaddr]] @@ -894,6 +954,7 @@ |0x42|SM-RP-OA (Originating Address)|<> |0x43|SM-RP-UI (SM TPDU)|<> |0x44|SM-RP-Cause (RP Cause value)|<> +|0x45|SM Alert Reason|<> |=== [[gsup-ie-empty]] @@ -1177,3 +1238,19 @@ is specified in TS GSM 03.40. But since GSUP has no generic _User Error IE_, and it is not required for other applications (other than SMS), a special <> is used to carry the cause value \'as-is'. + +[[gsup-ie-sm-al-reas]] +==== SM Alert Reason + +According to 3GPP TS 29.002, section 7.6.8.8, Alert Reason is used to +indicate the reason why the service centre is alerted. It can take one +of the following values: + +.SM Alert Reason values +[options="header",cols="15%,85%"] +|=== +|Type|Description +|0x00|Special value in libosmocore's API +|0x01|MS present +|0x02|Memory Available +|=== -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 20:34:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 20:34:54 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11836 to look at the new patch set (#2). Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... chapters/gsup.adoc: document MO-/MT-forwardSM messages Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Related Change-Id: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related Change-Id: (TTCN) Ibf49474a81235096c032ea21f217170f523bd94e Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 225 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/36/11836/2 -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 20:34:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 19 Nov 2018 20:34:54 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... chapters/gsup.adoc: document READY-FOR-SM message Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Related Change-Id: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78 Related: OS#3587 --- M common/chapters/gsup.adoc 1 file changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/37/11837/2 -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 19 23:25:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 19 Nov 2018 23:25:12 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 2: Code-Review-1 (12 comments) I'm sorry to criticise as much as this. I started out wanting to just +2 straight away, but ended up finding numerous trivial tweaks that would greatly serve readability. The bottom line is, this is probably correct, but I am distracted by the writing style ;) https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 507 PS2, Line 507: ==== MO-forwardSM Request I'm slightly critical of the mix of dash and non-caps / CamelCase / acronym style. Why not just "MO Forward Short Message Request" -- that is easy to understand for the reader on first sight. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 509 PS2, Line 509: Direction: SGSN / MSC => ESME (through VLR and HLR) I'm curious why you name the SGSN first. So far I wasn't aware of our SGSN even able to send SMS. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 522 PS2, Line 522: This message is used to forward _MO (Mobile Originated)_ short messages would be nice to first say it in simple rather nontechnical terms and then add details. Like, "When a subscriber sends an SMS, this message forwards it to the ESME. [...]" https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 524 PS2, Line 524: Entity). The corresponding MAP service (defined in 3GPP TS 29.002) is We have a glossary of acronyms, maybe rather make sure they are in the glossary and abbreviate everywhere / choose to write them out everywhere. Naming both makes it harder to follow the sentence flow. Same goes for indicating "MS (CS domain) / SGSN (PS domain)" all the time, this is not the place to explain what PS and CS mean, so rather assume the reader knows these acronyms. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 525 PS2, Line 525: *MAP-MO-FORWARD-SHORT-MESSAGE*, described in section 12.2. rather give the spec reference once, complete, in the end "... (see 3GPP TS 29.002 section 12.2)" https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 528 PS2, Line 528: attempt and _RP-SMMA_ notification attempt on the _SM-RL (Relay Layer)_. "attempt" sounds like it fails. "request"? https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 532 PS2, Line 532: Direction: ESME (through VLR and HLR) => SGSN / MSC above it spells "MSC => ESME (through VLR and HLR)" -- maybe rather reverse it here? "ESME (through HLR and VLR) -> MSC"? https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 545 PS2, Line 545: short message delivery from SGSN (PS domain) / MSC (CS domain) to an ESME above it says ESME => MSC, in this sentence the direction is reversed? Copy-paste error? Or did you mean that the earlier message was in the other direction? To avoid the confusion, you could simply not name the direction again, just rely on the reader looking at the direction definition on top and knowing that an error response is for an earlier request in the other direction. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 546 PS2, Line 546: (External Short Message Entity). Thus it triggers an _RP-ERROR_ on the _SM-RL this is not the place to define what should happen in the implementation, is it? If at all, this could indicate "should usually trigger", but foremost, this explains the message definition, and the semantics are up to the implementation / explained elsewhere. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 1094 PS2, Line 1094: Relay Layer)_ has an unique _message reference (see 8.2.3)_, that Don't ask me why, but it is "a unique". I know the consonant vs vocal rule, but that is not as deterministic as one might think. There is also "an RSL procedure" because "R" is spoken "arr"... 8.2.3 in this document? then use a <> link. 8.2.3 in 04.11? then write the full '3GPP TS 04.11 section 8.2.3' out here, but rather not break the flow of the sentence with it. I'd not use italics at all. If they are "given names", capitalize. If already capitalized, italics are redundant. If you really must use italics, don't also use italics for '(see 8.2.3)'. (I used to use a lot of markup too in the past, but now my opinion is they are too much effort and rather than helping, they clutter up the reading flow.) https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 1110 PS2, Line 1110: * IMSI (see clause 7.6.2.1); clause 7.6.2.1 *where*? https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 1111 PS2, Line 1111: * LMSI (see clause 7.6.2.16, not implemented!); clarify "not implemented" -- this here should be a protocol definition: it is by definition implemented or not implemented by the *implementations* (libosmo-gsup-foo), this protocol definition cannot be "not implemented" by itself. -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 19 Nov 2018 23:25:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:14:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:14:07 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document READY-FOR-SM message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11837 ) Change subject: chapters/gsup.adoc: document READY-FOR-SM message ...................................................................... Patch Set 2: Code-Review-1 similar things as for the MO-forwardSM patch... -- To view, visit https://gerrit.osmocom.org/11837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I549b6c8840a1e86caac09e77fb8bc5042d939e62 Gerrit-Change-Number: 11837 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 00:14:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:16:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:16:33 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... Patch Set 6: I'd still prefer if (!quiet) fprintf(stderr, "message\n"); If you want to keep it this way then go ahead. -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 00:16:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:19:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:19:59 +0000 Subject: Change in osmo-msc[master]: msc: vty: Fix integer printf formatting In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11824 ) Change subject: msc: vty: Fix integer printf formatting ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae1c0b20a519ce71a21f72cea3c63694ef10adb4 Gerrit-Change-Number: 11824 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 00:19:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:30:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:30:21 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11789/1/src/gsm/gsm_utils.c File src/gsm/gsm_utils.c: https://gerrit.osmocom.org/#/c/11789/1/src/gsm/gsm_utils.c at 751 PS1, Line 751: /*! Resolve GSM band from ARFCN, aborts process on invalid ARFCN I know it comes from previous code, but in doxygen comments, the first summary line must be terminated with a '.' (otherwise the following sentence bleeds into the summary, since doxygen doesn't care about line feeds) (OTOH I'm not sure why we even bother with doxygen, OTOOH since doxygen is currently used let's use it correctly) https://gerrit.osmocom.org/#/c/11789/1/utils/osmo-arfcn.c File utils/osmo-arfcn.c: https://gerrit.osmocom.org/#/c/11789/1/utils/osmo-arfcn.c at 80 PS1, Line 80: fprintf(stderr, "ARFCN contains no valid band\n"); no return -EINVAL here? -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Tue, 20 Nov 2018 00:30:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:33:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:33:51 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Verify and warn on invalid arfcn passed In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11791 ) Change subject: bsc: vty: Verify and warn on invalid arfcn passed ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11791/4/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11791/4/src/osmo-bsc/bsc_vty.c at 3125 PS4, Line 3125: vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); normally we just use %u for uint*_t. I choked on that practice very early on when starting on Osmocom, but have not seen a single problem with that. -- To view, visit https://gerrit.osmocom.org/11791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib001501bf37289e824a1f72b62afde23892e88d2 Gerrit-Change-Number: 11791 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 00:33:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:36:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:36:09 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11571 ) Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... Patch Set 3: can't vote because this makes zero sense to me. Set the gain by setting chan = 0? what? -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 00:36:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:40:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:40:26 +0000 Subject: Change in osmo-bsc[master]: bsc: Enable force-combined-si on nanoBTS by default In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11834 ) Change subject: bsc: Enable force-combined-si on nanoBTS by default ...................................................................... Patch Set 1: Code-Review+2 (2 comments) https://gerrit.osmocom.org/#/c/11834/1/src/osmo-bsc/bts_ipaccess_nanobts.c File src/osmo-bsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/#/c/11834/1/src/osmo-bsc/bts_ipaccess_nanobts.c at 68 PS1, Line 68: problems on some MS if it is enabled, see OS#3063. Disable it by (comment style ... we usually have '*' on each line, right?) https://gerrit.osmocom.org/#/c/11834/1/src/osmo-bsc/bts_sysmobts.c File src/osmo-bsc/bts_sysmobts.c: https://gerrit.osmocom.org/#/c/11834/1/src/osmo-bsc/bts_sysmobts.c at 51 PS1, Line 51: /* Unlinke nanoBTS, sysmoBTS supports SI2bis and SI2ter fine */ Unlike -- To view, visit https://gerrit.osmocom.org/11834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d Gerrit-Change-Number: 11834 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 00:40:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:41:28 +0000 Subject: Change in osmo-bsc[master]: bsc: Prefix log string with related SI type during call to list_arfcn In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11828 ) Change subject: bsc: Prefix log string with related SI type during call to list_arfcn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie466abedce630ef0a8e7a8021383a1a612a0da8a Gerrit-Change-Number: 11828 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 00:41:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:42:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:42:12 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2bis L2 pseudo length In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11829 ) Change subject: bsc: si: Fix SI2bis L2 pseudo length ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I623c64c446c0973e939e9f1cba0a4d4d2f4f7237 Gerrit-Change-Number: 11829 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 00:42:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:42:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:42:47 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2ter L2 pseudo length In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11830 ) Change subject: bsc: si: Fix SI2ter L2 pseudo length ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45cb217ebdf89b82b0f37f38eef7a1e3a651f541 Gerrit-Change-Number: 11830 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 00:42:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:47:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:47:21 +0000 Subject: Change in osmo-bts[master]: bts-trx: setup timer once at creation time In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11766 ) Change subject: bts-trx: setup timer once at creation time ...................................................................... Patch Set 3: Code-Review+2 (2 comments) https://gerrit.osmocom.org/#/c/11766/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11766/3//COMMIT_MSG at 10 PS3, Line 10: to shecule it. to shackle it? ;) https://gerrit.osmocom.org/#/c/11766/3//COMMIT_MSG at 15 PS3, Line 15: I was first a bit confused, because the part of moving the alloc of the parent struct to a separate function wasn't mentioned in the commit log. -- To view, visit https://gerrit.osmocom.org/11766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 Gerrit-Change-Number: 11766 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 20 Nov 2018 00:47:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:49:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:49:52 +0000 Subject: Change in osmo-bts[master]: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11768 ) Change subject: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx ...................................................................... Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11768/3/src/osmo-bts-trx/trx_if.c File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/#/c/11768/3/src/osmo-bts-trx/trx_if.c at 440 PS3, Line 440: (one more blank line than usual) -- To view, visit https://gerrit.osmocom.org/11768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 Gerrit-Change-Number: 11768 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 00:49:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:54:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:54:27 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 792 PS1, Line 792: send_handover_performed(conn); > should we *always* send a handover performed, or only when the codec changed? IIUC the MSC need not [?] as I commented in https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/11733 with spec references, this current patch is correct. -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 00:54:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 00:57:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 00:57:57 +0000 Subject: Change in osmo-msc[master]: osmo_msc: remove unused parameter from msc_dtap() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11835 ) Change subject: osmo_msc: remove unused parameter from msc_dtap() ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11835/1/tests/msc_vlr/msc_vlr_tests.c File tests/msc_vlr/msc_vlr_tests.c: https://gerrit.osmocom.org/#/c/11835/1/tests/msc_vlr/msc_vlr_tests.c at a235 PS1, Line 235: lol -- To view, visit https://gerrit.osmocom.org/11835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da Gerrit-Change-Number: 11835 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 00:57:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:00:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:00:12 +0000 Subject: Change in osmo-msc[master]: osmo_msc: remove unused parameter from msc_dtap() In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2) to the change originally created by dexter. ( https://gerrit.osmocom.org/11835 ) Change subject: osmo_msc: remove unused parameter from msc_dtap() ...................................................................... osmo_msc: remove unused parameter from msc_dtap() The parameter link_id in the function msc_dtap() is unused. Lets remove it. Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface_bssap.c M src/libmsc/iucs.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_tests.c 5 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/11835/2 -- To view, visit https://gerrit.osmocom.org/11835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da Gerrit-Change-Number: 11835 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:00:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:00:35 +0000 Subject: Change in osmo-msc[master]: osmo_msc: remove unused parameter from msc_dtap() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11835 ) Change subject: osmo_msc: remove unused parameter from msc_dtap() ...................................................................... Patch Set 2: (I fixed the invocation from iucs.c) -- To view, visit https://gerrit.osmocom.org/11835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da Gerrit-Change-Number: 11835 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 01:00:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:33:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:33:34 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 4: (5 comments) https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/1/src/libosmo-mgcp/mgcp_protocol.c at 1573 PS1, Line 1573: > Fine, so it seems Harald has changed his mind, or I misunderstood when we talked months ago. [?] I like to use OSMO_ASSERT() on allocations, because if we cannot allocate a struct, how can we expect to allocate a string buffer / a gsmtap-logging packet /... to report that error in the first place? If we could not allocate, we are anyway shagged and might as well give up, no need to compose error message strings in the land of doom. That's what I thought. https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 111 PS4, Line 111: [MGCP_DLCX_FAIL_INVALID_CALLID] = {"dlcx:callid", "invalid CallId specified in DLCX command."}, reading the code below I think this is "DLCX error: specified CallId mismatches the endpoint's CallId" https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 112 PS4, Line 112: [MGCP_DLCX_FAIL_INVALID_CONNID] = {"dlcx:connid", "invalid connection ID specified in DLCX command."}, and this is "DLCX error: specified Connection ID does not exist on the endpoint" https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 116 PS4, Line 116: [MGCP_DLCX_FAIL_NO_RTP] = {"dlcx:no_rtp", "no rtp stream associated with connection."}, > I have checked this. [?] Almost, but you mixed up CallId with ConnId. CallId is just a number e.g. the MSC invented to identify this voice call. The ConnId is the CI hexstring that identifies one connection on an endpoint, and the ConnId is used to DLCX one conn of an endpoint. TLDR: this is related to ConnId. Ok, so below code, when reaching line 1371, has already found an endpoint with the given name. But then the ConnId passed in the DLCX cannot be found on that endpoint by mgcp_conn_get_rtp(). The same error should actually already hit in line 1305 below, where we use mgcp_verify_ci() to see that the ConnId is valid *and exists*. So I think we can drop FAIL_NO_RTP and use INVALID_CONNID instead. I still think in practice we would never hit the error at 1371. The only condition leading to hitting an error there would be conn->type != MGCP_CONN_TYPE_RTP. What conn types do we have besides RTP? enum mgcp_conn_type { MGCP_CONN_TYPE_RTP, }; ...as I suspected https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 1546 PS4, Line 1546: trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index); I'm sorry to say it, but, though the OSMO_ASSERT() discussion was a valid one to have, it was more or less displaced for rate_ctr_group_alloc() in particular, because that one returns NULL for name errors, and apparently no-one noticed that rather important trait before. But I see that other code around this also makes the same mistake of not checking the result of rate_ctr_group_alloc(), so I would agree to fix all of those *in a separate patch*: https://osmocom.org/issues/3701 -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 20 Nov 2018 01:33:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:37:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:37:03 +0000 Subject: Change in libosmocore[master]: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11833 ) Change subject: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK ...................................................................... Patch Set 1: Code-Review+2 add the comment if you like, I think it's readable enough by code -- To view, visit https://gerrit.osmocom.org/11833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Gerrit-Change-Number: 11833 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 01:37:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:39:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:39:17 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 3: Code-Review+1 this issue looks like it is growing a beard? Still waiting for relicensing approval? -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 20 Nov 2018 01:39:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:40:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:40:20 +0000 Subject: Change in osmo-dev[master]: gitignore: update src/ whitelist In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11759 ) Change subject: gitignore: update src/ whitelist ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I39ed2d4c16bbd31dea7aca95e7f5a04b87b374c2 Gerrit-Change-Number: 11759 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 01:40:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:40:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:40:25 +0000 Subject: Change in osmo-dev[master]: gitignore: update src/ whitelist In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11759 ) Change subject: gitignore: update src/ whitelist ...................................................................... gitignore: update src/ whitelist gits has replaced most shell scripts from src. Add gits and missing scripts. Change-Id: I39ed2d4c16bbd31dea7aca95e7f5a04b87b374c2 --- M .gitignore 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/.gitignore b/.gitignore index 1f4e0d8..c09c878 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,7 @@ *.pyc make-* src/* -!src/g -!src/e -!src/st -!src/s +!src/fetch-gerrit-patch.sh +!src/gits +!src/osmo-add-gerrit-hooks.sh !src/README -- To view, visit https://gerrit.osmocom.org/11759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I39ed2d4c16bbd31dea7aca95e7f5a04b87b374c2 Gerrit-Change-Number: 11759 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:41:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:41:29 +0000 Subject: Change in osmo-dev[master]: gitignore: add make/ and net/ (with exceptions) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11741 ) Change subject: gitignore: add make/ and net/ (with exceptions) ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 Gerrit-Change-Number: 11741 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 01:41:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:41:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:41:30 +0000 Subject: Change in osmo-dev[master]: gitignore: add make/ and net/ (with exceptions) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11741 ) Change subject: gitignore: add make/ and net/ (with exceptions) ...................................................................... gitignore: add make/ and net/ (with exceptions) Ignore all files and folders that get created when following the README and net/README instructions. Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 --- M .gitignore 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified diff --git a/.gitignore b/.gitignore index c09c878..b6d7fe7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,15 @@ tags *.pyc make-* +make/* src/* !src/fetch-gerrit-patch.sh !src/gits !src/osmo-add-gerrit-hooks.sh !src/README +net/* +!net/tmpl_* +!net/config_2g3g +!net/common_* +!net/README +!net/fill_config.py -- To view, visit https://gerrit.osmocom.org/11741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I62277f973cc8f1ee61c5244c9d8cc75775c7cfd9 Gerrit-Change-Number: 11741 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:44:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:44:17 +0000 Subject: Change in osmo-msc[master]: move project specific manuals to their own repos In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11726 ) Change subject: move project specific manuals to their own repos ...................................................................... Patch Set 2: Code-Review-1 (1 comment) looks mint except for myscript.sh https://gerrit.osmocom.org/#/c/11726/2/myscript.sh File myscript.sh: https://gerrit.osmocom.org/#/c/11726/2/myscript.sh at 1 PS2, Line 1: echo "hello world" wtf? -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 20 Nov 2018 01:44:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:46:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:46:49 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add shared content pdf build tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11795 ) Change subject: tests: add shared content pdf build tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf Gerrit-Change-Number: 11795 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 01:46:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:47:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:47:48 +0000 Subject: Change in osmo-gsm-manuals[master]: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11796 ) Change subject: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab Gerrit-Change-Number: 11796 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 01:47:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:52:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:52:45 +0000 Subject: Change in osmo-gsm-manuals[master]: *filter.conf/*.sty: use symlinks to build, common In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11798 ) Change subject: *filter.conf/*.sty: use symlinks to build, common ...................................................................... Patch Set 1: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/11798/1/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/11798/1/build/Makefile.asciidoc.inc at 56 PS1, Line 56: build common I can't seem to find the definitions of the 'build' and 'common' targets ... ? https://gerrit.osmocom.org/#/c/11798/1/build/Makefile.common.inc File build/Makefile.common.inc: https://gerrit.osmocom.org/#/c/11798/1/build/Makefile.common.inc at 13 PS1, Line 13: ln -s $(OSMO_GSM_MANUALS_DIR)/$@ $@ ah here. ok, removing code dup, but in this case with only two symlinks maybe writing it out would be more readable. I mean, I didn't easily find the target definitions, was expecting a 'build:' somewhere... (but this is not important) https://gerrit.osmocom.org/#/c/11798/1/build/custom-dblatex.sty File build/custom-dblatex.sty: https://gerrit.osmocom.org/#/c/11798/1/build/custom-dblatex.sty at 3 PS1, Line 3: %% The "common" folder is symlinked to ./common when building. heh, sounds like ln -s ./common common I have never tried that, will this break my file system by infinite loop? -- To view, visit https://gerrit.osmocom.org/11798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 Gerrit-Change-Number: 11798 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 01:52:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:53:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:53:21 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: include from ./common, not ../common In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11799 ) Change subject: *.adoc: include from ./common, not ../common ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 Gerrit-Change-Number: 11799 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 01:53:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:53:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:53:49 +0000 Subject: Change in osmo-gsm-manuals[master]: *-vty-reference.xml: use ./common, not ../common In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11800 ) Change subject: *-vty-reference.xml: use ./common, not ../common ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5368bcff34586c515af23e5a868417e561fd539d Gerrit-Change-Number: 11800 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 01:53:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:56:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:56:17 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir) ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11802/1/OsmoBSC/Makefile.am File OsmoBSC/Makefile.am: https://gerrit.osmocom.org/#/c/11802/1/OsmoBSC/Makefile.am at 1 PS1, Line 1: OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) so, this is a default? or are the individiual osmo-foo.gits actually cloned inside the osmo-gsm-manuals dir? I was expecting more like $(srcdir)/../osmo-gsm-manuals/, i.e. the osmo-gsm-manuals.git cloned next to all the other clones? -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 01:56:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 01:57:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 01:57:59 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11801 ) Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 01:57:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:14:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:14:15 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Patch Set 1: Code-Review-1 (3 comments) (this is a -0.5) https://gerrit.osmocom.org/#/c/11803/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11803/1//COMMIT_MSG at 18 PS1, Line 18: the xstl parser, as well as the LaTeX compiler, so they can find the is that the "TEXINPUTS" bit? https://gerrit.osmocom.org/#/c/11803/1/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/11803/1/build/Makefile.asciidoc.inc at 60 PS1, Line 60: [ -f $(notdir $<) ] || ln -s $< $(notdir $<) if you keep using this '[ ... ] ||' syntax you might run into the danger of me getting used to it and not complaining about it anymore. Isn't 'if [ condition ]; then ... fi' much more readable? ok, wait, I don't get what this is doing at all. '$<' ... the input file, so the .adoc file? and '$(notdir)'?? ah, essentially notdir == basename. so this creates a symlink where, in the $builddir, pointing at the $srcdir? this took long enough to warrant a comment: # Create a symlink at $(builddir)/srcfile.adoc pointing at $(srcdir)/srcfile.adoc. # $< is the $(srcdir)/srcfile.adoc, $(notdir) is like basename, and $PWD is the $(builddir). https://gerrit.osmocom.org/#/c/11803/1/build/Makefile.asciidoc.inc at 66 PS1, Line 66: TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ add comment: "pass TEXINPUTS to help a2x find [...]" (insert files to find) -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 02:14:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:15:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:15:24 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: use {srcdir} for out-of-tree builds In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11804 ) Change subject: *.adoc: use {srcdir} for out-of-tree builds ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a Gerrit-Change-Number: 11804 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 02:15:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:19:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:19:38 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: publish from project repos, not this repo anymore ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11740/2/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11740/2/contrib/jenkins.sh at 9 PS2, Line 9: echo "" why the <...> braces though? Are you planning on adding info to that wiki page? so far it doesn't have anything about publishing, except some half-hearted dependency list. In fact, I think the place that explained how to publish so far was the osmo-gsm-manuals/README .. or INSTALL.txt. Maybe link there instead, also from the wiki page, and fully explain there? -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 02:19:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:21:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:21:07 +0000 Subject: Change in osmo-gsm-manuals[master]: remove project specific files In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: remove project specific files ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11738/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11738/5//COMMIT_MSG at 12 PS5, Line 12: is reviewed) "once msc is reviewed"? -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 02:21:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:22:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:22:52 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11806 ) Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... Patch Set 2: I kind of imagined that I just place osmo-gsm-manuals.git next to the other osmo-* clones, and they look it up from there, no need to 'make install' or use pkgconfig or anything? -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 02:22:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:25:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:25:04 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11806 ) Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... Patch Set 2: I mean ../osmo-gsm-manuals/ by default, and reconfigurable by --with-osmo-gsm-manuals=~/ogm. Maybe if --with-osmo-gsm-manuals=path is passed use that, if not try pkgconfig first, if that fails try ../osmo-gsm-manuals? -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 02:25:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:26:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:26:56 +0000 Subject: Change in osmo-gsm-manuals[master]: copy NITB's osmobsc-usermanual.adoc to OsmoBSC In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11805 ) Change subject: copy NITB's osmobsc-usermanual.adoc to OsmoBSC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad Gerrit-Change-Number: 11805 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 02:26:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:29:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:29:06 +0000 Subject: Change in osmo-gsm-manuals[master]: make check: properly reference dependencies In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11794 ) Change subject: make check: properly reference dependencies ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11794/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11794/1//COMMIT_MSG at 13 PS1, Line 13: This allows creating a tests folder without its own chapters subfolder > Oh you are right: https://superuser.com/questions/169457/directory-vs-folder. [?] maybe because windows file systems "fold over" if you don't defrag them? ... but I've found myself writing "folder" when talking to less techy people -- To view, visit https://gerrit.osmocom.org/11794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 Gerrit-Change-Number: 11794 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 02:29:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:30:03 +0000 Subject: Change in osmo-gsm-manuals[master]: prepare for autotools: add git-version-gen In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11797 ) Change subject: prepare for autotools: add git-version-gen ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 Gerrit-Change-Number: 11797 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 02:30:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 02:32:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 02:32:26 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11725 ) Change subject: use autotools to add "make install" target ...................................................................... Patch Set 5: Code-Review+1 would +2 but you wrote you'd still update check-depends.sh for make distcheck... -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 02:32:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 08:58:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 08:58:51 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11703 to look at the new patch set (#4). Change subject: LCLS: add 48.008 parameter structure ...................................................................... LCLS: add 48.008 parameter structure It's convenient to hold all LCLS-related parameters from 3GPP TS 48.008 in a single structure. This will be used in follow-up patch handling Assignment Request with extended parameters as well as corresponding BSC code working with LCLS. Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Related: OS#2487 --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/11703/4 -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 08:59:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 08:59:28 +0000 Subject: Change in osmocom-bb[master]: mobile: fix vty bind ip override In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11457 ) Change subject: mobile: fix vty bind ip override ...................................................................... mobile: fix vty bind ip override Previously the vty bind config parameter was always ignored. Fix this by using proper default value from the config unless it's explicitly set via command-line parameter. Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa --- M src/host/layer23/src/mobile/main.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 115ac41..297a534 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -51,7 +52,7 @@ static char *gsmtap_ip = 0; static const char *custom_cfg_file = NULL; struct gsmtap_inst *gsmtap_inst = NULL; -static char *vty_ip = "127.0.0.1"; +static char *vty_ip = NULL; unsigned short vty_port = 4247; char *config_dir = NULL; int use_mncc_sock = 0; @@ -90,7 +91,7 @@ printf(" -u --vty-ip The VTY IP to telnet to. " "(default %s)\n", vty_ip); printf(" -v --vty-port The VTY port number to telnet to. " - "(default %u)\n", vty_port); + "(default %s)\n", vty_get_bind_addr()); printf(" -d --debug Change debug flags. default: %s\n", debug_default); printf(" -D --daemonize Run as daemon\n"); @@ -248,7 +249,7 @@ config_dir = dirname(config_dir); if (use_mncc_sock) - rc = l23_app_init(mncc_recv_socket, config_file, vty_ip, vty_port); + rc = l23_app_init(mncc_recv_socket, config_file, vty_ip ? vty_ip : vty_get_bind_addr(), vty_port); else rc = l23_app_init(NULL, config_file, vty_ip, vty_port); if (rc) -- To view, visit https://gerrit.osmocom.org/11457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa Gerrit-Change-Number: 11457 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:10:03 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 09:10:03 +0000 Subject: Change in libosmocore[master]: port arfcn range encode support from osmo-bsc In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/10185 ) Change subject: port arfcn range encode support from osmo-bsc ...................................................................... Patch Set 3: > Patch Set 3: Code-Review+1 > > this issue looks like it is growing a beard? Still waiting for relicensing approval? Indeed. Still waiting for a written statement by Jolly. -- To view, visit https://gerrit.osmocom.org/10185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia220764fba451be5e975ae7c5eefb1a25ac2bf2c Gerrit-Change-Number: 10185 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Tue, 20 Nov 2018 09:10:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:21:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:21:16 +0000 Subject: Change in osmo-msc[master]: msc: vty: Fix integer printf formatting In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11824 ) Change subject: msc: vty: Fix integer printf formatting ...................................................................... msc: vty: Fix integer printf formatting | ../../../git/src/libmsc/msc_vty.c:1202:44: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'uint64_t {aka long long unsigned int}' [-Wformat=] | vty_out(vty, "Location Update : %lu attach, %lu normal, %lu periodic%s", | ^ Change-Id: Iae1c0b20a519ce71a21f72cea3c63694ef10adb4 --- M src/libmsc/msc_vty.c 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 840559a..cdf3184 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1199,42 +1199,42 @@ "show statistics", SHOW_STR "Display network statistics\n") { - vty_out(vty, "Location Update : %lu attach, %lu normal, %lu periodic%s", + vty_out(vty, "Location Update : %" PRIu64 " attach, %" PRIu64 " normal, %" PRIu64 " periodic%s", gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_ATTACH].current, gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_NORMAL].current, gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_PERIODIC].current, VTY_NEWLINE); - vty_out(vty, "IMSI Detach Indications : %lu%s", + vty_out(vty, "IMSI Detach Indications : %" PRIu64 "%s", gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_TYPE_DETACH].current, VTY_NEWLINE); - vty_out(vty, "Location Updating Results: %lu completed, %lu failed%s", + vty_out(vty, "Location Updating Results: %" PRIu64 " completed, %" PRIu64 " failed%s", gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_COMPLETED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_LOC_UPDATE_FAILED].current, VTY_NEWLINE); - vty_out(vty, "SMS MO : %lu submitted, %lu no receiver%s", + vty_out(vty, "SMS MO : %" PRIu64 " submitted, %" PRIu64 " no receiver%s", gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_SUBMITTED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_NO_RECEIVER].current, VTY_NEWLINE); - vty_out(vty, "SMS MT : %lu delivered, %lu no memory, %lu other error%s", + vty_out(vty, "SMS MT : %" PRIu64 " delivered, %" PRIu64 " no memory, %" PRIu64 " other error%s", gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_DELIVERED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_RP_ERR_MEM].current, gsmnet->msc_ctrs->ctr[MSC_CTR_SMS_RP_ERR_OTHER].current, VTY_NEWLINE); - vty_out(vty, "MO Calls : %lu setup, %lu connect ack%s", + vty_out(vty, "MO Calls : %" PRIu64 " setup, %" PRIu64 " connect ack%s", gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MO_SETUP].current, gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MO_CONNECT_ACK].current, VTY_NEWLINE); - vty_out(vty, "MT Calls : %lu setup, %lu connect%s", + vty_out(vty, "MT Calls : %" PRIu64 " setup, %" PRIu64 " connect%s", gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MT_SETUP].current, gsmnet->msc_ctrs->ctr[MSC_CTR_CALL_MT_CONNECT].current, VTY_NEWLINE); - vty_out(vty, "MO NC SS/USSD : %lu requests, %lu established, %lu rejected%s", + vty_out(vty, "MO NC SS/USSD : %" PRIu64 " requests, %" PRIu64 " established, %" PRIu64 " rejected%s", gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_REQUESTS].current, gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_ESTABLISHED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_REQUESTS].current - gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_ESTABLISHED].current, VTY_NEWLINE); - vty_out(vty, "MT NC SS/USSD : %lu requests, %lu established, %lu rejected%s", + vty_out(vty, "MT NC SS/USSD : %" PRIu64 " requests, %" PRIu64 " established, %" PRIu64 " rejected%s", gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MT_REQUESTS].current, gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MT_ESTABLISHED].current, gsmnet->msc_ctrs->ctr[MSC_CTR_NC_SS_MT_REQUESTS].current -- To view, visit https://gerrit.osmocom.org/11824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iae1c0b20a519ce71a21f72cea3c63694ef10adb4 Gerrit-Change-Number: 11824 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:24:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:24:18 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Verify and warn on invalid arfcn passed In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11791 ) Change subject: bsc: vty: Verify and warn on invalid arfcn passed ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11791/4/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11791/4/src/osmo-bsc/bsc_vty.c at 3125 PS4, Line 3125: vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); > normally we just use %u for uint*_t. [?] Depending on compiler and architecture that's for sure a problem, I got several compiler warnings and saw real side effects of this kind of stuff. %u is for unsigned int, that's it. -- To view, visit https://gerrit.osmocom.org/11791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib001501bf37289e824a1f72b62afde23892e88d2 Gerrit-Change-Number: 11791 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 09:24:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:24:58 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 09:24:58 +0000 Subject: Change in osmo-msc[master]: move project specific manuals to their own repos In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11726 ) Change subject: move project specific manuals to their own repos ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11726/2/myscript.sh File myscript.sh: https://gerrit.osmocom.org/#/c/11726/2/myscript.sh at 1 PS2, Line 1: echo "hello world" > wtf? I am sure this was very important for debugging stuff, although I can't remember the details :p - will remove that in the next patch. -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 20 Nov 2018 09:24:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:27:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 09:27:25 +0000 Subject: Change in osmo-sgsn[master]: Fix IMSI padding in imsi-acl Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11838 Change subject: Fix IMSI padding in imsi-acl ...................................................................... Fix IMSI padding in imsi-acl In I73fd54ad3a4ab8be5aff0fee5c722597ad766e9d incorrect fix was added which only initialize first element of array. Fix this by using explicit index to initialize entire array. Change-Id: I26e4aa44f159d1b5b91dda4a586fd4e809711245 --- M src/gprs/sgsn_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/38/11838/1 diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c index 601b3c5..f570b83 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/gprs/sgsn_vty.c @@ -634,7 +634,7 @@ "Remove IMSI from ACL\n" "IMSI of subscriber\n") { - char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS + 1] = { '0' }; + char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS + 1] = { [0 ... GSM23003_IMSI_MAX_DIGITS] = '0' }; const char *op = argv[0]; const char *imsi = imsi_sanitized; size_t len = strnlen(argv[1], GSM23003_IMSI_MAX_DIGITS + 1); -- To view, visit https://gerrit.osmocom.org/11838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I26e4aa44f159d1b5b91dda4a586fd4e809711245 Gerrit-Change-Number: 11838 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:29:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:29:47 +0000 Subject: Change in osmo-bsc[master]: bsc: Enable force-combined-si on nanoBTS by default In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11834 to look at the new patch set (#2). Change subject: bsc: Enable force-combined-si on nanoBTS by default ...................................................................... bsc: Enable force-combined-si on nanoBTS by default Some nanoBTS firmwares (if not all) are known to not work properly with SI2ter. If BSC enables SI2ter through RSL, SI3 bit announcing SI2ter available will be forwarded by nanoBTS to MS, but will still only send SI2 message instead of expected SI2ter during TC=5 (see GSM 05.02 sec 6.3.4 "Mapping of BCCH data"). As a result, some MS won't allow registering to the network. To avoid this kind of scenario, enable force-combined-si by default on nanoBTS while still allowing to overwrite the feature through VTY. Other BTS models are kept with force-combined-si disabled by default as usually, since they seems to be working fine when SI2ter is enabled. Related: OS#3063 Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/system_information.c 7 files changed, 19 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/11834/2 -- To view, visit https://gerrit.osmocom.org/11834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d Gerrit-Change-Number: 11834 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:31:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:31:27 +0000 Subject: Change in osmo-bsc[master]: bsc: Prefix log string with related SI type during call to list_arfcn In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11828 ) Change subject: bsc: Prefix log string with related SI type during call to list_arfcn ...................................................................... bsc: Prefix log string with related SI type during call to list_arfcn SI2 and SI5 "same band" strings already contain the prefix. Change-Id: Ie466abedce630ef0a8e7a8021383a1a612a0da8a --- M src/osmo-bsc/system_information.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 2104e92..086b8e9 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -773,7 +773,7 @@ if (rc < 0) return rc; n = list_arfcn(si2b->bcch_frequency_list, 0xce, - "Neighbour cells in same band, but outside P-GSM:"); + "SI2bis Neighbour cells in same band, but outside P-GSM:"); if (n) { /* indicate in SI2 and SI2bis: there is an extension */ struct gsm48_system_information_type_2 *si2 = @@ -811,7 +811,7 @@ if (rc < 0) return rc; n = list_arfcn(si2t->ext_bcch_frequency_list, 0x8e, - "Neighbour cells in different band:"); + "SI2ter Neighbour cells in different band:"); if (!n) bts->si_valid &= ~(1 << SYSINFO_TYPE_2ter); @@ -1046,7 +1046,7 @@ if (rc < 0) return rc; n = list_arfcn(si5b->bcch_frequency_list, 0xce, - "Neighbour cells in same band, but outside P-GSM:"); + "SI5bis Neighbour cells in same band, but outside P-GSM:"); if (n) { /* indicate in SI5 and SI5bis: there is an extension */ struct gsm48_system_information_type_5 *si5 = @@ -1090,7 +1090,7 @@ if (rc < 0) return rc; n = list_arfcn(si5t->bcch_frequency_list, 0x8e, - "Neighbour cells in different band:"); + "SI5ter Neighbour cells in different band:"); if (!n) bts->si_valid &= ~(1 << SYSINFO_TYPE_5ter); -- To view, visit https://gerrit.osmocom.org/11828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie466abedce630ef0a8e7a8021383a1a612a0da8a Gerrit-Change-Number: 11828 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:31:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:31:27 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2bis L2 pseudo length In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11829 ) Change subject: bsc: si: Fix SI2bis L2 pseudo length ...................................................................... bsc: si: Fix SI2bis L2 pseudo length 3GPP TS 04.08 V7.21.0, section "9.1.33 System information type 2bis" states: "This message has a L2 pseudo length of 21.". Change-Id: I623c64c446c0973e939e9f1cba0a4d4d2f4f7237 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 086b8e9..18c609b 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -764,7 +764,7 @@ memset(si2b, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); - si2b->header.l2_plen = GSM48_LEN2PLEN(22); + si2b->header.l2_plen = GSM48_LEN2PLEN(21); si2b->header.rr_protocol_discriminator = GSM48_PDISC_RR; si2b->header.skip_indicator = 0; si2b->header.system_information = GSM48_MT_RR_SYSINFO_2bis; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 9424167..0c6df7a 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -213,7 +213,7 @@ BTS allocation OK in test_si_ba_ind() Testing if BA-IND is set as expected in SI2xxx and SI5xxx SI2: 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 -SI2bis: 59 06 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 2b +SI2bis: 55 06 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 2b SI2ter: 59 06 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2b 2b 2b 2b SI5: 06 1d 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 SI5bis: 06 05 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -- To view, visit https://gerrit.osmocom.org/11829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I623c64c446c0973e939e9f1cba0a4d4d2f4f7237 Gerrit-Change-Number: 11829 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:31:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:31:28 +0000 Subject: Change in osmo-bsc[master]: bsc: si: Fix SI2ter L2 pseudo length In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11830 ) Change subject: bsc: si: Fix SI2ter L2 pseudo length ...................................................................... bsc: si: Fix SI2ter L2 pseudo length 3GPP TS 04.08 V7.21.0, section "9.1.34 System information type 2ter" states: """ This message has a L2 pseudo length of 18. This message may be sent by the network with either a L2 pseudo length of 18 or some other value. A mobile station that does not ignore this message shall not discard the message due to a received L2 pseudo length different from 18. """ Change-Id: I45cb217ebdf89b82b0f37f38eef7a1e3a651f541 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 18c609b..0148ac3 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -802,7 +802,7 @@ memset(si2t, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); - si2t->header.l2_plen = GSM48_LEN2PLEN(22); + si2t->header.l2_plen = GSM48_LEN2PLEN(18); si2t->header.rr_protocol_discriminator = GSM48_PDISC_RR; si2t->header.skip_indicator = 0; si2t->header.system_information = GSM48_MT_RR_SYSINFO_2ter; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 0c6df7a..b083f08 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -214,7 +214,7 @@ Testing if BA-IND is set as expected in SI2xxx and SI5xxx SI2: 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 SI2bis: 55 06 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 2b -SI2ter: 59 06 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2b 2b 2b 2b +SI2ter: 49 06 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2b 2b 2b 2b SI5: 06 1d 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 SI5bis: 06 05 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 SI5ter: 06 06 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -- To view, visit https://gerrit.osmocom.org/11830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I45cb217ebdf89b82b0f37f38eef7a1e3a651f541 Gerrit-Change-Number: 11830 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:31:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 09:31:52 +0000 Subject: Change in osmo-dev[master]: gits: use @{u} to get upstream branch, not origin/%s In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11756 ) Change subject: gits: use @{u} to get upstream branch, not origin/%s ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 Gerrit-Change-Number: 11756 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 09:31:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:33:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 09:33:01 +0000 Subject: Change in osmo-sgsn[master]: Fix IMSI padding in imsi-acl In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11838 ) Change subject: Fix IMSI padding in imsi-acl ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I26e4aa44f159d1b5b91dda4a586fd4e809711245 Gerrit-Change-Number: 11838 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 20 Nov 2018 09:33:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:34:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 09:34:13 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 4: (4 comments) https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 111 PS4, Line 111: [MGCP_DLCX_FAIL_INVALID_CALLID] = {"dlcx:callid", "invalid CallId specified in DLCX command."}, > reading the code below I think this is "DLCX error: specified CallId mismatches the endpoint's CallI [?] Changed string in next patch set. https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 112 PS4, Line 112: [MGCP_DLCX_FAIL_INVALID_CONNID] = {"dlcx:connid", "invalid connection ID specified in DLCX command."}, > and this is "DLCX error: specified Connection ID does not exist on the endpoint" Changed string in next patch set. https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 116 PS4, Line 116: [MGCP_DLCX_FAIL_NO_RTP] = {"dlcx:no_rtp", "no rtp stream associated with connection."}, > Almost, but you mixed up CallId with ConnId. CallId is just a number e.g. [?] We can still write this code as if more than one conn type existed, though. That won't hurt. I have dropped FAIL_NO_RTP from the next patch set, it will use FAIL_INVALID_CONNID instead. https://gerrit.osmocom.org/#/c/11521/4/src/libosmo-mgcp/mgcp_protocol.c at 1546 PS4, Line 1546: trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index); > I'm sorry to say it, but, though the OSMO_ASSERT() discussion was a valid one to have, it was more o [?] Yes, let's treat this as a separate problem. -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 20 Nov 2018 09:34:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:34:19 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 09:34:19 +0000 Subject: Change in osmo-dev[master]: gits: remove code dup: ask_reset_hard() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11757 ) Change subject: gits: remove code dup: ask_reset_hard() ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11757/4/src/gits File src/gits: https://gerrit.osmocom.org/#/c/11757/4/src/gits at 284 PS4, Line 284: unrelated empty line added -- To view, visit https://gerrit.osmocom.org/11757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a Gerrit-Change-Number: 11757 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 09:34:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:34:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 09:34:57 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Hello dexter, Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11521 to look at the new patch set (#5). Change subject: add DLCX command statistics to osmo-mgw ...................................................................... add DLCX command statistics to osmo-mgw Add a counter group for DLCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of DLCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters' While here, rename MGCP_MDCX_FAIL_DEFERRED_BY_POLICY to MGCP_MDCX_DEFERRED_BY_POLICY; we have decided that deferred connections aren't failures, and this keeps names used by DLCX and MDCX in sync. Also remove some allocation failure checks with OSMO_ASSERT(); such checks aren't en vogue anymore. Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Depends: I80d36181600901ae2e0f321dc02b5d54ddc94139I Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 66 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/21/11521/5 -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:35:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 09:35:03 +0000 Subject: Change in osmo-dev[master]: gits: when asking for reset --hard, also offer push -f In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11758 ) Change subject: gits: when asking for reset --hard, also offer push -f ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 Gerrit-Change-Number: 11758 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 09:35:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:36:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:36:40 +0000 Subject: Change in osmo-bts[master]: bts-trx: setup timer once at creation time In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11766 ) Change subject: bts-trx: setup timer once at creation time ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11766/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11766/3//COMMIT_MSG at 15 PS3, Line 15: > I was first a bit confused, because the part of moving the alloc of the parent struct to a separate [?] Unfortunately, gerrit orders the list of files changed in a way that makes it difficult to understand the different parts, if you look at them in reverse order it's a lot easier to follow. I had to add new alloc/init functions to be able to set parameters in a way without coupling code and exposing stuff from different modules. -- To view, visit https://gerrit.osmocom.org/11766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 Gerrit-Change-Number: 11766 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 20 Nov 2018 09:36:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:38:55 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 09:38:55 +0000 Subject: Change in libosmocore[master]: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11833 ) Change subject: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK ...................................................................... send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In gprs_ns_process_msg(), we were dispatching the S_NS_UNBLOCK signal before sending out the NS_POUT_UNBLOCK_ACK message. Signal handlers might send messages to the other side, assuming that NS is now unblocked. However, since such messages will arrive before the UNBLOCK_ACK message the receiver might discard them. This problem has been observed with our TTCN3 BSSGP_Emulation as a peer to osmo-pcu. This patch makes TTCN3 PCU TC_paging() test pass regardless of whether the test or osmo-pcu is started first. Before this patch, this test would only pass if the test was started before osmo-pcu. A remaining problem is that the test does not yet keep passing reliably unless osmo-pcu is restarted between test runs. Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Related: OS#2890 Related: OS#2388 --- M src/gb/gprs_ns.c M tests/gb/gprs_ns_test.ok 2 files changed, 8 insertions(+), 6 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 198ead1..0780f2b 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1413,8 +1413,10 @@ /* Section 7.2: unblocking procedure */ LOGP(DNS, LOGL_INFO, "NSEI=%u Rx NS UNBLOCK\n", (*nsvc)->nsei); ns_mark_unblocked(*nsvc); - ns_osmo_signal_dispatch(*nsvc, S_NS_UNBLOCK, 0); rc = gprs_ns_tx_simple(*nsvc, NS_PDUT_UNBLOCK_ACK); + if (rc < 0) + break; + ns_osmo_signal_dispatch(*nsvc, S_NS_UNBLOCK, 0); break; case NS_PDUT_UNBLOCK_ACK: LOGP(DNS, LOGL_INFO, "NSEI=%u Rx NS UNBLOCK ACK\n", (*nsvc)->nsei); diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 669e182..3cb1dfc 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -133,10 +133,10 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1122/1.2.3.4:1111 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1122/1.2.3.4:1111 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -277,10 +277,10 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -318,10 +318,10 @@ PROCESSING UNBLOCK from 0x01020304:2222 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -421,10 +421,10 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -597,10 +597,10 @@ PROCESSING UNBLOCK from 0x01020304:2222 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:2222 MESSAGE to BSS, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:2222 result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 -- To view, visit https://gerrit.osmocom.org/11833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Gerrit-Change-Number: 11833 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:41:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:41:47 +0000 Subject: Change in osmo-bts[master]: bts-trx: setup timer once at creation time In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11766 to look at the new patch set (#4). Change subject: bts-trx: setup timer once at creation time ...................................................................... bts-trx: setup timer once at creation time The setup is only needed once, so no need to set it every time we want to schedule it. Furthermore, it will ease new code introduced in follow-up patches, which will schedule this timer under some circumstances without need to send a message at the same time (because re-try of a cmd after a delay is wanted). This commit adds an alloc function and an init function to keep different parts of the code decoupled and avoid exposing more implementation details between them (like exposing the trx_if timer). Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 5 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/11766/4 -- To view, visit https://gerrit.osmocom.org/11766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 Gerrit-Change-Number: 11766 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:41:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:41:47 +0000 Subject: Change in osmo-bts[master]: common: Implement OML for trx_set_available(1) In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11767 to look at the new patch set (#4). Change subject: common: Implement OML for trx_set_available(1) ...................................................................... common: Implement OML for trx_set_available(1) Related: OS#3692 Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a --- M src/common/bts.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/11767/4 -- To view, visit https://gerrit.osmocom.org/11767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a Gerrit-Change-Number: 11767 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:41:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:41:47 +0000 Subject: Change in osmo-bts[master]: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11768 to look at the new patch set (#4). Change subject: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx ...................................................................... bts-trx: Allow re-try without exit if POWERON fails in osmo-trx If POWERON fails, announce to BSC that the TRX is not available, and announce it as available as soon as POWERON success is received. Related: OS#3692 Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 44 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/11768/4 -- To view, visit https://gerrit.osmocom.org/11768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 Gerrit-Change-Number: 11768 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:45:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 20 Nov 2018 09:45:36 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 2: (9 comments) https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 507 PS2, Line 507: ==== MO-forwardSM Request > I'm slightly critical of the mix of dash and non-caps / CamelCase / acronym style. [?] Well, this mix is not my invention. I am also not a big fun of such style. But exactly this form is used in the MAP specifications and Wireshark. Anyway, I will think about changing to "MO Forward Short Message Request". https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 509 PS2, Line 509: Direction: SGSN / MSC => ESME (through VLR and HLR) > I'm curious why you name the SGSN first. So far I wasn't aware of our SGSN even able to send SMS. It isn't able yet, but there should be an issue about that. I will change the order despite I don't think it's important. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 522 PS2, Line 522: This message is used to forward _MO (Mobile Originated)_ short messages Actually, there is some magic happening between "When a subscriber sends an SMS" and MSC / SGSN "forwards it to the ESME", so I could not just omit this part (SMC, SMR state machines) without a proper explanation. > Direction: SGSN / MSC => ESME (through VLR and HLR) This line clearly defines the scope - we are at the MSC / SGSN level, and we deal with MO/MT SMS messages. I don't think "MO/MT" is too technical to understand, moreover I believe everyone in the mobile telecom area should know what it means. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 524 PS2, Line 524: Entity). The corresponding MAP service (defined in 3GPP TS 29.002) is > We have a glossary of acronyms, maybe rather make sure they are in the glossary and abbreviate every [?] Thanks, I'll check out the glossary of acronyms. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 525 PS2, Line 525: *MAP-MO-FORWARD-SHORT-MESSAGE*, described in section 12.2. > rather give the spec reference once, complete, in the end "... (see 3GPP TS 29.002 section 12. [?] Thanks, I'll correct this part. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 528 PS2, Line 528: attempt and _RP-SMMA_ notification attempt on the _SM-RL (Relay Layer)_. > "attempt" sounds like it fails This word was taken exactly from the GSM 04.11 specs. Probably, I will change to "request", but I also don't think this is critical. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 532 PS2, Line 532: Direction: ESME (through VLR and HLR) => SGSN / MSC > above it spells "MSC => ESME (through VLR and HLR)" -- maybe rather reverse it here? "ESME (through [?] No need to reverse, this is correct. - Request is sent from MSC / SGSN to ESME, - Result / Error is sent back from ESME. Message flows to be introduced later. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 545 PS2, Line 545: short message delivery from SGSN (PS domain) / MSC (CS domain) to an ESME > above it says ESME => MSC, in this sentence the direction is reversed? Copy-paste error? Or did you [?] "... from SGSN (PS domain) / MSC (CS domain) to an ESME ..." is related to "... message delivery ...", this is not about the direction of Error message itself, because it was already stated above. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 1094 PS2, Line 1094: Relay Layer)_ has an unique _message reference (see 8.2.3)_, that > 8.2.3 in this document? then use a <> link. 8.2.3 in 04.11? > then write the full '3GPP TS 04.11 section 8.2.3' out here, > but rather not break the flow of the sentence with it. In the beginning of this sentence I am referencing "TS GSM 04.11", so it should be clear where to look. I would unconditionally agree with you if "8.2.3" was a part of a separate sentence. > I'd not use italics at all. If they are "given names", capitalize. Thanks, I'll most likely avoid using this. -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 09:45:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:49:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 20 Nov 2018 09:49:18 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11571 ) Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... Patch Set 3: > can't vote because this makes zero sense to me. Set the gain by > setting chan = 0? what? Please read the commit description, it's explained there. -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 09:49:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 09:54:53 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 09:54:53 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6927?= Message-ID: <2137423372.733.1542707693226.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 373.60 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 09:55:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 09:55:17 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6928?= In-Reply-To: <2137423372.733.1542707693226.JavaMail.jenkins@jenkins.osmocom.org> References: <2137423372.733.1542707693226.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2074284245.734.1542707717160.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 372.20 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:56:45 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 09:56:45 +0000 Subject: Change in libosmocore[master]: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11833 ) Change subject: send NS_POUT_UNBLOCK_ACK before signalling S_NS_UNBLOCK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11833/1/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/#/c/11833/1/src/gb/gprs_ns.c at 1417 PS1, Line 1417: if (rc < 0) > Worth explaining here in a comment why are we breaking (because we don't want to send messages if we [?] gprs_ns_tx() will already log a message upon failure. -- To view, visit https://gerrit.osmocom.org/11833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3af54a14bb6bcfa167c9a9d9f67835e7f5b9f1bb Gerrit-Change-Number: 11833 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 09:56:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 09:56:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 09:56:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6927?= Message-ID: <1684010037.735.1542707809362.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.15 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 09:56:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 09:56:50 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6928?= In-Reply-To: <1684010037.735.1542707809362.JavaMail.jenkins@jenkins.osmocom.org> References: <1684010037.735.1542707809362.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1179150464.736.1542707810954.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.15 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 09:58:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 09:58:57 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6929?= In-Reply-To: <2074284245.734.1542707717160.JavaMail.jenkins@jenkins.osmocom.org> References: <2074284245.734.1542707717160.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1444429932.737.1542707937142.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 373.53 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 09:59:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 09:59:10 +0000 Subject: Change in osmo-sgsn[master]: Fix IMSI padding in imsi-acl In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11838 ) Change subject: Fix IMSI padding in imsi-acl ...................................................................... Patch Set 1: Code-Review-1 (1 comment) BTW, are you sure only first byte is initialized and not the whole array? Did you check it by testing or using gdb? https://gerrit.osmocom.org/#/c/11838/1/src/gprs/sgsn_vty.c File src/gprs/sgsn_vty.c: https://gerrit.osmocom.org/#/c/11838/1/src/gprs/sgsn_vty.c at 637 PS1, Line 637: char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS + 1] = { [0 ... GSM23003_IMSI_MAX_DIGITS] = '0' }; I bet this is close to zero portable. Can we find some other way of initializing it, like memset() ? char imsi_sanitized[GSM23003_IMSI_MAX_DIGITS + 1]; memset(imti_sanitized, '0', GSM23003_IMSI_MAX_DIGITS); "This is a GNU extension of C99 Designated Initializers. In older GCC, you may need to use -std=gnu99 to compile your code." https://gcc.gnu.org/onlinedocs/gcc/Designated-Inits.html "To initialize a range of elements to the same value, write ?[first ... last] = value?. This is a GNU extension." -- To view, visit https://gerrit.osmocom.org/11838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I26e4aa44f159d1b5b91dda4a586fd4e809711245 Gerrit-Change-Number: 11838 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 09:59:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 09:59:56 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 09:59:56 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6929?= In-Reply-To: <1179150464.736.1542707810954.JavaMail.jenkins@jenkins.osmocom.org> References: <1179150464.736.1542707810954.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <49339976.738.1542707996930.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.15 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 10:06:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 10:06:09 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11789 to look at the new patch set (#2). Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ARFCNs are values in well defined ranges. Until this patch, ARFCNs not belonging to any band were blindly assigned to DCS1800 by gsm_arfcn2band, causing unnoticed bugs and misconfigurations in osmo-bsc. Previous API gsm_arfcn2band cannot accomodate this kind of check easily, so let's deprecate it to tell people to use a new API gsm_arfcn2band_rc which performs this kind of checks and allows callers to log failures, misconfigurations, etc. At the same time, modify implementation of gsm_arfcn2band to abort if an invalid ARFCN is passed, this way users of this API can notice they are passing wrong data to it that most probably will produce unexpected results. Related: OS#3063 Change-Id: I780d452dcebce385469e32ef2fd844df6033393a --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c M src/gsm/libosmogsm.map M utils/osmo-arfcn.c 4 files changed, 58 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/11789/2 -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 10:06:31 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:06:31 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6930?= In-Reply-To: <1444429932.737.1542707937142.JavaMail.jenkins@jenkins.osmocom.org> References: <1444429932.737.1542707937142.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <253815568.739.1542708391443.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 395.35 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 10:06:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 10:06:38 +0000 Subject: Change in libosmocore[master]: document unblock-ack vs. signalling in gprs_ns_process_msg() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11839 Change subject: document unblock-ack vs. signalling in gprs_ns_process_msg() ...................................................................... document unblock-ack vs. signalling in gprs_ns_process_msg() Since commit 797558ea1768e464f9559c5f7a4f3f4285c5de25 we send the NS_UNBLOCK_ACK message before dispatching the NS_UNBLOCK signal, instead of afterwards. Add comments which explain the intended order of events. Suggested-by: Pau Related: OS#2388 Change-Id: I4b93853c952a97302f8afc14f462f22c3e487564 --- M src/gb/gprs_ns.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/11839/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 0780f2b..1281c9f 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1413,9 +1413,15 @@ /* Section 7.2: unblocking procedure */ LOGP(DNS, LOGL_INFO, "NSEI=%u Rx NS UNBLOCK\n", (*nsvc)->nsei); ns_mark_unblocked(*nsvc); + /* This UNBLOCK_ACK message will cause our peer to move us into NS_UNBLOCKED state. */ rc = gprs_ns_tx_simple(*nsvc, NS_PDUT_UNBLOCK_ACK); if (rc < 0) break; + /* + * UNBLOCK_ACK has been transmitted. + * Signal handlers may send additional messages following UNBLOCK_ACK under + * the assumption that NS is now in UNBLOCKED state at our peer's end. + */ ns_osmo_signal_dispatch(*nsvc, S_NS_UNBLOCK, 0); break; case NS_PDUT_UNBLOCK_ACK: -- To view, visit https://gerrit.osmocom.org/11839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b93853c952a97302f8afc14f462f22c3e487564 Gerrit-Change-Number: 11839 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 10:07:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:07:17 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6930?= In-Reply-To: <49339976.738.1542707996930.JavaMail.jenkins@jenkins.osmocom.org> References: <49339976.738.1542707996930.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <695553062.740.1542708437601.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.15 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 10:08:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 10:08:36 +0000 Subject: Change in libosmocore[master]: document unblock-ack vs. signalling in gprs_ns_process_msg() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11839 ) Change subject: document unblock-ack vs. signalling in gprs_ns_process_msg() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b93853c952a97302f8afc14f462f22c3e487564 Gerrit-Change-Number: 11839 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 10:08:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 10:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 10:14:14 +0000 Subject: Change in libosmocore[master]: document unblock-ack vs. signalling in gprs_ns_process_msg() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11839 ) Change subject: document unblock-ack vs. signalling in gprs_ns_process_msg() ...................................................................... document unblock-ack vs. signalling in gprs_ns_process_msg() Since commit 797558ea1768e464f9559c5f7a4f3f4285c5de25 we send the NS_UNBLOCK_ACK message before dispatching the NS_UNBLOCK signal, instead of afterwards. Add comments which explain the intended order of events. Suggested-by: Pau Related: OS#2388 Change-Id: I4b93853c952a97302f8afc14f462f22c3e487564 --- M src/gb/gprs_ns.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 0780f2b..1281c9f 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1413,9 +1413,15 @@ /* Section 7.2: unblocking procedure */ LOGP(DNS, LOGL_INFO, "NSEI=%u Rx NS UNBLOCK\n", (*nsvc)->nsei); ns_mark_unblocked(*nsvc); + /* This UNBLOCK_ACK message will cause our peer to move us into NS_UNBLOCKED state. */ rc = gprs_ns_tx_simple(*nsvc, NS_PDUT_UNBLOCK_ACK); if (rc < 0) break; + /* + * UNBLOCK_ACK has been transmitted. + * Signal handlers may send additional messages following UNBLOCK_ACK under + * the assumption that NS is now in UNBLOCKED state at our peer's end. + */ ns_osmo_signal_dispatch(*nsvc, S_NS_UNBLOCK, 0); break; case NS_PDUT_UNBLOCK_ACK: -- To view, visit https://gerrit.osmocom.org/11839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b93853c952a97302f8afc14f462f22c3e487564 Gerrit-Change-Number: 11839 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 10:23:32 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:23:32 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6931?= In-Reply-To: <253815568.739.1542708391443.JavaMail.jenkins@jenkins.osmocom.org> References: <253815568.739.1542708391443.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1517153054.741.1542709412401.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 372.20 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 10:24:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:24:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6931?= In-Reply-To: <695553062.740.1542708437601.JavaMail.jenkins@jenkins.osmocom.org> References: <695553062.740.1542708437601.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1653479963.742.1542709482280.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.15 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 10:24:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:24:51 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6932?= In-Reply-To: <1517153054.741.1542709412401.JavaMail.jenkins@jenkins.osmocom.org> References: <1517153054.741.1542709412401.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1176556765.743.1542709491335.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 394.00 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 10:25:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:25:37 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6932?= In-Reply-To: <1653479963.742.1542709482280.JavaMail.jenkins@jenkins.osmocom.org> References: <1653479963.742.1542709482280.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1532252208.744.1542709537194.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.24 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 10:27:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:27:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6933?= In-Reply-To: <1176556765.743.1542709491335.JavaMail.jenkins@jenkins.osmocom.org> References: <1176556765.743.1542709491335.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1823007020.745.1542709626980.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 395.11 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 10:29:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:29:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6933?= In-Reply-To: <1532252208.744.1542709537194.JavaMail.jenkins@jenkins.osmocom.org> References: <1532252208.744.1542709537194.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <850909598.746.1542709774843.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.24 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 10:34:27 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:34:27 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6934?= In-Reply-To: <1823007020.745.1542709626980.JavaMail.jenkins@jenkins.osmocom.org> References: <1823007020.745.1542709626980.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1552614552.747.1542710067815.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 395.13 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 10:35:10 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 10:35:10 +0000 Subject: Change in osmo-sgsn[master]: update gbproxy test expected output Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11840 Change subject: update gbproxy test expected output ...................................................................... update gbproxy test expected output libosmocore commit 797558ea1768e464f9559c5f7a4f3f4285c5de25 changed the order of NS_UNBLOCK_ACK transmission dispatching of the NS_UNBLOCK signal. Update expected output in gdbproxy test accordingly to make this test pass again. Change-Id: Ia3df811755b1c88cf7a27a466677b24a6c32fd8e Related: OS#2388 --- M tests/gbproxy/gbproxy_test.ok 1 file changed, 38 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/40/11840/1 diff --git a/tests/gbproxy/gbproxy_test.ok b/tests/gbproxy/gbproxy_test.ok index 5d77dc9..9016ed3 100644 --- a/tests/gbproxy/gbproxy_test.ok +++ b/tests/gbproxy/gbproxy_test.ok @@ -72,11 +72,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -154,11 +154,11 @@ PROCESSING UNBLOCK from 0x01020304:2222 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 - MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 -- To view, visit https://gerrit.osmocom.org/11840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3df811755b1c88cf7a27a466677b24a6c32fd8e Gerrit-Change-Number: 11840 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 10:35:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:35:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6934?= In-Reply-To: <850909598.746.1542709774843.JavaMail.jenkins@jenkins.osmocom.org> References: <850909598.746.1542709774843.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <872649629.748.1542710113807.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.24 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 10:43:17 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 20 Nov 2018 10:43:17 +0000 Subject: Change in osmo-sgsn[master]: update gbproxy test expected output In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11840 to look at the new patch set (#2). Change subject: update gbproxy test expected output ...................................................................... update gbproxy test expected output libosmocore commit 797558ea1768e464f9559c5f7a4f3f4285c5de25 changed the order of NS_UNBLOCK_ACK transmission dispatching of the NS_UNBLOCK signal. Update expected output of gbproxy tests accordingly to make these tests pass again. Change-Id: Ia3df811755b1c88cf7a27a466677b24a6c32fd8e Related: OS#2388 --- M tests/gbproxy/gbproxy_test.ok 1 file changed, 38 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/40/11840/2 -- To view, visit https://gerrit.osmocom.org/11840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia3df811755b1c88cf7a27a466677b24a6c32fd8e Gerrit-Change-Number: 11840 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 10:44:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 10:44:20 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11703 ) Change subject: LCLS: add 48.008 parameter structure ...................................................................... Patch Set 4: Feel free to correct typos directly - we don't have to wait for me to fix it and than for you to add vote again. -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 10:44:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 10:59:34 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 10:59:34 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6935?= In-Reply-To: <1552614552.747.1542710067815.JavaMail.jenkins@jenkins.osmocom.org> References: <1552614552.747.1542710067815.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <535070851.749.1542711574818.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 392.70 KB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue Nov 20 11:01:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 11:01:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6935?= In-Reply-To: <872649629.748.1542710113807.JavaMail.jenkins@jenkins.osmocom.org> References: <872649629.748.1542710113807.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1449974297.750.1542711693364.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.24 MB...] MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 2. testsuite.at:10: 2. gbproxy (testsuite.at:10): FAILED (testsuite.at:13) Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 11:14:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 11:14:31 +0000 Subject: Change in osmo-sgsn[master]: update gbproxy test expected output In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11840 ) Change subject: update gbproxy test expected output ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3df811755b1c88cf7a27a466677b24a6c32fd8e Gerrit-Change-Number: 11840 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 11:14:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 11:17:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 11:17:16 +0000 Subject: Change in osmo-sgsn[master]: update gbproxy test expected output In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11840 ) Change subject: update gbproxy test expected output ...................................................................... update gbproxy test expected output libosmocore commit 797558ea1768e464f9559c5f7a4f3f4285c5de25 changed the order of NS_UNBLOCK_ACK transmission dispatching of the NS_UNBLOCK signal. Update expected output of gbproxy tests accordingly to make these tests pass again. Change-Id: Ia3df811755b1c88cf7a27a466677b24a6c32fd8e Related: OS#2388 --- M tests/gbproxy/gbproxy_test.ok 1 file changed, 38 insertions(+), 38 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/gbproxy/gbproxy_test.ok b/tests/gbproxy/gbproxy_test.ok index 5d77dc9..9016ed3 100644 --- a/tests/gbproxy/gbproxy_test.ok +++ b/tests/gbproxy/gbproxy_test.ok @@ -72,11 +72,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -154,11 +154,11 @@ PROCESSING UNBLOCK from 0x01020304:2222 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 - MESSAGE to BSS at 0x01020304:2222, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:2222 @@ -243,11 +243,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -306,11 +306,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -369,11 +369,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -432,11 +432,11 @@ PROCESSING UNBLOCK from 0x01020304:4444 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 - MESSAGE to BSS at 0x01020304:4444, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:4444 @@ -497,11 +497,11 @@ PROCESSING UNBLOCK from 0x01020304:3333 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 - MESSAGE to BSS at 0x01020304:3333, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:3333 @@ -561,11 +561,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1024,11 +1024,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1193,11 +1193,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1413,11 +1413,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -1728,11 +1728,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2097,11 +2097,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -2552,11 +2552,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3280,11 +3280,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -3615,11 +3615,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -4445,11 +4445,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -5682,11 +5682,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 @@ -7364,11 +7364,11 @@ PROCESSING UNBLOCK from 0x01020304:1111 06 -==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 - MESSAGE to BSS at 0x01020304:1111, msg length 1 07 +==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111 + result (UNBLOCK) = 1 PROCESSING ALIVE_ACK from 0x01020304:1111 -- To view, visit https://gerrit.osmocom.org/11840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia3df811755b1c88cf7a27a466677b24a6c32fd8e Gerrit-Change-Number: 11840 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 11:18:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 11:18:04 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11703 ) Change subject: LCLS: add 48.008 parameter structure ...................................................................... Patch Set 4: > Feel free to correct typos directly - we don't have to wait for me > to fix it and than for you to add vote again. Done that, then ocassionally author re-pushes and change is lost. -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 11:18:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 11:18:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 11:18:17 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11703 ) Change subject: LCLS: add 48.008 parameter structure ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 11:18:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 11:22:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 11:22:51 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6936?= In-Reply-To: <535070851.749.1542711574818.JavaMail.jenkins@jenkins.osmocom.org> References: <535070851.749.1542711574818.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1493864156.752.1542712971429.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue Nov 20 11:23:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 11:23:55 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--en?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#6936?= In-Reply-To: <1449974297.750.1542711693364.JavaMail.jenkins@jenkins.osmocom.org> References: <1449974297.750.1542711693364.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <326991407.753.1542713035602.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Nov 20 12:32:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 12:32:56 +0000 Subject: Change in libosmocore[master]: LCLS: add 48.008 parameter structure In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11703 ) Change subject: LCLS: add 48.008 parameter structure ...................................................................... LCLS: add 48.008 parameter structure It's convenient to hold all LCLS-related parameters from 3GPP TS 48.008 in a single structure. This will be used in follow-up patch handling Assignment Request with extended parameters as well as corresponding BSC code working with LCLS. Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Related: OS#2487 --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index edae853..c5bf280 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -58,6 +58,14 @@ unsigned int id_list_len; }; +/*! LCLS-related parameters from 3GPP TS 48.008 */ +struct osmo_lcls { + enum gsm0808_lcls_config config; /* ?3.2.2.116 Configuration */ + enum gsm0808_lcls_control control; /* ?3.2.2.117 Connection Status Control */ + struct gsm0808_gcr *gcr; /* ?3.2.2.115 Global Call Reference */ + bool corr_needed; /* ?3.2.2.118 Correlation-Not-Needed */ +}; + extern const struct value_string gsm0808_cell_id_discr_names[]; static inline const char *gsm0808_cell_id_discr_name(enum CELL_IDENT id_discr) { return get_value_string(gsm0808_cell_id_discr_names, id_discr); } -- To view, visit https://gerrit.osmocom.org/11703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b873f9a3c5a5d33b438382971b3d92e40d48d62 Gerrit-Change-Number: 11703 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 12:46:42 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 12:46:42 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2490?= Message-ID: <779185478.754.1542718002310.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 709.13 KB...] CC RANAP_RequestType.lo CC RANAP_ResidualBitErrorRatio.lo CC RANAP_ResponseTime.lo CC RANAP_RIMInformation.lo CC RANAP_RIM-Transfer.lo CC RANAP_RIMRoutingAddress.lo CC RANAP_RNC-ID.lo CC RANAP_RNCTraceInformation.lo CC RANAP_RNSAPRelocationParameters.lo CC RANAP_RRC-Container.lo CC RANAP_RTLoadValue.lo CC RANAP_RSRVCC-HO-Indication.lo CC RANAP_RSRVCC-Information.lo CC RANAP_RSRVCC-Operation-Possible.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from ../../include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h:14, from RANAP_RNSAPRelocationParameters.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: ?struct MemberN? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberN { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberN { ^~~~~~~~~~~~~ In file included from :8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from ../../include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h:14, from RANAP_RNSAPRelocationParameters.c:7: ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: ?struct MemberB? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberB { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberB { ^~~~~~~~~~~~~ CC RANAP_SAC.lo CC RANAP_SAI.lo CC RANAP_SAPI.lo CC RANAP_SessionUpdateID.lo CC RANAP_Shared-Network-Information.lo CC RANAP_Session-Re-establishment-Indicator.lo CC RANAP_SignallingIndication.lo CC RANAP_SDU-ErrorRatio.lo CC RANAP_SDU-FormatInformationParameters.lo CC RANAP_SDU-FormatInformationParameterItem.lo CC RANAP_SDU-Parameters.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14, from ../../include/osmocom/ranap/RANAP_Shared-Network-Information.h:14, from RANAP_Shared-Network-Information.c:7: ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: ?struct MemberA? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberA { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberA { ^~~~~~~~~~~~~ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: ?struct MemberM? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberM { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberM { ^~~~~~~~~~~~~ CC RANAP_SDU-ParameterItem.lo CC RANAP_SNA-Access-Information.lo CC RANAP_SNAC.lo CC RANAP_Service-Handover.lo CC RANAP_Source-ToTarget-TransparentContainer.lo CC RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.lo CC RANAP_SourceCellID.lo CC RANAP_SourceBSS-ToTargetBSS-TransparentContainer.lo CC RANAP_SourceID.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:14, from ../../include/osmocom/ranap/RANAP_SNA-Access-Information.h:14, from RANAP_SNA-Access-Information.c:7: ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: ?struct MemberC? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberC { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberC { ^~~~~~~~~~~~~ CC RANAP_SourceRNC-ID.lo CC RANAP_SourceRNC-ToTargetRNC-TransparentContainer.lo CC RANAP_IRAT-Measurement-Configuration.lo CC RANAP_IRATmeasurementParameters.lo CC RANAP_RSRQ-Type.lo CC RANAP_RSRQ-Extension.lo CC RANAP_EUTRANFrequencies.lo CC RANAP_MeasBand.lo CC RANAP_SubscriberProfileIDforRFP.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from ../../include/osmocom/ranap/RANAP_IRATmeasurementParameters.h:15, from ../../include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h:15, from RANAP_IRAT-Measurement-Configuration.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: ?struct MemberJ? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberJ { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberJ { ^~~~~~~~~~~~~ CC RANAP_SourceStatisticsDescriptor.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from ../../include/osmocom/ranap/RANAP_IRATmeasurementParameters.h:15, from RANAP_IRATmeasurementParameters.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: ?struct MemberJ? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberJ { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberJ { ^~~~~~~~~~~~~ CC RANAP_SupportedRAB-ParameterBitrateList.lo CC RANAP_SupportedBitrate.lo In file included from :8:0, from ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:14, from RANAP_EUTRANFrequencies.c:7: ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: ?struct MemberJ? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberJ { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberJ { ^~~~~~~~~~~~~ CC RANAP_SourceUTRANCellID.lo CC RANAP_SRB-ID.lo CC RANAP_SRB-TrCH-Mapping.lo CC RANAP_SRB-TrCH-MappingItem.lo CC RANAP_SRVCC-HO-Indication.lo CC RANAP_SRVCC-Information.lo CC RANAP_SRVCC-Operation-Possible.lo CC RANAP_SubflowSDU-Size.lo CC RANAP_TAC.lo CC RANAP_TAI.lo CC RANAP_Target-ToSource-TransparentContainer.lo CC RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.lo CC RANAP_TargetBSS-ToSourceBSS-TransparentContainer.lo CC RANAP_TargetCellId.lo CC RANAP_TargetID.lo CC RANAP_TargetENB-ID.lo CC RANAP_TargetRNC-ID.lo CC RANAP_TargetRNC-ToSourceRNC-TransparentContainer.lo CC RANAP_TBCD-STRING.lo CC RANAP_TemporaryUE-ID.lo CC RANAP_Time-UE-StayedInCell.lo CC RANAP_Time-UE-StayedInCell-EnhancedGranularity.lo CC RANAP_TimeToMBMSDataTransfer.lo CC RANAP_TimingDifferenceULDL.lo CC RANAP_TMGI.lo CC RANAP_TMSI.lo CC RANAP_TraceDepth.lo CC RANAP_TraceInformation.lo CC RANAP_TracePropagationParameters.lo CC RANAP_TraceRecordingSessionInformation.lo CC RANAP_TraceRecordingSessionReference.lo CC RANAP_TraceReference.lo CC RANAP_TraceType.lo CC RANAP_TrafficClass.lo CC RANAP_TrafficHandlingPriority.lo CC RANAP_TransferDelay.lo CC RANAP_UnsuccessfullyTransmittedDataVolume.lo CC RANAP_TransportLayerAddress.lo CC RANAP_TrCH-ID.lo CC RANAP_TrCH-ID-List.lo CC RANAP_TriggerID.lo CC RANAP_TunnelInformation.lo CC RANAP_TypeOfError.lo CC RANAP_UE-AggregateMaximumBitRate.lo CC RANAP_UE-AggregateMaximumBitRateDownlink.lo CC RANAP_UE-AggregateMaximumBitRateUplink.lo CC RANAP_UE-History-Information.lo CC RANAP_UE-ID.lo CC RANAP_UESBI-Iu.lo CC RANAP_UESBI-IuA.lo CC RANAP_UESBI-IuB.lo CC RANAP_UL-GTP-PDU-SequenceNumber.lo CC RANAP_UL-N-PDU-SequenceNumber.lo CC RANAP_UPInformation.lo CC RANAP_UPInitialisationFrame.lo CC RANAP_UP-ModeVersions.lo CC RANAP_USCH-ID.lo CC RANAP_UserPlaneMode.lo CC RANAP_UTRAN-CellID.lo CC RANAP_VelocityEstimate.lo CC RANAP_HorizontalVelocity.lo CC RANAP_HorizontalWithVerticalVelocity.lo CC RANAP_HorizontalVelocityWithUncertainty.lo CC RANAP_HorizontalWithVerticalVelocityAndUncertainty.lo CC RANAP_HorizontalSpeedAndBearing.lo CC RANAP_VerticalVelocity.lo CC RANAP_VerticalSpeedDirection.lo CC RANAP_VerticalAccuracyCode.lo CC RANAP_VoiceSupportMatchIndicator.lo CC RANAP_RANAP-PDU.lo CC RANAP_InitiatingMessage.lo CC RANAP_SuccessfulOutcome.lo CC RANAP_UnsuccessfulOutcome.lo CC RANAP_Outcome.lo CC RANAP_Iu-ReleaseCommand.lo CC RANAP_Iu-ReleaseComplete.lo CC RANAP_RelocationRequired.lo CC RANAP_RelocationCommand.lo CC RANAP_RelocationPreparationFailure.lo CC RANAP_RelocationRequest.lo CC RANAP_RelocationRequestAcknowledge.lo CC RANAP_RelocationFailure.lo malloc: .././dispose_cmd.c:249: assertion botched free: start and end chunk sizes differ Aborting.../bin/bash: line 1: 21754 Aborted /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0.11-319c\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0.11-319c\" -DPACKAGE_BUGREPORT=\"openbsc at lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-iuh\" -DVERSION=\"0.3.0.11-319c\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_RelocationPreparationFailure.lo -MD -MP -MF .deps/RANAP_RelocationPreparationFailure.Tpo -c -o RANAP_RelocationPreparationFailure.lo RANAP_RelocationPreparationFailure.c Makefile:2506: recipe for target 'RANAP_RelocationPreparationFailure.lo' failed make[4]: *** [RANAP_RelocationPreparationFailure.lo] Error 134 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory ' Makefile:642: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:454: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:458: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:382: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 20 12:54:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 12:54:25 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 12:54:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:03:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 14:03:49 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c at 163 PS2, Line 163: static struct osmo_lcls old_cfg_csc; Not directly related to this patch, but: Shouldn't this be per-conn? -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 14:03:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:04:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 14:04:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable PCU related tests if PCU socket not configured Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11841 Change subject: bts: Disable PCU related tests if PCU socket not configured ...................................................................... bts: Disable PCU related tests if PCU socket not configured With some real HW setups, there's no PCU (osmo-pcu) available locally, for instance when using a sysmobts, or when using a nanoBTS. There's no need to waste time and generate extra output by running this tests in this case. Furthermore, some tests seem to crash sometimes in that setup, probably due to using invalid fd (-1): MTC at 801a0da9866a: Setting RSL_SYSTEM_INFO_4 (4): '31061C62F224002A4740E50400'O /osmo-ttcn3-hacks/bts/BTS_Tests: Segmentation fault occurred /usr/lib/titan/libttcn3-parallel-dynamic.so(_Z14signal_handleri+0xa3)[0x7f0c33b48073] /lib/x86_64-linux-gnu/libc.so.6(+0x33060)[0x7f0c321aa060] /osmo-ttcn3-hacks/bts/UD_PT.so(_ZN12UD__PortType15UD__PT_PROVIDER13outgoing_sendERKN9UD__Types14UD__send__dataE+0xf0)[0x7f0c349e42f8] /osmo-ttcn3-hacks/bts/PCUIF_CodecPort.so(_ZN16PCUIF__CodecPort16PCUIF__CODEC__PT4sendERKNS_17PCUIF__send__dataERK9COMPONENT+0x19e)[0x7f0c37e1731a] /osmo-ttcn3-hacks/bts/PCUIF_CodecPort.so(_ZN16PCUIF__CodecPort16PCUIF__CODEC__PT4sendERKNS_26PCUIF__send__data_templateE+0x5f)[0x7f0c37e174f7] /osmo-ttcn3-hacks/bts/BTS_Tests.so(_ZN10BTS__Tests20f__TC__pcu__act__reqERK7INTEGERS2_S2_RK7BOOLEAN+0x411)[0x7f0c3eec3210] /osmo-ttcn3-hacks/bts/BTS_Tests.so(_ZN10BTS__Tests28testcase_TC__pcu__deact__reqEbd+0x15d)[0x7f0c3eec4f27] /osmo-ttcn3-hacks/bts/BTS_Tests.so(+0xfb65d)[0x7f0c3eeef65d] /usr/lib/titan/libttcn3-parallel-dynamic.so(_ZN11Module_List15execute_controlEPKc+0x1c)[0x7f0c33af3fbc] Change-Id: I773c7ec52dd8532bf160e92ffefc8d936ca55de2 --- M bts/BTS_Tests.ttcn 1 file changed, 21 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/11841/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cde9562..753d89b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4186,23 +4186,27 @@ execute( TC_ipa_crcx_mdcx_mdcx_dlcx_not_active() ); execute( TC_ipa_crcx_sdcch_not_active() ); - execute( TC_pcu_act_req() ); - execute( TC_pcu_act_req_wrong_ts() ); - execute( TC_pcu_act_req_wrong_bts() ); - execute( TC_pcu_act_req_wrong_trx() ); - execute( TC_pcu_deact_req() ); - execute( TC_pcu_deact_req_wrong_ts() ); - execute( TC_pcu_ver_si13() ); - execute( TC_pcu_data_req_wrong_bts() ); - execute( TC_pcu_data_req_wrong_trx() ); - execute( TC_pcu_data_req_wrong_ts() ); - execute( TC_pcu_data_req_ts_inactive() ); - execute( TC_pcu_data_req_pdtch() ); - execute( TC_pcu_data_req_ptcch() ); - execute( TC_pcu_data_req_agch() ); - execute( TC_pcu_data_req_imm_ass_pch() ); - execute( TC_pcu_rach_content() ); - execute( TC_pcu_paging_from_rsl() ); + if (mp_pcu_socket != "") { + execute( TC_pcu_act_req() ); + execute( TC_pcu_act_req_wrong_ts() ); + execute( TC_pcu_act_req_wrong_bts() ); + execute( TC_pcu_act_req_wrong_trx() ); + execute( TC_pcu_deact_req() ); + execute( TC_pcu_deact_req_wrong_ts() ); + execute( TC_pcu_ver_si13() ); + execute( TC_pcu_data_req_wrong_bts() ); + execute( TC_pcu_data_req_wrong_trx() ); + execute( TC_pcu_data_req_wrong_ts() ); + execute( TC_pcu_data_req_ts_inactive() ); + execute( TC_pcu_data_req_pdtch() ); + execute( TC_pcu_data_req_ptcch() ); + execute( TC_pcu_data_req_agch() ); + execute( TC_pcu_data_req_imm_ass_pch() ); + execute( TC_pcu_rach_content() ); + execute( TC_pcu_paging_from_rsl() ); + } else { + log("PCU socket path not available, skipping PCU tests"); + } execute( TC_dyn_osmo_pdch_act_deact() ); execute( TC_dyn_osmo_pdch_unsol_deact() ); -- To view, visit https://gerrit.osmocom.org/11841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I773c7ec52dd8532bf160e92ffefc8d936ca55de2 Gerrit-Change-Number: 11841 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:06:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 14:06:08 +0000 Subject: Change in osmo-gsm-manuals[master]: remove project specific files In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: remove project specific files ...................................................................... Patch Set 5: (1 comment) > I'd personally remove them one by one as they are moved to its own repo, one commit at a time. I'll change this patch to only remove OsmoMSC. https://gerrit.osmocom.org/#/c/11738/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11738/5//COMMIT_MSG at 12 PS5, Line 12: is reviewed) > "once msc is reviewed"? I was referring to this osmo-msc.git patch: https://gerrit.osmocom.org/#/c/osmo-msc/+/11726/ -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 14:06:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:09:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 14:09:01 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c at 163 PS2, Line 163: static struct osmo_lcls old_cfg_csc; > Shouldn't this be per-conn? More like per-call but we're working on per-conn level indeed. Not sure I understand the question though. Could you elaborate? -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 14:09:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:20:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 14:20:23 +0000 Subject: Change in libosmocore[master]: Add osmo_sockaddrin_to_str_and_uint() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11842 Change subject: Add osmo_sockaddrin_to_str_and_uint() ...................................................................... Add osmo_sockaddrin_to_str_and_uint() It's similar to osmo_sockaddr_to_str_and_uint() but does not require odd typecasting for AF_INET case. Make osmo_sockaddr_to_str_and_uint() into wrapper around new function and make sure to check for address family before typecasting. Also use proper return type. Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/11842/1 diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 28f89a5..0930de0 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -11,7 +11,8 @@ #include #include -struct sockaddr; +#include + struct osmo_fd; /* flags for osmo_sock_init. */ @@ -49,6 +50,8 @@ unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, const struct sockaddr *sa); +size_t osmo_sockaddrin_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, + const struct sockaddr_in *sin); int osmo_sock_unix_init(uint16_t type, uint8_t proto, const char *socket_path, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 0e17a28..698b126 100644 --- a/src/socket.c +++ b/src/socket.c @@ -569,6 +569,25 @@ return 0; } +/*! Convert sockaddr_in to IP address as char string and port as uint16_t. + * \param[out] addr String buffer to write IP address to, or NULL. + * \param[out] addr_len Size of \a addr. + * \param[out] port Pointer to uint16_t to write the port number to, or NULL. + * \param[in] sin Sockaddr to convert. + * \returns the required string buffer size, like osmo_strlcpy(), or 0 if \a addr is NULL. + */ +size_t osmo_sockaddrin_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, + const struct sockaddr_in *sin) +{ + if (port) + *port = ntohs(sin->sin_port); + + if (addr) + return osmo_strlcpy(addr, inet_ntoa(sin->sin_addr), addr_len); + + return 0; +} + /*! Convert sockaddr to IP address as char string and port as uint16_t. * \param[out] addr String buffer to write IP address to, or NULL. * \param[out] addr_len Size of \a addr. @@ -581,11 +600,7 @@ { const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; - if (port) - *port = ntohs(sin->sin_port); - if (addr) - return osmo_strlcpy(addr, inet_ntoa(sin->sin_addr), addr_len); - return 0; + return osmo_sockaddrin_to_str_and_uint(addr, addr_len, port, sin); } /*! Initialize a unix domain socket (including bind/connect) -- To view, visit https://gerrit.osmocom.org/11842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2 Gerrit-Change-Number: 11842 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:36:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 14:36:38 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS: add GCR routines ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 14:36:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:48:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 14:48:56 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR routines In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS: add GCR routines ...................................................................... Patch Set 5: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11827/5/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11827/5/src/gsm/gsm0808.c at 416 PS5, Line 416: if (!g) Do we really need this kind of check? why would you expect somebdy to pass g=NULL? that looks wrong. https://gerrit.osmocom.org/#/c/11827/5/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/11827/5/tests/gsm0808/gsm0808_test.c at 140 PS5, Line 140: memset(p.cr, 0, 5); sizeof(p.cr). Probably you even want memset(0) whole p since it comes from the stack. https://gerrit.osmocom.org/#/c/11827/5/tests/gsm0808/gsm0808_test.c at 141 PS5, Line 141: memset(g.cr, 'F', 5); sizeof(g.cr) -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 14:48:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:49:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 14:49:33 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11806 ) Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... Patch Set 2: > You probably want to move this as a fixup of another commit, or at least before patch 15/16 which will take some time to gt merged. Will do. > I kind of imagined that I just place osmo-gsm-manuals.git next to the other osmo-* clones, and they look it up from there, no need to 'make install' or use pkgconfig or anything? > > I mean ../osmo-gsm-manuals/ by default, and reconfigurable by --with-osmo-gsm-manuals=~/ogm. > > Maybe if --with-osmo-gsm-manuals=path is passed use that, if not try pkgconfig first, if that fails try ../osmo-gsm-manuals? Well, with the patches I'm submitting here, the workflow would be: $ cd osmo-gsm-manuals $ autoreconf -fi $ ./configure $ make install $ cd ../osmo-msc $ autoreconf -fi $ ./configure --enable-manuals $ make or instead of make, if you just want the manuals, run in the osmo-msc (or other project) dir: $ make -C docs/manuals Reasons are explained in this commit message: https://gerrit.osmocom.org/#/c/osmo-gsm-manuals/+/11797/ I did *not* add a fallback to "../osmo-gsm-manuals" for OSMO_GSM_MANUALS_DIR or other means to override it, though that should be possible to add with some configure.ac magic. Would you prefer if I added it? -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-CC: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 14:49:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:53:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 14:53:21 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: publish from project repos, not this repo anymore ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/11740/2/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/#/c/11740/2/contrib/jenkins.sh at 7 PS2, Line 7: echo "Manuals have been moved to the projects, and need to be published from there." > Mentiond that "make publish" exists now? I will added it to the INSTALL.txt and refer to that instead of the wiki page. https://gerrit.osmocom.org/#/c/11740/2/contrib/jenkins.sh at 9 PS2, Line 9: echo "" > why the <...> braces though? I've seen this in license texts (e.g. GPL headers) and then doing it like that, but that's not a good reason. I'll omit this in the future. > Are you planning on adding info to that wiki page? so far it doesn't have anything about publishing, except some half-hearted dependency list. That was the idea. > In fact, I think the place that explained how to publish so far was the osmo-gsm-manuals/README .. or INSTALL.txt. Maybe link there instead, also from the wiki page, and fully explain there? Right, I will extended the INSTALL.txt instead and refer to that file. Also the wiki page links to that file now instead of showing the incomplete dependency list. -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 14:53:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 14:59:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 14:59:45 +0000 Subject: Change in osmo-gsm-manuals[master]: *filter.conf/*.sty: use symlinks to build, common In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11798 ) Change subject: *filter.conf/*.sty: use symlinks to build, common ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11798/1/build/custom-dblatex.sty File build/custom-dblatex.sty: https://gerrit.osmocom.org/#/c/11798/1/build/custom-dblatex.sty at 3 PS1, Line 3: %% The "common" folder is symlinked to ./common when building. > heh, sounds like [?] Right, I'll formulate that more clearly :) $ ln -s ./common common $ ls -lah common lrwxrwxrwx 1 user user 8 Nov 20 15:54 common -> ./common $ cd common cd:cd:6: too many levels of symbolic links: common -- To view, visit https://gerrit.osmocom.org/11798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 Gerrit-Change-Number: 11798 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 14:59:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:01:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 15:01:54 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir) ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11802/1/OsmoBSC/Makefile.am File OsmoBSC/Makefile.am: https://gerrit.osmocom.org/#/c/11802/1/OsmoBSC/Makefile.am at 1 PS1, Line 1: OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) > so, this is a default? or are the individiual osmo-foo. [?] See my reply here: https://gerrit.osmocom.org/#/c/osmo-gsm-manuals/+/11806/ (I wish I could link to individual comments...) -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 15:01:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 15:13:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 15:13:21 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#313?= In-Reply-To: <1732378421.720.1542640207639.JavaMail.jenkins@jenkins.osmocom.org> References: <1732378421.720.1542640207639.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <426871812.755.1542726801937.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:18:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 15:18:05 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS: add GCR routines ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 15:18:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:20:53 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 15:20:53 +0000 Subject: Change in osmo-msc[master]: Use libosmocore to function to parse cipher mode reject cause In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11832 ) Change subject: Use libosmocore to function to parse cipher mode reject cause ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Gerrit-Change-Number: 11832 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 15:20:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:24:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 15:24:33 +0000 Subject: Change in osmo-msc[master]: Use BSSAP-specific TLV parser from libosmocore In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11831 ) Change subject: Use BSSAP-specific TLV parser from libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae1a3ffcebf1b0b95e61cd5dffe7ef734796fcfc Gerrit-Change-Number: 11831 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 15:24:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:24:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 15:24:54 +0000 Subject: Change in osmo-msc[master]: Use BSSAP-specific TLV parser from libosmocore In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11831 ) Change subject: Use BSSAP-specific TLV parser from libosmocore ...................................................................... Use BSSAP-specific TLV parser from libosmocore Change-Id: Iae1a3ffcebf1b0b95e61cd5dffe7ef734796fcfc --- M src/libmsc/a_iface_bssap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 282fd73..f24fb05 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -611,7 +611,7 @@ } msg_type = msg->l3h[0]; - rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l3h + 1, msgb_l3len(msg) - 1, 0, 0); + rc = osmo_bssap_tlv_parse(&tp, msg->l3h + 1, msgb_l3len(msg) - 1); if (rc < 0) { LOGP(DBSSAP, LOGL_ERROR, "Failed parsing TLV -- discarding message! %s\n", osmo_hexdump(msg->l3h, msgb_l3len(msg))); -- To view, visit https://gerrit.osmocom.org/11831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iae1a3ffcebf1b0b95e61cd5dffe7ef734796fcfc Gerrit-Change-Number: 11831 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:25:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 15:25:15 +0000 Subject: Change in osmo-msc[master]: Use libosmocore to function to parse cipher mode reject cause In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11832 ) Change subject: Use libosmocore to function to parse cipher mode reject cause ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Gerrit-Change-Number: 11832 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 15:25:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:37:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 15:37:18 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11803/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11803/1//COMMIT_MSG at 18 PS1, Line 18: the xstl parser, as well as the LaTeX compiler, so they can find the > is that the "TEXINPUTS" bit? The TEXINPUTS bit is for the LaTeX compiler, yes (TEX as in LaTeX). The xstl parser bit is in Makefile.docbook.inc: dblatex --xslt-opts="--path $(OSMO_GSM_MANUALS_DIR)/common/chapters:$$PWD/generated" ... Do you think it needs a better explanation in the commit message? -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 15:37:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:47:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 15:47:59 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Patch Set 1: even better would be a comment close to where it is used, for future readers too busy to look up the log. -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 15:47:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:51:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 15:51:11 +0000 Subject: Change in osmo-dev[master]: gits: remove code dup: ask_reset_hard() In-Reply-To: References: Message-ID: Hello osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11757 to look at the new patch set (#5). Change subject: gits: remove code dup: ask_reset_hard() ...................................................................... gits: remove code dup: ask_reset_hard() Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a --- M src/gits 1 file changed, 14 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/57/11757/5 -- To view, visit https://gerrit.osmocom.org/11757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a Gerrit-Change-Number: 11757 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:51:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 15:51:19 +0000 Subject: Change in osmo-dev[master]: gits: when asking for reset --hard, also offer push -f In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11758 ) Change subject: gits: when asking for reset --hard, also offer push -f ...................................................................... gits: when asking for reset --hard, also offer push -f Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 --- M src/gits 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve diff --git a/src/gits b/src/gits index c7f5750..d47759f 100755 --- a/src/gits +++ b/src/gits @@ -238,16 +238,19 @@ return answer -def ask_reset_hard(git_dir): +def ask_reset_hard_or_push_f(git_dir): do_reset = ask(git_dir, 'Diverged.', '%s: git reset --hard %s?' % ( orig_branch, upstream_branch), ' no', - 'OK yes (write OK in caps!)', - valid_answers=('', 'OK')) + 'OK yes, reset to upstream (write OK in caps!)', + 'P `push -f` to overwrite upstream (P in caps!)', + valid_answers=('', 'OK', 'P')) if do_reset == 'OK': git(git_dir, 'reset', '--hard', upstream_branch) + elif do_reset == 'P': + git(git_dir, 'push', '-f') def rebase(git_dir): @@ -287,7 +290,7 @@ # Diverged elif ahead and behind: - ask_reset_hard(git_dir) + ask_reset_hard_or_push_f(git_dir) # Behind elif behind: @@ -315,7 +318,7 @@ git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - ask_reset_hard(git_dir) + ask_reset_hard_or_push_f(git_dir) return orig_branch -- To view, visit https://gerrit.osmocom.org/11758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iab38229ee7deaec91c342fa114028e222e652b60 Gerrit-Change-Number: 11758 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:51:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 15:51:19 +0000 Subject: Change in osmo-dev[master]: gits: remove code dup: ask_reset_hard() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11757 ) Change subject: gits: remove code dup: ask_reset_hard() ...................................................................... gits: remove code dup: ask_reset_hard() Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a --- M src/gits 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/gits b/src/gits index 95b722e..c7f5750 100755 --- a/src/gits +++ b/src/gits @@ -238,6 +238,18 @@ return answer +def ask_reset_hard(git_dir): + do_reset = ask(git_dir, 'Diverged.', + '%s: git reset --hard %s?' % ( + orig_branch, upstream_branch), + ' no', + 'OK yes (write OK in caps!)', + valid_answers=('', 'OK')) + + if do_reset == 'OK': + git(git_dir, 'reset', '--hard', upstream_branch) + + def rebase(git_dir): orig_branch = git_branch_current(git_dir) if orig_branch is None: @@ -275,15 +287,7 @@ # Diverged elif ahead and behind: - do_reset = ask(git_dir, 'Diverged.', - '%s: git reset --hard %s?' % ( - orig_branch, upstream_branch), - ' no', - 'OK yes (write OK in caps!)', - valid_answers=('', 'OK')) - - if do_reset == 'OK': - git(git_dir, 'reset', '--hard', upstream_branch) + ask_reset_hard(git_dir) # Behind elif behind: @@ -311,13 +315,7 @@ git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - do_reset = ask(git_dir, '%s: git reset --hard %s?' % (orig_branch, upstream_branch), - ' no', - 'OK yes (write OK in caps!)', - valid_answers=('', 'OK')) - - if do_reset == 'OK': - git(git_dir, 'reset', '--hard', upstream_branch) + ask_reset_hard(git_dir) return orig_branch -- To view, visit https://gerrit.osmocom.org/11757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I741aa6ca29370f26a724f5b4b9c6e7f8ac3f282a Gerrit-Change-Number: 11757 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:51:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 15:51:20 +0000 Subject: Change in osmo-dev[master]: gits: use @{u} to get upstream branch, not origin/%s In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11756 ) Change subject: gits: use @{u} to get upstream branch, not origin/%s ...................................................................... gits: use @{u} to get upstream branch, not origin/%s git has an internal concept of a branch's upstream branch, and the remote need not be 'origin', and also, the upstream branch name may differ completely. So, use git's {u} keyword to obtain the upstream branch name. This removes all 'origin' strings from gits. Also, git_branch_exists() is no longer needed, drop it. Also remove a couple of default arguments which aren't ever used because we always pass arguments anyway. In the case of git_ahead_behind(), we would have use for a default branch_upstream=None to imply calling git_branch_upstream(), but then during rebase, if no upstream exists, we would invoke it twice to get None a second time. So just call the function explicitly. I thought about returning an empty string instead of None, but it's too convoluted. In git_output(), pipe STDERR to STDOUT, because every time we parse a remote ref (git ref-parse --abbrev-ref '%s{u}') and there is no remote branch, git prints 'Fatal: there is no remote bla bla' on stdout, and that error is expected / ok to happen, so it just clutters the 'gits' output. The easiest way to achieve silence then is to pipe to STDOUT, IIUC otherwise we'd have to use Popen() and communicate()... In the case of error, subprocess raises an exception and we see that an error happens. In the ref-parse case we can simply catch the exception and be quiet. Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 --- M src/gits 1 file changed, 30 insertions(+), 22 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve diff --git a/src/gits b/src/gits index cb2cf59..95b722e 100755 --- a/src/gits +++ b/src/gits @@ -58,7 +58,7 @@ def git_output(git_dir, *args): - return subprocess.check_output(['git', '-C', git_dir, ] + list(args)).decode('utf-8') + return subprocess.check_output(['git', '-C', git_dir, ] + list(args), stderr=subprocess.STDOUT).decode('utf-8') def git_bool(git_dir, *args): @@ -69,20 +69,16 @@ return False -def git_branch_exists(git_dir, branch='origin/master'): - return git_bool(git_dir, 'rev-parse', '--quiet', '--verify', branch) - - -def git_ahead_behind(git_dir, branch='master', remote='origin'): +def git_ahead_behind(git_dir, branch, branch_upstream): ''' Count revisions ahead/behind of the remote branch. returns: (ahead, behind) (e.g. (0, 5)) ''' # Missing remote branch - if not git_branch_exists(git_dir, remote + '/' + branch): + if not branch_upstream: return (0, 0) - behind = git_output(git_dir, 'rev-list', '--count', '%s..%s/%s' % (branch, remote, branch)) - ahead = git_output(git_dir, 'rev-list', '--count', '%s/%s..%s' % (remote, branch, branch)) + behind = git_output(git_dir, 'rev-list', '--count', '%s..%s' % (branch, branch_upstream)) + ahead = git_output(git_dir, 'rev-list', '--count', '%s..%s' % (branch_upstream, branch)) return (int(ahead.rstrip()), int(behind.rstrip())) @@ -98,12 +94,20 @@ return ret +def git_branch_upstream(git_dir, branch_name='HEAD'): + '''Return an upstream branch name, or an None if there is none.''' + try: + return git_output(git_dir, 'rev-parse', '--abbrev-ref', '%s@{u}' % branch_name).rstrip() + except subprocess.CalledProcessError: + return None + + def git_has_modifications(git_dir): return not git_bool(git_dir, 'diff', '--quiet', 'HEAD') -def git_can_fast_forward(git_dir, branch='master', remote='origin'): - return git_bool(git_dir, 'merge-base', '--is-ancestor', branch, remote + '/' + branch) +def git_can_fast_forward(git_dir, branch, branch_upstream): + return git_bool(git_dir, 'merge-base', '--is-ancestor', branch, branch_upstream) def format_branch_ahead_behind(branch, ahead, behind): @@ -142,12 +146,14 @@ if not is_current and branch not in interesting_branch_names: continue - ahead, behind = git_ahead_behind(git_dir, branch) + ahead, behind = git_ahead_behind(git_dir, branch, + git_branch_upstream(git_dir, branch)) + if not ahead and not behind and not is_current: # skip branches that are "not interesting" continue - # Branch with ahead/behind origin info ("master[+1|-5]") + # Branch with ahead/behind upstream info ("master[+1|-5]") strs.append(format_branch_ahead_behind(branch, ahead, behind)) return strs @@ -238,8 +244,10 @@ print('Not on a branch: %s' % git_dir) raise SkipThisRepo() - print('Rebasing branch: ' + orig_branch) - ahead, behind = git_ahead_behind(git_dir, orig_branch) + upstream_branch = git_branch_upstream(git_dir, orig_branch) + + print('Rebasing %r onto %r' % (orig_branch, upstream_branch)) + ahead, behind = git_ahead_behind(git_dir, orig_branch, upstream_branch) if git_has_modifications(git_dir): do_commit = ask(git_dir, 'Local mods.', @@ -262,24 +270,24 @@ raise SkipThisRepo() # Missing upstream branch - if not git_branch_exists(git_dir, 'origin/' + orig_branch): + if not upstream_branch: print('there is no upstream branch for %r' % orig_branch) # Diverged elif ahead and behind: do_reset = ask(git_dir, 'Diverged.', - '%s: git reset --hard origin/%s?' % ( - orig_branch, orig_branch), + '%s: git reset --hard %s?' % ( + orig_branch, upstream_branch), ' no', 'OK yes (write OK in caps!)', valid_answers=('', 'OK')) if do_reset == 'OK': - git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + git(git_dir, 'reset', '--hard', upstream_branch) # Behind elif behind: - if git_can_fast_forward(git_dir, orig_branch): + if git_can_fast_forward(git_dir, orig_branch, upstream_branch): print('fast-forwarding...') git(git_dir, 'merge') else: @@ -303,13 +311,13 @@ git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - do_reset = ask(git_dir, '%s: git reset --hard origin/%s?' % (orig_branch, orig_branch), + do_reset = ask(git_dir, '%s: git reset --hard %s?' % (orig_branch, upstream_branch), ' no', 'OK yes (write OK in caps!)', valid_answers=('', 'OK')) if do_reset == 'OK': - git(git_dir, 'reset', '--hard', 'origin/%s' % orig_branch) + git(git_dir, 'reset', '--hard', upstream_branch) return orig_branch -- To view, visit https://gerrit.osmocom.org/11756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ife146903ae1323a4e568587ccfd4018725e9d719 Gerrit-Change-Number: 11756 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 15:59:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 15:59:08 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 3: (1 comment) @pespin, am I missing something, or would you remove -1 now? https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gsm/protocol/gsm_03_41.h File include/osmocom/gsm/protocol/gsm_03_41.h: https://gerrit.osmocom.org/#/c/11787/2/include/osmocom/gsm/protocol/gsm_03_41.h at 36 PS2, Line 36: uint8_t language:4; > Ah nice, I didn't know the behaviour in packet structus was also to remove padding intra-byte wise. [?] feel free to submit a patch for the little-endian part (but I think it's not worth the effort) -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 15:59:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:03:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:03:57 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11806 ) Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... Patch Set 2: Code-Review+2 I would have assumed it would suffice to just point to the git clone, installing not needed, after all it's just some adoc, no linked libraries. But ok, if it works like this then let's apply this as it is, we can still bother about local-clone fallback another time. Rather be done with this before we merge more manuals patches. -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 16:03:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:08:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:08:14 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir) ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11802/1/OsmoBSC/Makefile.am File OsmoBSC/Makefile.am: https://gerrit.osmocom.org/#/c/11802/1/OsmoBSC/Makefile.am at 1 PS1, Line 1: OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) > See my reply here: [?] Oh, I see, you probably mean to use $(top_srcdir)! It looked like it was moving out of the tree, but in fact $(top_srcdir) would be better here. (fyi, there's also $(top_builddir)) -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 16:08:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:11:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:11:57 +0000 Subject: Change in osmo-gsm-manuals[master]: remove project specific files In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: remove project specific files ...................................................................... Patch Set 5: Code-Review+2 I think it's ok to remove all in one flush, save you the monkey work -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 16:11:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: make check: properly reference dependencies In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11794 to look at the new patch set (#2). Change subject: make check: properly reference dependencies ...................................................................... make check: properly reference dependencies Use $(ASCIIDOC_DEPS) instead of assuming that the value would be "chapters/*.adoc". The variable exists already, but it was not used yet in 'make check' of Makefile.asciidoc.inc. This allows creating a tests dir without its own chapters subdir (follow-up commit), which is part of a larger effort to move manuals to project repositories. The reason for moving manuals to project repositories is that we can have documentation changes together with code changes in the same patches. Not part of this patchset, but possible in the future, is optionally building UNIX man pages in the project repositories (OS#3386) as well as generating the VTY documentation on the fly from running the project binaries (OS#3695). (moving manuals to project repositories 1/19) Related: OS#3386 Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/94/11794/2 -- To view, visit https://gerrit.osmocom.org/11794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 Gerrit-Change-Number: 11794 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add shared content pdf build tests In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11795 to look at the new patch set (#2). Change subject: tests: add shared content pdf build tests ...................................................................... tests: add shared content pdf build tests Build project independent "test-usermanual.pdf" (with all common chapters automatically included) and "test-vty-reference.pdf" files. This allows testing if changed common chapters and the build scripts are still working, even when the project specific manuals will be moved away from this repository. (moving manuals to project repositories 2/19) Related: OS#3386 Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf --- M .gitignore M Makefile A tests/Makefile A tests/test-usermanual-docinfo.xml A tests/test-vty-reference.xml A tests/vty/test_vty_additions.xml A tests/vty/test_vty_reference.xml 7 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/95/11795/2 -- To view, visit https://gerrit.osmocom.org/11795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf Gerrit-Change-Number: 11795 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11796 to look at the new patch set (#2). Change subject: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g ...................................................................... s/TOPDIR/OSMO_GSM_MANUALS_DIR/g Replace TOPDIR with OSMO_GSM_MANUALS_DIR. When the project specific manuals will be built out of this repository, we still need to refer to the top directory of the shared content. But it will be in another repository, so we need to rename the variable to avoid confusion. (moving manuals to project repositories 3/19) Related: OS#3385 Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab --- M OsmoBSC/Makefile M OsmoBTS/Makefile M OsmoGGSN/Makefile M OsmoGSMTester/Makefile M OsmoHLR/Makefile M OsmoMGCP/Makefile M OsmoMGW/Makefile M OsmoMSC/Makefile M OsmoNAT/Makefile M OsmoNITB/Makefile M OsmoPCU/Makefile M OsmoSGSN/Makefile M OsmoSIPConnector/Makefile M OsmoSTP/Makefile M OsmoTRX/Makefile M OsmocomBB/Makefile M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc M tests/Makefile 20 files changed, 88 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/96/11796/2 -- To view, visit https://gerrit.osmocom.org/11796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab Gerrit-Change-Number: 11796 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: prepare for autotools: add git-version-gen In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11797 to look at the new patch set (#2). Change subject: prepare for autotools: add git-version-gen ...................................................................... prepare for autotools: add git-version-gen Add the same version of git-version-gen, which most other Osmocom repositories (libasn1c, libosmocore, libosmo-netif, libosmo-sccp, ...) are using, so they behave the same. git-version-gen generates a version string derived from the git repository, or from a .tarball-version file when running outside of a git directory. Unfortunatelly it seems to be impossible to use git-version-gen from autoconf without adding it to the source tree. Autotools will be used to install the shared manual files into the system in a way that is consistent with the other Osmocom repositories: $ autoreconf -fi $ ./configure --prefix=/usr/local $ make $ make install Project repositories will check with pkg-config if osmo-gsm-manuals is installed (like any other shared Osmocom component), when a new configure flag for building the manuals is passed. This will also work with distribution's package managers, for instance we could have a osmo-gsm-manuals-dev package in Debian on which the other packages would have a build-time dependency to build the UNIX man pages (OS#3386). (moving manuals to project repositories 4/19) Related: OS#3385 Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 --- M .gitignore A git-version-gen 2 files changed, 155 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/97/11797/2 -- To view, visit https://gerrit.osmocom.org/11797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 Gerrit-Change-Number: 11797 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11725 to look at the new patch set (#6). Change subject: use autotools to add "make install" target ...................................................................... use autotools to add "make install" target For reasoning why a transition to autotools is desired, see the commit message of the previous patch in this series. "make install" copies the "build", "common" dirs, as well as the "*.xsl" files to $(prefix)/share/osmo-gsm-manuals. Prefix is typically /usr/local. Also a pkg-config file gets installed, so the path of the shared files can be looked up by autoconf scripts of the project repositories. The check-depends script is installed to $(prefix)/bin/osmo-gsm-manuals-check-depends and will be used by project specific autoconf scripts, too. All existing make targets ("make", "make check", "make upload") are still working, users only need to run "autoreconf -fi" and "./configure" beforehand. Makefile.am uses custom install-data-hook and uninstall-local targets, so we don't need to specify each file of the relevant subdirs in a _DATA variable (no extra maintenance effort). (moving manuals to project repositories 5/19) Related: OS#3385 Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 --- M .gitignore M INSTALL.txt D Makefile A Makefile.am R OsmoBSC/Makefile.am R OsmoBTS/Makefile.am R OsmoGGSN/Makefile.am R OsmoGSMTester/Makefile.am R OsmoHLR/Makefile.am R OsmoMGCP/Makefile.am R OsmoMGW/Makefile.am R OsmoMSC/Makefile.am R OsmoNAT/Makefile.am R OsmoNITB/Makefile.am R OsmoPCU/Makefile.am R OsmoSGSN/Makefile.am R OsmoSIPConnector/Makefile.am R OsmoSTP/Makefile.am R OsmoTRX/Makefile.am R OsmocomBB/Makefile.am A configure.ac M contrib/jenkins.sh A osmo-gsm-manuals.pc.in R tests/Makefile.am 24 files changed, 114 insertions(+), 79 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/25/11725/6 -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11806 to look at the new patch set (#3). Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... cosmetic: update usage of OSMO_GSM_MANUALS_DIR OSMO_GSM_MANUALS_DIR should use pkg-config to figure out the location of the shared osmo-gsm-manuals files. (moving manuals to project repositories 6/19) Related: OS#3385 Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 --- M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc 3 files changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/06/11806/3 -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: *filter.conf/*.sty: use symlinks to build, common In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11798 to look at the new patch set (#2). Change subject: *filter.conf/*.sty: use symlinks to build, common ...................................................................... *filter.conf/*.sty: use symlinks to build, common $(OSMO_GSM_MANUALS_DIR) is used in most places to reference to the top dir, which contains "build" and "common". But not in the asciidoc mscgen filter configurations, and in the custom LaTeX style. They have ../common or ../build hardcoded, which won't work anymore when the project specific files will be in another repository. Update the Makefiles to create symlinks to "build" and "common" in the dir where the build was started. Use ./common in the files that had ../common hardcoded, and do the same for ./build. Update the Makefile.common.inc comment to refer to common targets in general, so we don't need to list each single one there (like the new 'common' and 'build' targets). I've also thought about using variables there, but this would only work for the asciidoc files, not for the .sty file. We would need to generate the latter from another file and replace the variable dynamically. Having the symlinks instead seemed to be slightly easier. (moving manuals to project repositories 7/19) Related: OS#3385 Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 --- M .gitignore M build/Makefile.asciidoc.inc M build/Makefile.common.inc M build/Makefile.docbook.inc M build/custom-dblatex.sty M build/mscgen-filter.conf M build/python2-filter.conf 7 files changed, 25 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/98/11798/2 -- To view, visit https://gerrit.osmocom.org/11798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 Gerrit-Change-Number: 11798 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: include from ./common, not ../common In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11799 to look at the new patch set (#2). Change subject: *.adoc: include from ./common, not ../common ...................................................................... *.adoc: include from ./common, not ../common Change hardcoded ../common paths, which will break when moving the project specific manuals in other repositories, to ./common so they use the dynamically created symlink that always points to the right path. (moving manuals to project repositories 8/19) Related: OS#3385 Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 --- M OsmoBSC/osmobsc-usermanual.adoc M OsmoBTS/osmobts-abis.adoc M OsmoBTS/osmobts-usermanual.adoc M OsmoGGSN/osmoggsn-usermanual.adoc M OsmoHLR/osmohlr-usermanual.adoc M OsmoMGW/osmomgw-usermanual.adoc M OsmoMSC/osmomsc-usermanual.adoc M OsmoNITB/osmonitb-usermanual.adoc M OsmoPCU/osmopcu-gb.adoc M OsmoPCU/osmopcu-usermanual.adoc M OsmoSGSN/osmosgsn-usermanual.adoc M OsmoSIPConnector/osmosipconnector-usermanual.adoc M OsmoSTP/osmostp-usermanual.adoc M OsmoTRX/osmotrx-usermanual.adoc M OsmocomBB/osmocombb-usermanual.adoc M common/chapters/logging.adoc 16 files changed, 131 insertions(+), 131 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/99/11799/2 -- To view, visit https://gerrit.osmocom.org/11799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 Gerrit-Change-Number: 11799 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: *-vty-reference.xml: use ./common, not ../common In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11800 to look at the new patch set (#2). Change subject: *-vty-reference.xml: use ./common, not ../common ...................................................................... *-vty-reference.xml: use ./common, not ../common Change hardcoded ../common paths, which will break when moving the project specific manuals in other repositories, to ./common so they use the dynamically created symlink that always points to the right path. (moving manuals to project repositories 9/19) Change-Id: I5368bcff34586c515af23e5a868417e561fd539d --- M OsmoBSC/osmobsc-vty-reference.xml M OsmoBTS/osmobts-vty-reference.xml M OsmoGGSN/osmoggsn-vty-reference.xml M OsmoHLR/osmohlr-vty-reference.xml M OsmoMGCP/osmomgcp-vty-reference.xml M OsmoMGW/osmomgw-vty-reference.xml M OsmoMSC/osmomsc-vty-reference.xml M OsmoNAT/osmonat-vty-reference.xml M OsmoNITB/osmonitb-vty-reference.xml M OsmoPCU/osmopcu-vty-reference.xml M OsmoSGSN/osmosgsn-vty-reference.xml M OsmoSIPConnector/osmosipconnector-vty-reference.xml M OsmoSTP/osmostp-vty-reference.xml M OsmoTRX/osmotrx-vty-reference.xml M tests/test-vty-reference.xml 15 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/00/11800/2 -- To view, visit https://gerrit.osmocom.org/11800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5368bcff34586c515af23e5a868417e561fd539d Gerrit-Change-Number: 11800 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11801 to look at the new patch set (#2). Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... vty_reference_combine.sh: add *reference.xml arg Pass the path to $(srcdir)/vty/*reference.xml as parameter to vty_reference_combine.sh instead of assuming that it will be in ./vty/*reference.xml. This is necessary to make the build scripts work for out-of-tree builds. Because when building out-of-tree, the source dir and build dir (the one where the Makefile gets generated, and in which "make" runs), are not the same anymore. The relative vty/reference.xml path is only valid in the source dir, not in the build dir. The next commits in this series have more changes for out-of-tree builds. Out-of-tree building is necessary for consistency with the other Osmocom code, which can be built out-of-tree as well. It would be strange if this did not work anymore as soon as the users enabled building the manuals. (moving manuals to project repositories 10/19) Related: OS#3385 Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c --- M build/Makefile.vty-reference.inc M build/vty_reference_combine.sh 2 files changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/01/11801/2 -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir) In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11802 to look at the new patch set (#2). Change subject: Osmo*/Makefile.am: use $(srcdir) ...................................................................... Osmo*/Makefile.am: use $(srcdir) Use $(srcdir) infront of all relative paths, which reference other files in the repository. This is needed for out-of-tree building. (moving manuals to project repositories 11/19) Related: OS#3385 Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc --- M OsmoBSC/Makefile.am M OsmoBTS/Makefile.am M OsmoGGSN/Makefile.am M OsmoGSMTester/Makefile.am M OsmoHLR/Makefile.am M OsmoMGCP/Makefile.am M OsmoMGW/Makefile.am M OsmoMSC/Makefile.am M OsmoNAT/Makefile.am M OsmoNITB/Makefile.am M OsmoPCU/Makefile.am M OsmoSGSN/Makefile.am M OsmoSIPConnector/Makefile.am M OsmoSTP/Makefile.am M OsmoTRX/Makefile.am M OsmocomBB/Makefile.am M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M tests/Makefile.am 19 files changed, 41 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/02/11802/2 -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11803 to look at the new patch set (#2). Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Makefile.*.inc: adjust to out-of-tree building Makefile.asciidoc.inc: create a symlink for the root adoc file, from which a PDF gets generated, from the srcdir to the builddir. This file may include other adoc files, which do not get symlinked. We need to do this, because a2x (the program generating the PDF file) does not have a parameter for the output file, and will otherwise generate the PDF in the srcdir instead of the builddir. Do the same in the check target, so the relative include paths work the same. Makefile.asciidoc.inc, Makefile.docbook.inc: set the include paths for the xstl parser, as well as the LaTeX compiler, so they can find the files they need from both OSMO_GSM_MANUALS_DIR and builddir. Makefile.asciidoc.inc, Makefile.docbook.inc: refer to the output file $@ with $(notdir $@). This removes the path from the file, like basename from coreutils. The output file will then be placed in the builddir instead of the srcdir. Makefile.vty-reference.inc: use $(srcdir) in references to vty/*.xml files. (moving manuals to project repositories 12/19) Related: OS#3385 Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d --- M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc 3 files changed, 31 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/03/11803/2 -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: use {srcdir} for out-of-tree builds In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11804 to look at the new patch set (#2). Change subject: *.adoc: use {srcdir} for out-of-tree builds ...................................................................... *.adoc: use {srcdir} for out-of-tree builds Define a new {srcdir} variable in Makefile.asciidoc.inc, that can be used in all adoc files. The value is the same as the Makefile variable $(srcdir). Use {srcdir} in the "include::" lines of all adoc files. (moving manuals to project repositories 13/19) Related: OS#3385 Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a --- M OsmoBSC/aoip-mgw-options.adoc M OsmoBSC/osmobsc-usermanual.adoc M OsmoBTS/osmobts-abis.adoc M OsmoBTS/osmobts-usermanual.adoc M OsmoBTS/rtp-amr.adoc M OsmoGGSN/osmoggsn-usermanual.adoc M OsmoGSMTester/osmo-gsm-tester-manual.adoc M OsmoHLR/osmohlr-usermanual.adoc M OsmoMGW/osmomgw-usermanual.adoc M OsmoMSC/osmomsc-usermanual.adoc M OsmoNITB/osmonitb-usermanual.adoc M OsmoPCU/osmopcu-gb.adoc M OsmoPCU/osmopcu-usermanual.adoc M OsmoSGSN/osmosgsn-usermanual.adoc M OsmoSIPConnector/osmosipconnector-usermanual.adoc M OsmoSTP/osmostp-usermanual.adoc M OsmoTRX/osmotrx-usermanual.adoc M OsmocomBB/osmocombb-usermanual.adoc M build/Makefile.asciidoc.inc 19 files changed, 82 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/04/11804/2 -- To view, visit https://gerrit.osmocom.org/11804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a Gerrit-Change-Number: 11804 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: copy NITB's osmobsc-usermanual.adoc to OsmoBSC In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11805 to look at the new patch set (#2). Change subject: copy NITB's osmobsc-usermanual.adoc to OsmoBSC ...................................................................... copy NITB's osmobsc-usermanual.adoc to OsmoBSC Includes from other projects don't work anymore when moving project specific manuals into other repositories. (moving manuals to project repositories 14/19) Related: OS#3385 Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad --- A OsmoBSC/chapters/bts-examples.adoc M OsmoBSC/osmobsc-usermanual.adoc 2 files changed, 282 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/05/11805/2 -- To view, visit https://gerrit.osmocom.org/11805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad Gerrit-Change-Number: 11805 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11740 to look at the new patch set (#3). Change subject: publish from project repos, not this repo anymore ...................................................................... publish from project repos, not this repo anymore Do not publish PDFs for all projects anymore with jenkins.sh --publish or "make publish". Extract known_hosts from jenkins.sh, and install it along with the other shared files in OSMO_GSM_MANUALS_DIR. Add a "publish" target to Makefile.common.inc, so we can use it from the project repositories. Document its usage in INSTALL.txt. No automatism for building and publishing the documentation of all projects will be implemented in this patch series, as discussed here: https://osmocom.org/issues/3385#note-7 (moving manuals to project repositories 19/19) Related: OS#3385 Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 --- M INSTALL.txt M build/Makefile.common.inc A build/known_hosts M contrib/jenkins.sh 4 files changed, 32 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/40/11740/3 -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:14 +0000 Subject: Change in osmo-gsm-manuals[master]: move OsmoMSC files to osmo-msc.git In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11738 to look at the new patch set (#6). Change subject: move OsmoMSC files to osmo-msc.git ...................................................................... move OsmoMSC files to osmo-msc.git Add to osmo-msc.git with I2f9c27f81940b02414f0e618483bffade72e8cf7. The other project specific files will be moved in future commits. One commit per dir. Related: OS#3385 Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc --- M Makefile.am D OsmoMSC/Makefile.am D OsmoMSC/chapters/control.adoc D OsmoMSC/chapters/counters.adoc D OsmoMSC/chapters/counters_generated.adoc D OsmoMSC/chapters/net.adoc D OsmoMSC/chapters/overview.adoc D OsmoMSC/chapters/running.adoc D OsmoMSC/images/sgs-imsi_attach_lu.msc D OsmoMSC/images/sgs-mo_call_no_ps_ho.msc D OsmoMSC/images/sgs-mo_sms_idle.msc D OsmoMSC/images/sgs-mt_call_idle.msc D OsmoMSC/images/sgs-mt_sms_idle.msc D OsmoMSC/osmomsc-usermanual-docinfo.xml D OsmoMSC/osmomsc-usermanual.adoc D OsmoMSC/osmomsc-vty-reference.xml D OsmoMSC/vty/msc_vty_additions.xml D OsmoMSC/vty/msc_vty_reference.xml M configure.ac 19 files changed, 1 insertion(+), 3,447 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/38/11738/6 -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:20 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: chmod xsltproc output Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11843 Change subject: vty_reference_combine.sh: chmod xsltproc output ...................................................................... vty_reference_combine.sh: chmod xsltproc output Force the xsltproc output file to be writable, if it exists already. This is needed for 'make distcheck': xsltproc gives output files the same permissions as input files. We need to change the output file in multiple iterations in vty_reference_combine.sh, hence it must be writable. (moving manuals to project repositories 15/19) Related: OS#3385 Change-Id: I693e12ee15665d01cbc50187e6cb3ca74ad0356a --- M build/vty_reference_combine.sh 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/43/11843/1 diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh index cb18e9e..449b227 100755 --- a/build/vty_reference_combine.sh +++ b/build/vty_reference_combine.sh @@ -22,6 +22,14 @@ while [ -n "$1" ]; do addition="$(realpath "$1")" shift + + # Fix permissions: xsltproc sets the output permissions the same as the + # input file, which means during "make distcheck" our output file will + # become read-only. + if [ -f "$combine_src" ]; then + chmod 644 "$combine_src" + fi + mv "$combined" "$combine_src" xsltproc -o "$combined" \ --stringparam with "$addition" \ -- To view, visit https://gerrit.osmocom.org/11843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I693e12ee15665d01cbc50187e6cb3ca74ad0356a Gerrit-Change-Number: 11843 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:20 +0000 Subject: Change in osmo-gsm-manuals[master]: gitignore: add 'make distcheck' files Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11844 Change subject: gitignore: add 'make distcheck' files ...................................................................... gitignore: add 'make distcheck' files (moving manuals to project repositories 16/19) Related: OS#3385 Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 --- M .gitignore 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/44/11844/1 diff --git a/.gitignore b/.gitignore index b174bb9..d823675 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,10 @@ Makefile.in Makefile +# make distcheck +osmo-gsm-manuals-*/ +osmo-gsm-manuals-*.tar.* + # symlinks to shared dirs (needed for out-of-tree builds) */common */build -- To view, visit https://gerrit.osmocom.org/11844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 Gerrit-Change-Number: 11844 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:20 +0000 Subject: Change in osmo-gsm-manuals[master]: */Makefile.am: add EXTRA_DIST Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11845 Change subject: */Makefile.am: add EXTRA_DIST ...................................................................... */Makefile.am: add EXTRA_DIST Necessary for 'make distcheck': the files will otherwise not end up in the dist archives. (moving manuals to project repositories 17/19) Related: OS#3385 Change-Id: I5a2d6e572d346addc8770d1331c9223a56635869 --- M OsmoBSC/Makefile.am M OsmoBTS/Makefile.am M OsmoGGSN/Makefile.am M OsmoGSMTester/Makefile.am M OsmoHLR/Makefile.am M OsmoMGCP/Makefile.am M OsmoMGW/Makefile.am M OsmoMSC/Makefile.am M OsmoNAT/Makefile.am M OsmoNITB/Makefile.am M OsmoPCU/Makefile.am M OsmoSGSN/Makefile.am M OsmoSIPConnector/Makefile.am M OsmoSTP/Makefile.am M OsmoTRX/Makefile.am M OsmocomBB/Makefile.am M tests/Makefile.am 17 files changed, 93 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/45/11845/1 diff --git a/OsmoBSC/Makefile.am b/OsmoBSC/Makefile.am index f88b9e7..0d7dfab 100644 --- a/OsmoBSC/Makefile.am +++ b/OsmoBSC/Makefile.am @@ -1,4 +1,16 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = aoip-mgw-options.adoc \ + aoip-mgw-options-docinfo.xml \ + osmobsc-usermanual.adoc \ + osmobsc-usermanual-docinfo.xml \ + osmobsc-vty-reference.xml \ + osmux-reference.adoc \ + osmux-reference-docinfo.xml \ + chapters \ + message-sequences \ + mgw \ + om2000 \ + vty ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/OsmoBTS/Makefile.am b/OsmoBTS/Makefile.am index 8abde91..084ae60 100644 --- a/OsmoBTS/Makefile.am +++ b/OsmoBTS/Makefile.am @@ -1,4 +1,15 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = dtx.dot \ + osmobts-abis.adoc \ + osmobts-abis-docinfo.xml \ + osmobts-usermanual.adoc \ + osmobts-usermanual-docinfo.xml \ + osmobts-vty-reference.xml \ + rtp-amr.adoc \ + rtp-amr-docinfo.xml \ + abis \ + chapters \ + vty ASCIIDOC = osmobts-usermanual.adoc osmobts-abis.adoc rtp-amr.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/OsmoGGSN/Makefile.am b/OsmoGGSN/Makefile.am index ff372b4..67df435 100644 --- a/OsmoGGSN/Makefile.am +++ b/OsmoGGSN/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmoggsn-usermanual.adoc \ + osmoggsn-usermanual-docinfo.xml \ + osmoggsn-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmoggsn-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoGSMTester/Makefile.am b/OsmoGSMTester/Makefile.am index e14cd6d..e68e381 100644 --- a/OsmoGSMTester/Makefile.am +++ b/OsmoGSMTester/Makefile.am @@ -1,4 +1,7 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmo-gsm-tester-manual.adoc \ + osmo-gsm-tester-manual-docinfo.xml \ + chapters ASCIIDOC = osmo-gsm-tester-manual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoHLR/Makefile.am b/OsmoHLR/Makefile.am index b0ff6dd..a861f6a 100644 --- a/OsmoHLR/Makefile.am +++ b/OsmoHLR/Makefile.am @@ -1,4 +1,12 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = example_subscriber_add_update_delete.vty \ + example_subscriber_cs_ps_enabled.ctrl \ + example_subscriber_info.ctrl \ + osmohlr-usermanual.adoc \ + osmohlr-usermanual-docinfo.xml \ + osmohlr-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmohlr-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.vty $(srcdir)/*.ctrl diff --git a/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am index ddc498c..a08463d 100644 --- a/OsmoMGCP/Makefile.am +++ b/OsmoMGCP/Makefile.am @@ -1,4 +1,6 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmomgcp-vty-reference.xml \ + vty VTY_REFERENCE = osmomgcp-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoMGW/Makefile.am b/OsmoMGW/Makefile.am index b2e1f85..7606583 100644 --- a/OsmoMGW/Makefile.am +++ b/OsmoMGW/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmomgw-usermanual.adoc \ + osmomgw-usermanual-docinfo.xml \ + osmomgw-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmomgw-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoMSC/Makefile.am b/OsmoMSC/Makefile.am index a03ccf3..d359e5c 100644 --- a/OsmoMSC/Makefile.am +++ b/OsmoMSC/Makefile.am @@ -1,4 +1,10 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmomsc-usermanual.adoc \ + osmomsc-usermanual-docinfo.xml \ + osmomsc-vty-reference.xml \ + chapters \ + images \ + vty ASCIIDOC = osmomsc-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am index eaaff14..560e715 100644 --- a/OsmoNAT/Makefile.am +++ b/OsmoNAT/Makefile.am @@ -1,4 +1,6 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmonat-vty-reference.xml \ + vty VTY_REFERENCE = osmonat-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoNITB/Makefile.am b/OsmoNITB/Makefile.am index c6fcac3..cc9387f 100644 --- a/OsmoNITB/Makefile.am +++ b/OsmoNITB/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmonitb-usermanual.adoc \ + osmonitb-usermanual-docinfo.xml \ + osmonitb-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmonitb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoPCU/Makefile.am b/OsmoPCU/Makefile.am index 846e10a..b6a3c1c 100644 --- a/OsmoPCU/Makefile.am +++ b/OsmoPCU/Makefile.am @@ -1,4 +1,12 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmopcu-gb.adoc \ + osmopcu-gb-docinfo.xml \ + osmopcu-usermanual.adoc \ + osmopcu-usermanual-docinfo.xml \ + osmopcu-vty-reference.xml \ + chapters \ + gb \ + vty ASCIIDOC = $(srcdir)/osmopcu-usermanual.adoc $(srcdir)/osmopcu-gb.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/OsmoSGSN/Makefile.am b/OsmoSGSN/Makefile.am index c3352d7..1f2b6c5 100644 --- a/OsmoSGSN/Makefile.am +++ b/OsmoSGSN/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmosgsn-usermanual.adoc \ + osmosgsn-usermanual-docinfo.xml \ + osmosgsn-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmosgsn-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoSIPConnector/Makefile.am b/OsmoSIPConnector/Makefile.am index 60c244f..2a5cb79 100644 --- a/OsmoSIPConnector/Makefile.am +++ b/OsmoSIPConnector/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmosipconnector-usermanual.adoc \ + osmosipconnector-usermanual-docinfo.xml \ + osmosipconnector-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmosipconnector-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoSTP/Makefile.am b/OsmoSTP/Makefile.am index 113f426..5e24fd7 100644 --- a/OsmoSTP/Makefile.am +++ b/OsmoSTP/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmostp-usermanual.adoc \ + osmostp-usermanual-docinfo.xml \ + osmostp-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmostp-usermanual.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/OsmoTRX/Makefile.am b/OsmoTRX/Makefile.am index 901b245..9cc80d0 100644 --- a/OsmoTRX/Makefile.am +++ b/OsmoTRX/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmotrx-usermanual.adoc \ + osmotrx-usermanual-docinfo.xml \ + osmotrx-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmotrx-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am index be2ba25..db9b089 100644 --- a/OsmocomBB/Makefile.am +++ b/OsmocomBB/Makefile.am @@ -1,4 +1,7 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = osmocombb-usermanual.adoc \ + osmocombb-usermanual-docinfo.xml \ + chapters ASCIIDOC = osmocombb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/tests/Makefile.am b/tests/Makefile.am index 3484193..f807318 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,7 @@ OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) +EXTRA_DIST = test-usermanual-docinfo.xml \ + test-vty-reference.xml \ + vty # Generate adoc file that includes all chapters ASCIIDOC = test-usermanual.adoc -- To view, visit https://gerrit.osmocom.org/11845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5a2d6e572d346addc8770d1331c9223a56635869 Gerrit-Change-Number: 11845 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:14:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:14:21 +0000 Subject: Change in osmo-gsm-manuals[master]: jenkins.sh: run 'make distcheck' Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11846 Change subject: jenkins.sh: run 'make distcheck' ...................................................................... jenkins.sh: run 'make distcheck' Everything is in place for 'make distcheck' now. (moving manuals to project repositories 18/19) Related: OS#3385 Change-Id: Ie31fba3d1afd31c25489ce08169101d9ed9de536 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/46/11846/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 1fd19d1..626160e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -10,6 +10,7 @@ ./configure $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE check +$MAKE $PARALLEL_MAKE distcheck if [ "x$publish" = "x--publish" ]; then mkdir out/ -- To view, visit https://gerrit.osmocom.org/11846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie31fba3d1afd31c25489ce08169101d9ed9de536 Gerrit-Change-Number: 11846 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 20 16:14:39 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 20 Nov 2018 16:14:39 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2491?= In-Reply-To: <779185478.754.1542718002310.JavaMail.jenkins@jenkins.osmocom.org> References: <779185478.754.1542718002310.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <574475196.756.1542730479182.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:15:13 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:15:13 +0000 Subject: Change in osmo-msc[master]: add manuals from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11726 to look at the new patch set (#3). Change subject: add manuals from osmo-gsm-manuals.git ...................................................................... add manuals from osmo-gsm-manuals.git Build manuals when ./configure --enable-manuals is specified. Requires osmo-gsm-manuals to be installed. Related: OS#3385 Depends: Ibe0424ceace151115985896b6d43035c69067c50 (osmo-gsm-manuals) Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 --- M .gitignore M configure.ac M doc/Makefile.am A doc/manuals/Makefile.am A doc/manuals/chapters/control.adoc A doc/manuals/chapters/counters.adoc A doc/manuals/chapters/counters_generated.adoc A doc/manuals/chapters/net.adoc A doc/manuals/chapters/overview.adoc A doc/manuals/chapters/running.adoc A doc/manuals/images/sgs-imsi_attach_lu.msc A doc/manuals/images/sgs-mo_call_no_ps_ho.msc A doc/manuals/images/sgs-mo_sms_idle.msc A doc/manuals/images/sgs-mt_call_idle.msc A doc/manuals/images/sgs-mt_sms_idle.msc A doc/manuals/osmomsc-usermanual-docinfo.xml A doc/manuals/osmomsc-usermanual.adoc A doc/manuals/osmomsc-vty-reference.xml A doc/manuals/vty/msc_vty_additions.xml A doc/manuals/vty/msc_vty_reference.xml 20 files changed, 3,317 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/11726/3 -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:16:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:16:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable PCU related tests if PCU socket not configured In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11841 ) Change subject: bts: Disable PCU related tests if PCU socket not configured ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I773c7ec52dd8532bf160e92ffefc8d936ca55de2 Gerrit-Change-Number: 11841 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 16:16:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:17:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:17:51 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max Gerrit-Comment-Date: Tue, 20 Nov 2018 16:17:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:18:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:18:15 +0000 Subject: Change in osmo-bts[master]: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11768 ) Change subject: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 Gerrit-Change-Number: 11768 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 16:18:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:19:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:19:01 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11571 ) Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... Patch Set 3: Code-Review+2 I did read it thrice, still don't get it :) but if you say it's ok then here we go -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 16:19:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:20:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:20:11 +0000 Subject: Change in osmo-bts[master]: bts-trx: setup timer once at creation time In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11766 ) Change subject: bts-trx: setup timer once at creation time ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 Gerrit-Change-Number: 11766 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 20 Nov 2018 16:20:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:20:26 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:20:26 +0000 Subject: Change in osmo-gsm-manuals[master]: move OsmoMSC files to osmo-msc.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: move OsmoMSC files to osmo-msc.git ...................................................................... Patch Set 6: > I think it's ok to remove all in one flush, save you the monkey work Thanks. I had the patches already updated to only remove OsmoMSC for now. I'm fine with either way. -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 16:20:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:20:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:20:53 +0000 Subject: Change in osmo-bsc[master]: bsc: Enable force-combined-si on nanoBTS by default In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11834 ) Change subject: bsc: Enable force-combined-si on nanoBTS by default ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d Gerrit-Change-Number: 11834 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 16:20:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:23:16 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 16:23:16 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Log domain and fix strings without endl char In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11744 ) Change subject: osmo_ortp: Log domain and fix strings without endl char ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11744/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/#/c/11744/1/src/trau/osmo_ortp.c at 109 PS1, Line 109: int needs_endl; (curious, why not bool ... but whatever) -- To view, visit https://gerrit.osmocom.org/11744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6df0df04cd6ba342753c84398274d04917ace40 Gerrit-Change-Number: 11744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 20 Nov 2018 16:23:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:31:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:31:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: Disable PCU related tests if PCU socket not configured In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11841 ) Change subject: bts: Disable PCU related tests if PCU socket not configured ...................................................................... bts: Disable PCU related tests if PCU socket not configured With some real HW setups, there's no PCU (osmo-pcu) available locally, for instance when using a sysmobts, or when using a nanoBTS. There's no need to waste time and generate extra output by running this tests in this case. Furthermore, some tests seem to crash sometimes in that setup, probably due to using invalid fd (-1): MTC at 801a0da9866a: Setting RSL_SYSTEM_INFO_4 (4): '31061C62F224002A4740E50400'O /osmo-ttcn3-hacks/bts/BTS_Tests: Segmentation fault occurred /usr/lib/titan/libttcn3-parallel-dynamic.so(_Z14signal_handleri+0xa3)[0x7f0c33b48073] /lib/x86_64-linux-gnu/libc.so.6(+0x33060)[0x7f0c321aa060] /osmo-ttcn3-hacks/bts/UD_PT.so(_ZN12UD__PortType15UD__PT_PROVIDER13outgoing_sendERKN9UD__Types14UD__send__dataE+0xf0)[0x7f0c349e42f8] /osmo-ttcn3-hacks/bts/PCUIF_CodecPort.so(_ZN16PCUIF__CodecPort16PCUIF__CODEC__PT4sendERKNS_17PCUIF__send__dataERK9COMPONENT+0x19e)[0x7f0c37e1731a] /osmo-ttcn3-hacks/bts/PCUIF_CodecPort.so(_ZN16PCUIF__CodecPort16PCUIF__CODEC__PT4sendERKNS_26PCUIF__send__data_templateE+0x5f)[0x7f0c37e174f7] /osmo-ttcn3-hacks/bts/BTS_Tests.so(_ZN10BTS__Tests20f__TC__pcu__act__reqERK7INTEGERS2_S2_RK7BOOLEAN+0x411)[0x7f0c3eec3210] /osmo-ttcn3-hacks/bts/BTS_Tests.so(_ZN10BTS__Tests28testcase_TC__pcu__deact__reqEbd+0x15d)[0x7f0c3eec4f27] /osmo-ttcn3-hacks/bts/BTS_Tests.so(+0xfb65d)[0x7f0c3eeef65d] /usr/lib/titan/libttcn3-parallel-dynamic.so(_ZN11Module_List15execute_controlEPKc+0x1c)[0x7f0c33af3fbc] Change-Id: I773c7ec52dd8532bf160e92ffefc8d936ca55de2 --- M bts/BTS_Tests.ttcn 1 file changed, 21 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cde9562..753d89b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -4186,23 +4186,27 @@ execute( TC_ipa_crcx_mdcx_mdcx_dlcx_not_active() ); execute( TC_ipa_crcx_sdcch_not_active() ); - execute( TC_pcu_act_req() ); - execute( TC_pcu_act_req_wrong_ts() ); - execute( TC_pcu_act_req_wrong_bts() ); - execute( TC_pcu_act_req_wrong_trx() ); - execute( TC_pcu_deact_req() ); - execute( TC_pcu_deact_req_wrong_ts() ); - execute( TC_pcu_ver_si13() ); - execute( TC_pcu_data_req_wrong_bts() ); - execute( TC_pcu_data_req_wrong_trx() ); - execute( TC_pcu_data_req_wrong_ts() ); - execute( TC_pcu_data_req_ts_inactive() ); - execute( TC_pcu_data_req_pdtch() ); - execute( TC_pcu_data_req_ptcch() ); - execute( TC_pcu_data_req_agch() ); - execute( TC_pcu_data_req_imm_ass_pch() ); - execute( TC_pcu_rach_content() ); - execute( TC_pcu_paging_from_rsl() ); + if (mp_pcu_socket != "") { + execute( TC_pcu_act_req() ); + execute( TC_pcu_act_req_wrong_ts() ); + execute( TC_pcu_act_req_wrong_bts() ); + execute( TC_pcu_act_req_wrong_trx() ); + execute( TC_pcu_deact_req() ); + execute( TC_pcu_deact_req_wrong_ts() ); + execute( TC_pcu_ver_si13() ); + execute( TC_pcu_data_req_wrong_bts() ); + execute( TC_pcu_data_req_wrong_trx() ); + execute( TC_pcu_data_req_wrong_ts() ); + execute( TC_pcu_data_req_ts_inactive() ); + execute( TC_pcu_data_req_pdtch() ); + execute( TC_pcu_data_req_ptcch() ); + execute( TC_pcu_data_req_agch() ); + execute( TC_pcu_data_req_imm_ass_pch() ); + execute( TC_pcu_rach_content() ); + execute( TC_pcu_paging_from_rsl() ); + } else { + log("PCU socket path not available, skipping PCU tests"); + } execute( TC_dyn_osmo_pdch_act_deact() ); execute( TC_dyn_osmo_pdch_unsol_deact() ); -- To view, visit https://gerrit.osmocom.org/11841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I773c7ec52dd8532bf160e92ffefc8d936ca55de2 Gerrit-Change-Number: 11841 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:33:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:33:10 +0000 Subject: Change in osmo-bts[master]: bts-trx: setup timer once at creation time In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11766 ) Change subject: bts-trx: setup timer once at creation time ...................................................................... bts-trx: setup timer once at creation time The setup is only needed once, so no need to set it every time we want to schedule it. Furthermore, it will ease new code introduced in follow-up patches, which will schedule this timer under some circumstances without need to send a message at the same time (because re-try of a cmd after a delay is wanted). This commit adds an alloc function and an init function to keep different parts of the code decoupled and avoid exposing more implementation details between them (like exposing the trx_if timer). Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 5 files changed, 17 insertions(+), 6 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index faff3a0..b4ca54f 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -58,6 +58,14 @@ [GSM_PCHAN_UNKNOWN] = 0, }; +struct trx_l1h *trx_l1h_alloc(void *tall_ctx, struct phy_instance *pinst) +{ + struct trx_l1h *l1h; + l1h = talloc_zero(tall_ctx, struct trx_l1h); + l1h->phy_inst = pinst; + trx_if_init(l1h); + return l1h; +} static void check_transceiver_availability_trx(struct trx_l1h *l1h, int avail) { diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h index 77c5936..165f9d8 100644 --- a/src/osmo-bts-trx/l1_if.h +++ b/src/osmo-bts-trx/l1_if.h @@ -64,6 +64,7 @@ struct l1sched_trx l1s; }; +struct trx_l1h *trx_l1h_alloc(void *tall_ctx, struct phy_instance *pinst); int check_transceiver_availability(struct gsm_bts *bts, int avail); int l1if_provision_transceiver_trx(struct trx_l1h *l1h); int l1if_provision_transceiver(struct gsm_bts *bts); diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 98f460e..9529190 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -139,8 +139,7 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst) { struct trx_l1h *l1h; - l1h = talloc_zero(tall_bts_ctx, struct trx_l1h); - l1h->phy_inst = pinst; + l1h = trx_l1h_alloc(tall_bts_ctx, pinst); pinst->u.osmotrx.hdl = l1h; l1h->config.power_oml = 1; diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 4bcdfc6..b409d51 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -140,8 +140,6 @@ * TRX ctrl socket */ -static void trx_ctrl_timer_cb(void *data); - /* send first ctrl message and start timer */ static void trx_ctrl_send(struct trx_l1h *l1h) { @@ -162,8 +160,6 @@ send(l1h->trx_ofd_ctrl.fd, buf, len+1, 0); /* start timer */ - l1h->trx_ctrl_timer.cb = trx_ctrl_timer_cb; - l1h->trx_ctrl_timer.data = l1h; osmo_timer_schedule(&l1h->trx_ctrl_timer, 2, 0); } @@ -184,6 +180,12 @@ trx_ctrl_send(l1h); } +void trx_if_init(struct trx_l1h *l1h) +{ + l1h->trx_ctrl_timer.cb = trx_ctrl_timer_cb; + l1h->trx_ctrl_timer.data = l1h; +} + /*! Send a new TRX control command. * \param[inout] l1h TRX Layer1 handle to which to send command * \param[in] criticial diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index b161044..206f5e5 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -14,6 +14,7 @@ int critical; }; +void trx_if_init(struct trx_l1h *l1h); int trx_if_cmd_poweroff(struct trx_l1h *l1h); int trx_if_cmd_poweron(struct trx_l1h *l1h); int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc); -- To view, visit https://gerrit.osmocom.org/11766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3b6461d0130d25284e673c5efce0b3832c48bbb5 Gerrit-Change-Number: 11766 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:33:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:33:11 +0000 Subject: Change in osmo-bts[master]: common: Implement OML for trx_set_available(1) In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11767 ) Change subject: common: Implement OML for trx_set_available(1) ...................................................................... common: Implement OML for trx_set_available(1) Related: OS#3692 Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a --- M src/common/bts.c 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/bts.c b/src/common/bts.c index 68cb167..2b17ec6 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -322,13 +322,11 @@ LOGP(DSUM, LOGL_INFO, "TRX(%d): Setting available = %d\n", trx->nr, avail); if (avail) { - /* FIXME: This needs to be sorted out */ -#if 0 - oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); - oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OFF_LINE); + int op_state = trx->rsl_link ? NM_OPSTATE_ENABLED : NM_OPSTATE_DISABLED; + oml_mo_state_chg(&trx->mo, op_state, NM_AVSTATE_OK); + oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_OK); for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) - oml_mo_state_chg(&trx->ts[tn].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); -#endif + oml_mo_state_chg(&trx->ts[tn].mo, op_state, NM_AVSTATE_OK); } else { oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED); oml_mo_state_chg(&trx->bb_transc.mo, -1, NM_AVSTATE_NOT_INSTALLED); -- To view, visit https://gerrit.osmocom.org/11767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1ba32c162a8a98ed0fdd4190227de66270679e5a Gerrit-Change-Number: 11767 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:33:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:33:13 +0000 Subject: Change in osmo-bts[master]: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11768 ) Change subject: bts-trx: Allow re-try without exit if POWERON fails in osmo-trx ...................................................................... bts-trx: Allow re-try without exit if POWERON fails in osmo-trx If POWERON fails, announce to BSC that the TRX is not available, and announce it as available as soon as POWERON success is received. Related: OS#3692 Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 44 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index b409d51..b048170 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -173,7 +173,7 @@ OSMO_ASSERT(!llist_empty(&l1h->trx_ctrl_list)); tcm = llist_entry(l1h->trx_ctrl_list.next, struct trx_ctrl_msg, list); - LOGP(DTRX, LOGL_NOTICE, "No response from transceiver for %s (CMD %s%s%s)\n", + LOGP(DTRX, LOGL_NOTICE, "No satisfactory response from transceiver for %s (CMD %s%s%s)\n", phy_instance_name(l1h->phy_inst), tcm->cmd, tcm->params_len ? " ":"", tcm->params); @@ -437,6 +437,40 @@ return true; } +/* -EINVAL: unrecoverable error, exit BTS + * N > 0: try sending originating command again after N seconds + * 0: Done with response, get originating command out from send queue + */ +static int trx_ctrl_rx_rsp(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp, bool critical) +{ + struct phy_instance *pinst = l1h->phy_inst; + + /* If TRX fails, try again after 1 sec */ + if (strcmp(rsp->cmd, "POWERON") == 0) { + if (rsp->status == 0) { + if (pinst->phy_link->state != PHY_LINK_CONNECTED) + phy_link_state_set(pinst->phy_link, PHY_LINK_CONNECTED); + } else { + LOGP(DTRX, LOGL_NOTICE, + "transceiver (%s) rejected POWERON command (%d), re-trying in a few seconds\n", + phy_instance_name(pinst), rsp->status); + if (pinst->phy_link->state != PHY_LINK_SHUTDOWN) + phy_link_state_set(pinst->phy_link, PHY_LINK_SHUTDOWN); + return 5; + } + } + + if (rsp->status) { + LOGP(DTRX, critical ? LOGL_FATAL : LOGL_NOTICE, + "transceiver (%s) rejected TRX command with response: '%s%s%s %d'\n", + phy_instance_name(pinst), rsp->cmd, rsp->params[0] != '\0' ? " ":"", + rsp->params, rsp->status); + if (critical) + return -EINVAL; + } + return 0; +} + /*! Get + parse response from TRX ctrl socket */ static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what) { @@ -444,7 +478,7 @@ struct phy_instance *pinst = l1h->phy_inst; char buf[1500]; struct trx_ctrl_rsp rsp; - int len; + int len, rc; struct trx_ctrl_msg *tcm; len = recv(ofd->fd, buf, sizeof(buf) - 1, 0); @@ -492,13 +526,14 @@ } /* check for response code */ - if (rsp.status) { - LOGP(DTRX, (tcm->critical) ? LOGL_FATAL : LOGL_NOTICE, - "transceiver (%s) rejected TRX command " - "with response: '%s'\n", - phy_instance_name(pinst), buf); - if (tcm->critical) - goto rsp_error; + rc = trx_ctrl_rx_rsp(l1h, &rsp, tcm->critical); + if (rc == -EINVAL) + goto rsp_error; + + /* re-schedule last cmd in rc seconds time */ + if (rc > 0) { + osmo_timer_schedule(&l1h->trx_ctrl_timer, rc, 0); + return 0; } /* remove command from list, save it to last_acked and removed previous last_acked */ @@ -781,7 +816,6 @@ } /* FIXME: is there better way to check/report TRX availability? */ transceiver_available = 1; - phy_link_state_set(plink, PHY_LINK_CONNECTED); return 0; cleanup: -- To view, visit https://gerrit.osmocom.org/11768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa8f497381038fd7f9f779a8211ebc6453837c65 Gerrit-Change-Number: 11768 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:36:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:36:18 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11802 to look at the new patch set (#3). Change subject: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) ...................................................................... Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) Use $(srcdir) infront of all relative paths, which reference other files in the repository. Use $(top_srcdir) as OSMO_GSM_MANUALS_DIR. This is needed for out-of-tree building. (moving manuals to project repositories 11/19) Related: OS#3385 Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc --- M OsmoBSC/Makefile.am M OsmoBTS/Makefile.am M OsmoGGSN/Makefile.am M OsmoGSMTester/Makefile.am M OsmoHLR/Makefile.am M OsmoMGCP/Makefile.am M OsmoMGW/Makefile.am M OsmoMSC/Makefile.am M OsmoNAT/Makefile.am M OsmoNITB/Makefile.am M OsmoPCU/Makefile.am M OsmoSGSN/Makefile.am M OsmoSIPConnector/Makefile.am M OsmoSTP/Makefile.am M OsmoTRX/Makefile.am M OsmocomBB/Makefile.am M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M tests/Makefile.am 19 files changed, 41 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/02/11802/3 -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:36:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:36:18 +0000 Subject: Change in osmo-gsm-manuals[master]: */Makefile.am: add EXTRA_DIST In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11845 ) Change subject: */Makefile.am: add EXTRA_DIST ...................................................................... */Makefile.am: add EXTRA_DIST Necessary for 'make distcheck': the files will otherwise not end up in the dist archives. (moving manuals to project repositories 17/19) Related: OS#3385 Change-Id: I5a2d6e572d346addc8770d1331c9223a56635869 --- M OsmoBSC/Makefile.am M OsmoBTS/Makefile.am M OsmoGGSN/Makefile.am M OsmoGSMTester/Makefile.am M OsmoHLR/Makefile.am M OsmoMGCP/Makefile.am M OsmoMGW/Makefile.am M OsmoMSC/Makefile.am M OsmoNAT/Makefile.am M OsmoNITB/Makefile.am M OsmoPCU/Makefile.am M OsmoSGSN/Makefile.am M OsmoSIPConnector/Makefile.am M OsmoSTP/Makefile.am M OsmoTRX/Makefile.am M OsmocomBB/Makefile.am M tests/Makefile.am 17 files changed, 93 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/45/11845/2 -- To view, visit https://gerrit.osmocom.org/11845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5a2d6e572d346addc8770d1331c9223a56635869 Gerrit-Change-Number: 11845 Gerrit-PatchSet: 2 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:36:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:36:18 +0000 Subject: Change in osmo-gsm-manuals[master]: move OsmoMSC files to osmo-msc.git In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11738 to look at the new patch set (#7). Change subject: move OsmoMSC files to osmo-msc.git ...................................................................... move OsmoMSC files to osmo-msc.git Add to osmo-msc.git with I2f9c27f81940b02414f0e618483bffade72e8cf7. The other project specific files will be moved in future commits. One commit per dir. Related: OS#3385 Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc --- M Makefile.am D OsmoMSC/chapters/control.adoc D OsmoMSC/chapters/counters.adoc D OsmoMSC/chapters/counters_generated.adoc D OsmoMSC/chapters/net.adoc D OsmoMSC/chapters/overview.adoc D OsmoMSC/chapters/running.adoc D OsmoMSC/images/sgs-imsi_attach_lu.msc D OsmoMSC/images/sgs-mo_call_no_ps_ho.msc D OsmoMSC/images/sgs-mo_sms_idle.msc D OsmoMSC/images/sgs-mt_call_idle.msc D OsmoMSC/images/sgs-mt_sms_idle.msc D OsmoMSC/osmomsc-usermanual-docinfo.xml D OsmoMSC/osmomsc-usermanual.adoc D OsmoMSC/osmomsc-vty-reference.xml D OsmoMSC/vty/msc_vty_additions.xml D OsmoMSC/vty/msc_vty_reference.xml M configure.ac 18 files changed, 1 insertion(+), 3,431 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/38/11738/7 -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:36:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 20 Nov 2018 16:36:41 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11802/1/OsmoBSC/Makefile.am File OsmoBSC/Makefile.am: https://gerrit.osmocom.org/#/c/11802/1/OsmoBSC/Makefile.am at 1 PS1, Line 1: OSMO_GSM_MANUALS_DIR = $(realpath $(srcdir)/..) > Oh, I see, you probably mean to use $(top_srcdir)! It looked like it was moving out of the tree, but [?] Ah right, that would be much better. Thanks, updated! -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 16:36:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:39:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:39:27 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11786 ) Change subject: add contrib/struct_endianess.py ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 16:39:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:42:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:42:41 +0000 Subject: Change in libosmocore[master]: add/clean big-endian packed structs (struct_endianess.py) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11787 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) ...................................................................... Patch Set 3: Code-Review+1 Fine for me since we don't want to spend more time on this for now. I'd like Harald to review it too though, since it's quite intrusive size-wise. -- To view, visit https://gerrit.osmocom.org/11787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia0b99d76932aeb03e93bd0c62d3bf025dec5f9d2 Gerrit-Change-Number: 11787 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 16:42:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:43:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:43:55 +0000 Subject: Change in osmo-bsc[master]: bsc: Enable force-combined-si on nanoBTS by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11834 ) Change subject: bsc: Enable force-combined-si on nanoBTS by default ...................................................................... bsc: Enable force-combined-si on nanoBTS by default Some nanoBTS firmwares (if not all) are known to not work properly with SI2ter. If BSC enables SI2ter through RSL, SI3 bit announcing SI2ter available will be forwarded by nanoBTS to MS, but will still only send SI2 message instead of expected SI2ter during TC=5 (see GSM 05.02 sec 6.3.4 "Mapping of BCCH data"). As a result, some MS won't allow registering to the network. To avoid this kind of scenario, enable force-combined-si by default on nanoBTS while still allowing to overwrite the feature through VTY. Other BTS models are kept with force-combined-si disabled by default as usually, since they seems to be working fine when SI2ter is enabled. Related: OS#3063 Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/system_information.c 7 files changed, 19 insertions(+), 6 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 750b089..eec154d 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -40,7 +40,6 @@ oml ip.access stream_id 255 line 0 codec-support fr gprs mode none - no force-combined-si trx 0 rf_locked 0 arfcn 871 diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index d1b3678..fd3a349 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -39,7 +39,6 @@ oml ip.access stream_id 255 line 0 codec-support fr gprs mode none - no force-combined-si trx 0 rf_locked 0 arfcn 871 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4d8a4d0..ba52c99 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -756,6 +756,9 @@ void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); void (*config_write_ts)(struct vty *vty, struct gsm_bts_trx_ts *ts); + /* Should SI2bis and SI2ter be disabled by default on this BTS model? */ + bool force_combined_si; + struct tlv_definition nm_att_tlvdef; /* features of a given BTS model set via gsm_bts_model_register() locally */ @@ -1046,6 +1049,7 @@ /* SI related items */ int force_combined_si; + bool force_combined_si_set; int bcch_change_mark; /* Abis NM queue */ diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 3ac592c..931db5b 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -985,8 +985,9 @@ if (bts->excl_from_rf_lock) vty_out(vty, " rf-lock-exclude%s", VTY_NEWLINE); - vty_out(vty, " %sforce-combined-si%s", - bts->force_combined_si ? "" : "no ", VTY_NEWLINE); + if (bts->force_combined_si_set) + vty_out(vty, " %sforce-combined-si%s", + bts->force_combined_si ? "" : "no ", VTY_NEWLINE); for (i = 0; i < ARRAY_SIZE(bts->depends_on); ++i) { int j; @@ -3411,6 +3412,7 @@ { struct gsm_bts *bts = vty->index; bts->force_combined_si = 1; + bts->force_combined_si_set = true; return CMD_SUCCESS; } @@ -3421,6 +3423,7 @@ { struct gsm_bts *bts = vty->index; bts->force_combined_si = 0; + bts->force_combined_si_set = true; return CMD_SUCCESS; } diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 1fffd89..cf81a22 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -63,7 +63,12 @@ .start = bts_model_nanobts_start, .oml_rcvmsg = &abis_nm_rcvmsg, .oml_status = &get_oml_status, - .e1line_bind_ops = bts_model_nanobts_e1line_bind_ops, + .e1line_bind_ops = bts_model_nanobts_e1line_bind_ops, + /* Some nanoBTS firmwares (if not all) don't support SI2ter and cause + * problems on some MS if it is enabled, see OS#3063. Disable it by + * default, can still be enabled through VTY cmd with same name. + */ + .force_combined_si = true, .nm_att_tlvdef = { .def = { /* ip.access specifics */ diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c index 91d1118..2537864 100644 --- a/src/osmo-bsc/bts_sysmobts.c +++ b/src/osmo-bsc/bts_sysmobts.c @@ -48,6 +48,9 @@ model_sysmobts.name = "sysmobts"; model_sysmobts.type = GSM_BTS_TYPE_OSMOBTS; + /* Unlike nanoBTS, sysmoBTS supports SI2bis and SI2ter fine */ + model_sysmobts.force_combined_si = false; + model_sysmobts.features.data = &model_sysmobts._features_data[0]; model_sysmobts.features.data_len = sizeof(model_sysmobts._features_data); diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 0148ac3..0a441dc 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -327,7 +327,7 @@ static inline int use_arfcn(const struct gsm_bts *bts, const bool bis, const bool ter, const bool pgsm, const int arfcn) { - if (bts->force_combined_si) + if (bts->force_combined_si_set ? bts->force_combined_si : bts->model->force_combined_si) return !bis && !ter; if (!bis && !ter && band_compatible(bts, arfcn)) return 1; -- To view, visit https://gerrit.osmocom.org/11834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ide6e8967de0eedc9e2bcaf4414aaa537b009d72d Gerrit-Change-Number: 11834 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:46:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:46:16 +0000 Subject: Change in osmo-trx[master]: ChannelizerBase: Fix ASan alloc-dealloc-mismatch In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11570 ) Change subject: ChannelizerBase: Fix ASan alloc-dealloc-mismatch ...................................................................... Patch Set 1: Code-Review+2 Merging with my own +2 after 19 days under review. As Vadim reviewed it and from ASan output the issue seems pretty obvious, I'll add +2 myself. -- To view, visit https://gerrit.osmocom.org/11570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7c98ae478f319573dd86a0d2cb264f676bb3859 Gerrit-Change-Number: 11570 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 20 Nov 2018 16:46:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:46:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:46:19 +0000 Subject: Change in osmo-trx[master]: ChannelizerBase: Fix ASan alloc-dealloc-mismatch In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11570 ) Change subject: ChannelizerBase: Fix ASan alloc-dealloc-mismatch ...................................................................... ChannelizerBase: Fix ASan alloc-dealloc-mismatch Fixes following Adress Sanitizer warning: ================================================================= ==27120==ERROR: AddressSanitizer: alloc-dealloc-mismatch (operator new [] vs operator delete) on 0x60c00003d900 #0 0x7f2f216de421 in operator delete(void*, unsigned long) /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cc:151 #1 0x561641ce18b7 in ChannelizerBase::~ChannelizerBase() (/build/new/out/bin/osmo-trx-uhd+0x4a8b7) #2 0x561641ce1cad in Channelizer::~Channelizer() (/build/new/out/bin/osmo-trx-uhd+0x4acad) #3 0x561641cd5160 in RadioInterfaceMulti::close() (/build/new/out/bin/osmo-trx-uhd+0x3e160) #4 0x561641cd5047 in RadioInterfaceMulti::~RadioInterfaceMulti() (/build/new/out/bin/osmo-trx-uhd+0x3e047) #5 0x561641cd5093 in RadioInterfaceMulti::~RadioInterfaceMulti() (/build/new/out/bin/osmo-trx-uhd+0x3e093) #6 0x561641ca3fdd in trx_stop() (/build/new/out/bin/osmo-trx-uhd+0xcfdd) #7 0x561641ca4b32 in main (/build/new/out/bin/osmo-trx-uhd+0xdb32) #8 0x7f2f1f555222 in __libc_start_main (/usr/lib/libc.so.6+0x24222) #9 0x561641ca195d in _start (/build/new/out/bin/osmo-trx-uhd+0xa95d) 0x60c00003d900 is located 0 bytes inside of 128-byte region [0x60c00003d900,0x60c00003d980) allocated by thread T0 here: #0 0x7f2f216dcf19 in operator new[](unsigned long) /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cc:93 #1 0x561641ce142d in ChannelizerBase::init() (/build/new/out/bin/osmo-trx-uhd+0x4a42d) #2 0x561641cd5865 in RadioInterfaceMulti::init(int) (/build/new/out/bin/osmo-trx-uhd+0x3e865) #3 0x561641ca1cb7 in makeRadioInterface(trx_ctx*, RadioDevice*, int) (/build/new/out/bin/osmo-trx-uhd+0xacb7) #4 0x561641ca44c6 in trx_start(trx_ctx*) (/build/new/out/bin/osmo-trx-uhd+0xd4c6) #5 0x561641ca4b05 in main (/build/new/out/bin/osmo-trx-uhd+0xdb05) #6 0x7f2f1f555222 in __libc_start_main (/usr/lib/libc.so.6+0x24222) SUMMARY: AddressSanitizer: alloc-dealloc-mismatch /build/gcc/src/gcc/libsanitizer/asan/asan_new_delete.cc:151 in operator delete(void*, unsigned long) ==27120==HINT: if you don't care about these errors you may set ASAN_OPTIONS=alloc_dealloc_mismatch=0 ==27120==ABORTING Change-Id: Ib7c98ae478f319573dd86a0d2cb264f676bb3859 --- M Transceiver52M/ChannelizerBase.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/Transceiver52M/ChannelizerBase.cpp b/Transceiver52M/ChannelizerBase.cpp index 8223dba..430e260 100644 --- a/Transceiver52M/ChannelizerBase.cpp +++ b/Transceiver52M/ChannelizerBase.cpp @@ -239,7 +239,7 @@ for (size_t i = 0; i < m; i++) { free(subFilters[i]); - delete hist[i]; + delete[] hist[i]; } fft_free(fftInput); -- To view, visit https://gerrit.osmocom.org/11570 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib7c98ae478f319573dd86a0d2cb264f676bb3859 Gerrit-Change-Number: 11570 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:46:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:46:19 +0000 Subject: Change in osmo-trx[master]: UHDDevice: setRxGain on chan 0 when using multi-arfcn In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11571 ) Change subject: UHDDevice: setRxGain on chan 0 when using multi-arfcn ...................................................................... UHDDevice: setRxGain on chan 0 when using multi-arfcn When using multi-arfcn feature, several logical channels (arfcn) are multiplxed into one physical transceiver, as can be seen in uhd_device::set_channels. As a result, when multi-arfcn is enabled some properties are actually shared for those logical channels, and internally mapped to the first (only existing) channel, and per-channel internal array variables are allocated accordingly (size() == 1). When setting RxGain, we need to set the correct existing physical channel. Same check is done in getRxGain, and then we apply the RxGain correctly and we avoid outputing an error "Requested non-existent channel" immediatelly after. Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index c30f3a7..3db09a8 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -486,6 +486,9 @@ double uhd_device::setRxGain(double db, size_t chan) { + if (iface == MULTI_ARFCN) + chan = 0; + if (chan >= rx_gains.size()) { LOGC(DDEV, ALERT) << "Requested non-existent channel " << chan; return 0.0f; -- To view, visit https://gerrit.osmocom.org/11571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5b02bb1ef6450dc48be7b8058d96a5691847d3cc Gerrit-Change-Number: 11571 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:47:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:47:52 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Log domain and fix strings without endl char In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11744 ) Change subject: osmo_ortp: Log domain and fix strings without endl char ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11744/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/#/c/11744/1/src/trau/osmo_ortp.c at 109 PS1, Line 109: int needs_endl; > (curious, why not bool ... [?] Because it's actually used as an integer to calculate size needed to alloc. -- To view, visit https://gerrit.osmocom.org/11744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6df0df04cd6ba342753c84398274d04917ace40 Gerrit-Change-Number: 11744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 16:47:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:47:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:47:53 +0000 Subject: Change in libosmo-abis[master]: osmo_ortp: Log domain and fix strings without endl char In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11744 ) Change subject: osmo_ortp: Log domain and fix strings without endl char ...................................................................... osmo_ortp: Log domain and fix strings without endl char Change-Id: Ib6df0df04cd6ba342753c84398274d04917ace40 --- M src/trau/osmo_ortp.c 1 file changed, 28 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index d8f4abf..0eb1661 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -102,8 +102,35 @@ #endif OrtpLogLevel lev, const char *fmt, va_list args) { + /* Some strings coming from ortp are not endline terminated and mangle + * the output. Make sure all strings are endl terminated before + * printing. + */ + int needs_endl; + const char *domain_str; + char *str; + size_t fmt_len = strlen(fmt); +#if HAVE_ORTP_LOG_DOMAIN + /* domain can be NULL, found experimentally */ + domain_str = domain ? : ""; +#else + domain_str = ""; +#endif + size_t domain_len = strlen(domain_str); + + if (fmt_len == 0) + return; + + needs_endl = fmt[fmt_len - 1] != '\n' ? 1 : 0; + + str = osmo_ortp_malloc(domain_len + 2 /*": "*/ + fmt_len + needs_endl + 1); + sprintf(str, "%s%s%s%s", domain_str, domain_len ? ": " : "", fmt, needs_endl ? "\n" : ""); + osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0, - 0, fmt, args); + 0, str, args); + + osmo_ortp_free(str); + } /* ORTP signal callbacks */ -- To view, visit https://gerrit.osmocom.org/11744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib6df0df04cd6ba342753c84398274d04917ace40 Gerrit-Change-Number: 11744 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 16:56:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 16:56:28 +0000 Subject: Change in libosmocore[master]: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11789 ) Change subject: gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ...................................................................... gsm: Deprecate buggy gsm_arfcn2band API and introduce gsm_arfcn2band_rc ARFCNs are values in well defined ranges. Until this patch, ARFCNs not belonging to any band were blindly assigned to DCS1800 by gsm_arfcn2band, causing unnoticed bugs and misconfigurations in osmo-bsc. Previous API gsm_arfcn2band cannot accomodate this kind of check easily, so let's deprecate it to tell people to use a new API gsm_arfcn2band_rc which performs this kind of checks and allows callers to log failures, misconfigurations, etc. At the same time, modify implementation of gsm_arfcn2band to abort if an invalid ARFCN is passed, this way users of this API can notice they are passing wrong data to it that most probably will produce unexpected results. Related: OS#3063 Change-Id: I780d452dcebce385469e32ef2fd844df6033393a --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c M src/gsm/libosmogsm.map M utils/osmo-arfcn.c 4 files changed, 58 insertions(+), 25 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 7eda5b9..fe5903d 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -161,7 +161,8 @@ #define ARFCN_UPLINK 0x4000 #define ARFCN_FLAG_MASK 0xf000 /* Reserve the upper 5 bits for flags */ -enum gsm_band gsm_arfcn2band(uint16_t arfcn); +int gsm_arfcn2band_rc(uint16_t arfcn, enum gsm_band *band); +enum gsm_band gsm_arfcn2band(uint16_t arfcn) OSMO_DEPRECATED("Use gsm_arfcn2band_rc() instead"); /* Convert an ARFCN to the frequency in MHz * 10 */ uint16_t gsm_arfcn2freq10(uint16_t arfcn, int uplink); diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 7e6c794..8b4b558 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -706,36 +706,61 @@ } } -/*! Resolve GSM band from ARFCN +/*! Resolve GSM band from ARFCN. * In Osmocom, we use the highest bit of the \a arfcn to indicate PCS * \param[in] arfcn Osmocom ARFCN, highest bit determines PCS mode - * \returns GSM Band */ -enum gsm_band gsm_arfcn2band(uint16_t arfcn) + * \param[out] band GSM Band containing \arfcn if arfcn is valid, undetermined otherwise + * \returns 0 if arfcn is valid and \a band was set, negative on error */ +int gsm_arfcn2band_rc(uint16_t arfcn, enum gsm_band *band) { int is_pcs = arfcn & ARFCN_PCS; arfcn &= ~ARFCN_FLAG_MASK; - if (is_pcs) - return GSM_BAND_1900; - else if (arfcn <= 124) - return GSM_BAND_900; - else if (arfcn >= 955 && arfcn <= 1023) - return GSM_BAND_900; - else if (arfcn >= 128 && arfcn <= 251) - return GSM_BAND_850; - else if (arfcn >= 512 && arfcn <= 885) - return GSM_BAND_1800; - else if (arfcn >= 259 && arfcn <= 293) - return GSM_BAND_450; - else if (arfcn >= 306 && arfcn <= 340) - return GSM_BAND_480; - else if (arfcn >= 350 && arfcn <= 425) - return GSM_BAND_810; - else if (arfcn >= 438 && arfcn <= 511) - return GSM_BAND_750; - else - return GSM_BAND_1800; + if (is_pcs) { + *band = GSM_BAND_1900; + return 0; + } else if (arfcn <= 124) { + *band = GSM_BAND_900; + return 0; + } else if (arfcn >= 955 && arfcn <= 1023) { + *band = GSM_BAND_900; + return 0; + } else if (arfcn >= 128 && arfcn <= 251) { + *band = GSM_BAND_850; + return 0; + } else if (arfcn >= 512 && arfcn <= 885) { + *band = GSM_BAND_1800; + return 0; + } else if (arfcn >= 259 && arfcn <= 293) { + *band = GSM_BAND_450; + return 0; + } else if (arfcn >= 306 && arfcn <= 340) { + *band = GSM_BAND_480; + return 0; + } else if (arfcn >= 350 && arfcn <= 425) { + *band = GSM_BAND_810; + return 0; + } else if (arfcn >= 438 && arfcn <= 511) { + *band = GSM_BAND_750; + return 0; + } + return -1; +} + +/*! Resolve GSM band from ARFCN, aborts process on invalid ARFCN. + * In Osmocom, we use the highest bit of the \a arfcn to indicate PCS. + * DEPRECATED: Use gsm_arfcn2band_rc instead. + * \param[in] arfcn Osmocom ARFCN, highest bit determines PCS mode + * \returns GSM Band if ARFCN is valid (part of any valid band), aborts otherwise */ +enum gsm_band gsm_arfcn2band(uint16_t arfcn) +{ + enum gsm_band band; + if (gsm_arfcn2band_rc(arfcn, &band) == 0) + return band; + + osmo_panic("%s:%d Invalid arfcn %" PRIu16 " passed to gsm_arfcn2band\n", + __FILE__, __LINE__, arfcn); } struct gsm_freq_range { diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 217dcc3..3fe9dfc 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -349,6 +349,7 @@ gsm_7bit_encode_n; gsm_7bit_encode_n_ussd; +gsm_arfcn2band_rc; gsm_arfcn2band; gsm_arfcn2freq10; gsm_freq102arfcn; diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c index 61108f8..aee132c 100644 --- a/utils/osmo-arfcn.c +++ b/utils/osmo-arfcn.c @@ -62,6 +62,7 @@ static int freq2arfcn(int freq10, int uplink) { uint16_t arfcn; + enum gsm_band band; if (uplink != 0 && uplink != 1) { fprintf(stderr, "Need to specify uplink or downlink\n"); @@ -75,8 +76,13 @@ return -EINVAL; } + if (gsm_arfcn2band_rc(arfcn, &band) < 0) { + fprintf(stderr, "ARFCN contains no valid band\n"); + return -EINVAL; + } + printf("%s: ARFCN %4d\n", - gsm_band_name(gsm_arfcn2band(arfcn)), + gsm_band_name(band), arfcn & ~ARFCN_FLAG_MASK); return 0; } -- To view, visit https://gerrit.osmocom.org/11789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I780d452dcebce385469e32ef2fd844df6033393a Gerrit-Change-Number: 11789 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:03:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:03:47 +0000 Subject: Change in osmo-gsm-tester[master]: templates: bsc/nitb: Remove explicit no force-combined-si Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11847 Change subject: templates: bsc/nitb: Remove explicit no force-combined-si ...................................................................... templates: bsc/nitb: Remove explicit no force-combined-si It's always been the default anyway, so no need to explicitly state it. Furthermore, recently (osmobsc 167cb828665b91ed7d28007abd4a1862ebbb78c9) force-combined-si was enabled by default for nanoBTS due to issues with some MS not registering when it's not enabled, so let's osmo-bsc decide were should it be enabled. Related: OS#3063 Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 --- M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/47/11847/1 diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 4f39f79..53e683b 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -85,7 +85,6 @@ gprs nsvc 0 local udp port 23020 gprs nsvc 0 remote udp port 23000 gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr} - no force-combined-si % else: gprs mode none % endif diff --git a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl index 764ca94..ee7381f 100644 --- a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl @@ -77,7 +77,6 @@ gprs nsvc 0 local udp port 23020 gprs nsvc 0 remote udp port 23000 gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr} - no force-combined-si % else: gprs mode none % endif -- To view, visit https://gerrit.osmocom.org/11847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 Gerrit-Change-Number: 11847 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:24:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:24:39 +0000 Subject: Change in osmo-gsm-manuals[master]: make check: properly reference dependencies In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11794 ) Change subject: make check: properly reference dependencies ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 Gerrit-Change-Number: 11794 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:24:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:24:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:24:54 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add shared content pdf build tests In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11795 ) Change subject: tests: add shared content pdf build tests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf Gerrit-Change-Number: 11795 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:24:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:25:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:25:09 +0000 Subject: Change in osmo-gsm-manuals[master]: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11796 ) Change subject: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab Gerrit-Change-Number: 11796 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:25:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:25:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:25:56 +0000 Subject: Change in osmo-gsm-manuals[master]: prepare for autotools: add git-version-gen In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11797 ) Change subject: prepare for autotools: add git-version-gen ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 Gerrit-Change-Number: 11797 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:25:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:27:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 20 Nov 2018 17:27:40 +0000 Subject: Change in osmo-msc[master]: Use libosmocore to function to parse cipher mode reject cause In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11832 ) Change subject: Use libosmocore to function to parse cipher mode reject cause ...................................................................... Use libosmocore to function to parse cipher mode reject cause This allow us to handle both regular and extended cause transparently. Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Related: OS#3187 --- M src/libmsc/a_iface_bssap.c 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index f24fb05..c11347e 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -427,20 +427,21 @@ static int bssmap_rx_ciph_rej(struct gsm_subscriber_connection *conn, struct msgb *msg, struct tlv_parsed *tp) { + int rc; enum gsm0808_cause cause; struct rate_ctr_group *msc = conn->network->msc_ctrs; LOGPCONN(conn, LOGL_NOTICE, "RX BSSMAP CIPHER MODE REJECT\n"); - if (!TLVP_PRES_LEN(tp, GSM0808_IE_CAUSE, 1)) { - LOGPCONN(conn, LOGL_ERROR, "Cause code is missing -- discarding message!\n"); - return -EINVAL; + rc = gsm0808_get_cipher_reject_cause(tp); + if (rc < 0) { + LOGPCONN(conn, LOGL_ERROR, "failed (%s) to extract Cause from Cipher mode reject: %s\n", + strerror(-rc), msgb_hexdump(msg)); + return rc; } rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_REJECT]); - - /* FIXME: add support for 2-byte Cause values using libosmocore functions */ - cause = *TLVP_VAL(tp, GSM0808_IE_CAUSE); + cause = (enum gsm0808_cause)rc; LOGPCONN(conn, LOGL_NOTICE, "Cipher mode rejection cause: %s\n", gsm0808_cause_name(cause)); /* FIXME: Can we do something meaningful here? e.g. report to the -- To view, visit https://gerrit.osmocom.org/11832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7742ac41dd0642a5a40ce79d23250f8d9e6ae556 Gerrit-Change-Number: 11832 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:32:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:32:42 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11725 ) Change subject: use autotools to add "make install" target ...................................................................... Patch Set 6: Code-Review+1 (1 comment) +1, leaving for Neels the +2 since he had some comment sin previous patches. https://gerrit.osmocom.org/#/c/11725/6/Makefile.am File Makefile.am: https://gerrit.osmocom.org/#/c/11725/6/Makefile.am at 2 PS6, Line 2: share_path = "$(DESTDIR)$(prefix)/share/osmo-gsm-manuals" would be clearer to name it destdir_sharepath or so, I first though it was related to share_files (sources). -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:32:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:33:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:33:35 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11806 ) Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:33:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:34:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:34:49 +0000 Subject: Change in osmo-gsm-manuals[master]: *filter.conf/*.sty: use symlinks to build, common In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11798 ) Change subject: *filter.conf/*.sty: use symlinks to build, common ...................................................................... Patch Set 2: Code-Review+1 +1, leaving for Neels since he had some comments in prev versions. -- To view, visit https://gerrit.osmocom.org/11798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 Gerrit-Change-Number: 11798 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:34:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:35:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:35:43 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: include from ./common, not ../common In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11799 ) Change subject: *.adoc: include from ./common, not ../common ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 Gerrit-Change-Number: 11799 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:35:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:35:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:35:53 +0000 Subject: Change in osmo-gsm-manuals[master]: *-vty-reference.xml: use ./common, not ../common In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11800 ) Change subject: *-vty-reference.xml: use ./common, not ../common ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5368bcff34586c515af23e5a868417e561fd539d Gerrit-Change-Number: 11800 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:35:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:36:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:36:05 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11801 ) Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:36:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:38:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:38:42 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:38:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:44:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:44:26 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11803/3/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/11803/3/build/Makefile.asciidoc.inc at 63 PS3, Line 63: # $(notdir) is like basename from coreutils, and $PWD is the $(builddir). where is $PWD used here? -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:44:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:45:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:45:05 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: use {srcdir} for out-of-tree builds In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11804 ) Change subject: *.adoc: use {srcdir} for out-of-tree builds ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a Gerrit-Change-Number: 11804 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:45:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:45:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:45:33 +0000 Subject: Change in osmo-gsm-manuals[master]: copy NITB's osmobsc-usermanual.adoc to OsmoBSC In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11805 ) Change subject: copy NITB's osmobsc-usermanual.adoc to OsmoBSC ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad Gerrit-Change-Number: 11805 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:45:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:47:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:47:43 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: chmod xsltproc output In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11843 ) Change subject: vty_reference_combine.sh: chmod xsltproc output ...................................................................... Patch Set 2: Code-Review+2 lol good catch, happy you found it. -- To view, visit https://gerrit.osmocom.org/11843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I693e12ee15665d01cbc50187e6cb3ca74ad0356a Gerrit-Change-Number: 11843 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:47:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:48:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:48:38 +0000 Subject: Change in osmo-gsm-manuals[master]: gitignore: add 'make distcheck' files In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11844 ) Change subject: gitignore: add 'make distcheck' files ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11844/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11844/2//COMMIT_MSG at 7 PS2, Line 7: gitignore: add 'make distcheck' files "make distcheck" generated files? -- To view, visit https://gerrit.osmocom.org/11844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 Gerrit-Change-Number: 11844 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 20 Nov 2018 17:48:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:49:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:49:43 +0000 Subject: Change in osmo-gsm-manuals[master]: */Makefile.am: add EXTRA_DIST In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11845 ) Change subject: */Makefile.am: add EXTRA_DIST ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a2d6e572d346addc8770d1331c9223a56635869 Gerrit-Change-Number: 11845 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:49:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:50:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:50:31 +0000 Subject: Change in osmo-gsm-manuals[master]: jenkins.sh: run 'make distcheck' In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11846 ) Change subject: jenkins.sh: run 'make distcheck' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie31fba3d1afd31c25489ce08169101d9ed9de536 Gerrit-Change-Number: 11846 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 17:50:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:53:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:53:50 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: publish from project repos, not this repo anymore ...................................................................... Patch Set 4: Code-Review+1 Leaving +2 for Neels and his comments. -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:53:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 17:58:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 17:58:38 +0000 Subject: Change in osmo-gsm-manuals[master]: move OsmoMSC files to osmo-msc.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: move OsmoMSC files to osmo-msc.git ...................................................................... Patch Set 7: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 7 PS7, Line 7: move OsmoMSC files to osmo-msc.git You are not moving them here, you are removing them from osmo-gsm-manuals. I'd say: Remove OsmoMSC files (now avail in osmo-msc.git) https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 9 PS7, Line 9: Add to osmo-msc.git with I2f9c27f81940b02414f0e618483bffade72e8cf7. Is this Change-Id part of osmo-msc.git? Then: "files were added in osmo-msc.git Change-Id I2f9c27f81940b02414f0e618483bffade72e8cf7." https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 14 PS7, Line 14: Related: OS#3385 Depends: osmo-msc.git Change-Id I2f9c27f81940b02414f0e618483bffade72e8cf7 https://gerrit.osmocom.org/#/c/11738/7/Makefile.am File Makefile.am: https://gerrit.osmocom.org/#/c/11738/7/Makefile.am at 8 PS7, Line 8: SUBDIRS = tests OsmoBSC OsmoBTS OsmoGGSN OsmoGSMTester OsmoHLR OsmoMGCP OsmoMGW OsmoNAT OsmoNITB OsmoPCU \ Would make sense to split this line into a multiline with \, since we'll be changing it a lot in follow-up patches. -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 20 Nov 2018 17:58:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 18:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 18:14:44 +0000 Subject: Change in osmo-bsc[master]: bsc: band_compatible: Return band non-compatible for invalid arfcn In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11790 ) Change subject: bsc: band_compatible: Return band non-compatible for invalid arfcn ...................................................................... bsc: band_compatible: Return band non-compatible for invalid arfcn Before libosmocore Change-Id I780d452dcebce385469e32ef2fd844df6033393a, it avoids stating arfcn 886-954 are compatible when operating under DC1800. After that Change-Id, avoids aborting the program due to unexpected behaviour. Related: OS#3063 Depends: libosmocore Change-Id I780d452dcebce385469e32ef2fd844df6033393a Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 --- M src/osmo-bsc/system_information.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 0a441dc..4709f7f 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -53,7 +53,12 @@ */ static int band_compatible(const struct gsm_bts *bts, int arfcn) { - enum gsm_band band = gsm_arfcn2band(arfcn); + enum gsm_band band; + + if (gsm_arfcn2band_rc(arfcn, &band) < 0) { + LOGP(DRR, LOGL_ERROR, "Invalid arfcn %d detected!\n", arfcn); + return 0; + } /* normal case */ if (band == bts->band) -- To view, visit https://gerrit.osmocom.org/11790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibf5d5ab50b6fc6597244eeedcd27d2ce245278a3 Gerrit-Change-Number: 11790 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Keith Whyte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 18:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 20 Nov 2018 18:14:44 +0000 Subject: Change in osmo-bsc[master]: bsc: vty: Verify and warn on invalid arfcn passed In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11791 ) Change subject: bsc: vty: Verify and warn on invalid arfcn passed ...................................................................... bsc: vty: Verify and warn on invalid arfcn passed Related: OS#3063 Depends: libosmocore Change-Id I780d452dcebce385469e32ef2fd844df6033393a Change-Id: Ib001501bf37289e824a1f72b62afde23892e88d2 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 31 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 931db5b..4f18d47 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3114,6 +3114,7 @@ struct gsm_bts *bts = vty->index; struct bitvec *bv = &bts->si_common.neigh_list; uint16_t arfcn = atoi(argv[1]); + enum gsm_band unused; if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { vty_out(vty, "%% Cannot configure neighbor list in " @@ -3121,6 +3122,11 @@ return CMD_WARNING; } + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } + if (!strcmp(argv[0], "add")) bitvec_set_bit_pos(bv, arfcn, 1); else @@ -3257,6 +3263,7 @@ "Delete from SI5 manual neighbor list\n" "ARFCN of neighbor\n" "ARFCN of neighbor\n") { + enum gsm_band unused; struct gsm_bts *bts = vty->index; struct bitvec *bv = &bts->si_common.si5_neigh_list; uint16_t arfcn = atoi(argv[1]); @@ -3267,6 +3274,11 @@ return CMD_WARNING; } + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } + if (!strcmp(argv[0], "add")) bitvec_set_bit_pos(bv, arfcn, 1); else @@ -3937,8 +3949,14 @@ "Set the ARFCN for this TRX\n" "Absolute Radio Frequency Channel Number\n") { - int arfcn = atoi(argv[0]); + enum gsm_band unused; struct gsm_bts_trx *trx = vty->index; + int arfcn = atoi(argv[0]); + + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } /* FIXME: check if this ARFCN is supported by this TRX */ @@ -4186,9 +4204,15 @@ HOPPING_STR "Configure hopping ARFCN list\n" "Add an entry to the hopping ARFCN list\n" "ARFCN\n") { + enum gsm_band unused; struct gsm_bts_trx_ts *ts = vty->index; int arfcn = atoi(argv[0]); + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } + bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, 1); return CMD_SUCCESS; @@ -4200,9 +4224,15 @@ HOPPING_STR "Configure hopping ARFCN list\n" "Delete an entry to the hopping ARFCN list\n" "ARFCN\n") { + enum gsm_band unused; struct gsm_bts_trx_ts *ts = vty->index; int arfcn = atoi(argv[0]); + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + vty_out(vty, "%% Invalid arfcn %" PRIu16 " detected%s", arfcn, VTY_NEWLINE); + return CMD_WARNING; + } + bitvec_set_bit_pos(&ts->hopping.arfcns, arfcn, 0); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/11791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib001501bf37289e824a1f72b62afde23892e88d2 Gerrit-Change-Number: 11791 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 18:33:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 18:33:39 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11684/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11684/4//COMMIT_MSG at 11 PS4, Line 11: this signal in later patch Change-Id 3f3281bf45a22020225ba15610de4003bc506601. that's still not a change-id -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 18:33:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 20 18:34:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 20 Nov 2018 18:34:25 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11684/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11684/4//COMMIT_MSG at 11 PS4, Line 11: this signal in later patch Change-Id 3f3281bf45a22020225ba15610de4003bc506601. > that's still not a change-id (i.e. it's a git commit hash that doesn't exist anymore) -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 20 Nov 2018 18:34:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 03:44:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 03:44:11 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: fix vty bind ip override" Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11848 Change subject: Revert "mobile: fix vty bind ip override" ...................................................................... Revert "mobile: fix vty bind ip override" This reverts commit c8de8cb1e126a18c0269571fba38310589dd9273 (Change-Id I32517567847fd5c54b1742f18bf409ff81e316fa by Max), because several problems were introduced, in particular: a) Help message of mobile application is broken: "The VTY IP to telnet to. (default (null))", "The VTY port number to telnet to. (default 127.0.0.1)". b) Default VTY bind addres != parsed from the config file. c) The (vty_ip == NULL) is resolved only when an external MNCC handler is used, otherwise NULL is passed to l23_app_init(). Change-Id: Ic63a4eb828ff32d3744886b4f5f6f5019c798620 --- M src/host/layer23/src/mobile/main.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/11848/1 diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 297a534..115ac41 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -31,7 +31,6 @@ #include #include #include -#include #include @@ -52,7 +51,7 @@ static char *gsmtap_ip = 0; static const char *custom_cfg_file = NULL; struct gsmtap_inst *gsmtap_inst = NULL; -static char *vty_ip = NULL; +static char *vty_ip = "127.0.0.1"; unsigned short vty_port = 4247; char *config_dir = NULL; int use_mncc_sock = 0; @@ -91,7 +90,7 @@ printf(" -u --vty-ip The VTY IP to telnet to. " "(default %s)\n", vty_ip); printf(" -v --vty-port The VTY port number to telnet to. " - "(default %s)\n", vty_get_bind_addr()); + "(default %u)\n", vty_port); printf(" -d --debug Change debug flags. default: %s\n", debug_default); printf(" -D --daemonize Run as daemon\n"); @@ -249,7 +248,7 @@ config_dir = dirname(config_dir); if (use_mncc_sock) - rc = l23_app_init(mncc_recv_socket, config_file, vty_ip ? vty_ip : vty_get_bind_addr(), vty_port); + rc = l23_app_init(mncc_recv_socket, config_file, vty_ip, vty_port); else rc = l23_app_init(NULL, config_file, vty_ip, vty_port); if (rc) -- To view, visit https://gerrit.osmocom.org/11848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic63a4eb828ff32d3744886b4f5f6f5019c798620 Gerrit-Change-Number: 11848 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 03:44:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 03:44:12 +0000 Subject: Change in osmocom-bb[master]: mobile/app_mobile.c: drop redundant printf() call Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11849 Change subject: mobile/app_mobile.c: drop redundant printf() call ...................................................................... mobile/app_mobile.c: drop redundant printf() call The VTY requisites are always being printed by libosmovty, there is no need to duplicate this information. Change-Id: I688f66175ea67d4c6a46819bee7d300ad9ce7cc7 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/11849/1 diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index f53445a..af627c6 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -469,7 +469,6 @@ vty_ip, vty_port, strerror(errno)); return rc; } - printf("VTY available on %s %u\n", vty_ip, vty_port); osmo_signal_register_handler(SS_GLOBAL, &global_signal_cb, NULL); osmo_signal_register_handler(SS_L1CTL, &mobile_signal_cb, NULL); -- To view, visit https://gerrit.osmocom.org/11849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I688f66175ea67d4c6a46819bee7d300ad9ce7cc7 Gerrit-Change-Number: 11849 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 03:44:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 03:44:13 +0000 Subject: Change in osmocom-bb[master]: mobile/app_mobile.c: use LOGP() instead of printf()/fprintf() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11850 Change subject: mobile/app_mobile.c: use LOGP() instead of printf()/fprintf() ...................................................................... mobile/app_mobile.c: use LOGP() instead of printf()/fprintf() Change-Id: I6af76afbaa34dde5ddfc31a65700030862442dba --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/50/11850/1 diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index af627c6..464cd55 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -452,20 +452,19 @@ if (config_file != NULL) { rc = vty_read_config_file(config_file, &dummy_conn); if (rc < 0) { - fprintf(stderr, "Failed to parse the config file:" - " '%s'\n", config_file); - fprintf(stderr, "Please check or create config file" - " using: 'touch %s'\n", config_file); - fprintf(stderr, "or use one from " - "'doc/examples/mobile/'\n"); + LOGP(DMOB, LOGL_FATAL, "Failed to parse the configuration " + "file '%s'\n", config_file); + LOGP(DMOB, LOGL_FATAL, "Please make sure the file " + "'%s' exists, or use an example from " + "'doc/examples/mobile/'\n", config_file); return rc; } - printf("Using configuration from %s\n", config_file); + LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file); } vty_reading = 0; rc = telnet_init_dynif(l23_ctx, NULL, vty_ip, vty_port); if (rc < 0) { - fprintf(stderr, "Cannot init VTY on %s port %u: %s\n", + LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", vty_ip, vty_port, strerror(errno)); return rc; } @@ -477,7 +476,7 @@ if (llist_empty(&ms_list)) { struct osmocom_ms *ms; - printf("No Mobile Station defined, creating: MS '1'\n"); + LOGP(DMOB, LOGL_NOTICE, "No Mobile Station defined, creating: MS '1'\n"); ms = mobile_new("1"); if (!ms) return -1; -- To view, visit https://gerrit.osmocom.org/11850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6af76afbaa34dde5ddfc31a65700030862442dba Gerrit-Change-Number: 11850 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 03:44:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 03:44:14 +0000 Subject: Change in osmocom-bb[master]: mobile: abort in case of argv handling errors Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11851 Change subject: mobile: abort in case of argv handling errors ...................................................................... mobile: abort in case of argv handling errors The process should be aborted if a non-existing command line option or an incorrect parameter value is passed. Change-Id: Ib656ad12f12429ed15dc2a1554901ffa51148ff6 --- M src/host/layer23/src/mobile/main.c 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/11851/1 diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 115ac41..e015c30 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -99,7 +99,7 @@ "offer socket\n"); } -static void handle_options(int argc, char **argv) +static int handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; @@ -148,9 +148,12 @@ use_mncc_sock = 1; break; default: - break; + /* Unknown parameter passed */ + return -EINVAL; } } + + return 0; } void sighandler(int sigset) @@ -218,7 +221,11 @@ /* Init default stderr logging */ osmo_init_logging2(l23_ctx, &log_info); - handle_options(argc, argv); + rc = handle_options(argc, argv); + if (rc) { /* Abort in case of parsing errors */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + return 1; + } if (gsmtap_ip) { gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); -- To view, visit https://gerrit.osmocom.org/11851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib656ad12f12429ed15dc2a1554901ffa51148ff6 Gerrit-Change-Number: 11851 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 03:44:14 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 03:44:14 +0000 Subject: Change in osmocom-bb[master]: mobile: use VTY bind addr from config, deprecate cmd line options Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11852 Change subject: mobile: use VTY bind addr from config, deprecate cmd line options ...................................................................... mobile: use VTY bind addr from config, deprecate cmd line options This change revives the main idea of: Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa to stop ignoring the VTY bind address from the config file. Furthermore, it deprecates (and disables) both 'u' and 'v' command line options, because they are redundant. Change-Id: I99e0ec1717edd29b3be231be86616cc7effe5d95 --- M src/host/layer23/include/osmocom/bb/mobile/app_mobile.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c 3 files changed, 19 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/52/11852/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h index c2ab3c8..191f4ba 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h +++ b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h @@ -9,7 +9,7 @@ struct vty; int l23_app_init(int (*mncc_recv)(struct osmocom_ms *ms, int, void *), - const char *config_file, const char *vty_ip, uint16_t vty_port); + const char *config_file); int l23_app_exit(void); int l23_app_work(int *quit); int mobile_delete(struct osmocom_ms *ms, int force); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 464cd55..a051fba 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -39,6 +39,8 @@ #include #include #include + +#include #include #include @@ -434,7 +436,7 @@ /* global init */ int l23_app_init(int (*mncc_recv)(struct osmocom_ms *ms, int, void *), - const char *config_file, const char *vty_ip, uint16_t vty_port) + const char *config_file) { struct telnet_connection dummy_conn; int rc = 0; @@ -462,10 +464,11 @@ LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file); } vty_reading = 0; - rc = telnet_init_dynif(l23_ctx, NULL, vty_ip, vty_port); + rc = telnet_init_dynif(l23_ctx, NULL, + vty_get_bind_addr(), OSMO_VTY_PORT_BB); if (rc < 0) { LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", - vty_ip, vty_port, strerror(errno)); + vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno)); return rc; } diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index e015c30..9764b33 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -51,8 +51,6 @@ static char *gsmtap_ip = 0; static const char *custom_cfg_file = NULL; struct gsmtap_inst *gsmtap_inst = NULL; -static char *vty_ip = "127.0.0.1"; -unsigned short vty_port = 4247; char *config_dir = NULL; int use_mncc_sock = 0; int daemonize = 0; @@ -87,10 +85,6 @@ printf(" Some help...\n"); printf(" -h --help this text\n"); printf(" -i --gsmtap-ip The destination IP used for GSMTAP.\n"); - printf(" -u --vty-ip The VTY IP to telnet to. " - "(default %s)\n", vty_ip); - printf(" -v --vty-port The VTY port number to telnet to. " - "(default %u)\n", vty_port); printf(" -d --debug Change debug flags. default: %s\n", debug_default); printf(" -D --daemonize Run as daemon\n"); @@ -106,12 +100,13 @@ static struct option long_options[] = { {"help", 0, 0, 'h'}, {"gsmtap-ip", 1, 0, 'i'}, - {"vty-ip", 1, 0, 'u'}, - {"vty-port", 1, 0, 'v'}, {"debug", 1, 0, 'd'}, {"daemonize", 0, 0, 'D'}, {"config-file", 1, 0, 'c'}, {"mncc-sock", 0, 0, 'm'}, + /* DEPRECATED options, to be removed */ + {"vty-ip", 1, 0, 'u'}, + {"vty-port", 1, 0, 'v'}, {0, 0, 0, 0}, }; @@ -129,15 +124,9 @@ case 'i': gsmtap_ip = optarg; break; - case 'u': - vty_ip = optarg; - break; case 'c': custom_cfg_file = optarg; break; - case 'v': - vty_port = atoi(optarg); - break; case 'd': log_parse_category_mask(osmo_stderr_target, optarg); break; @@ -147,6 +136,13 @@ case 'm': use_mncc_sock = 1; break; + /* DEPRECATED options, to be removed */ + case 'u': + case 'v': + fprintf(stderr, "Both 'u' and 'v' options are " + "deprecated! Please use the configuration file " + "in order to set VTY bind address.\n"); + /* fall-thru */ default: /* Unknown parameter passed */ return -EINVAL; @@ -255,9 +251,9 @@ config_dir = dirname(config_dir); if (use_mncc_sock) - rc = l23_app_init(mncc_recv_socket, config_file, vty_ip, vty_port); + rc = l23_app_init(mncc_recv_socket, config_file); else - rc = l23_app_init(NULL, config_file, vty_ip, vty_port); + rc = l23_app_init(NULL, config_file); if (rc) exit(rc); -- To view, visit https://gerrit.osmocom.org/11852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I99e0ec1717edd29b3be231be86616cc7effe5d95 Gerrit-Change-Number: 11852 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 09:12:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 21 Nov 2018 09:12:37 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: fix vty bind ip override" In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11848 ) Change subject: Revert "mobile: fix vty bind ip override" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic63a4eb828ff32d3744886b4f5f6f5019c798620 Gerrit-Change-Number: 11848 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 21 Nov 2018 09:12:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 09:12:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 21 Nov 2018 09:12:46 +0000 Subject: Change in osmocom-bb[master]: mobile: use VTY bind addr from config, deprecate cmd line options In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11852 ) Change subject: mobile: use VTY bind addr from config, deprecate cmd line options ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99e0ec1717edd29b3be231be86616cc7effe5d95 Gerrit-Change-Number: 11852 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Comment-Date: Wed, 21 Nov 2018 09:12:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:00:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:00:53 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11684 to look at the new patch set (#5). Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... abis_nm: Introduce new signal S_NM_GET_ATTR_REP This signal can be used for tools willing to request and parse Attribute Response and do something with the information. ipaccess-config tool will use this signal in later patch Change-Id Ida416a969a3309868d6f4e50f34b34f224c32dd6. Related: OS#3624 Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 --- M include/osmocom/bsc/signal.h M src/osmo-bsc/abis_nm.c 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/11684/5 -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:00:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:00:53 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix whitespace In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11685 to look at the new patch set (#5). Change subject: ipaccess-config: Fix whitespace ...................................................................... ipaccess-config: Fix whitespace Related: OS#3624 Change-Id: I190752000a73d7600a946c7535661550b1fe3520 --- M src/ipaccess/ipaccess-config.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/11685/5 -- To view, visit https://gerrit.osmocom.org/11685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I190752000a73d7600a946c7535661550b1fe3520 Gerrit-Change-Number: 11685 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:00:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:00:53 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11686 to look at the new patch set (#7). Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID Related: OS#3624 Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 --- M src/ipaccess/ipaccess-config.c 1 file changed, 62 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/11686/7 -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 7 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:00:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:00:53 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: cosmetic: Remove unneeded comment with hex values In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11688 to look at the new patch set (#7). Change subject: ipaccess-config: cosmetic: Remove unneeded comment with hex values ...................................................................... ipaccess-config: cosmetic: Remove unneeded comment with hex values Same type of message parsing is already implemented in code, no need to keep them. Related: OS#3624 Change-Id: I715bd9582f9289b5674aaa8d8de1164ebef2fd11 --- M src/ipaccess/ipaccess-config.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/11688/7 -- To view, visit https://gerrit.osmocom.org/11688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I715bd9582f9289b5674aaa8d8de1164ebef2fd11 Gerrit-Change-Number: 11688 Gerrit-PatchSet: 7 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:00:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:00:53 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11687 to look at the new patch set (#7). Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... ipaccess-config: Use stderr for debug type messages when using -G This way only formated output is pinted to stdout when using -G. Related: OS#3624 Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e --- M src/ipaccess/ipaccess-config.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11687/7 -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 7 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:01:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:01:58 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: fix vty bind ip override" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11848 ) Change subject: Revert "mobile: fix vty bind ip override" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic63a4eb828ff32d3744886b4f5f6f5019c798620 Gerrit-Change-Number: 11848 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 11:01:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:02:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:02:09 +0000 Subject: Change in osmocom-bb[master]: mobile/app_mobile.c: drop redundant printf() call In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11849 ) Change subject: mobile/app_mobile.c: drop redundant printf() call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I688f66175ea67d4c6a46819bee7d300ad9ce7cc7 Gerrit-Change-Number: 11849 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 11:02:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:02:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:02:43 +0000 Subject: Change in osmocom-bb[master]: mobile/app_mobile.c: use LOGP() instead of printf()/fprintf() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11850 ) Change subject: mobile/app_mobile.c: use LOGP() instead of printf()/fprintf() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6af76afbaa34dde5ddfc31a65700030862442dba Gerrit-Change-Number: 11850 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 11:02:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:03:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:03:25 +0000 Subject: Change in osmocom-bb[master]: mobile: abort in case of argv handling errors In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11851 ) Change subject: mobile: abort in case of argv handling errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib656ad12f12429ed15dc2a1554901ffa51148ff6 Gerrit-Change-Number: 11851 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 11:03:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:07:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 11:07:04 +0000 Subject: Change in osmocom-bb[master]: mobile: use VTY bind addr from config, deprecate cmd line options In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11852 ) Change subject: mobile: use VTY bind addr from config, deprecate cmd line options ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99e0ec1717edd29b3be231be86616cc7effe5d95 Gerrit-Change-Number: 11852 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 11:07:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:11:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 11:11:16 +0000 Subject: Change in osmocom-bb[master]: Revert "mobile: fix vty bind ip override" In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11848 ) Change subject: Revert "mobile: fix vty bind ip override" ...................................................................... Revert "mobile: fix vty bind ip override" This reverts commit c8de8cb1e126a18c0269571fba38310589dd9273 (Change-Id I32517567847fd5c54b1742f18bf409ff81e316fa by Max), because several problems were introduced, in particular: a) Help message of mobile application is broken: "The VTY IP to telnet to. (default (null))", "The VTY port number to telnet to. (default 127.0.0.1)". b) Default VTY bind addres != parsed from the config file. c) The (vty_ip == NULL) is resolved only when an external MNCC handler is used, otherwise NULL is passed to l23_app_init(). Change-Id: Ic63a4eb828ff32d3744886b4f5f6f5019c798620 --- M src/host/layer23/src/mobile/main.c 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 297a534..115ac41 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -31,7 +31,6 @@ #include #include #include -#include #include @@ -52,7 +51,7 @@ static char *gsmtap_ip = 0; static const char *custom_cfg_file = NULL; struct gsmtap_inst *gsmtap_inst = NULL; -static char *vty_ip = NULL; +static char *vty_ip = "127.0.0.1"; unsigned short vty_port = 4247; char *config_dir = NULL; int use_mncc_sock = 0; @@ -91,7 +90,7 @@ printf(" -u --vty-ip The VTY IP to telnet to. " "(default %s)\n", vty_ip); printf(" -v --vty-port The VTY port number to telnet to. " - "(default %s)\n", vty_get_bind_addr()); + "(default %u)\n", vty_port); printf(" -d --debug Change debug flags. default: %s\n", debug_default); printf(" -D --daemonize Run as daemon\n"); @@ -249,7 +248,7 @@ config_dir = dirname(config_dir); if (use_mncc_sock) - rc = l23_app_init(mncc_recv_socket, config_file, vty_ip ? vty_ip : vty_get_bind_addr(), vty_port); + rc = l23_app_init(mncc_recv_socket, config_file, vty_ip, vty_port); else rc = l23_app_init(NULL, config_file, vty_ip, vty_port); if (rc) -- To view, visit https://gerrit.osmocom.org/11848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic63a4eb828ff32d3744886b4f5f6f5019c798620 Gerrit-Change-Number: 11848 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:11:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 11:11:17 +0000 Subject: Change in osmocom-bb[master]: mobile/app_mobile.c: drop redundant printf() call In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11849 ) Change subject: mobile/app_mobile.c: drop redundant printf() call ...................................................................... mobile/app_mobile.c: drop redundant printf() call The VTY requisites are always being printed by libosmovty, there is no need to duplicate this information. Change-Id: I688f66175ea67d4c6a46819bee7d300ad9ce7cc7 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index f53445a..af627c6 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -469,7 +469,6 @@ vty_ip, vty_port, strerror(errno)); return rc; } - printf("VTY available on %s %u\n", vty_ip, vty_port); osmo_signal_register_handler(SS_GLOBAL, &global_signal_cb, NULL); osmo_signal_register_handler(SS_L1CTL, &mobile_signal_cb, NULL); -- To view, visit https://gerrit.osmocom.org/11849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I688f66175ea67d4c6a46819bee7d300ad9ce7cc7 Gerrit-Change-Number: 11849 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:11:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 11:11:17 +0000 Subject: Change in osmocom-bb[master]: mobile/app_mobile.c: use LOGP() instead of printf()/fprintf() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11850 ) Change subject: mobile/app_mobile.c: use LOGP() instead of printf()/fprintf() ...................................................................... mobile/app_mobile.c: use LOGP() instead of printf()/fprintf() Change-Id: I6af76afbaa34dde5ddfc31a65700030862442dba --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 8 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index af627c6..464cd55 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -452,20 +452,19 @@ if (config_file != NULL) { rc = vty_read_config_file(config_file, &dummy_conn); if (rc < 0) { - fprintf(stderr, "Failed to parse the config file:" - " '%s'\n", config_file); - fprintf(stderr, "Please check or create config file" - " using: 'touch %s'\n", config_file); - fprintf(stderr, "or use one from " - "'doc/examples/mobile/'\n"); + LOGP(DMOB, LOGL_FATAL, "Failed to parse the configuration " + "file '%s'\n", config_file); + LOGP(DMOB, LOGL_FATAL, "Please make sure the file " + "'%s' exists, or use an example from " + "'doc/examples/mobile/'\n", config_file); return rc; } - printf("Using configuration from %s\n", config_file); + LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file); } vty_reading = 0; rc = telnet_init_dynif(l23_ctx, NULL, vty_ip, vty_port); if (rc < 0) { - fprintf(stderr, "Cannot init VTY on %s port %u: %s\n", + LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", vty_ip, vty_port, strerror(errno)); return rc; } @@ -477,7 +476,7 @@ if (llist_empty(&ms_list)) { struct osmocom_ms *ms; - printf("No Mobile Station defined, creating: MS '1'\n"); + LOGP(DMOB, LOGL_NOTICE, "No Mobile Station defined, creating: MS '1'\n"); ms = mobile_new("1"); if (!ms) return -1; -- To view, visit https://gerrit.osmocom.org/11850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6af76afbaa34dde5ddfc31a65700030862442dba Gerrit-Change-Number: 11850 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:11:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 11:11:18 +0000 Subject: Change in osmocom-bb[master]: mobile: abort in case of argv handling errors In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11851 ) Change subject: mobile: abort in case of argv handling errors ...................................................................... mobile: abort in case of argv handling errors The process should be aborted if a non-existing command line option or an incorrect parameter value is passed. Change-Id: Ib656ad12f12429ed15dc2a1554901ffa51148ff6 --- M src/host/layer23/src/mobile/main.c 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 115ac41..e015c30 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -99,7 +99,7 @@ "offer socket\n"); } -static void handle_options(int argc, char **argv) +static int handle_options(int argc, char **argv) { while (1) { int option_index = 0, c; @@ -148,9 +148,12 @@ use_mncc_sock = 1; break; default: - break; + /* Unknown parameter passed */ + return -EINVAL; } } + + return 0; } void sighandler(int sigset) @@ -218,7 +221,11 @@ /* Init default stderr logging */ osmo_init_logging2(l23_ctx, &log_info); - handle_options(argc, argv); + rc = handle_options(argc, argv); + if (rc) { /* Abort in case of parsing errors */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + return 1; + } if (gsmtap_ip) { gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1); -- To view, visit https://gerrit.osmocom.org/11851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib656ad12f12429ed15dc2a1554901ffa51148ff6 Gerrit-Change-Number: 11851 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 11:11:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 11:11:18 +0000 Subject: Change in osmocom-bb[master]: mobile: use VTY bind addr from config, deprecate cmd line options In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11852 ) Change subject: mobile: use VTY bind addr from config, deprecate cmd line options ...................................................................... mobile: use VTY bind addr from config, deprecate cmd line options This change revives the main idea of: Change-Id: I32517567847fd5c54b1742f18bf409ff81e316fa to stop ignoring the VTY bind address from the config file. Furthermore, it deprecates (and disables) both 'u' and 'v' command line options, because they are redundant. Change-Id: I99e0ec1717edd29b3be231be86616cc7effe5d95 --- M src/host/layer23/include/osmocom/bb/mobile/app_mobile.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c 3 files changed, 19 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h index c2ab3c8..191f4ba 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h +++ b/src/host/layer23/include/osmocom/bb/mobile/app_mobile.h @@ -9,7 +9,7 @@ struct vty; int l23_app_init(int (*mncc_recv)(struct osmocom_ms *ms, int, void *), - const char *config_file, const char *vty_ip, uint16_t vty_port); + const char *config_file); int l23_app_exit(void); int l23_app_work(int *quit); int mobile_delete(struct osmocom_ms *ms, int force); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 464cd55..a051fba 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -39,6 +39,8 @@ #include #include #include + +#include #include #include @@ -434,7 +436,7 @@ /* global init */ int l23_app_init(int (*mncc_recv)(struct osmocom_ms *ms, int, void *), - const char *config_file, const char *vty_ip, uint16_t vty_port) + const char *config_file) { struct telnet_connection dummy_conn; int rc = 0; @@ -462,10 +464,11 @@ LOGP(DMOB, LOGL_INFO, "Using configuration from '%s'\n", config_file); } vty_reading = 0; - rc = telnet_init_dynif(l23_ctx, NULL, vty_ip, vty_port); + rc = telnet_init_dynif(l23_ctx, NULL, + vty_get_bind_addr(), OSMO_VTY_PORT_BB); if (rc < 0) { LOGP(DMOB, LOGL_FATAL, "Cannot init VTY on %s port %u: %s\n", - vty_ip, vty_port, strerror(errno)); + vty_get_bind_addr(), OSMO_VTY_PORT_BB, strerror(errno)); return rc; } diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index e015c30..9764b33 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -51,8 +51,6 @@ static char *gsmtap_ip = 0; static const char *custom_cfg_file = NULL; struct gsmtap_inst *gsmtap_inst = NULL; -static char *vty_ip = "127.0.0.1"; -unsigned short vty_port = 4247; char *config_dir = NULL; int use_mncc_sock = 0; int daemonize = 0; @@ -87,10 +85,6 @@ printf(" Some help...\n"); printf(" -h --help this text\n"); printf(" -i --gsmtap-ip The destination IP used for GSMTAP.\n"); - printf(" -u --vty-ip The VTY IP to telnet to. " - "(default %s)\n", vty_ip); - printf(" -v --vty-port The VTY port number to telnet to. " - "(default %u)\n", vty_port); printf(" -d --debug Change debug flags. default: %s\n", debug_default); printf(" -D --daemonize Run as daemon\n"); @@ -106,12 +100,13 @@ static struct option long_options[] = { {"help", 0, 0, 'h'}, {"gsmtap-ip", 1, 0, 'i'}, - {"vty-ip", 1, 0, 'u'}, - {"vty-port", 1, 0, 'v'}, {"debug", 1, 0, 'd'}, {"daemonize", 0, 0, 'D'}, {"config-file", 1, 0, 'c'}, {"mncc-sock", 0, 0, 'm'}, + /* DEPRECATED options, to be removed */ + {"vty-ip", 1, 0, 'u'}, + {"vty-port", 1, 0, 'v'}, {0, 0, 0, 0}, }; @@ -129,15 +124,9 @@ case 'i': gsmtap_ip = optarg; break; - case 'u': - vty_ip = optarg; - break; case 'c': custom_cfg_file = optarg; break; - case 'v': - vty_port = atoi(optarg); - break; case 'd': log_parse_category_mask(osmo_stderr_target, optarg); break; @@ -147,6 +136,13 @@ case 'm': use_mncc_sock = 1; break; + /* DEPRECATED options, to be removed */ + case 'u': + case 'v': + fprintf(stderr, "Both 'u' and 'v' options are " + "deprecated! Please use the configuration file " + "in order to set VTY bind address.\n"); + /* fall-thru */ default: /* Unknown parameter passed */ return -EINVAL; @@ -255,9 +251,9 @@ config_dir = dirname(config_dir); if (use_mncc_sock) - rc = l23_app_init(mncc_recv_socket, config_file, vty_ip, vty_port); + rc = l23_app_init(mncc_recv_socket, config_file); else - rc = l23_app_init(NULL, config_file, vty_ip, vty_port); + rc = l23_app_init(NULL, config_file); if (rc) exit(rc); -- To view, visit https://gerrit.osmocom.org/11852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I99e0ec1717edd29b3be231be86616cc7effe5d95 Gerrit-Change-Number: 11852 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:06:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 12:06:46 +0000 Subject: Change in osmo-gsm-tester[master]: suites: gprs: Add test to verify MS can use gprs after long idle time Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11853 Change subject: suites: gprs: Add test to verify MS can use gprs after long idle time ...................................................................... suites: gprs: Add test to verify MS can use gprs after long idle time Change-Id: I1a726049d1e4a95f1145dcf1f654c63503ceb78a --- A suites/gprs/ping_idle_ping.py 1 file changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/53/11853/1 diff --git a/suites/gprs/ping_idle_ping.py b/suites/gprs/ping_idle_ping.py new file mode 100755 index 0000000..e0968ac --- /dev/null +++ b/suites/gprs/ping_idle_ping.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 + +# Following test verifies GPRS works fine after MS stays idle (no data +# sent/received) for a long while. +# See OS#3678 and OS#2455 for more information. + +from osmo_gsm_tester.testenv import * + +hlr = suite.hlr() +bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms = suite.modem() + +bsc.bts_add(bts) +sgsn.bts_add(bts) + +print('start network...') +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() + +hlr.subscriber_add(ms) + +ms.connect(msc.mcc_mnc()) +ms.attach() + +ms.log_info() + +print('waiting for modems to attach...') +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) + +print('waiting for modems to attach to data services...') +wait(ms.is_attached) + +# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) +ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) +print("Setting up data plane for %r" % repr(ctx_id_v4)) +ms.setup_context_data_plane(ctx_id_v4) +print("[1] Running 10 ping requests for %r" % repr(ctx_id_v4)) +ms.run_netns_wait('ping1', ('ping', '-c', '10', ggsn.addr())) + +print("Sleeping for 60 seconds") +sleep(60) + +print("[2] Running 10 ping requests for %r" % repr(ctx_id_v4)) +ms.run_netns_wait('ping2', ('ping', '-c', '10', ggsn.addr())) +ms.deactivate_context(ctx_id_v4) -- To view, visit https://gerrit.osmocom.org/11853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a726049d1e4a95f1145dcf1f654c63503ceb78a Gerrit-Change-Number: 11853 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:21:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:21:18 +0000 Subject: Change in osmo-gsm-manuals[master]: make check: properly reference dependencies In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11794 ) Change subject: make check: properly reference dependencies ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 Gerrit-Change-Number: 11794 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:21:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:21:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:21:45 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add shared content pdf build tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11795 ) Change subject: tests: add shared content pdf build tests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf Gerrit-Change-Number: 11795 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:21:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:22:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:22:05 +0000 Subject: Change in osmo-gsm-manuals[master]: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11796 ) Change subject: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab Gerrit-Change-Number: 11796 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:22:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:22:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:22:54 +0000 Subject: Change in osmo-gsm-manuals[master]: prepare for autotools: add git-version-gen In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11797 ) Change subject: prepare for autotools: add git-version-gen ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 Gerrit-Change-Number: 11797 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:22:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:23:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 21 Nov 2018 12:23:41 +0000 Subject: Change in libsmpp34[master]: fix use of partly initialized struct in tcp test Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11854 Change subject: fix use of partly initialized struct in tcp test ...................................................................... fix use of partly initialized struct in tcp test Properly initialize sockaddr 'name' used by tcp test, and remove a redundant re-declaration of this variable in a nested scope. Change-Id: Id6e488308a72be96cca6aa661f088d2c3c67a6a3 Related: CID#188848 --- M test_apps/tcp.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/54/11854/1 diff --git a/test_apps/tcp.c b/test_apps/tcp.c index 4e24fa5..4cf681d 100644 --- a/test_apps/tcp.c +++ b/test_apps/tcp.c @@ -69,7 +69,7 @@ /* bind to a local addr */ if (strlen(local_src) != 0) { - struct sockaddr_in name; + memset(&name, 0, sizeof(name)); name.sin_family = AF_INET; name.sin_port = htons(local_port); name.sin_addr.s_addr = inet_addr(local_src); @@ -91,6 +91,7 @@ }; memcpy(&addr.s_addr, _host.h_addr_list[0], sizeof(struct in_addr)); + memset(&name, 0, sizeof(name)); name.sin_family = AF_INET; name.sin_port = htons( port ); name.sin_addr = addr; -- To view, visit https://gerrit.osmocom.org/11854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id6e488308a72be96cca6aa661f088d2c3c67a6a3 Gerrit-Change-Number: 11854 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:26:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 12:26:37 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11803/3/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/11803/3/build/Makefile.asciidoc.inc at 63 PS3, Line 63: # $(notdir) is like basename from coreutils, and $PWD is the $(builddir). > where is $PWD used here? This should be an explanation for $(builddir), just like $(notdir) is explained before (that's my understanding of it anyway, the line was suggested by Neels). I'll switch it around to $(builddir) is $PWD, then the explanation is on the right side just like with $(notdir) and $< before. -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:26:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:39:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:39:13 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11725 ) Change subject: use autotools to add "make install" target ...................................................................... Patch Set 6: Code-Review+2 (2 comments) if you want then do the cosmetics, but I'd like to merge now. https://gerrit.osmocom.org/#/c/11725/6/Makefile.am File Makefile.am: https://gerrit.osmocom.org/#/c/11725/6/Makefile.am at 2 PS6, Line 2: share_path = "$(DESTDIR)$(prefix)/share/osmo-gsm-manuals" > would be clearer to name it destdir_sharepath or so, I first though it was related to share_files (s [?] It's nothing that needs to change ... IIUC they are related (the share_files get installed in share_path) https://gerrit.osmocom.org/#/c/11725/6/osmo-gsm-manuals.pc.in File osmo-gsm-manuals.pc.in: https://gerrit.osmocom.org/#/c/11725/6/osmo-gsm-manuals.pc.in at 2 PS6, Line 2: osmogsmmanualsdir=@prefix@/share/osmo-gsm-manuals (does it have to be without some underscores tucked between the words?) -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 6 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:39:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:40:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:40:06 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11806 ) Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:40:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:41:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:41:01 +0000 Subject: Change in osmo-gsm-manuals[master]: *filter.conf/*.sty: use symlinks to build, common In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11798 ) Change subject: *filter.conf/*.sty: use symlinks to build, common ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 Gerrit-Change-Number: 11798 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:41:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:41:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:41:30 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: include from ./common, not ../common In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11799 ) Change subject: *.adoc: include from ./common, not ../common ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 Gerrit-Change-Number: 11799 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:41:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:41:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:41:46 +0000 Subject: Change in osmo-gsm-manuals[master]: *-vty-reference.xml: use ./common, not ../common In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11800 ) Change subject: *-vty-reference.xml: use ./common, not ../common ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5368bcff34586c515af23e5a868417e561fd539d Gerrit-Change-Number: 11800 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:41:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:42:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:42:28 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11801 ) Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:42:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:44:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:44:01 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:44:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:44:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:44:20 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: use {srcdir} for out-of-tree builds In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11804 ) Change subject: *.adoc: use {srcdir} for out-of-tree builds ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a Gerrit-Change-Number: 11804 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:44:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:48:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:48:21 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Patch Set 3: Code-Review+2 (2 comments) https://gerrit.osmocom.org/#/c/11803/3/build/Makefile.asciidoc.inc File build/Makefile.asciidoc.inc: https://gerrit.osmocom.org/#/c/11803/3/build/Makefile.asciidoc.inc at 63 PS3, Line 63: # $(notdir) is like basename from coreutils, and $PWD is the $(builddir). > This should be an explanation for $(builddir), just like $(notdir) is explained before (that's my un [?] or write out "current directory" or "we are in"... (but I obviously think it's ok like this too) https://gerrit.osmocom.org/#/c/11803/3/build/Makefile.asciidoc.inc at 69 PS3, Line 69: # in $(OSMO_GSM_MANUALS_DIR). very nice, warm and fuzzy -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:48:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:48:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:48:39 +0000 Subject: Change in osmo-gsm-manuals[master]: copy NITB's osmobsc-usermanual.adoc to OsmoBSC In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11805 ) Change subject: copy NITB's osmobsc-usermanual.adoc to OsmoBSC ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad Gerrit-Change-Number: 11805 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 12:48:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:49:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 12:49:32 +0000 Subject: Change in osmo-msc[master]: libmsc/db.c: cosmetic: mark missing breaks in switch as intended Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11855 Change subject: libmsc/db.c: cosmetic: mark missing breaks in switch as intended ...................................................................... libmsc/db.c: cosmetic: mark missing breaks in switch as intended Change-Id: I3f4f34ecd0c5bb2d1a675ad5c4669fcffb87f292 Closes: Coverity CID#148209 --- M src/libmsc/db.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/11855/1 diff --git a/src/libmsc/db.c b/src/libmsc/db.c index d06db10..b5e7ad8 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -573,9 +573,11 @@ case 2: if (update_db_revision_2()) goto error; + /* fall through */ case 3: if (update_db_revision_3()) goto error; + /* fall through */ case 4: if (update_db_revision_4()) goto error; -- To view, visit https://gerrit.osmocom.org/11855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3f4f34ecd0c5bb2d1a675ad5c4669fcffb87f292 Gerrit-Change-Number: 11855 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:49:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:49:52 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: chmod xsltproc output In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11843 ) Change subject: vty_reference_combine.sh: chmod xsltproc output ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I693e12ee15665d01cbc50187e6cb3ca74ad0356a Gerrit-Change-Number: 11843 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:49:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:50:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 12:50:49 +0000 Subject: Change in osmo-msc[master]: libmsc/db.c: cosmetic: mark missing breaks in switch as intended In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11855 ) Change subject: libmsc/db.c: cosmetic: mark missing breaks in switch as intended ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f4f34ecd0c5bb2d1a675ad5c4669fcffb87f292 Gerrit-Change-Number: 11855 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 21 Nov 2018 12:50:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:51:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:51:15 +0000 Subject: Change in osmo-gsm-manuals[master]: gitignore: add 'make distcheck' files In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11844 ) Change subject: gitignore: add 'make distcheck' files ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11844/2/.gitignore File .gitignore: https://gerrit.osmocom.org/#/c/11844/2/.gitignore at 40 PS2, Line 40: osmo-gsm-manuals-*.tar.* I don't think we have it in any other repositories, but ok -- To view, visit https://gerrit.osmocom.org/11844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 Gerrit-Change-Number: 11844 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:51:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:52:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 12:52:09 +0000 Subject: Change in osmo-gsm-manuals[master]: */Makefile.am: add EXTRA_DIST In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11845 ) Change subject: */Makefile.am: add EXTRA_DIST ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a2d6e572d346addc8770d1331c9223a56635869 Gerrit-Change-Number: 11845 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 12:52:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 12:58:35 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 12:58:35 +0000 Subject: Change in osmo-msc[master]: libmsc/db.c: cosmetic: mark missing breaks in switch as intended In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11855 ) Change subject: libmsc/db.c: cosmetic: mark missing breaks in switch as intended ...................................................................... libmsc/db.c: cosmetic: mark missing breaks in switch as intended Change-Id: I3f4f34ecd0c5bb2d1a675ad5c4669fcffb87f292 Closes: Coverity CID#148209 --- M src/libmsc/db.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/db.c b/src/libmsc/db.c index d06db10..b5e7ad8 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -573,9 +573,11 @@ case 2: if (update_db_revision_2()) goto error; + /* fall through */ case 3: if (update_db_revision_3()) goto error; + /* fall through */ case 4: if (update_db_revision_4()) goto error; -- To view, visit https://gerrit.osmocom.org/11855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3f4f34ecd0c5bb2d1a675ad5c4669fcffb87f292 Gerrit-Change-Number: 11855 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:03:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:03:31 +0000 Subject: Change in osmo-gsm-manuals[master]: move OsmoMSC files to osmo-msc.git In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: move OsmoMSC files to osmo-msc.git ...................................................................... Patch Set 7: Code-Review+2 (4 comments) In general I think spreading out the removals over numerous patches adds little more than effort. Does it matter how we move the files? The end result will be that they are gone from here, and it's not like looking at file removals is confusing, i.e. splitting up doesn't really make anything more easy to read, does it? Ok, to revert a single repos would be easier with single patches, but I doubt we'll do that, and I doubt even if that it's worth the extra effort (including time spent on moving doc patches that are being written while this refactoring is in limbo) I accept opinions, but would prefer if we could get this done sooner rather than later, and avoid treading out more bikeshed issues more than we have already... https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 7 PS7, Line 7: move OsmoMSC files to osmo-msc.git > You are not moving them here, you are removing them from osmo-gsm-manuals. [?] (IMHO "move" is better, because that's semantically what we're doing. but either way is fine.) https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 9 PS7, Line 9: Add to osmo-msc.git with I2f9c27f81940b02414f0e618483bffade72e8cf7. > Is this Change-Id part of osmo-msc.git? [?] (IMHO also this is fine. but so is pau's version) https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 14 PS7, Line 14: Related: OS#3385 > Depends: osmo-msc. [?] if this build breaks without that osmo-msc commit, 'Depends:' is accurate. I guess it's more like 'Related:'? https://gerrit.osmocom.org/#/c/11738/7/Makefile.am File Makefile.am: https://gerrit.osmocom.org/#/c/11738/7/Makefile.am at 8 PS7, Line 8: SUBDIRS = tests OsmoBSC OsmoBTS OsmoGGSN OsmoGSMTester OsmoHLR OsmoMGCP OsmoMGW OsmoNAT OsmoNITB OsmoPCU \ > Would make sense to split this line into a multiline with \, since we'll be changing it a lot in fol [?] (IMHO this is not needed) -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 13:03:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:03:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:03:51 +0000 Subject: Change in osmo-gsm-manuals[master]: move OsmoMSC files to osmo-msc.git In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: move OsmoMSC files to osmo-msc.git ...................................................................... Patch Set 7: Code-Review+1 ah, of course fix the jenkins failure first. -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 13:03:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:04:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:04:23 +0000 Subject: Change in osmo-gsm-manuals[master]: jenkins.sh: run 'make distcheck' In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11846 ) Change subject: jenkins.sh: run 'make distcheck' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie31fba3d1afd31c25489ce08169101d9ed9de536 Gerrit-Change-Number: 11846 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 13:04:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:06:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:06:33 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: publish from project repos, not this repo anymore ...................................................................... Patch Set 4: Code-Review+1 (fix the build failure) -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 13:06:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:07:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:07:51 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 13:07:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:09:49 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 13:09:49 +0000 Subject: Change in libsmpp34[master]: fix use of partly initialized struct in tcp test In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11854 ) Change subject: fix use of partly initialized struct in tcp test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6e488308a72be96cca6aa661f088d2c3c67a6a3 Gerrit-Change-Number: 11854 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 21 Nov 2018 13:09:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:10:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:10:25 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Use stderr for debug type messages when using -G In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Use stderr for debug type messages when using -G ...................................................................... Patch Set 7: Even though I don't really care a lot about this program, I can't bring myself to +2 on switching output between stdout and stderr, I think it's a very weird choice. Someone else will have to push it past my +1. -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 7 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 13:10:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:14:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 13:14:26 +0000 Subject: Change in osmo-gsm-manuals[master]: move OsmoMSC files to osmo-msc.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: move OsmoMSC files to osmo-msc.git ...................................................................... Patch Set 7: (2 comments) Spreading isn't much more effort, since most stuff is basically "git rm -r $(subdir)". Let's focus on merging content now into new repositories. Then, for each repo with its manual included, we issue a commit to remove it from here. https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 7 PS7, Line 7: move OsmoMSC files to osmo-msc.git > (IMHO "move" is better, because that's semantically what we're doing. but either way is fine. [?] Yes, we are moving them to /dev/null in this commit ;) https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 14 PS7, Line 14: Related: OS#3385 > if this build breaks without that osmo-msc commit, 'Depends:' is accurate. [?] I think this commit shouldn't be merged until the content is moved to osmo-msc, then we can remove this one, that's why. -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 13:14:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:14:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 21 Nov 2018 13:14:27 +0000 Subject: Change in osmo-ggsn[master]: check ioctl() call return value in tun_new() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11856 Change subject: check ioctl() call return value in tun_new() ...................................................................... check ioctl() call return value in tun_new() Coverity complains about a missing ioctl() return value check. Check for failure of the TUNSETNOCSUM ioctl and log a warning if it fails. Change-Id: I88da2164d975d7a232619b8d31c5eadeef0f3a80 Related: CID#57661 --- M lib/tun.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/56/11856/1 diff --git a/lib/tun.c b/lib/tun.c index fa4c37d..6ae006b 100644 --- a/lib/tun.c +++ b/lib/tun.c @@ -193,7 +193,10 @@ strncpy((*tun)->devname, ifr.ifr_name, IFNAMSIZ); (*tun)->devname[IFNAMSIZ - 1] = 0; - ioctl((*tun)->fd, TUNSETNOCSUM, 1); /* Disable checksums */ + /* Disable checksums */ + if (ioctl((*tun)->fd, TUNSETNOCSUM, 1) < 0) { + SYS_ERR(DTUN, LOGL_NOTICE, errno, "could not disable checksum on %s", (*tun)->devname); + } return 0; } else { strncpy((*tun)->devname, dev_name, IFNAMSIZ); -- To view, visit https://gerrit.osmocom.org/11856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I88da2164d975d7a232619b8d31c5eadeef0f3a80 Gerrit-Change-Number: 11856 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:14:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 13:14:54 +0000 Subject: Change in osmo-gsm-manuals[master]: move OsmoMSC files to osmo-msc.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: move OsmoMSC files to osmo-msc.git ...................................................................... Patch Set 7: That being said, we can merge all previous commits, no need to wait for that to happen to merge them. -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 13:14:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:26:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 13:26:36 +0000 Subject: Change in osmo-bsc[master]: abis_nm: Introduce new signal S_NM_GET_ATTR_REP In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11684 ) Change subject: abis_nm: Introduce new signal S_NM_GET_ATTR_REP ...................................................................... abis_nm: Introduce new signal S_NM_GET_ATTR_REP This signal can be used for tools willing to request and parse Attribute Response and do something with the information. ipaccess-config tool will use this signal in later patch Change-Id Ida416a969a3309868d6f4e50f34b34f224c32dd6. Related: OS#3624 Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 --- M include/osmocom/bsc/signal.h M src/osmo-bsc/abis_nm.c 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 1b351aa..62a3d2c 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -72,6 +72,7 @@ S_NM_STATECHG_ADM, /* Administrative State changed */ S_NM_OM2K_CONF_RES, /* OM2K Configuration Result */ S_NM_OPSTART_ACK, /* Received OPSTART ACK, arg is struct msgb *oml_msg */ + S_NM_GET_ATTR_REP, /* Received Get Attributes Response, arg is struct msgb *oml_msg */ }; /* SS_LCHAN signals */ diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index c1a26ac..f1306fc 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -616,6 +616,7 @@ struct e1inp_sign_link *sign_link = mb->dst; struct gsm_bts *bts = trx ? trx->bts : sign_link->trx->bts; struct tlv_parsed tp; + int rc; DEBUGPFOH(DNM, foh, "Get Attributes Response for BTS%u\n", bts->nr); @@ -623,9 +624,13 @@ /* nanoBTS doesn't send Get Attribute Response Info, uses its own format */ if (bts->type != GSM_BTS_TYPE_NANOBTS) - return parse_attr_resp_info(bts, trx, foh, &tp); + rc = parse_attr_resp_info(bts, trx, foh, &tp); else - return parse_attr_resp_info_attr(bts, trx, foh, &tp); + rc = parse_attr_resp_info_attr(bts, trx, foh, &tp); + + osmo_signal_dispatch(SS_NM, S_NM_GET_ATTR_REP, mb); + + return rc; } /* 3GPP TS 52.021 ?6.2.5 */ -- To view, visit https://gerrit.osmocom.org/11684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9a121bbfe1b96904d4e16845abc90bb6ef20d2c9 Gerrit-Change-Number: 11684 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:26:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 13:26:37 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix whitespace In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11685 ) Change subject: ipaccess-config: Fix whitespace ...................................................................... ipaccess-config: Fix whitespace Related: OS#3624 Change-Id: I190752000a73d7600a946c7535661550b1fe3520 --- M src/ipaccess/ipaccess-config.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Max: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 0fb5ad9..657dad1 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -1044,7 +1044,7 @@ gsm_bts_trx_alloc(bts); gsm_bts_trx_alloc(bts); bts->oml_tei = stream_id; - + osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); osmo_signal_register_handler(SS_IPAC_NWL, nwl_sig_cb, NULL); @@ -1060,7 +1060,7 @@ perror("Error connecting to the BTS"); exit(1); } - + bts->oml_link->ts->sign.delay = 10; bts->c0->rsl_link->ts->sign.delay = 10; while (1) { -- To view, visit https://gerrit.osmocom.org/11685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I190752000a73d7600a946c7535661550b1fe3520 Gerrit-Change-Number: 11685 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:26:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 13:26:38 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11686 ) Change subject: ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID ...................................................................... ipaccess-config: Add -G cmdl opt to query OML IP and Unit ID Related: OS#3624 Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 --- M src/ipaccess/ipaccess-config.c 1 file changed, 62 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 657dad1..9e3dc39 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -59,6 +60,7 @@ static int net_listen_testnr; static int restart; +static bool get_attr; static char *prim_oml_ip; static char *bts_ip_addr, *bts_ip_mask, *bts_ip_gw; static char *unit_id; @@ -269,6 +271,33 @@ return 0; } +static int print_attr_rep(struct msgb *mb) +{ + /* Parse using nanoBTS own formatting for Get Attribute Response */ + struct abis_om_hdr *oh = msgb_l2(mb); + struct abis_om_fom_hdr *foh = msgb_l3(mb); + struct e1inp_sign_link *sign_link = mb->dst; + struct gsm_bts_trx *trx = sign_link->trx; + struct gsm_bts *bts = trx->bts; + struct tlv_parsed tp; + struct in_addr ia = {0}; + char oml_ip[20] = {0}; + uint16_t oml_port = 0; + char unit_id[40] = {0}; + + + abis_nm_tlv_parse(&tp, bts, foh->data, oh->length-sizeof(*foh)); + + abis_nm_tlv_attr_primary_oml(&tp, &ia, &oml_port); + osmo_strlcpy(oml_ip, inet_ntoa(ia), sizeof(oml_ip)); + + abis_nm_tlv_attr_unit_id(&tp, unit_id, sizeof(unit_id)); + + fprintf(stdout, "{ primary_oml_ip: \"%s\", primary_oml_port: %" PRIu16 ", unit_id: \"%s\" }\n", + oml_ip, oml_port, unit_id); + return 0; +} + static int nm_state_event(int evt, uint8_t obj_class, void *obj, struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, struct abis_om_obj_inst *obj_inst); @@ -278,6 +307,7 @@ { struct ipacc_ack_signal_data *ipacc_data; struct nm_statechg_signal_data *nsd; + struct msgb *oml_msg; switch (signal) { case S_NM_IPACC_NACK: @@ -300,6 +330,11 @@ nm_state_event(signal, nsd->obj_class, nsd->obj, nsd->old_state, nsd->new_state, nsd->obj_inst); break; + case S_NM_GET_ATTR_REP: + fprintf(stderr, "Received SIGNAL S_NM_GET_ATTR_REP\n"); + oml_msg = signal_data; + print_attr_rep(oml_msg); + exit(0); default: break; } @@ -493,18 +528,23 @@ static void bootstrap_om(struct gsm_bts_trx *trx) { - struct msgb *nmsg = msgb_alloc(1024, "nested msgb"); + struct msgb *nmsg_get = msgb_alloc(1024, "nested get msgb"); + struct msgb *nmsg_set = msgb_alloc(1024, "nested set msgb"); int need_to_set_attr = 0; int len; printf("OML link established using TRX %d\n", trx->nr); + if (get_attr) { + msgb_put_u8(nmsg_get, NM_ATT_IPACC_PRIM_OML_CFG); + msgb_put_u8(nmsg_get, NM_ATT_IPACC_UNIT_ID); + } if (unit_id) { len = strlen(unit_id); - if (len > nmsg->data_len-10) + if (len > nmsg_set->data_len-10) goto out_err; printf("setting Unit ID to '%s'\n", unit_id); - nv_put_unit_id(nmsg, unit_id); + nv_put_unit_id(nmsg_set, unit_id); need_to_set_attr = 1; } if (prim_oml_ip) { @@ -517,13 +557,13 @@ } printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia)); - nv_put_prim_oml(nmsg, ntohl(ia.s_addr), 0); + nv_put_prim_oml(nmsg_set, ntohl(ia.s_addr), 0); need_to_set_attr = 1; } if (nv_mask) { printf("setting NV Flags/Mask to 0x%04x/0x%04x\n", nv_flags, nv_mask); - nv_put_flags(nmsg, nv_flags, nv_mask); + nv_put_flags(nmsg_set, nv_flags, nv_mask); need_to_set_attr = 1; } if (bts_ip_addr && bts_ip_mask) { @@ -542,7 +582,7 @@ } printf("setting static IP Address/Mask\n"); - nv_put_ip_if_cfg(nmsg, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr)); + nv_put_ip_if_cfg(nmsg_set, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr)); need_to_set_attr = 1; } if (bts_ip_gw) { @@ -556,12 +596,18 @@ printf("setting static IP Gateway\n"); /* we only set the default gateway with zero addr/mask */ - nv_put_gw_cfg(nmsg, 0, 0, ntohl(ia_gw.s_addr)); + nv_put_gw_cfg(nmsg_set, 0, 0, ntohl(ia_gw.s_addr)); need_to_set_attr = 1; } + if (get_attr) { + fprintf(stderr, "getting Attributes (%d): %s\n", nmsg_get->len, osmo_hexdump(msgb_data(nmsg_get), msgb_length(nmsg_get))); + abis_nm_get_attr(trx->bts, NM_OC_BASEB_TRANSC, 0, trx->nr, 0xff, nmsg_get->head, nmsg_get->len); + oml_state = 1; + } + if (need_to_set_attr) { - abis_nm_ipaccess_set_nvattr(trx, nmsg->head, nmsg->len); + abis_nm_ipaccess_set_nvattr(trx, nmsg_set->head, nmsg_set->len); oml_state = 1; } @@ -571,7 +617,8 @@ } out_err: - msgb_free(nmsg); + msgb_free(nmsg_get); + msgb_free(nmsg_set); } static int nm_state_event(int evt, uint8_t obj_class, void *obj, @@ -833,6 +880,7 @@ printf("Commands for writing to the BTS:\n"); printf(" -u --unit-id UNIT_ID\t\tSet the Unit ID of the BTS\n"); printf(" -o --oml-ip IP\t\tSet primary OML IP (IP of your BSC)\n"); + printf(" -G --get-attr\t\tGet several attributes from BTS\n"); printf(" -i --ip-address IP/MASK\tSet static IP address + netmask of BTS\n"); printf(" -g --ip-gateway IP\t\tSet static IP gateway of BTS\n"); printf(" -r --restart\t\t\tRestart the BTS (after other operations)\n"); @@ -910,6 +958,7 @@ unsigned long ul; char *slash; static struct option long_options[] = { + { "get-attr", 0, 0, 'G' }, { "unit-id", 1, 0, 'u' }, { "oml-ip", 1, 0, 'o' }, { "ip-address", 1, 0, 'i' }, @@ -931,13 +980,16 @@ { 0, 0, 0, 0 }, }; - c = getopt_long(argc, argv, "u:o:i:g:rn:S:U:l:L:hs:d:f:wcpH", long_options, + c = getopt_long(argc, argv, "Gu:o:i:g:rn:S:U:l:L:hs:d:f:wcpH", long_options, &option_index); if (c == -1) break; switch (c) { + case 'G': + get_attr = true; + break; case 'u': if (!check_unitid_fmt(optarg)) exit(2); -- To view, visit https://gerrit.osmocom.org/11686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ida416a969a3309868d6f4e50f34b34f224c32dd6 Gerrit-Change-Number: 11686 Gerrit-PatchSet: 8 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:26:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 13:26:39 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: cosmetic: Remove unneeded comment with hex values In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11688 ) Change subject: ipaccess-config: cosmetic: Remove unneeded comment with hex values ...................................................................... ipaccess-config: cosmetic: Remove unneeded comment with hex values Same type of message parsing is already implemented in code, no need to keep them. Related: OS#3624 Change-Id: I715bd9582f9289b5674aaa8d8de1164ebef2fd11 --- M src/ipaccess/ipaccess-config.c 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 9e3dc39..dcaa756 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -78,11 +78,6 @@ static struct abis_nm_sw_desc *sw_load1 = NULL; static struct abis_nm_sw_desc *sw_load2 = NULL; -/* -static uint8_t prim_oml_attr[] = { 0x95, 0x00, 7, 0x88, 192, 168, 100, 11, 0x00, 0x00 }; -static uint8_t unit_id_attr[] = { 0x91, 0x00, 9, '2', '3', '4', '2', '/' , '0', '/', '0', 0x00 }; -*/ - extern int ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what); extern struct e1inp_line_ops ipaccess_e1inp_line_ops; -- To view, visit https://gerrit.osmocom.org/11688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I715bd9582f9289b5674aaa8d8de1164ebef2fd11 Gerrit-Change-Number: 11688 Gerrit-PatchSet: 8 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:34:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:34:21 +0000 Subject: Change in osmo-gsm-manuals[master]: chapters/gsup.adoc: document MO-/MT-forwardSM messages In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11836 ) Change subject: chapters/gsup.adoc: document MO-/MT-forwardSM messages ...................................................................... Patch Set 2: (7 comments) Let me state again that this documentation is fine as it is. I have quite detailed opinions on documentation, and it's intended to provide ideas (not so much criticism), and shouldn't be a blocker if others think it's fine. There are two(?) places where the reference to a section number isn't clear, that's the only reason why I -1. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc File common/chapters/gsup.adoc: https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 507 PS2, Line 507: ==== MO-forwardSM Request > Well, this mix is not my invention. I am also not a big fun of such style. [?] if Wireshark are the only ones using this naming, then that's not a reason to take it in here. If it were etsi specs that would be different. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 509 PS2, Line 509: Direction: SGSN / MSC => ESME (through VLR and HLR) > It isn't able yet, but there should be an issue about that. [?] yes, not important. (yet ever so slightly confusing the status quo) https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 522 PS2, Line 522: This message is used to forward _MO (Mobile Originated)_ short messages > Actually, there is some magic happening between "When a subscriber [?] yes, it is absolutely possible to understand, I just found myself reading the sentence was hard with all the interleaves, i.e. the braces like "(PS domain)", "(External...)", "(defined...)", so I would like to have a plain readable sentence first, and then more information separately, if it's required. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 528 PS2, Line 528: attempt and _RP-SMMA_ notification attempt on the _SM-RL (Relay Layer)_. > > "attempt" sounds like it fails [?] agree (actually none of my remarks are critical) https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 532 PS2, Line 532: Direction: ESME (through VLR and HLR) => SGSN / MSC > No need to reverse, this is correct. [?] I meant the order in the braces. As it is now I read that the ESME sends to the VLR and then to the HLR. So I'd favor: ESME (through HLR and VLR) -> MSC https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 545 PS2, Line 545: short message delivery from SGSN (PS domain) / MSC (CS domain) to an ESME > "... from SGSN (PS domain) / MSC (CS domain) to an ESME ..." [?] It would help to put 'an earlier' in there: This message is used to indicate a negative result of an earlier MO short message delivery well ... and I still think an "MO message delivery" is clear and no need to explain its direction again. https://gerrit.osmocom.org/#/c/11836/2/common/chapters/gsup.adoc at 1094 PS2, Line 1094: Relay Layer)_ has an unique _message reference (see 8.2.3)_, that > > 8.2.3 in this document? then use a <> link. 8.2.3 in 04.11? [?] To unclutter and remove uncertainties, I'd still rather have each reference in one place and complete, instead of spreading them with words in-between. -- To view, visit https://gerrit.osmocom.org/11836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0150756c33c1352bc4eb49421824542c711175c Gerrit-Change-Number: 11836 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 21 Nov 2018 13:34:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:37:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 13:37:34 +0000 Subject: Change in osmo-gsm-tester[master]: suites: gprs: Add test to verify CS paging works while MS is GPRS att... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11857 Change subject: suites: gprs: Add test to verify CS paging works while MS is GPRS attached ...................................................................... suites: gprs: Add test to verify CS paging works while MS is GPRS attached Related: OS#2204 Change-Id: If2844d78b52eda59c1f6d9e18363b858f2b5f007 --- A suites/gprs/cs_paging_gprs_active.py M suites/gprs/suite.conf 2 files changed, 88 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/11857/1 diff --git a/suites/gprs/cs_paging_gprs_active.py b/suites/gprs/cs_paging_gprs_active.py new file mode 100755 index 0000000..fc0e160 --- /dev/null +++ b/suites/gprs/cs_paging_gprs_active.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 + +# Following test verifies CS paging works when MS is GPRS attached. +# See OS#2204 for more information. + +from osmo_gsm_tester.testenv import * + +hlr = suite.hlr() +bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms_mo = suite.modem() +ms_mt = suite.modem() + +bsc.bts_add(bts) +sgsn.bts_add(bts) + +print('start network...') +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() + +hlr.subscriber_add(ms_mo) +hlr.subscriber_add(ms_mt) + +ms_mo.connect(msc.mcc_mnc()) +ms_mt.connect(msc.mcc_mnc()) +ms_mo.attach() +ms_mt.attach() + +ms_mo.log_info() +ms_mt.log_info() + +print('waiting for modems to attach...') +wait(ms_mo.is_connected, msc.mcc_mnc()) +wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms_mo, ms_mt) + +print('waiting for modems to attach to data services...') +wait(ms_mo.is_attached) +wait(ms_mt.is_attached) + +# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) +ctx_id_v4_mo = ms_mo.activate_context(apn='inet46', protocol=ms_mo.CTX_PROT_IPv4) +ctx_id_v4_mt = ms_mt.activate_context(apn='inet46', protocol=ms_mt.CTX_PROT_IPv4) + +assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 +mo_cid = ms_mo.call_dial(ms_mt) +mt_cid = ms_mt.call_wait_incoming(ms_mo) +print('dial success') + +assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) +ms_mt.call_answer(mt_cid) +wait(ms_mo.call_is_active, mo_cid) +wait(ms_mt.call_is_active, mt_cid) +print('answer success, call established and ongoing') + +sleep(5) # maintain the call active for 5 seconds + +assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) +ms_mt.call_hangup(mt_cid) +wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) +print('hangup success') + +ms_mo.deactivate_context(ctx_id_v4_mo) +ms_mt.deactivate_context(ctx_id_v4_mt) diff --git a/suites/gprs/suite.conf b/suites/gprs/suite.conf index 3d4fe48..d40c1e5 100644 --- a/suites/gprs/suite.conf +++ b/suites/gprs/suite.conf @@ -4,6 +4,10 @@ bts: - times: 1 modem: - - times: 4 + - times: 2 + features: + - gprs + - voice + - times: 2 features: - gprs -- To view, visit https://gerrit.osmocom.org/11857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If2844d78b52eda59c1f6d9e18363b858f2b5f007 Gerrit-Change-Number: 11857 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:38:32 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 21 Nov 2018 13:38:32 +0000 Subject: Change in osmo-ggsn[master]: fix allocation of ippool's hash table Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11858 Change subject: fix allocation of ippool's hash table ...................................................................... fix allocation of ippool's hash table The calloc() call in ippool_new() had two problems. The first problem is benign: The order of arguments were reversed. Pass the number of elements in the array first, then the size of each element, as calloc() expects. This problem was found by me. There are more instances of this problem in this file, which I'll address in follow-up patches. The second problem is that the requested allocation was larger than necessary: The hash table is an array of pointers to ippoolm_t, not an array of struct ippoolm_t. Fix the required size passed to calloc(). This problem was found by Coverity. Change-Id: I93fa5bc539771ca19714f6a665558c9140e2ce07 Related: CID#57920 --- M lib/ippool.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/58/11858/1 diff --git a/lib/ippool.c b/lib/ippool.c index 6561f1f..6ce3cda 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -276,9 +276,8 @@ (*this)->hashmask = (*this)->hashsize - 1; /* Allocate hash table */ - if (! - ((*this)->hash = - calloc(sizeof(struct ippoolm_t), (*this)->hashsize))) { + (*this)->hash = calloc((*this)->hashsize, sizeof(struct ippoolm_t *)); + if (!(*this)->hash) { SYS_ERR(DIP, LOGL_ERROR, 0, "Failed to allocate memory for hash members in ippool"); return -1; -- To view, visit https://gerrit.osmocom.org/11858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I93fa5bc539771ca19714f6a665558c9140e2ce07 Gerrit-Change-Number: 11858 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:42:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:42:40 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11725 to look at the new patch set (#7). Change subject: use autotools to add "make install" target ...................................................................... use autotools to add "make install" target For reasoning why a transition to autotools is desired, see the commit message of the previous patch in this series. "make install" copies the "build", "common" dirs, as well as the "*.xsl" files to $(prefix)/share/osmo-gsm-manuals. Prefix is typically /usr/local. Also a pkg-config file gets installed, so the path of the shared files can be looked up by autoconf scripts of the project repositories. The check-depends script is installed to $(prefix)/bin/osmo-gsm-manuals-check-depends and will be used by project specific autoconf scripts, too. All existing make targets ("make", "make check", "make upload") are still working, users only need to run "autoreconf -fi" and "./configure" beforehand. Makefile.am uses custom install-data-hook and uninstall-local targets, so we don't need to specify each file of the relevant subdirs in a _DATA variable (no extra maintenance effort). (moving manuals to project repositories 5/19) Related: OS#3385 Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 --- M .gitignore M INSTALL.txt D Makefile A Makefile.am R OsmoBSC/Makefile.am R OsmoBTS/Makefile.am R OsmoGGSN/Makefile.am R OsmoGSMTester/Makefile.am R OsmoHLR/Makefile.am R OsmoMGCP/Makefile.am R OsmoMGW/Makefile.am R OsmoMSC/Makefile.am R OsmoNAT/Makefile.am R OsmoNITB/Makefile.am R OsmoPCU/Makefile.am R OsmoSGSN/Makefile.am R OsmoSIPConnector/Makefile.am R OsmoSTP/Makefile.am R OsmoTRX/Makefile.am R OsmocomBB/Makefile.am M build/Makefile.common.inc A configure.ac M contrib/jenkins.sh A osmo-gsm-manuals.pc.in R tests/Makefile.am 25 files changed, 131 insertions(+), 79 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/25/11725/7 -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:42:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:42:40 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11802 to look at the new patch set (#4). Change subject: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) ...................................................................... Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) Use $(srcdir) infront of all relative paths, which reference other files in the repository. Use $(top_srcdir) as OSMO_GSM_MANUALS_DIR. This is needed for out-of-tree building. (moving manuals to project repositories 11/19) Related: OS#3385 Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc --- M OsmoBSC/Makefile.am M OsmoBTS/Makefile.am M OsmoGGSN/Makefile.am M OsmoGSMTester/Makefile.am M OsmoHLR/Makefile.am M OsmoMGCP/Makefile.am M OsmoMGW/Makefile.am M OsmoMSC/Makefile.am M OsmoNAT/Makefile.am M OsmoNITB/Makefile.am M OsmoPCU/Makefile.am M OsmoSGSN/Makefile.am M OsmoSIPConnector/Makefile.am M OsmoSTP/Makefile.am M OsmoTRX/Makefile.am M OsmocomBB/Makefile.am M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M tests/Makefile.am 19 files changed, 38 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/02/11802/4 -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:42:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:42:40 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11803 to look at the new patch set (#4). Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Makefile.*.inc: adjust to out-of-tree building Makefile.asciidoc.inc: create a symlink for the root adoc file, from which a PDF gets generated, from the srcdir to the builddir. This file may include other adoc files, which do not get symlinked. We need to do this, because a2x (the program generating the PDF file) does not have a parameter for the output file, and will otherwise generate the PDF in the srcdir instead of the builddir. Do the same in the check target, so the relative include paths work the same. Makefile.asciidoc.inc, Makefile.docbook.inc: set the include paths for the xstl parser, as well as the LaTeX compiler, so they can find the files they need from both OSMO_GSM_MANUALS_DIR and builddir. Makefile.asciidoc.inc, Makefile.docbook.inc: refer to the output file $@ with $(notdir $@). This removes the path from the file, like basename from coreutils. The output file will then be placed in the builddir instead of the srcdir. Makefile.vty-reference.inc: use $(srcdir) in references to vty/*.xml files. (moving manuals to project repositories 12/19) Related: OS#3385 Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d --- M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc 3 files changed, 31 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/03/11803/4 -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:42:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:42:40 +0000 Subject: Change in osmo-gsm-manuals[master]: gitignore: add "make distcheck" generated files In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11844 to look at the new patch set (#3). Change subject: gitignore: add "make distcheck" generated files ...................................................................... gitignore: add "make distcheck" generated files (moving manuals to project repositories 16/19) Related: OS#3385 Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 --- M .gitignore 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/44/11844/3 -- To view, visit https://gerrit.osmocom.org/11844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 Gerrit-Change-Number: 11844 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:42:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:42:40 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11740 to look at the new patch set (#5). Change subject: publish from project repos, not this repo anymore ...................................................................... publish from project repos, not this repo anymore Do not publish PDFs for all projects anymore with jenkins.sh --publish or "make publish". Extract known_hosts from jenkins.sh, and install it along with the other shared files in OSMO_GSM_MANUALS_DIR. Add a "publish" target to Makefile.common.inc, so we can use it from the project repositories. Document its usage in INSTALL.txt. No automatism for building and publishing the documentation of all projects will be implemented in this patch series, as discussed here: https://osmocom.org/issues/3385#note-7 (moving manuals to project repositories 19/19) Related: OS#3385 Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 --- M INSTALL.txt M build/Makefile.common.inc A build/known_hosts M contrib/jenkins.sh 4 files changed, 32 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/40/11740/5 -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:42:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:42:40 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMSC files (now avail in osmo-msc.git) In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11738 to look at the new patch set (#8). Change subject: remove OsmoMSC files (now avail in osmo-msc.git) ...................................................................... remove OsmoMSC files (now avail in osmo-msc.git) Files were added in osmo-msc.git Change-Id I2f9c27f81940b02414f0e618483bffade72e8cf7. The other project specific files will be moved in future commits. One commit per dir. Depends: osmo-msc.git Change-Id I2f9c27f81940b02414f0e618483bffade72e8cf7 Related: OS#3385 Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc --- M Makefile.am D OsmoMSC/chapters/control.adoc D OsmoMSC/chapters/counters.adoc D OsmoMSC/chapters/counters_generated.adoc D OsmoMSC/chapters/net.adoc D OsmoMSC/chapters/overview.adoc D OsmoMSC/chapters/running.adoc D OsmoMSC/images/sgs-imsi_attach_lu.msc D OsmoMSC/images/sgs-mo_call_no_ps_ho.msc D OsmoMSC/images/sgs-mo_sms_idle.msc D OsmoMSC/images/sgs-mt_call_idle.msc D OsmoMSC/images/sgs-mt_sms_idle.msc D OsmoMSC/osmomsc-usermanual-docinfo.xml D OsmoMSC/osmomsc-usermanual.adoc D OsmoMSC/osmomsc-vty-reference.xml D OsmoMSC/vty/msc_vty_additions.xml D OsmoMSC/vty/msc_vty_reference.xml M configure.ac 18 files changed, 0 insertions(+), 3,431 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/38/11738/8 -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:43:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 13:43:42 +0000 Subject: Change in osmo-ggsn[master]: fix allocation of ippool's hash table In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11858 ) Change subject: fix allocation of ippool's hash table ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I93fa5bc539771ca19714f6a665558c9140e2ce07 Gerrit-Change-Number: 11858 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 13:43:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:46:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:46:05 +0000 Subject: Change in osmo-gsm-manuals[master]: make check: properly reference dependencies In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11794 ) Change subject: make check: properly reference dependencies ...................................................................... make check: properly reference dependencies Use $(ASCIIDOC_DEPS) instead of assuming that the value would be "chapters/*.adoc". The variable exists already, but it was not used yet in 'make check' of Makefile.asciidoc.inc. This allows creating a tests dir without its own chapters subdir (follow-up commit), which is part of a larger effort to move manuals to project repositories. The reason for moving manuals to project repositories is that we can have documentation changes together with code changes in the same patches. Not part of this patchset, but possible in the future, is optionally building UNIX man pages in the project repositories (OS#3386) as well as generating the VTY documentation on the fly from running the project binaries (OS#3695). (moving manuals to project repositories 1/19) Related: OS#3386 Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 --- M build/Makefile.asciidoc.inc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index a3c95fe..c2b0961 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -62,7 +62,7 @@ check: $(ASCIIDOC_CHECKS) -$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc chapters/*.adoc +$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 # Make absolutely sure that the %.check target is updated. touch $@ -- To view, visit https://gerrit.osmocom.org/11794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id8b26759607a3490d6cbd93c68ba1f89aa8ef1f2 Gerrit-Change-Number: 11794 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:46:06 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:46:06 +0000 Subject: Change in osmo-gsm-manuals[master]: tests: add shared content pdf build tests In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11795 ) Change subject: tests: add shared content pdf build tests ...................................................................... tests: add shared content pdf build tests Build project independent "test-usermanual.pdf" (with all common chapters automatically included) and "test-vty-reference.pdf" files. This allows testing if changed common chapters and the build scripts are still working, even when the project specific manuals will be moved away from this repository. (moving manuals to project repositories 2/19) Related: OS#3386 Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf --- M .gitignore M Makefile A tests/Makefile A tests/test-usermanual-docinfo.xml A tests/test-vty-reference.xml A tests/vty/test_vty_additions.xml A tests/vty/test_vty_reference.xml 7 files changed, 121 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 3c72c7f..1e0984f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ *__*.svg *.check generated/ +tests/test-usermanual.adoc diff --git a/Makefile b/Makefile index eb3be75..c94f0a8 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ cd OsmoTRX; $(MAKE) clean: + cd tests; $(MAKE) clean cd OsmoBTS; $(MAKE) clean cd OsmoNITB; $(MAKE) clean cd OsmoBSC; $(MAKE) clean @@ -53,6 +54,7 @@ cd OsmoTRX; $(MAKE) upload check: + cd tests; $(MAKE) cd OsmoBTS; $(MAKE) check cd OsmoNITB; $(MAKE) check cd OsmoBSC; $(MAKE) check diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..0b914e9 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,30 @@ +TOPDIR = .. + +# Generate adoc file that includes all chapters +ASCIIDOC = test-usermanual.adoc +ASCIIDOC_DEPS = +$(ASCIIDOC): $(TOPDIR)/common/chapters/*.adoc + echo ":gfdl-enabled:" > $@ + echo ":program-name: Test" >> $@ + echo "" >> $@ + echo "Osmo GSM Manuals Shared Content Test" >> $@ + echo "====================================" >> $@ + echo "Oliver Smith " >> $@ + echo "" >> $@ + for chapter in $(TOPDIR)/common/chapters/*.adoc; do \ + echo "include::$${chapter}[]" >> $@; \ + done; +CLEAN_FILES = $(ASCIIDOC) + +include $(TOPDIR)/build/Makefile.asciidoc.inc + +VTY_REFERENCE = test-vty-reference.xml +include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(TOPDIR)/build/Makefile.common.inc + + +default: all check + + +.DEFAULT_GOAL := default +.PHONY: default diff --git a/tests/test-usermanual-docinfo.xml b/tests/test-usermanual-docinfo.xml new file mode 100644 index 0000000..4edc233 --- /dev/null +++ b/tests/test-usermanual-docinfo.xml @@ -0,0 +1,31 @@ + + + 1 + 6th November 2018 + os + Initial + + + + + 2018 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/tests/test-vty-reference.xml b/tests/test-vty-reference.xml new file mode 100644 index 0000000..8bec1e6 --- /dev/null +++ b/tests/test-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 6th November 2018 + os + Initial + + + + Test VTY Reference + + + 2018 + + + + This work is copyrighted by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/tests/vty/test_vty_additions.xml b/tests/vty/test_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/tests/vty/test_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/tests/vty/test_vty_reference.xml b/tests/vty/test_vty_reference.xml new file mode 100644 index 0000000..e5674e7 --- /dev/null +++ b/tests/vty/test_vty_reference.xml @@ -0,0 +1,17 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/11795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia74e32678c95e22ba493e80d0a4a8f783c5a5ddf Gerrit-Change-Number: 11795 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:46:06 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:46:06 +0000 Subject: Change in osmo-gsm-manuals[master]: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11796 ) Change subject: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g ...................................................................... s/TOPDIR/OSMO_GSM_MANUALS_DIR/g Replace TOPDIR with OSMO_GSM_MANUALS_DIR. When the project specific manuals will be built out of this repository, we still need to refer to the top directory of the shared content. But it will be in another repository, so we need to rename the variable to avoid confusion. (moving manuals to project repositories 3/19) Related: OS#3385 Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab --- M OsmoBSC/Makefile M OsmoBTS/Makefile M OsmoGGSN/Makefile M OsmoGSMTester/Makefile M OsmoHLR/Makefile M OsmoMGCP/Makefile M OsmoMGW/Makefile M OsmoMSC/Makefile M OsmoNAT/Makefile M OsmoNITB/Makefile M OsmoPCU/Makefile M OsmoSGSN/Makefile M OsmoSIPConnector/Makefile M OsmoSTP/Makefile M OsmoTRX/Makefile M OsmocomBB/Makefile M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc M tests/Makefile 20 files changed, 88 insertions(+), 88 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile index b9f50d0..422c598 100644 --- a/OsmoBSC/Makefile +++ b/OsmoBSC/Makefile @@ -1,11 +1,11 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc osmobsc-usermanual.pdf: chapters/*.adoc chapters/*.dot aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc VTY_REFERENCE = osmobsc-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoBTS/Makefile b/OsmoBTS/Makefile index e1ff214..536ed17 100644 --- a/OsmoBTS/Makefile +++ b/OsmoBTS/Makefile @@ -1,12 +1,12 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmobts-usermanual.adoc osmobts-abis.adoc rtp-amr.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc osmobts-usermanual.pdf: chapters/*.adoc osmobts-abis.pdf: abis/*.adoc abis/*.msc rtp-amr.pdf: dtx.dot VTY_REFERENCE = osmobts-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGGSN/Makefile b/OsmoGGSN/Makefile index e809632..dce2b02 100644 --- a/OsmoGGSN/Makefile +++ b/OsmoGGSN/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmoggsn-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmoggsn-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGSMTester/Makefile b/OsmoGSMTester/Makefile index 43c5a37..4fe6748 100644 --- a/OsmoGSMTester/Makefile +++ b/OsmoGSMTester/Makefile @@ -1,7 +1,7 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmo-gsm-tester-manual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoHLR/Makefile b/OsmoHLR/Makefile index 234a48c..321c2a1 100644 --- a/OsmoHLR/Makefile +++ b/OsmoHLR/Makefile @@ -1,13 +1,13 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmohlr-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc *.vty *.ctrl -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmohlr-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc OSMO_HLR_PATH ?= ../../osmo-hlr TMP_DB = generated/hlr.db diff --git a/OsmoMGCP/Makefile b/OsmoMGCP/Makefile index e2a5e37..d47f390 100644 --- a/OsmoMGCP/Makefile +++ b/OsmoMGCP/Makefile @@ -1,6 +1,6 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. VTY_REFERENCE = osmomgcp-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMGW/Makefile b/OsmoMGW/Makefile index b092e66..96b436b 100644 --- a/OsmoMGW/Makefile +++ b/OsmoMGW/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmomgw-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmomgw-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMSC/Makefile b/OsmoMSC/Makefile index c9edcef..2548852 100644 --- a/OsmoMSC/Makefile +++ b/OsmoMSC/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmomsc-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmomsc-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoNAT/Makefile b/OsmoNAT/Makefile index fde7132..8d7c4a5 100644 --- a/OsmoNAT/Makefile +++ b/OsmoNAT/Makefile @@ -1,6 +1,6 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. VTY_REFERENCE = osmonat-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoNITB/Makefile b/OsmoNITB/Makefile index 0cd260d..4b275dd 100644 --- a/OsmoNITB/Makefile +++ b/OsmoNITB/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmonitb-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmonitb-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoPCU/Makefile b/OsmoPCU/Makefile index 7a1acc0..0f0ae76 100644 --- a/OsmoPCU/Makefile +++ b/OsmoPCU/Makefile @@ -1,11 +1,11 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc osmopcu-gb.pdf: gb/*.adoc gb/*.msc osmopcu-usermanual.pdf: chapters/*.adoc VTY_REFERENCE = osmopcu-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSGSN/Makefile b/OsmoSGSN/Makefile index baa1a49..ce69960 100644 --- a/OsmoSGSN/Makefile +++ b/OsmoSGSN/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmosgsn-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosgsn-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile index cd3bb89..e275e41 100644 --- a/OsmoSIPConnector/Makefile +++ b/OsmoSIPConnector/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmosipconnector-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosipconnector-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSTP/Makefile b/OsmoSTP/Makefile index 6832dd4..10149bf 100644 --- a/OsmoSTP/Makefile +++ b/OsmoSTP/Makefile @@ -1,11 +1,11 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmostp-usermanual.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc osmostp-usermanual.pdf: chapters/*.adoc aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc VTY_REFERENCE = osmostp-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoTRX/Makefile b/OsmoTRX/Makefile index 81aec9a..3b4b8b1 100644 --- a/OsmoTRX/Makefile +++ b/OsmoTRX/Makefile @@ -1,10 +1,10 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmotrx-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmotrx-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmocomBB/Makefile b/OsmocomBB/Makefile index 9f861a5..a0b7a2a 100644 --- a/OsmocomBB/Makefile +++ b/OsmocomBB/Makefile @@ -1,7 +1,7 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. ASCIIDOC = osmocombb-usermanual.adoc ASCIIDOC_DEPS = chapters/*.adoc -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index c2b0961..2cd7d50 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -1,6 +1,6 @@ # USAGE: # -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define in 'ASCIIDOC' all root .adoc files, # - optionally define in 'ASCIIDOC_DEPS' all dependencies common to all .adocs, # - include this file, @@ -8,16 +8,16 @@ # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # ASCIIDOC = osmo_yada.adoc osmo_moo.adoc # ASCIIDOC_DEPS = for_all/*.adoc -# include $(TOPDIR)/build/Makefile.asciidoc.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc # osmo_yada.pdf: yada/*.adoc yada/*.msc -BUILDDIR = $(TOPDIR)/build +BUILDDIR = $(OSMO_GSM_MANUALS_DIR)/build GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) -GIT_DATE := $(shell $(TOPDIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`) +GIT_DATE := $(shell $(OSMO_GSM_MANUALS_DIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`) # prepend the document name with the version numbe suffix #DOCS_VER = $(foreach P, $(ASCIIDOC_NAME), $(P)-v$(shell xmllint --recover --xpath "//revnumber[position()=last()]/text()" $(P)-docinfo.xml 2>/dev/null)) @@ -51,8 +51,8 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ $(ASCIIDOC_DEPS) \ $(ASCIIDOCSTYLE) \ - $(TOPDIR)/common/*/*.adoc \ - $(TOPDIR)/common/images/* + $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \ + $(OSMO_GSM_MANUALS_DIR)/common/images/* @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ @@ -62,7 +62,7 @@ check: $(ASCIIDOC_CHECKS) -$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) +$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 # Make absolutely sure that the %.check target is updated. touch $@ diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 70dfafa..acf410e 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -1,6 +1,6 @@ # USAGE: # -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define in 'DOCBOOKS' all root .xml files, # - optionally define in 'DOCBOOKS_DEPS' all dependencies common to all .xmls, # - include this file, @@ -8,10 +8,10 @@ # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # DOCBOOKS = osmo_yada.xml osmo_moo.xml # ASCIIDOC_DEPS = for_all/*.xml -# include $(TOPDIR)/build/Makefile.docbook.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc # osmo_yada.pdf: yada/*.xml # # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 1528d32..659f26c 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -8,34 +8,34 @@ # Export from VTY 'show online-help', exactly one file. # # In your Makefile, -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define the (single) name of the vty-reference source in VTY_REFERENCE, # - include this file. # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # VTY_REFERENCE = osmofoo-vty-reference -# include $(TOPDIR)/build/Makefile.vty-reference.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc # # This uses the Makefile.docbook.inc, you should not mix uses of # Makefile.vty-reference.inc and Makefile.docbook.inc. DOCBOOKS = $(VTY_REFERENCE) DOCBOOKS_DEPS = generated/docbook_vty.xml -include $(TOPDIR)/build/Makefile.docbook.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc -MERGE_DOC = $(shell realpath $(TOPDIR)/merge_doc.xsl) +MERGE_DOC = $(shell realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl) CLEAN_FILES += generated generated/docbook_vty.xml: \ vty/*xml \ - $(TOPDIR)/common/vty_additions.xml \ - $(TOPDIR)/common/chapters/vty.xml \ - $(TOPDIR)/vty_reference.xsl - $(TOPDIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ - $(TOPDIR)/common/vty_additions.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \ + $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl + $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ vty/*additions*.xml - xsltproc $(TOPDIR)/vty_reference.xsl generated/combined.xml \ + xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml diff --git a/tests/Makefile b/tests/Makefile index 0b914e9..5afc8ca 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,9 +1,9 @@ -TOPDIR = .. +OSMO_GSM_MANUALS_DIR = .. # Generate adoc file that includes all chapters ASCIIDOC = test-usermanual.adoc ASCIIDOC_DEPS = -$(ASCIIDOC): $(TOPDIR)/common/chapters/*.adoc +$(ASCIIDOC): $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc echo ":gfdl-enabled:" > $@ echo ":program-name: Test" >> $@ echo "" >> $@ @@ -11,16 +11,16 @@ echo "====================================" >> $@ echo "Oliver Smith " >> $@ echo "" >> $@ - for chapter in $(TOPDIR)/common/chapters/*.adoc; do \ + for chapter in $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc; do \ echo "include::$${chapter}[]" >> $@; \ done; CLEAN_FILES = $(ASCIIDOC) -include $(TOPDIR)/build/Makefile.asciidoc.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = test-vty-reference.xml -include $(TOPDIR)/build/Makefile.vty-reference.inc -include $(TOPDIR)/build/Makefile.common.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc default: all check -- To view, visit https://gerrit.osmocom.org/11796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab Gerrit-Change-Number: 11796 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:46:06 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 13:46:06 +0000 Subject: Change in osmo-gsm-manuals[master]: prepare for autotools: add git-version-gen In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11797 ) Change subject: prepare for autotools: add git-version-gen ...................................................................... prepare for autotools: add git-version-gen Add the same version of git-version-gen, which most other Osmocom repositories (libasn1c, libosmocore, libosmo-netif, libosmo-sccp, ...) are using, so they behave the same. git-version-gen generates a version string derived from the git repository, or from a .tarball-version file when running outside of a git directory. Unfortunatelly it seems to be impossible to use git-version-gen from autoconf without adding it to the source tree. Autotools will be used to install the shared manual files into the system in a way that is consistent with the other Osmocom repositories: $ autoreconf -fi $ ./configure --prefix=/usr/local $ make $ make install Project repositories will check with pkg-config if osmo-gsm-manuals is installed (like any other shared Osmocom component), when a new configure flag for building the manuals is passed. This will also work with distribution's package managers, for instance we could have a osmo-gsm-manuals-dev package in Debian on which the other packages would have a build-time dependency to build the UNIX man pages (OS#3386). (moving manuals to project repositories 4/19) Related: OS#3385 Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 --- M .gitignore A git-version-gen 2 files changed, 155 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 1e0984f..fbe2111 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ *.check generated/ tests/test-usermanual.adoc + +# git-version-gen +.tarball-version +.version diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -- To view, visit https://gerrit.osmocom.org/11797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I34b0d20046417179250a5065574e2bc303889cf6 Gerrit-Change-Number: 11797 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:48:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:48:41 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 3: Code-Review+1 (6 comments) I can't really make up my mind whether a general 'dynamic' setting for all timers will ever make sense. I imagine, if we have other dynamic timers, they will probably follow own semantics, and likely a simple on/off setting won't cut it. So if a dynamic timer ever needs more specific configuration, the scheme of having one command for all breaks? So maybe a '[no] paging-timeout-dynamic' would be simpler? I accept your decision though. https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3893 PS3, Line 3893: "Calculate T3113 dynamically based on channel config and load\n" slightly weird: this looks like a general command, yet names T3113 specifically in the doc? "Use dynamically calculated timer value. Timers currently supporting a dynamic setting are:" " T3113 based on channel config and load." well ... ok if T3113 is currently the only one, just need to make sure to change it if more show up. https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3903 PS3, Line 3903: if (d->T != 3113) { similarly, might already structure this as a switch()... well whatever https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3916 PS3, Line 3916: "Calculate T3113 dynamically based on channel config and load\n" with the preceding "no", it's ok to here write "Set given timer to non-dynamic and use the default or user provided fixed value". A conflict only arises if the same token at the same position has differing docs -- only one of them will survive in the online documentation. https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3927 PS3, Line 3927: vty_out(vty, "T%d has no dynamic setting%s", d->T, VTY_NEWLINE); technically would be ok to ignore this, because setting a non-dynamic timer to non-dynamic is a no-op, right? https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/paging.c File src/osmo-bsc/paging.c: https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/paging.c at 270 PS3, Line 270: return 0; (unrelated ws) https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/paging.c at 290 PS3, Line 290: (one more blank line than usual) -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 21 Nov 2018 13:48:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:51:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:51:45 +0000 Subject: Change in osmo-gsm-tester[master]: suites: gprs: Add test to verify CS paging works while MS is GPRS att... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11857 ) Change subject: suites: gprs: Add test to verify CS paging works while MS is GPRS attached ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If2844d78b52eda59c1f6d9e18363b858f2b5f007 Gerrit-Change-Number: 11857 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 21 Nov 2018 13:51:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:53:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:53:20 +0000 Subject: Change in osmo-gsm-tester[master]: suites: gprs: Add test to verify MS can use gprs after long idle time In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11853 ) Change subject: suites: gprs: Add test to verify MS can use gprs after long idle time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a726049d1e4a95f1145dcf1f654c63503ceb78a Gerrit-Change-Number: 11853 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 21 Nov 2018 13:53:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:53:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 13:53:42 +0000 Subject: Change in osmo-msc[master]: msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11859 Change subject: msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() ...................................................................... msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() Change-Id: I53b27629177b3342c4f5b34c80d52cbb6dc8476b --- M include/osmocom/msc/gsm_04_11.h 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/59/11859/1 diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index e3ff4ba..e9043d5 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -44,8 +44,6 @@ struct gsm_sms *sms); void gsm411_sapi_n_reject(struct gsm_subscriber_connection *conn); -uint8_t sms_next_rp_msg_ref(uint8_t *next_rp_ref); - int gsm411_send_rp_ack(struct gsm_trans *trans, uint8_t msg_ref); int gsm411_send_rp_error(struct gsm_trans *trans, uint8_t msg_ref, uint8_t cause); -- To view, visit https://gerrit.osmocom.org/11859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I53b27629177b3342c4f5b34c80d52cbb6dc8476b Gerrit-Change-Number: 11859 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:53:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 13:53:43 +0000 Subject: Change in osmo-msc[master]: msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11860 Change subject: msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() ...................................................................... msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() Change-Id: I87f96abd2b2d446751d8f95c9164c5eb6a58e66c --- M include/osmocom/msc/gsm_04_11.h M src/libmsc/transaction.c 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/60/11860/1 diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index e9043d5..0b9639f 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -37,7 +37,6 @@ const char *sender_msisdn, int dcs, const char *text); -void _gsm411_sms_trans_free(struct gsm_trans *trans); int gsm411_send_sms_subscr(struct vlr_subscr *vsub, struct gsm_sms *sms); int gsm411_send_sms(struct gsm_subscriber_connection *conn, diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 4c351d3..be14420 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -31,6 +31,7 @@ void *tall_trans_ctx; void _gsm48_cc_trans_free(struct gsm_trans *trans); +void _gsm411_sms_trans_free(struct gsm_trans *trans); void _gsm911_nc_ss_trans_free(struct gsm_trans *trans); /*! Find a transaction in connection for given protocol + transaction ID -- To view, visit https://gerrit.osmocom.org/11860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I87f96abd2b2d446751d8f95c9164c5eb6a58e66c Gerrit-Change-Number: 11860 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:53:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:53:43 +0000 Subject: Change in osmo-gsm-tester[master]: templates: bsc/nitb: Remove explicit no force-combined-si In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11847 ) Change subject: templates: bsc/nitb: Remove explicit no force-combined-si ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 Gerrit-Change-Number: 11847 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 21 Nov 2018 13:53:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 13:57:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 13:57:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_paging_resp_unsol In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11604 ) Change subject: bsc: Introduce test TC_paging_resp_unsol ...................................................................... Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11604/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11604/2/bsc/BSC_Tests.ttcn at 1460 PS2, Line 1460: dropped). See OS#3680. */ (comment style: '*') -- To view, visit https://gerrit.osmocom.org/11604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce Gerrit-Change-Number: 11604 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 21 Nov 2018 13:57:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:00:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:00:02 +0000 Subject: Change in osmo-bts[master]: lc15: Fix several u32 vs HANDLE compile warnings In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9531 ) Change subject: lc15: Fix several u32 vs HANDLE compile warnings ...................................................................... Patch Set 1: Code-Review+1 looks ok, though I don't understand the finer points of changing uint32_t to HANDLE vs introducing uint32_t elsewhere, so rather someone else should also take a look. -- To view, visit https://gerrit.osmocom.org/9531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4193ad5fdb70ea01acb7c33656ea7bfd3fe62916 Gerrit-Change-Number: 9531 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 21 Nov 2018 14:00:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:00:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:00:35 +0000 Subject: Change in osmo-msc[master]: msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11859 ) Change subject: msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I53b27629177b3342c4f5b34c80d52cbb6dc8476b Gerrit-Change-Number: 11859 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 21 Nov 2018 14:00:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:00:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:00:37 +0000 Subject: Change in osmo-msc[master]: msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11859 ) Change subject: msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() ...................................................................... msc/gsm_04_11.h: drop unused sms_next_rp_msg_ref() Change-Id: I53b27629177b3342c4f5b34c80d52cbb6dc8476b --- M include/osmocom/msc/gsm_04_11.h 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index e3ff4ba..e9043d5 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -44,8 +44,6 @@ struct gsm_sms *sms); void gsm411_sapi_n_reject(struct gsm_subscriber_connection *conn); -uint8_t sms_next_rp_msg_ref(uint8_t *next_rp_ref); - int gsm411_send_rp_ack(struct gsm_trans *trans, uint8_t msg_ref); int gsm411_send_rp_error(struct gsm_trans *trans, uint8_t msg_ref, uint8_t cause); -- To view, visit https://gerrit.osmocom.org/11859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I53b27629177b3342c4f5b34c80d52cbb6dc8476b Gerrit-Change-Number: 11859 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:01:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:01:43 +0000 Subject: Change in osmo-msc[master]: msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11860 ) Change subject: msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() ...................................................................... Patch Set 1: Code-Review+2 the commit log doesn't really say what the patch does, but yeah -- To view, visit https://gerrit.osmocom.org/11860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I87f96abd2b2d446751d8f95c9164c5eb6a58e66c Gerrit-Change-Number: 11860 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 21 Nov 2018 14:01:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:02:36 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 14:02:36 +0000 Subject: Change in osmo-msc[master]: msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11860 ) Change subject: msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() ...................................................................... msc/gsm_04_11.h: use forward-declaration for _gsm411_sms_trans_free() Change-Id: I87f96abd2b2d446751d8f95c9164c5eb6a58e66c --- M include/osmocom/msc/gsm_04_11.h M src/libmsc/transaction.c 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index e9043d5..0b9639f 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -37,7 +37,6 @@ const char *sender_msisdn, int dcs, const char *text); -void _gsm411_sms_trans_free(struct gsm_trans *trans); int gsm411_send_sms_subscr(struct vlr_subscr *vsub, struct gsm_sms *sms); int gsm411_send_sms(struct gsm_subscriber_connection *conn, diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 4c351d3..be14420 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -31,6 +31,7 @@ void *tall_trans_ctx; void _gsm48_cc_trans_free(struct gsm_trans *trans); +void _gsm411_sms_trans_free(struct gsm_trans *trans); void _gsm911_nc_ss_trans_free(struct gsm_trans *trans); /*! Find a transaction in connection for given protocol + transaction ID -- To view, visit https://gerrit.osmocom.org/11860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I87f96abd2b2d446751d8f95c9164c5eb6a58e66c Gerrit-Change-Number: 11860 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:02:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:02:49 +0000 Subject: Change in osmo-gsm-manuals[master]: gitignore: add "make distcheck" generated files In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11844 ) Change subject: gitignore: add "make distcheck" generated files ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 Gerrit-Change-Number: 11844 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 14:02:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:03:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:03:59 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11725 ) Change subject: use autotools to add "make install" target ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 14:03:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:05:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:05:20 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 14:05:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:06:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:06:21 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 14:06:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:06:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:06:49 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11740 ) Change subject: publish from project repos, not this repo anymore ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 Gerrit-Change-Number: 11740 Gerrit-PatchSet: 5 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 14:06:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:09:09 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 21 Nov 2018 14:09:09 +0000 Subject: Change in osmo-ggsn[master]: replace bogus memcpy() call in ippool_newip() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11861 Change subject: replace bogus memcpy() call in ippool_newip() ...................................................................... replace bogus memcpy() call in ippool_newip() When copying an address to a reused static hash table member with memcpy(), this code mistakenly passed the size of a pointer as the amount of bytes to be copied, rather than the actual size of the address. This means the IP pool could contain bogus IP addresses because only addr->len (a uint8_t) and 3 further bytes of the address were actually copied on 32 bit platforms. On 64 bit platforms, a sufficient amount of bytes were copied for IPv4 to work correctly, but too few bytes were copied for IPv6. This problem was found by Coverity. Replace the bogus memcpy() call with direct assignments to the appropriate struct in64addr union members, and assert that the length recorded for the address actually corresponds to the length used by the address family (IP4, IPv6). Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Related: CID#57921 --- M lib/ippool.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/61/11861/1 diff --git a/lib/ippool.c b/lib/ippool.c index 6561f1f..1963779 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -513,7 +513,13 @@ p2->next = NULL; p2->prev = NULL; p2->inuse = 2; /* Static address in use */ - memcpy(&p2->addr, addr, sizeof(addr)); + /* p2->addr.len and addr->len already match (see above). */ + if (p2->addr.len == sizeof(struct in_addr)) + p2->addr.v4 = addr->v4; + else if (p2->addr.len == sizeof(struct in6_addr)) + p2->addr.v6 = addr->v6; + else + OSMO_ASSERT(false); *member = p2; (void)ippool_hashadd(this, *member); if (0) -- To view, visit https://gerrit.osmocom.org/11861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Gerrit-Change-Number: 11861 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:11:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:11:14 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMSC files (now avail in osmo-msc.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: remove OsmoMSC files (now avail in osmo-msc.git) ...................................................................... Patch Set 8: Code-Review+2 (1 comment) giving +2 for when it's ready https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11738/7//COMMIT_MSG at 7 PS7, Line 7: remove OsmoMSC files (now avail in osmo-msc.git) > Yes, we are moving them to /dev/null in this commit ;) reminds me, in subversion, a "move" was modeled from the start as a "delete" + "add". That came around much later and bit us, because it was really hard to resolve conflicts where moves are involved. So even though we're removing here and adding there, semantically, for human understanding as well as logical file history, the clearest term is a 'move'! The finer details of how that is achieved are not that interesting. You can't argue yourself out of that :P -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 8 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 14:11:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:19:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:19:23 +0000 Subject: Change in osmo-ggsn[master]: check ioctl() call return value in tun_new() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11856 ) Change subject: check ioctl() call return value in tun_new() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11856/1/lib/tun.c File lib/tun.c: https://gerrit.osmocom.org/#/c/11856/1/lib/tun.c at 198 PS1, Line 198: SYS_ERR(DTUN, LOGL_NOTICE, errno, "could not disable checksum on %s", (*tun)->devname); LOGL_ERROR? -- To view, visit https://gerrit.osmocom.org/11856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88da2164d975d7a232619b8d31c5eadeef0f3a80 Gerrit-Change-Number: 11856 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 21 Nov 2018 14:19:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:21:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 14:21:21 +0000 Subject: Change in osmo-ggsn[master]: replace bogus memcpy() call in ippool_newip() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11861 ) Change subject: replace bogus memcpy() call in ippool_newip() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Gerrit-Change-Number: 11861 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 21 Nov 2018 14:21:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:24:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 21 Nov 2018 14:24:19 +0000 Subject: Change in osmo-ggsn[master]: check ioctl() call return value in tun_new() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11856 ) Change subject: check ioctl() call return value in tun_new() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11856/1/lib/tun.c File lib/tun.c: https://gerrit.osmocom.org/#/c/11856/1/lib/tun.c at 198 PS1, Line 198: SYS_ERR(DTUN, LOGL_NOTICE, errno, "could not disable checksum on %s", (*tun)->devname); > LOGL_ERROR? I intentionally decided not to use LOGL_ERROR because this failure is not treated as a fatal condition. Compare to how TUNSETIFF ioctl failure is handled. -- To view, visit https://gerrit.osmocom.org/11856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88da2164d975d7a232619b8d31c5eadeef0f3a80 Gerrit-Change-Number: 11856 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 21 Nov 2018 14:24:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 21 14:28:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 21 Nov 2018 14:28:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-gsm-manuals_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2340?= Message-ID: <2006565299.772.1542810480657.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 127.87 KB...] asciidoc: reading: /etc/asciidoc/filters/source/source-highlight-filter.conf asciidoc: test-usermanual.adoc: line 6: ifeval: "source-highlight"=="source-highlight": True asciidoc: test-usermanual.adoc: line 6: ifeval: "source-highlight"=="highlight": False asciidoc: test-usermanual.adoc: line 6: ifeval: "source-highlight"=="pygments": False asciidoc: reading: /etc/asciidoc/filters/code/code-filter.conf asciidoc: reading: /etc/asciidoc/lang-en.conf asciidoc: reading: ../build/mscgen-filter.conf asciidoc: reading: ../build/diag-filter.conf asciidoc: reading: ../build/docinfo-releaseinfo.conf asciidoc: reading: ../build/python2-filter.conf asciidoc: writing: asciidoc: include: asciidoc: test-usermanual.adoc: line 8: reading: asciidoc: include: asciidoc: test-usermanual.adoc: line 9: reading: asciidoc: include: asciidoc: test-usermanual.adoc: line 10: reading: asciidoc: bsc.adoc: line 83: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 11: reading: asciidoc: bts.adoc: line 305: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 12: reading: asciidoc: include: asciidoc: cell-broadcast.adoc: line 46: reading: asciidoc: cell-broadcast.adoc: line 45: evaluating: {counter2:target-number} asciidoc: cell-broadcast.adoc: line 45: evaluating: {set2:target:test-usermanual__1.png} asciidoc: osmocom-cbs.msc: line 12: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: include: asciidoc: test-usermanual.adoc: line 13: reading: asciidoc: control_if.adoc: line 25: evaluating: {counter2:target-number} asciidoc: control_if.adoc: line 25: evaluating: {set2:target:test-usermanual__2.png} asciidoc: control_if.adoc: line 32: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: control_if.adoc: line 32: evaluating: {counter:figure-number} asciidoc: control_if.adoc: line 40: evaluating: {counter2:target-number} asciidoc: control_if.adoc: line 40: evaluating: {set2:target:test-usermanual__3.png} asciidoc: control_if.adoc: line 46: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: control_if.adoc: line 46: evaluating: {counter:figure-number} asciidoc: control_if.adoc: line 77: evaluating: {counter2:target-number} asciidoc: control_if.adoc: line 77: evaluating: {set2:target:test-usermanual__4.png} asciidoc: control_if.adoc: line 83: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: control_if.adoc: line 83: evaluating: {counter:figure-number} asciidoc: control_if.adoc: line 88: evaluating: {counter2:target-number} asciidoc: control_if.adoc: line 88: evaluating: {set2:target:test-usermanual__5.png} asciidoc: control_if.adoc: line 94: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: control_if.adoc: line 94: evaluating: {counter:figure-number} asciidoc: control_if.adoc: line 104: evaluating: {counter2:target-number} asciidoc: control_if.adoc: line 104: evaluating: {set2:target:test-usermanual__6.png} asciidoc: control_if.adoc: line 110: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: control_if.adoc: line 110: evaluating: {counter:figure-number} asciidoc: control_if.adoc: line 115: evaluating: {counter2:target-number} asciidoc: control_if.adoc: line 115: evaluating: {set2:target:test-usermanual__7.png} asciidoc: control_if.adoc: line 121: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: control_if.adoc: line 121: evaluating: {counter:figure-number} asciidoc: control_if.adoc: line 131: evaluating: {counter2:target-number} asciidoc: control_if.adoc: line 131: evaluating: {set2:target:test-usermanual__8.png} asciidoc: control_if.adoc: line 136: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: control_if.adoc: line 136: evaluating: {counter:figure-number} asciidoc: control_if.adoc: line 152: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 14: reading: asciidoc: gb.adoc: line 60: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 15: reading: asciidoc: include: asciidoc: test-usermanual.adoc: line 16: reading: asciidoc: include: asciidoc: test-usermanual.adoc: line 17: reading: asciidoc: gsup.adoc: line 63: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 63: evaluating: {set2:target:test-usermanual__9.png} asciidoc: gsup.adoc: line 70: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 70: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 75: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 75: evaluating: {set2:target:test-usermanual__10.png} asciidoc: gsup.adoc: line 82: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 82: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 92: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 92: evaluating: {set2:target:test-usermanual__11.png} asciidoc: gsup.adoc: line 98: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 98: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 113: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 113: evaluating: {set2:target:test-usermanual__12.png} asciidoc: gsup.adoc: line 122: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 122: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 127: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 127: evaluating: {set2:target:test-usermanual__13.png} asciidoc: gsup.adoc: line 134: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 134: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 144: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 144: evaluating: {set2:target:test-usermanual__14.png} asciidoc: gsup.adoc: line 151: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 151: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 156: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 156: evaluating: {set2:target:test-usermanual__15.png} asciidoc: gsup.adoc: line 163: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 163: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 174: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 174: evaluating: {set2:target:test-usermanual__16.png} asciidoc: gsup.adoc: line 181: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 181: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 193: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 193: evaluating: {set2:target:test-usermanual__17.png} asciidoc: gsup.adoc: line 200: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: gsup.adoc: line 200: evaluating: {counter:figure-number} asciidoc: gsup.adoc: line 572: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 572: evaluating: {set2:target:test-usermanual__18.png} asciidoc: gsup.adoc: line 583: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 602: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 602: evaluating: {set2:target:test-usermanual__19.png} asciidoc: gsup.adoc: line 611: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 701: evaluating: {counter:table-number} asciidoc: gsup.adoc: line 707: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 707: evaluating: {set2:target:test-usermanual__20.png} asciidoc: gsup.adoc: line 716: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 725: evaluating: {counter:table-number} asciidoc: gsup.adoc: line 763: evaluating: {counter:table-number} asciidoc: gsup.adoc: line 772: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 772: evaluating: {set2:target:test-usermanual__21.png} asciidoc: gsup.adoc: line 780: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 790: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 790: evaluating: {set2:target:test-usermanual__22.png} asciidoc: gsup.adoc: line 803: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 817: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 817: evaluating: {set2:target:test-usermanual__23.png} asciidoc: gsup.adoc: line 832: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 852: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 852: evaluating: {set2:target:test-usermanual__24.png} asciidoc: gsup.adoc: line 861: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 874: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 874: evaluating: {set2:target:test-usermanual__25.png} asciidoc: gsup.adoc: line 881: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 893: evaluating: {counter2:target-number} asciidoc: gsup.adoc: line 893: evaluating: {set2:target:test-usermanual__26.png} asciidoc: gsup.adoc: line 908: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: gsup.adoc: line 954: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 18: reading: asciidoc: logging.adoc: line 222: evaluating: {counter:figure-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 19: reading: asciidoc: include: asciidoc: test-usermanual.adoc: line 20: reading: asciidoc: oap.adoc: line 27: evaluating: {counter2:target-number} asciidoc: oap.adoc: line 27: evaluating: {set2:target:test-usermanual__27.png} asciidoc: oap.adoc: line 35: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: oap.adoc: line 35: evaluating: {counter:figure-number} asciidoc: oap.adoc: line 40: evaluating: {counter2:target-number} asciidoc: oap.adoc: line 40: evaluating: {set2:target:test-usermanual__28.png} asciidoc: oap.adoc: line 46: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: oap.adoc: line 46: evaluating: {counter:figure-number} asciidoc: oap.adoc: line 51: evaluating: {counter2:target-number} asciidoc: oap.adoc: line 51: evaluating: {set2:target:test-usermanual__29.png} asciidoc: oap.adoc: line 61: filtering: "/usr/bin/python" "../build/filter-wrapper.py" mscgen -o " -Tpng - asciidoc: oap.adoc: line 61: evaluating: {counter:figure-number} asciidoc: oap.adoc: line 243: evaluating: {counter2:target-number} asciidoc: oap.adoc: line 243: evaluating: {set2:target:test-usermanual__30.png} asciidoc: oap.adoc: line 251: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: include: asciidoc: test-usermanual.adoc: line 21: reading: asciidoc: port_numbers.adoc: line 48: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 22: reading: asciidoc: include: asciidoc: test-usermanual.adoc: line 23: reading: asciidoc: rf.adoc: line 150: evaluating: {counter2:target-number} asciidoc: rf.adoc: line 150: evaluating: {set2:target:test-usermanual__31.png} asciidoc: rf.adoc: line 159: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o " -L dot -F png - Execute: dot -Tpng " > " asciidoc: rf.adoc: line 159: evaluating: {counter:figure-number} asciidoc: rf.adoc: line 200: evaluating: {counter2:target-number} asciidoc: rf.adoc: line 200: evaluating: {set2:target:test-usermanual__32.png} asciidoc: rf.adoc: line 212: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o " -L dot -F png - Execute: dot -Tpng " > " asciidoc: rf.adoc: line 212: evaluating: {counter:figure-number} asciidoc: rf.adoc: line 358: evaluating: {counter2:target-number} asciidoc: rf.adoc: line 358: evaluating: {set2:target:test-usermanual__33.png} asciidoc: rf.adoc: line 369: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o " -L dot -F png - Execute: dot -Tpng " > " asciidoc: rf.adoc: line 369: evaluating: {counter:figure-number} asciidoc: rf.adoc: line 374: evaluating: {counter2:target-number} asciidoc: rf.adoc: line 374: evaluating: {set2:target:test-usermanual__34.png} asciidoc: rf.adoc: line 393: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o " -L dot -F png - Execute: dot -Tpng " > " asciidoc: rf.adoc: line 393: evaluating: {counter:figure-number} asciidoc: rf.adoc: line 509: evaluating: {counter:table-number} asciidoc: rf.adoc: line 526: evaluating: {counter:table-number} asciidoc: rf.adoc: line 589: evaluating: {counter:table-number} asciidoc: rf.adoc: line 642: evaluating: {counter2:target-number} asciidoc: rf.adoc: line 642: evaluating: {set2:target:test-usermanual__35.png} asciidoc: rf.adoc: line 648: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o " -L dot -F png - Execute: dot -Tpng " > " asciidoc: rf.adoc: line 662: evaluating: {counter:table-number} asciidoc: rf.adoc: line 673: evaluating: {counter2:target-number} asciidoc: rf.adoc: line 673: evaluating: {set2:target:test-usermanual__36.png} asciidoc: rf.adoc: line 679: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o " -L dot -F png - Execute: dot -Tpng " > " asciidoc: include: asciidoc: test-usermanual.adoc: line 24: reading: asciidoc: include: asciidoc: sigtran-osmocom.adoc: line 221: reading: asciidoc: sigtran-osmocom.adoc: line 220: evaluating: {counter2:target-number} asciidoc: sigtran-osmocom.adoc: line 220: evaluating: {set2:target:test-usermanual__37.png} asciidoc: sigtran-simple-2g.dot: line 22: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o " -L dot -F png - Execute: dot -Tpng " > " asciidoc: sigtran-simple-2g.dot: line 22: evaluating: {counter:figure-number} asciidoc: include: asciidoc: sigtran-osmocom.adoc: line 251: reading: asciidoc: sigtran-osmocom.adoc: line 250: evaluating: {counter2:target-number} asciidoc: sigtran-osmocom.adoc: line 250: evaluating: {set2:target:test-usermanual__38.png} asciidoc: sigtran-simple-3g.dot: line 24: filtering: "/usr/bin/python" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o " -L dot -F png - Execute: dot -Tpng " > " asciidoc: sigtran-simple-3g.dot: line 24: evaluating: {counter:figure-number} asciidoc: sigtran-osmocom.adoc: line 288: evaluating: {counter:table-number} asciidoc: sigtran-osmocom.adoc: line 309: evaluating: {counter:table-number} asciidoc: sigtran-osmocom.adoc: line 355: evaluating: {counter:table-number} asciidoc: sigtran-osmocom.adoc: line 380: evaluating: {counter:table-number} asciidoc: sigtran-osmocom.adoc: line 396: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 25: reading: asciidoc: sigtran.adoc: line 118: evaluating: {counter:table-number} asciidoc: sigtran.adoc: line 141: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 26: reading: asciidoc: include: asciidoc: test-usermanual.adoc: line 27: reading: asciidoc: spectrum.adoc: line 42: evaluating: {counter:table-number} asciidoc: include: asciidoc: test-usermanual.adoc: line 28: reading: asciidoc: trx_if.adoc: line 121: evaluating: {counter2:target-number} asciidoc: trx_if.adoc: line 121: evaluating: {set2:target:test-usermanual__39.png} asciidoc: trx_if.adoc: line 131: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: trx_if.adoc: line 143: evaluating: {counter2:target-number} asciidoc: trx_if.adoc: line 143: evaluating: {set2:target:test-usermanual__40.png} asciidoc: trx_if.adoc: line 152: filtering: packetdiag -o " -Tpng - && echo " " asciidoc: include: asciidoc: test-usermanual.adoc: line 29: reading: asciidoc: vty.adoc: line 64: evaluating: {counter:table-number} ../build/Makefile.asciidoc.inc:56: recipe for target 'test-usermanual.pdf' failed make[1]: *** [test-usermanual.pdf] Error 1 make[1]: Leaving directory ' Makefile:57: recipe for target 'check' failed make: *** [check] Error 2 Build step 'Execute shell' marked build as failure $ ssh-agent -k unset SSH_AUTH_SOCK; unset SSH_AGENT_PID; echo Agent pid 29365 killed; [ssh-agent] Stopped. [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Nov 21 14:56:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 21 Nov 2018 14:56:51 +0000 Subject: Change in osmo-ggsn[master]: fix a format string directives in queue_seqset() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11862 Change subject: fix a format string directives in queue_seqset() ...................................................................... fix a format string directives in queue_seqset() Coverity pointed out that a format string used inappropriate format string directives for variables of type size_t. Change-Id: I889019aad963932fdc032421e60a72c809a93bca Related: CID#135197 --- M gtp/queue.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/62/11862/1 diff --git a/gtp/queue.c b/gtp/queue.c index 82cd7b4..2a780f5 100644 --- a/gtp/queue.c +++ b/gtp/queue.c @@ -79,7 +79,7 @@ if (QUEUE_DEBUG) printf("Begin queue_seqset seq = %d\n", (int)seq); if (QUEUE_DEBUG) - printf("SIZEOF PEER %d, *PEER %d\n", sizeof(peer), + printf("SIZEOF PEER %zd, *PEER %zd\n", sizeof(peer), sizeof(*peer)); qmsg->seq = seq; -- To view, visit https://gerrit.osmocom.org/11862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I889019aad963932fdc032421e60a72c809a93bca Gerrit-Change-Number: 11862 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 21 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 21 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#314?= Message-ID: <785041746.773.1542813007758.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.81 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:52 +0000 Subject: Change in osmo-gsm-manuals[master]: use autotools to add "make install" target In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11725 ) Change subject: use autotools to add "make install" target ...................................................................... use autotools to add "make install" target For reasoning why a transition to autotools is desired, see the commit message of the previous patch in this series. "make install" copies the "build", "common" dirs, as well as the "*.xsl" files to $(prefix)/share/osmo-gsm-manuals. Prefix is typically /usr/local. Also a pkg-config file gets installed, so the path of the shared files can be looked up by autoconf scripts of the project repositories. The check-depends script is installed to $(prefix)/bin/osmo-gsm-manuals-check-depends and will be used by project specific autoconf scripts, too. All existing make targets ("make", "make check", "make upload") are still working, users only need to run "autoreconf -fi" and "./configure" beforehand. Makefile.am uses custom install-data-hook and uninstall-local targets, so we don't need to specify each file of the relevant subdirs in a _DATA variable (no extra maintenance effort). (moving manuals to project repositories 5/19) Related: OS#3385 Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 --- M .gitignore M INSTALL.txt D Makefile A Makefile.am R OsmoBSC/Makefile.am R OsmoBTS/Makefile.am R OsmoGGSN/Makefile.am R OsmoGSMTester/Makefile.am R OsmoHLR/Makefile.am R OsmoMGCP/Makefile.am R OsmoMGW/Makefile.am R OsmoMSC/Makefile.am R OsmoNAT/Makefile.am R OsmoNITB/Makefile.am R OsmoPCU/Makefile.am R OsmoSGSN/Makefile.am R OsmoSIPConnector/Makefile.am R OsmoSTP/Makefile.am R OsmoTRX/Makefile.am R OsmocomBB/Makefile.am M build/Makefile.common.inc A configure.ac M contrib/jenkins.sh A osmo-gsm-manuals.pc.in R tests/Makefile.am 25 files changed, 131 insertions(+), 79 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/.gitignore b/.gitignore index fbe2111..30bc93e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,23 @@ # git-version-gen .tarball-version .version + +# autotools +aclocal.m4 +autom4te.cache/ +config.log +config.status +config.guess +config.sub +configure +compile +depcomp +install-sh +missing +stamp-h1 +libtool +ltmain.sh +m4/*.m4 +*.pc +Makefile.in +Makefile diff --git a/INSTALL.txt b/INSTALL.txt index 9c3ee7b..6efe8d1 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -15,8 +15,11 @@ (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.) Build PDFs, run: + autoreconf -fi + ./configure make -or for a parallel build using more CPU cores: + +or for a parallel build using more CPU cores, replace make with: make -j 5 To update the VTY reference for a given program, use 'osmo_interact_vty.py -X', diff --git a/Makefile b/Makefile deleted file mode 100644 index c94f0a8..0000000 --- a/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -all: check-deps - cd OsmoBTS; $(MAKE) - cd OsmoNITB; $(MAKE) - cd OsmoBSC; $(MAKE) - cd OsmoMGCP; $(MAKE) - cd OsmoSGSN; $(MAKE) - cd OsmoGGSN; $(MAKE) - cd OsmoNAT; $(MAKE) - cd OsmoPCU; $(MAKE) - cd OsmoGSMTester; $(MAKE) - cd OsmoMSC; $(MAKE) - cd OsmoHLR; $(MAKE) - cd OsmoSIPConnector; $(MAKE) - cd OsmoSTP; $(MAKE) - cd OsmocomBB; $(MAKE) - cd OsmoMGW; $(MAKE) - cd OsmoTRX; $(MAKE) - -clean: - cd tests; $(MAKE) clean - cd OsmoBTS; $(MAKE) clean - cd OsmoNITB; $(MAKE) clean - cd OsmoBSC; $(MAKE) clean - cd OsmoMGCP; $(MAKE) clean - cd OsmoSGSN; $(MAKE) clean - cd OsmoGGSN; $(MAKE) clean - cd OsmoNAT; $(MAKE) clean - cd OsmoPCU; $(MAKE) clean - cd OsmoGSMTester; $(MAKE) clean - cd OsmoMSC; $(MAKE) clean - cd OsmoHLR; $(MAKE) clean - cd OsmoSIPConnector; $(MAKE) clean - cd OsmoSTP; $(MAKE) clean - cd OsmocomBB; $(MAKE) clean - cd OsmoMGW; $(MAKE) clean - cd OsmoTRX; $(MAKE) clean - -upload: - cd OsmoBTS; $(MAKE) upload - cd OsmoNITB; $(MAKE) upload - cd OsmoBSC; $(MAKE) upload - cd OsmoMGCP; $(MAKE) upload - cd OsmoSGSN; $(MAKE) upload - cd OsmoGGSN; $(MAKE) upload - cd OsmoNAT; $(MAKE) upload - cd OsmoPCU; $(MAKE) upload - cd OsmoGSMTester; $(MAKE) upload - cd OsmoMSC; $(MAKE) upload - cd OsmoHLR; $(MAKE) upload - cd OsmoSIPConnector; $(MAKE) upload - cd OsmoSTP; $(MAKE) upload - cd OsmocomBB; $(MAKE) upload - cd OsmoMGW; $(MAKE) upload - cd OsmoTRX; $(MAKE) upload - -check: - cd tests; $(MAKE) - cd OsmoBTS; $(MAKE) check - cd OsmoNITB; $(MAKE) check - cd OsmoBSC; $(MAKE) check - cd OsmoSGSN; $(MAKE) check - cd OsmoGGSN; $(MAKE) check - cd OsmoPCU; $(MAKE) check - cd OsmoSTP; $(MAKE) check - # These don't use asciidoc, so they have no 'make check' target: - #cd OsmoMGCP; $(MAKE) check - #cd OsmoNAT; $(MAKE) check - #cd OsmoMGW; $(MAKE) check - cd OsmoGSMTester; $(MAKE) check - cd OsmoMSC; $(MAKE) check - cd OsmoHLR; $(MAKE) check - cd OsmoSIPConnector; $(MAKE) check - cd OsmoSTP; $(MAKE) check - cd OsmocomBB; $(MAKE) check - cd OsmoTRX; $(MAKE) check - -check-deps: - ./check-depends.sh diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..dc8f1ca --- /dev/null +++ b/Makefile.am @@ -0,0 +1,51 @@ +share_files = $(srcdir)/build $(srcdir)/common $(srcdir)/*.xsl +share_path = "$(DESTDIR)$(prefix)/share/osmo-gsm-manuals" + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = osmo-gsm-manuals.pc +BUILT_SOURCES = $(top_srcdir)/.version +EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) +SUBDIRS = tests \ + OsmoBSC \ + OsmoBTS \ + OsmoGGSN \ + OsmoGSMTester \ + OsmoHLR \ + OsmoMGCP \ + OsmoMGW \ + OsmoMSC \ + OsmoNAT \ + OsmoNITB \ + OsmoPCU \ + OsmoSGSN \ + OsmoSIPConnector \ + OsmoSTP \ + OsmoTRX \ + OsmocomBB + +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ + +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + +install-data-hook: + cd "$(srcdir)" && \ + files="$$(find $(notdir $(share_files)) -not -type d)" && \ + for i in $$files; do \ + if [ -x "$$i" ]; then \ + mode=755; \ + else \ + mode=644; \ + fi; \ + install -vDm$$mode "$$i" "$(share_path)/$$i" || exit 1; \ + done; + install -Dm755 "$(srcdir)/check-depends.sh" "$(DESTDIR)$(prefix)/bin/osmo-gsm-manuals-check-depends" + +uninstall-local: + rm -rv "$(share_path)" "$(DESTDIR)$(prefix)/bin/osmo-gsm-manuals-check-depends" + +upload: + for i in Osmo*; do \ + $(MAKE) -C "$$i" upload || exit 1; \ + done diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile.am similarity index 100% rename from OsmoBSC/Makefile rename to OsmoBSC/Makefile.am diff --git a/OsmoBTS/Makefile b/OsmoBTS/Makefile.am similarity index 100% rename from OsmoBTS/Makefile rename to OsmoBTS/Makefile.am diff --git a/OsmoGGSN/Makefile b/OsmoGGSN/Makefile.am similarity index 100% rename from OsmoGGSN/Makefile rename to OsmoGGSN/Makefile.am diff --git a/OsmoGSMTester/Makefile b/OsmoGSMTester/Makefile.am similarity index 100% rename from OsmoGSMTester/Makefile rename to OsmoGSMTester/Makefile.am diff --git a/OsmoHLR/Makefile b/OsmoHLR/Makefile.am similarity index 100% rename from OsmoHLR/Makefile rename to OsmoHLR/Makefile.am diff --git a/OsmoMGCP/Makefile b/OsmoMGCP/Makefile.am similarity index 100% rename from OsmoMGCP/Makefile rename to OsmoMGCP/Makefile.am diff --git a/OsmoMGW/Makefile b/OsmoMGW/Makefile.am similarity index 100% rename from OsmoMGW/Makefile rename to OsmoMGW/Makefile.am diff --git a/OsmoMSC/Makefile b/OsmoMSC/Makefile.am similarity index 100% rename from OsmoMSC/Makefile rename to OsmoMSC/Makefile.am diff --git a/OsmoNAT/Makefile b/OsmoNAT/Makefile.am similarity index 100% rename from OsmoNAT/Makefile rename to OsmoNAT/Makefile.am diff --git a/OsmoNITB/Makefile b/OsmoNITB/Makefile.am similarity index 100% rename from OsmoNITB/Makefile rename to OsmoNITB/Makefile.am diff --git a/OsmoPCU/Makefile b/OsmoPCU/Makefile.am similarity index 100% rename from OsmoPCU/Makefile rename to OsmoPCU/Makefile.am diff --git a/OsmoSGSN/Makefile b/OsmoSGSN/Makefile.am similarity index 100% rename from OsmoSGSN/Makefile rename to OsmoSGSN/Makefile.am diff --git a/OsmoSIPConnector/Makefile b/OsmoSIPConnector/Makefile.am similarity index 100% rename from OsmoSIPConnector/Makefile rename to OsmoSIPConnector/Makefile.am diff --git a/OsmoSTP/Makefile b/OsmoSTP/Makefile.am similarity index 100% rename from OsmoSTP/Makefile rename to OsmoSTP/Makefile.am diff --git a/OsmoTRX/Makefile b/OsmoTRX/Makefile.am similarity index 100% rename from OsmoTRX/Makefile rename to OsmoTRX/Makefile.am diff --git a/OsmocomBB/Makefile b/OsmocomBB/Makefile.am similarity index 100% rename from OsmocomBB/Makefile rename to OsmocomBB/Makefile.am diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index e624b5f..6a210bc 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -12,3 +12,5 @@ clean: -rm -rf $(CLEAN_FILES) + +distclean: clean diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..e890b3e --- /dev/null +++ b/configure.ac @@ -0,0 +1,46 @@ +dnl Process this file with autoconf to produce a configure script +AC_INIT([osmo-gsm-manuals], + m4_esyscmd([./git-version-gen .tarball-version]), + [openbsc at lists.osmocom.org]) + +dnl *This* is the root dir, even if an install-sh exists in ../ or ../../ +AC_CONFIG_AUX_DIR([.]) + +AM_INIT_AUTOMAKE([foreign dist-bzip2 1.6 subdir-objects]) + +dnl checks for programs +AC_PROG_INSTALL +LT_INIT + +dnl check for pkg-config (explained in detail in libosmocore/configure.ac) +AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) +if test "x$PKG_CONFIG_INSTALLED" = "xno"; then + AC_MSG_WARN([You need to install pkg-config]) +fi +PKG_PROG_PKG_CONFIG([0.20]) + +if ! $srcdir/check-depends.sh +then + AC_MSG_ERROR("missing dependencies!") +fi + +AC_OUTPUT( + osmo-gsm-manuals.pc + Makefile + tests/Makefile + OsmoBSC/Makefile + OsmoBTS/Makefile + OsmoGGSN/Makefile + OsmoGSMTester/Makefile + OsmoHLR/Makefile + OsmoMGCP/Makefile + OsmoMGW/Makefile + OsmoMSC/Makefile + OsmoNAT/Makefile + OsmoNITB/Makefile + OsmoPCU/Makefile + OsmoSGSN/Makefile + OsmoSIPConnector/Makefile + OsmoSTP/Makefile + OsmoTRX/Makefile + OsmocomBB/Makefile) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 80d873d..1fd19d1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -6,6 +6,8 @@ osmo-clean-workspace.sh +autoreconf -fi +./configure $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE check diff --git a/osmo-gsm-manuals.pc.in b/osmo-gsm-manuals.pc.in new file mode 100644 index 0000000..f9b318e --- /dev/null +++ b/osmo-gsm-manuals.pc.in @@ -0,0 +1,6 @@ +prefix=@prefix@ +osmogsmmanualsdir=@prefix@/share/osmo-gsm-manuals + +Name: Osmocom GSM Manuals Development Files +Description: Common files for building manuals of Osmocom programs +Version: @VERSION@ diff --git a/tests/Makefile b/tests/Makefile.am similarity index 100% rename from tests/Makefile rename to tests/Makefile.am -- To view, visit https://gerrit.osmocom.org/11725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e7036fae062ee783cb132b14608827a82c5e7c7 Gerrit-Change-Number: 11725 Gerrit-PatchSet: 7 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:52 +0000 Subject: Change in osmo-gsm-manuals[master]: cosmetic: update usage of OSMO_GSM_MANUALS_DIR In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11806 ) Change subject: cosmetic: update usage of OSMO_GSM_MANUALS_DIR ...................................................................... cosmetic: update usage of OSMO_GSM_MANUALS_DIR OSMO_GSM_MANUALS_DIR should use pkg-config to figure out the location of the shared osmo-gsm-manuals files. (moving manuals to project repositories 6/19) Related: OS#3385 Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 --- M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc 3 files changed, 10 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 2cd7d50..18cfa88 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -1,6 +1,8 @@ # USAGE: # -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define in 'ASCIIDOC' all root .adoc files, # - optionally define in 'ASCIIDOC_DEPS' all dependencies common to all .adocs, # - include this file, diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index acf410e..b69fcea 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -1,6 +1,8 @@ # USAGE: # -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define in 'DOCBOOKS' all root .xml files, # - optionally define in 'DOCBOOKS_DEPS' all dependencies common to all .xmls, # - include this file, diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 659f26c..af5388c 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -7,8 +7,10 @@ # - vty/*_reference.xml # Export from VTY 'show online-help', exactly one file. # -# In your Makefile, -# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, +# In your Makefile.am, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the osmo-gsm-manuals shared files +# installation path as returned by "pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir" +# (project specific repos set this with configure.ac), # - define the (single) name of the vty-reference source in VTY_REFERENCE, # - include this file. # -- To view, visit https://gerrit.osmocom.org/11806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I64cfffb5104edcf7a20f41aeb5bf8ee6988b57c4 Gerrit-Change-Number: 11806 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:53 +0000 Subject: Change in osmo-gsm-manuals[master]: *filter.conf/*.sty: use symlinks to build, common In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11798 ) Change subject: *filter.conf/*.sty: use symlinks to build, common ...................................................................... *filter.conf/*.sty: use symlinks to build, common $(OSMO_GSM_MANUALS_DIR) is used in most places to reference to the top dir, which contains "build" and "common". But not in the asciidoc mscgen filter configurations, and in the custom LaTeX style. They have ../common or ../build hardcoded, which won't work anymore when the project specific files will be in another repository. Update the Makefiles to create symlinks to "build" and "common" in the dir where the build was started. Use ./common in the files that had ../common hardcoded, and do the same for ./build. Update the Makefile.common.inc comment to refer to common targets in general, so we don't need to list each single one there (like the new 'common' and 'build' targets). I've also thought about using variables there, but this would only work for the asciidoc files, not for the .sty file. We would need to generate the latter from another file and replace the variable dynamically. Having the symlinks instead seemed to be slightly easier. (moving manuals to project repositories 7/19) Related: OS#3385 Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 --- M .gitignore M build/Makefile.asciidoc.inc M build/Makefile.common.inc M build/Makefile.docbook.inc M build/custom-dblatex.sty M build/mscgen-filter.conf M build/python2-filter.conf 7 files changed, 25 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 30bc93e..b174bb9 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,7 @@ *.pc Makefile.in Makefile + +# symlinks to shared dirs (needed for out-of-tree builds) +*/common +*/build diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 18cfa88..6b57c7d 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -54,7 +54,8 @@ $(ASCIIDOC_DEPS) \ $(ASCIIDOCSTYLE) \ $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \ - $(OSMO_GSM_MANUALS_DIR)/common/images/* + $(OSMO_GSM_MANUALS_DIR)/common/images/* \ + build common @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ @@ -64,7 +65,11 @@ check: $(ASCIIDOC_CHECKS) -$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) +$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml \ + $(ASCIIDOCSTYLE) \ + $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc \ + $(ASCIIDOC_DEPS) \ + build common asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 # Make absolutely sure that the %.check target is updated. touch $@ diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index 6a210bc..efd56f6 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -3,9 +3,14 @@ # Other makefiles like Makefile.asciidoc.inc and Makefile.vty-reference.inc add # entries to UPLOAD_FILES and CLEAN_FILES. # -# Include this file at the end to have 'upload' and 'clean' targets. +# Include this file at the end to have the common targets (upload, clean etc.). UPLOAD_PATH ?= generic at sysmocom-downloads:documents +SYMLINKS = common build +CLEAN_FILES += $(SYMLINKS) + +$(SYMLINKS): + ln -s $(OSMO_GSM_MANUALS_DIR)/$@ $@ upload: $(UPLOAD_FILES) rsync -avz $(UPLOAD_FILES) $(UPLOAD_PATH)/ diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index b69fcea..4d015a7 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -32,6 +32,6 @@ xmllint --xinclude --postvalid --noout $< # Create a PDF file and lint it before -%.pdf: %.xml %.xml-lint $(DOCBOOKS_DEPS) +%.pdf: %.xml %.xml-lint $(DOCBOOKS_DEPS) build common dblatex $(dblatex_quiet) -P draft.mode=no $< diff --git a/build/custom-dblatex.sty b/build/custom-dblatex.sty index 606b9ab..16931ad 100644 --- a/build/custom-dblatex.sty +++ b/build/custom-dblatex.sty @@ -1,5 +1,6 @@ %% %% This style is derived from the docbook one. +%% "${OSMO_GSM_MANUALS_DIR}/common" is symlinked to ./common when building. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{asciidoc}[2008/06/05 AsciiDoc DocBook Style] @@ -40,13 +41,13 @@ \textsf{ \vfill \begin{center} - \includegraphics{../common/images/sysmocom.pdf} + \includegraphics{./common/images/sysmocom.pdf} \ \\ % \huge{\Company} \end{center} \vspace{2.5cm} \begin{center} - \includegraphics{../common/images/osmocom.pdf} + \includegraphics{./common/images/osmocom.pdf} \ \\ % \vspace{0.5cm} \huge{\textbf{\DBKtitle}}\\ % diff --git a/build/mscgen-filter.conf b/build/mscgen-filter.conf index ce3cb3f..fa8f03e 100644 --- a/build/mscgen-filter.conf +++ b/build/mscgen-filter.conf @@ -1,9 +1,10 @@ # # AsciiDoc mscgen filter configuration file. +# ${OSMO_GSM_MANUALS}/build is symlinked to ./build when building. # [mscgen-filter-style] -mscgen-style=template="mscgen-block",subs=(),posattrs=("style","target"),filter='../build/filter-wrapper.py mscgen -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} -' +mscgen-style=template="mscgen-block",subs=(),posattrs=("style","target"),filter='./build/filter-wrapper.py mscgen -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} -' [blockdef-listing] template::[mscgen-filter-style] diff --git a/build/python2-filter.conf b/build/python2-filter.conf index ca2ddaf..812c7c2 100644 --- a/build/python2-filter.conf +++ b/build/python2-filter.conf @@ -1,9 +1,10 @@ # # AsciiDoc mscgen filter configuration file. +# ${OSMO_GSM_MANUALS}/build is symlinked to ./build when building. # [python2-filter-style] -python2-style=template="python2-block",subs=(),posattrs=("style","target"),filter='../build/filter-wrapper.py python2 - --output="{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}"' +python2-style=template="python2-block",subs=(),posattrs=("style","target"),filter='./build/filter-wrapper.py python2 - --output="{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}"' [blockdef-listing] template::[python2-filter-style] -- To view, visit https://gerrit.osmocom.org/11798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4cfd1a9ef482d382f10cdf060e8e2cba81852864 Gerrit-Change-Number: 11798 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:53 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: include from ./common, not ../common In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11799 ) Change subject: *.adoc: include from ./common, not ../common ...................................................................... *.adoc: include from ./common, not ../common Change hardcoded ../common paths, which will break when moving the project specific manuals in other repositories, to ./common so they use the dynamically created symlink that always points to the right path. (moving manuals to project repositories 8/19) Related: OS#3385 Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 --- M OsmoBSC/osmobsc-usermanual.adoc M OsmoBTS/osmobts-abis.adoc M OsmoBTS/osmobts-usermanual.adoc M OsmoGGSN/osmoggsn-usermanual.adoc M OsmoHLR/osmohlr-usermanual.adoc M OsmoMGW/osmomgw-usermanual.adoc M OsmoMSC/osmomsc-usermanual.adoc M OsmoNITB/osmonitb-usermanual.adoc M OsmoPCU/osmopcu-gb.adoc M OsmoPCU/osmopcu-usermanual.adoc M OsmoSGSN/osmosgsn-usermanual.adoc M OsmoSIPConnector/osmosipconnector-usermanual.adoc M OsmoSTP/osmostp-usermanual.adoc M OsmoTRX/osmotrx-usermanual.adoc M OsmocomBB/osmocombb-usermanual.adoc M common/chapters/logging.adoc 16 files changed, 131 insertions(+), 131 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index 0ec15e5..c3954bb 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -5,7 +5,7 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -17,27 +17,27 @@ include::chapters/handover.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] -include::../common/chapters/bts.adoc[] +include::./common/chapters/bts.adoc[] include::../OsmoNITB/chapters/bts-examples.adoc[] -include::../common/chapters/bsc.adoc[] +include::./common/chapters/bsc.adoc[] -include::../common/chapters/abis.adoc[] +include::./common/chapters/abis.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/cell-broadcast.adoc[] +include::./common/chapters/cell-broadcast.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoBTS/osmobts-abis.adoc b/OsmoBTS/osmobts-abis.adoc index 1e02414..20e56e0 100644 --- a/OsmoBTS/osmobts-abis.adoc +++ b/OsmoBTS/osmobts-abis.adoc @@ -85,8 +85,8 @@ include::abis/rtp.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoBTS/osmobts-usermanual.adoc b/OsmoBTS/osmobts-usermanual.adoc index 07f88e2..ee3e37f 100644 --- a/OsmoBTS/osmobts-usermanual.adoc +++ b/OsmoBTS/osmobts-usermanual.adoc @@ -4,19 +4,19 @@ =================== Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] -include::../common/chapters/abis.adoc[] +include::./common/chapters/abis.adoc[] include::chapters/interfaces.adoc[] include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] @@ -26,14 +26,14 @@ include::chapters/architecture.adoc[] -include::../common/chapters/trx_if.adoc[] +include::./common/chapters/trx_if.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoGGSN/osmoggsn-usermanual.adoc b/OsmoGGSN/osmoggsn-usermanual.adoc index efa2c8f..3394121 100644 --- a/OsmoGGSN/osmoggsn-usermanual.adoc +++ b/OsmoGGSN/osmoggsn-usermanual.adoc @@ -3,7 +3,7 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -11,19 +11,19 @@ //include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoHLR/osmohlr-usermanual.adoc b/OsmoHLR/osmohlr-usermanual.adoc index d9a4654..bc2a614 100644 --- a/OsmoHLR/osmohlr-usermanual.adoc +++ b/OsmoHLR/osmohlr-usermanual.adoc @@ -6,7 +6,7 @@ Neels Hofmeyr -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -16,21 +16,21 @@ include::chapters/ussd.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/control.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/gsup.adoc[] +include::./common/chapters/gsup.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc index 6030023..55e9090 100644 --- a/OsmoMGW/osmomgw-usermanual.adoc +++ b/OsmoMGW/osmomgw-usermanual.adoc @@ -6,15 +6,15 @@ Daniel Willmann -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] include::chapters/running.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] @@ -22,12 +22,12 @@ //include::chapters/counters.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoMSC/osmomsc-usermanual.adoc b/OsmoMSC/osmomsc-usermanual.adoc index ac68d93..1b48435 100644 --- a/OsmoMSC/osmomsc-usermanual.adoc +++ b/OsmoMSC/osmomsc-usermanual.adoc @@ -6,7 +6,7 @@ Neels Hofmeyr -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -16,25 +16,25 @@ include::chapters/counters.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/net.adoc[] -include::../common/chapters/smpp.adoc[] +include::./common/chapters/smpp.adoc[] -include::../common/chapters/mncc.adoc[] +include::./common/chapters/mncc.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/gsup.adoc[] +include::./common/chapters/gsup.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoNITB/osmonitb-usermanual.adoc b/OsmoNITB/osmonitb-usermanual.adoc index 63d430a..d836f7b 100644 --- a/OsmoNITB/osmonitb-usermanual.adoc +++ b/OsmoNITB/osmonitb-usermanual.adoc @@ -6,7 +6,7 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -14,35 +14,35 @@ include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/net.adoc[] -include::../common/chapters/bsc.adoc[] +include::./common/chapters/bsc.adoc[] -include::../common/chapters/bts.adoc[] +include::./common/chapters/bts.adoc[] include::chapters/bts-examples.adoc[] include::chapters/hlr.adoc[] -include::../common/chapters/smpp.adoc[] +include::./common/chapters/smpp.adoc[] -include::../common/chapters/mncc.adoc[] +include::./common/chapters/mncc.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/cell-broadcast.adoc[] +include::./common/chapters/cell-broadcast.adoc[] -include::../common/chapters/abis.adoc[] +include::./common/chapters/abis.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoPCU/osmopcu-gb.adoc b/OsmoPCU/osmopcu-gb.adoc index 64316a2..af5ea27 100644 --- a/OsmoPCU/osmopcu-gb.adoc +++ b/OsmoPCU/osmopcu-gb.adoc @@ -88,8 +88,8 @@ include::gb/bssgp.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoPCU/osmopcu-usermanual.adoc b/OsmoPCU/osmopcu-usermanual.adoc index a72e947..810772e 100644 --- a/OsmoPCU/osmopcu-usermanual.adoc +++ b/OsmoPCU/osmopcu-usermanual.adoc @@ -5,26 +5,26 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] include::chapters/running.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] include::chapters/counters.adoc[] -include::../common/chapters/gb.adoc[] +include::./common/chapters/gb.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoSGSN/osmosgsn-usermanual.adoc b/OsmoSGSN/osmosgsn-usermanual.adoc index 079e811..c85fc6e 100644 --- a/OsmoSGSN/osmosgsn-usermanual.adoc +++ b/OsmoSGSN/osmosgsn-usermanual.adoc @@ -5,7 +5,7 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] @@ -13,26 +13,26 @@ include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] -include::../common/chapters/gb.adoc[] +include::./common/chapters/gb.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] -include::../common/chapters/oap.adoc[] +include::./common/chapters/oap.adoc[] -include::../common/chapters/gsup.adoc[] +include::./common/chapters/gsup.adoc[] include::chapters/counters.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoSIPConnector/osmosipconnector-usermanual.adoc b/OsmoSIPConnector/osmosipconnector-usermanual.adoc index 72f6c1f..67a0e52 100644 --- a/OsmoSIPConnector/osmosipconnector-usermanual.adoc +++ b/OsmoSIPConnector/osmosipconnector-usermanual.adoc @@ -6,23 +6,23 @@ Daniel Willmann -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] include::chapters/running.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/configuration.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoSTP/osmostp-usermanual.adoc b/OsmoSTP/osmostp-usermanual.adoc index 6dc1d08..5c919b9 100644 --- a/OsmoSTP/osmostp-usermanual.adoc +++ b/OsmoSTP/osmostp-usermanual.adoc @@ -3,32 +3,32 @@ Harald Welte -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] // include::chapters/overview.adoc[] -include::../common/chapters/sigtran.adoc[] +include::./common/chapters/sigtran.adoc[] -include::../common/chapters/sigtran-osmocom.adoc[] +include::./common/chapters/sigtran-osmocom.adoc[] //include::chapters/running.adoc[] // include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] -//include::../common/chapters/bts.adoc[] +//include::./common/chapters/bts.adoc[] //include::../OsmoNITB/chapters/bts-examples.adoc[] -//include::../common/chapters/control_if.adoc[] +//include::./common/chapters/control_if.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc index 14f5514..fdd9c8a 100644 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ b/OsmoTRX/osmotrx-usermanual.adoc @@ -5,19 +5,19 @@ Pau Espin Pedrol -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/overview.adoc[] include::chapters/running.adoc[] -include::../common/chapters/control_if.adoc[] +include::./common/chapters/control_if.adoc[] include::chapters/control.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] include::chapters/counters.adoc[] @@ -31,12 +31,12 @@ include::chapters/code-architecture.adoc[] -include::../common/chapters/trx_if.adoc[] +include::./common/chapters/trx_if.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/OsmocomBB/osmocombb-usermanual.adoc b/OsmocomBB/osmocombb-usermanual.adoc index b405934..c055577 100644 --- a/OsmocomBB/osmocombb-usermanual.adoc +++ b/OsmocomBB/osmocombb-usermanual.adoc @@ -3,19 +3,19 @@ Holger Hans Peter Freyther -include::../common/chapters/preface.adoc[] +include::./common/chapters/preface.adoc[] include::chapters/scripting.adoc[] -include::../common/chapters/vty.adoc[] +include::./common/chapters/vty.adoc[] -include::../common/chapters/logging.adoc[] +include::./common/chapters/logging.adoc[] -include::../common/chapters/port_numbers.adoc[] +include::./common/chapters/port_numbers.adoc[] -include::../common/chapters/bibliography.adoc[] +include::./common/chapters/bibliography.adoc[] -include::../common/chapters/glossary.adoc[] +include::./common/chapters/glossary.adoc[] -include::../common/chapters/gfdl.adoc[] +include::./common/chapters/gfdl.adoc[] diff --git a/common/chapters/logging.adoc b/common/chapters/logging.adoc index a89526c..927c498 100644 --- a/common/chapters/logging.adoc +++ b/common/chapters/logging.adoc @@ -219,7 +219,7 @@ [[fig-wireshark-gsmtap-log]] .Wireshark with logs delivered over GSMTAP -image::../common/images/wireshark-gsmtap-log.png[] +image::./common/images/wireshark-gsmtap-log.png[] Note: the logs are also duplicated to stderr when GSMTAP logging is configured because stderr is the default log target which is initialized automatically. To descrease stderr logging to absolute minimum, you can configure it as follows: -- To view, visit https://gerrit.osmocom.org/11799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id984f5e85481f7877567ee6d21f7ca455d773ef1 Gerrit-Change-Number: 11799 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:53 +0000 Subject: Change in osmo-gsm-manuals[master]: *-vty-reference.xml: use ./common, not ../common In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11800 ) Change subject: *-vty-reference.xml: use ./common, not ../common ...................................................................... *-vty-reference.xml: use ./common, not ../common Change hardcoded ../common paths, which will break when moving the project specific manuals in other repositories, to ./common so they use the dynamically created symlink that always points to the right path. (moving manuals to project repositories 9/19) Change-Id: I5368bcff34586c515af23e5a868417e561fd539d --- M OsmoBSC/osmobsc-vty-reference.xml M OsmoBTS/osmobts-vty-reference.xml M OsmoGGSN/osmoggsn-vty-reference.xml M OsmoHLR/osmohlr-vty-reference.xml M OsmoMGCP/osmomgcp-vty-reference.xml M OsmoMGW/osmomgw-vty-reference.xml M OsmoMSC/osmomsc-vty-reference.xml M OsmoNAT/osmonat-vty-reference.xml M OsmoNITB/osmonitb-vty-reference.xml M OsmoPCU/osmopcu-vty-reference.xml M OsmoSGSN/osmosgsn-vty-reference.xml M OsmoSIPConnector/osmosipconnector-vty-reference.xml M OsmoSTP/osmostp-vty-reference.xml M OsmoTRX/osmotrx-vty-reference.xml M tests/test-vty-reference.xml 15 files changed, 15 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/OsmoBSC/osmobsc-vty-reference.xml b/OsmoBSC/osmobsc-vty-reference.xml index 6d993b4..f51e56e 100644 --- a/OsmoBSC/osmobsc-vty-reference.xml +++ b/OsmoBSC/osmobsc-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoBTS/osmobts-vty-reference.xml b/OsmoBTS/osmobts-vty-reference.xml index f404843..b7c8a59 100644 --- a/OsmoBTS/osmobts-vty-reference.xml +++ b/OsmoBTS/osmobts-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoGGSN/osmoggsn-vty-reference.xml b/OsmoGGSN/osmoggsn-vty-reference.xml index c9aea03..3ad7e83 100644 --- a/OsmoGGSN/osmoggsn-vty-reference.xml +++ b/OsmoGGSN/osmoggsn-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoHLR/osmohlr-vty-reference.xml b/OsmoHLR/osmohlr-vty-reference.xml index 11633fd..f2d06ef 100644 --- a/OsmoHLR/osmohlr-vty-reference.xml +++ b/OsmoHLR/osmohlr-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoMGCP/osmomgcp-vty-reference.xml b/OsmoMGCP/osmomgcp-vty-reference.xml index 46b40d3..e9cc898 100644 --- a/OsmoMGCP/osmomgcp-vty-reference.xml +++ b/OsmoMGCP/osmomgcp-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoMGW/osmomgw-vty-reference.xml b/OsmoMGW/osmomgw-vty-reference.xml index 2d91545..334453e 100644 --- a/OsmoMGW/osmomgw-vty-reference.xml +++ b/OsmoMGW/osmomgw-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoMSC/osmomsc-vty-reference.xml b/OsmoMSC/osmomsc-vty-reference.xml index 3b54e9e..132f200 100644 --- a/OsmoMSC/osmomsc-vty-reference.xml +++ b/OsmoMSC/osmomsc-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoNAT/osmonat-vty-reference.xml b/OsmoNAT/osmonat-vty-reference.xml index 335beab..8f8b096 100644 --- a/OsmoNAT/osmonat-vty-reference.xml +++ b/OsmoNAT/osmonat-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoNITB/osmonitb-vty-reference.xml b/OsmoNITB/osmonitb-vty-reference.xml index 1407165..da0e358 100644 --- a/OsmoNITB/osmonitb-vty-reference.xml +++ b/OsmoNITB/osmonitb-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoPCU/osmopcu-vty-reference.xml b/OsmoPCU/osmopcu-vty-reference.xml index c28c472..f8c39ec 100644 --- a/OsmoPCU/osmopcu-vty-reference.xml +++ b/OsmoPCU/osmopcu-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoSGSN/osmosgsn-vty-reference.xml b/OsmoSGSN/osmosgsn-vty-reference.xml index 9a8b8d9..82b666a 100644 --- a/OsmoSGSN/osmosgsn-vty-reference.xml +++ b/OsmoSGSN/osmosgsn-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoSIPConnector/osmosipconnector-vty-reference.xml b/OsmoSIPConnector/osmosipconnector-vty-reference.xml index fe22a99..0eeb952 100644 --- a/OsmoSIPConnector/osmosipconnector-vty-reference.xml +++ b/OsmoSIPConnector/osmosipconnector-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoSTP/osmostp-vty-reference.xml b/OsmoSTP/osmostp-vty-reference.xml index b4ee500..ae0f7b0 100644 --- a/OsmoSTP/osmostp-vty-reference.xml +++ b/OsmoSTP/osmostp-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/OsmoTRX/osmotrx-vty-reference.xml b/OsmoTRX/osmotrx-vty-reference.xml index ae0afbf..4291929 100644 --- a/OsmoTRX/osmotrx-vty-reference.xml +++ b/OsmoTRX/osmotrx-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> diff --git a/tests/test-vty-reference.xml b/tests/test-vty-reference.xml index 8bec1e6..94ccab1 100644 --- a/tests/test-vty-reference.xml +++ b/tests/test-vty-reference.xml @@ -5,7 +5,7 @@ --> + ]> -- To view, visit https://gerrit.osmocom.org/11800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5368bcff34586c515af23e5a868417e561fd539d Gerrit-Change-Number: 11800 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:54 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: add *reference.xml arg In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11801 ) Change subject: vty_reference_combine.sh: add *reference.xml arg ...................................................................... vty_reference_combine.sh: add *reference.xml arg Pass the path to $(srcdir)/vty/*reference.xml as parameter to vty_reference_combine.sh instead of assuming that it will be in ./vty/*reference.xml. This is necessary to make the build scripts work for out-of-tree builds. Because when building out-of-tree, the source dir and build dir (the one where the Makefile gets generated, and in which "make" runs), are not the same anymore. The relative vty/reference.xml path is only valid in the source dir, not in the build dir. The next commits in this series have more changes for out-of-tree builds. Out-of-tree building is necessary for consistency with the other Osmocom code, which can be built out-of-tree as well. It would be strange if this did not work anymore as soon as the users enabled building the manuals. (moving manuals to project repositories 10/19) Related: OS#3385 Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c --- M build/Makefile.vty-reference.inc M build/vty_reference_combine.sh 2 files changed, 9 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index af5388c..cb00648 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -37,6 +37,7 @@ $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \ $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ + $(srcdir)/vty/*reference.xml \ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ vty/*additions*.xml xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh index be234a7..cb18e9e 100755 --- a/build/vty_reference_combine.sh +++ b/build/vty_reference_combine.sh @@ -1,16 +1,20 @@ #!/bin/sh +# usage: vty_reference_combine.sh path/to/merge_doc.xsl path/to/*reference.xml [paths to additional xmls] +# see Makefile.vty-reference.inc set -e -# the first argument should point at libosmocore/doc/vty/merge_doc.xsl +# first argument: merge_doc.xsl MERGE_DOC="$1" shift +# second argument: *reference.xml +reference="$1" +test "$(ls -1 $reference | wc -l)" = "1" +shift + combined="generated/combined.xml" combine_src="generated/combine_src.xml" -reference="vty/*reference.xml" -test "$(ls -1 $reference | wc -l)" = "1" - set -x mkdir -p generated cp $reference "$combined" -- To view, visit https://gerrit.osmocom.org/11801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c Gerrit-Change-Number: 11801 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:54 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:54 +0000 Subject: Change in osmo-gsm-manuals[master]: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11802 ) Change subject: Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) ...................................................................... Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) Use $(srcdir) infront of all relative paths, which reference other files in the repository. Use $(top_srcdir) as OSMO_GSM_MANUALS_DIR. This is needed for out-of-tree building. (moving manuals to project repositories 11/19) Related: OS#3385 Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc --- M OsmoBSC/Makefile.am M OsmoBTS/Makefile.am M OsmoGGSN/Makefile.am M OsmoGSMTester/Makefile.am M OsmoHLR/Makefile.am M OsmoMGCP/Makefile.am M OsmoMGW/Makefile.am M OsmoMSC/Makefile.am M OsmoNAT/Makefile.am M OsmoNITB/Makefile.am M OsmoPCU/Makefile.am M OsmoSGSN/Makefile.am M OsmoSIPConnector/Makefile.am M OsmoSTP/Makefile.am M OsmoTRX/Makefile.am M OsmocomBB/Makefile.am M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M tests/Makefile.am 19 files changed, 38 insertions(+), 38 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoBSC/Makefile.am b/OsmoBSC/Makefile.am index 422c598..3e71048 100644 --- a/OsmoBSC/Makefile.am +++ b/OsmoBSC/Makefile.am @@ -1,9 +1,9 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmobsc-usermanual.pdf: chapters/*.adoc chapters/*.dot -aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc +osmobsc-usermanual.pdf: $(srcdir)/chapters/*.adoc $(srcdir)/chapters/*.dot +aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc VTY_REFERENCE = osmobsc-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoBTS/Makefile.am b/OsmoBTS/Makefile.am index 536ed17..c97cb3a 100644 --- a/OsmoBTS/Makefile.am +++ b/OsmoBTS/Makefile.am @@ -1,10 +1,10 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmobts-usermanual.adoc osmobts-abis.adoc rtp-amr.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmobts-usermanual.pdf: chapters/*.adoc -osmobts-abis.pdf: abis/*.adoc abis/*.msc -rtp-amr.pdf: dtx.dot +osmobts-usermanual.pdf: $(srcdir)/chapters/*.adoc +osmobts-abis.pdf: $(srcdir)/abis/*.adoc $(srcdir)/abis/*.msc +rtp-amr.pdf: $(srcdir)/dtx.dot VTY_REFERENCE = osmobts-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoGGSN/Makefile.am b/OsmoGGSN/Makefile.am index dce2b02..ec1e8db 100644 --- a/OsmoGGSN/Makefile.am +++ b/OsmoGGSN/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmoggsn-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmoggsn-vty-reference.xml diff --git a/OsmoGSMTester/Makefile.am b/OsmoGSMTester/Makefile.am index 4fe6748..6bba962 100644 --- a/OsmoGSMTester/Makefile.am +++ b/OsmoGSMTester/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmo-gsm-tester-manual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoHLR/Makefile.am b/OsmoHLR/Makefile.am index 321c2a1..45d534a 100644 --- a/OsmoHLR/Makefile.am +++ b/OsmoHLR/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmohlr-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc *.vty *.ctrl +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.vty $(srcdir)/*.ctrl include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmohlr-vty-reference.xml diff --git a/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am index d47f390..8650693 100644 --- a/OsmoMGCP/Makefile.am +++ b/OsmoMGCP/Makefile.am @@ -1,4 +1,4 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) VTY_REFERENCE = osmomgcp-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoMGW/Makefile.am b/OsmoMGW/Makefile.am index 96b436b..a00722b 100644 --- a/OsmoMGW/Makefile.am +++ b/OsmoMGW/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmomgw-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmomgw-vty-reference.xml diff --git a/OsmoMSC/Makefile.am b/OsmoMSC/Makefile.am index 2548852..fe9a8c0 100644 --- a/OsmoMSC/Makefile.am +++ b/OsmoMSC/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmomsc-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmomsc-vty-reference.xml diff --git a/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am index 8d7c4a5..64b18e2 100644 --- a/OsmoNAT/Makefile.am +++ b/OsmoNAT/Makefile.am @@ -1,4 +1,4 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) VTY_REFERENCE = osmonat-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoNITB/Makefile.am b/OsmoNITB/Makefile.am index 4b275dd..11ec5b1 100644 --- a/OsmoNITB/Makefile.am +++ b/OsmoNITB/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmonitb-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmonitb-vty-reference.xml diff --git a/OsmoPCU/Makefile.am b/OsmoPCU/Makefile.am index 0f0ae76..9830701 100644 --- a/OsmoPCU/Makefile.am +++ b/OsmoPCU/Makefile.am @@ -1,9 +1,9 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmopcu-gb.pdf: gb/*.adoc gb/*.msc -osmopcu-usermanual.pdf: chapters/*.adoc +osmopcu-gb.pdf: $(srcdir)/gb/*.adoc $(srcdir)/gb/*.msc +osmopcu-usermanual.pdf: $(srcdir)/chapters/*.adoc VTY_REFERENCE = osmopcu-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoSGSN/Makefile.am b/OsmoSGSN/Makefile.am index ce69960..b2ab73b 100644 --- a/OsmoSGSN/Makefile.am +++ b/OsmoSGSN/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmosgsn-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosgsn-vty-reference.xml diff --git a/OsmoSIPConnector/Makefile.am b/OsmoSIPConnector/Makefile.am index e275e41..36f3452 100644 --- a/OsmoSIPConnector/Makefile.am +++ b/OsmoSIPConnector/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmosipconnector-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmosipconnector-vty-reference.xml diff --git a/OsmoSTP/Makefile.am b/OsmoSTP/Makefile.am index 10149bf..2eefccd 100644 --- a/OsmoSTP/Makefile.am +++ b/OsmoSTP/Makefile.am @@ -1,9 +1,9 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmostp-usermanual.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmostp-usermanual.pdf: chapters/*.adoc -aoip-mgw-options.pdf: aoip-mgw-options.adoc mgw/*.msc +osmostp-usermanual.pdf: $(srcdir)/chapters/*.adoc +aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc VTY_REFERENCE = osmostp-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoTRX/Makefile.am b/OsmoTRX/Makefile.am index 3b4b8b1..ed8287a 100644 --- a/OsmoTRX/Makefile.am +++ b/OsmoTRX/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmotrx-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = osmotrx-vty-reference.xml diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am index a0b7a2a..f5ed510 100644 --- a/OsmocomBB/Makefile.am +++ b/OsmocomBB/Makefile.am @@ -1,7 +1,7 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) ASCIIDOC = osmocombb-usermanual.adoc -ASCIIDOC_DEPS = chapters/*.adoc +ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 6b57c7d..cff47f6 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -12,7 +12,7 @@ # # OSMO_GSM_MANUALS_DIR = .. # ASCIIDOC = osmo_yada.adoc osmo_moo.adoc -# ASCIIDOC_DEPS = for_all/*.adoc +# ASCIIDOC_DEPS = $(srcdir)/for_all/*.adoc # include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc # osmo_yada.pdf: yada/*.adoc yada/*.msc diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 4d015a7..7b9969a 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -12,7 +12,7 @@ # # OSMO_GSM_MANUALS_DIR = .. # DOCBOOKS = osmo_yada.xml osmo_moo.xml -# ASCIIDOC_DEPS = for_all/*.xml +# ASCIIDOC_DEPS = $(srcdir)/for_all/*.xml # include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc # osmo_yada.pdf: yada/*.xml # diff --git a/tests/Makefile.am b/tests/Makefile.am index 5afc8ca..3d03edd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -OSMO_GSM_MANUALS_DIR = .. +OSMO_GSM_MANUALS_DIR = $(top_srcdir) # Generate adoc file that includes all chapters ASCIIDOC = test-usermanual.adoc -- To view, visit https://gerrit.osmocom.org/11802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2454d7507fae4e1c47458a1adf36f68e637f4bbc Gerrit-Change-Number: 11802 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:55 +0000 Subject: Change in osmo-gsm-manuals[master]: Makefile.*.inc: adjust to out-of-tree building In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11803 ) Change subject: Makefile.*.inc: adjust to out-of-tree building ...................................................................... Makefile.*.inc: adjust to out-of-tree building Makefile.asciidoc.inc: create a symlink for the root adoc file, from which a PDF gets generated, from the srcdir to the builddir. This file may include other adoc files, which do not get symlinked. We need to do this, because a2x (the program generating the PDF file) does not have a parameter for the output file, and will otherwise generate the PDF in the srcdir instead of the builddir. Do the same in the check target, so the relative include paths work the same. Makefile.asciidoc.inc, Makefile.docbook.inc: set the include paths for the xstl parser, as well as the LaTeX compiler, so they can find the files they need from both OSMO_GSM_MANUALS_DIR and builddir. Makefile.asciidoc.inc, Makefile.docbook.inc: refer to the output file $@ with $(notdir $@). This removes the path from the file, like basename from coreutils. The output file will then be placed in the builddir instead of the srcdir. Makefile.vty-reference.inc: use $(srcdir) in references to vty/*.xml files. (moving manuals to project repositories 12/19) Related: OS#3385 Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d --- M build/Makefile.asciidoc.inc M build/Makefile.docbook.inc M build/Makefile.vty-reference.inc 3 files changed, 31 insertions(+), 8 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index cff47f6..2e3db86 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -56,12 +56,24 @@ $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \ $(OSMO_GSM_MANUALS_DIR)/common/images/* \ build common + + # a2x can't use a different output file. To support out-of-tree builds, + # we create a symlink at $(builddir)/srcfile.adoc pointing at + # $(srcdir)/srcfile.adoc. $< is the $(srcdir)/srcfile.adoc, + # $(notdir) is like basename from coreutils, and $(builddir) is $PWD. + if ! [ -f $(notdir $<) ]; then \ + ln -s $< $(notdir $<); \ + fi + + # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} + # in $(OSMO_GSM_MANUALS_DIR). @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ || true - a2x $(A2X_OPTS) $< || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ - asciidoc -v $(ASCIIDOC_OPTS) $<; exit 1) + TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ + a2x $(A2X_OPTS) $(notdir $<) || (echo "ERROR: a2x failed! Running asciidoc to get verbose errors..."; \ + asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<); exit 1) check: $(ASCIIDOC_CHECKS) @@ -70,9 +82,18 @@ $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc \ $(ASCIIDOC_DEPS) \ build common - asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 + + # out-of-tree building: use a symlink to the output file like done in + # the non-check build above, so the relative include paths work the + # same. + if ! [ -f $(notdir $<) ]; then \ + ln -s $< $(notdir $<); \ + fi + + asciidoc -v $(ASCIIDOC_OPTS) $(notdir $<) > $(notdir $@) 2>&1 + # Make absolutely sure that the %.check target is updated. - touch $@ + touch $(notdir $@) # Do print the WARNING output but return error if any was found # (grep -v would omit the WARNING output from the log). - @grep WARNING $@ && exit 1 || exit 0 + @grep WARNING $(notdir $@) && exit 1 || exit 0 diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 7b9969a..373db7d 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -32,6 +32,8 @@ xmllint --xinclude --postvalid --noout $< # Create a PDF file and lint it before +# xslt path: find includes in both $(OSMO_GSM_MANUALS_DIR)/common/chapters and $(builddir)/generated %.pdf: %.xml %.xml-lint $(DOCBOOKS_DEPS) build common - dblatex $(dblatex_quiet) -P draft.mode=no $< + dblatex --xslt-opts="--path $(realpath $(OSMO_GSM_MANUALS_DIR))/common/chapters:$$PWD/generated" \ + $(dblatex_quiet) -P draft.mode=no -o $(notdir $@) $< diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index cb00648..9d8f127 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -32,13 +32,13 @@ CLEAN_FILES += generated generated/docbook_vty.xml: \ - vty/*xml \ + $(srcdir)/vty/*xml \ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \ $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ $(srcdir)/vty/*reference.xml \ $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ - vty/*additions*.xml + $(srcdir)/vty/*additions*.xml xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml -- To view, visit https://gerrit.osmocom.org/11803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie6b212a6518f0fc29fae610a37ae6c533189278d Gerrit-Change-Number: 11803 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:56 +0000 Subject: Change in osmo-gsm-manuals[master]: *.adoc: use {srcdir} for out-of-tree builds In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11804 ) Change subject: *.adoc: use {srcdir} for out-of-tree builds ...................................................................... *.adoc: use {srcdir} for out-of-tree builds Define a new {srcdir} variable in Makefile.asciidoc.inc, that can be used in all adoc files. The value is the same as the Makefile variable $(srcdir). Use {srcdir} in the "include::" lines of all adoc files. (moving manuals to project repositories 13/19) Related: OS#3385 Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a --- M OsmoBSC/aoip-mgw-options.adoc M OsmoBSC/osmobsc-usermanual.adoc M OsmoBTS/osmobts-abis.adoc M OsmoBTS/osmobts-usermanual.adoc M OsmoBTS/rtp-amr.adoc M OsmoGGSN/osmoggsn-usermanual.adoc M OsmoGSMTester/osmo-gsm-tester-manual.adoc M OsmoHLR/osmohlr-usermanual.adoc M OsmoMGW/osmomgw-usermanual.adoc M OsmoMSC/osmomsc-usermanual.adoc M OsmoNITB/osmonitb-usermanual.adoc M OsmoPCU/osmopcu-gb.adoc M OsmoPCU/osmopcu-usermanual.adoc M OsmoSGSN/osmosgsn-usermanual.adoc M OsmoSIPConnector/osmosipconnector-usermanual.adoc M OsmoSTP/osmostp-usermanual.adoc M OsmoTRX/osmotrx-usermanual.adoc M OsmocomBB/osmocombb-usermanual.adoc M build/Makefile.asciidoc.inc 19 files changed, 82 insertions(+), 82 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/OsmoBSC/aoip-mgw-options.adoc b/OsmoBSC/aoip-mgw-options.adoc index 8ce3b91..f693093 100644 --- a/OsmoBSC/aoip-mgw-options.adoc +++ b/OsmoBSC/aoip-mgw-options.adoc @@ -29,7 +29,7 @@ [mscgen] ---- -include::mgw/classic-bsc.msc[] +include::{srcdir}/mgw/classic-bsc.msc[] ---- === OsmoBSC 2010-2017: IPA-style A over SCCPlite @@ -43,7 +43,7 @@ [mscgen] ---- -include::mgw/osmo-bsc-old-sccplite.msc[] +include::{srcdir}/mgw/osmo-bsc-old-sccplite.msc[] ---- @@ -61,7 +61,7 @@ [mscgen] ---- -include::mgw/osmo-bsc-new-mgw.msc[] +include::{srcdir}/mgw/osmo-bsc-new-mgw.msc[] ---- @@ -73,5 +73,5 @@ [mscgen] ---- -include::mgw/osmo-bsc-new-mgw-e1.msc[] +include::{srcdir}/mgw/osmo-bsc-new-mgw-e1.msc[] ---- diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index c3954bb..7f7f450 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -7,15 +7,15 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] -include::chapters/handover.adoc[] +include::{srcdir}/chapters/handover.adoc[] include::./common/chapters/vty.adoc[] diff --git a/OsmoBTS/osmobts-abis.adoc b/OsmoBTS/osmobts-abis.adoc index 20e56e0..857b4bf 100644 --- a/OsmoBTS/osmobts-abis.adoc +++ b/OsmoBTS/osmobts-abis.adoc @@ -64,7 +64,7 @@ .Overview of A-bis connection establishment ["mscgen"] ---- -include::abis/abis-startup.msc[] +include::{srcdir}/abis/abis-startup.msc[] ---- === Identities @@ -77,13 +77,13 @@ * The BTS number at the site * The TRX number within the BTS -include::abis/ipa.adoc[] +include::{srcdir}/abis/ipa.adoc[] -include::abis/oml.adoc[] +include::{srcdir}/abis/oml.adoc[] -include::abis/rsl.adoc[] +include::{srcdir}/abis/rsl.adoc[] -include::abis/rtp.adoc[] +include::{srcdir}/abis/rtp.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoBTS/osmobts-usermanual.adoc b/OsmoBTS/osmobts-usermanual.adoc index ee3e37f..40db72b 100644 --- a/OsmoBTS/osmobts-usermanual.adoc +++ b/OsmoBTS/osmobts-usermanual.adoc @@ -6,25 +6,25 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] include::./common/chapters/abis.adoc[] -include::chapters/interfaces.adoc[] +include::{srcdir}/chapters/interfaces.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::chapters/dynamic-timeslots.adoc[] +include::{srcdir}/chapters/dynamic-timeslots.adoc[] -include::chapters/bts-models.adoc[] +include::{srcdir}/chapters/bts-models.adoc[] -include::chapters/architecture.adoc[] +include::{srcdir}/chapters/architecture.adoc[] include::./common/chapters/trx_if.adoc[] diff --git a/OsmoBTS/rtp-amr.adoc b/OsmoBTS/rtp-amr.adoc index 4da2e1b..5a36aea 100644 --- a/OsmoBTS/rtp-amr.adoc +++ b/OsmoBTS/rtp-amr.adoc @@ -1335,7 +1335,7 @@ [[dtx_dl_fsm]] [graphviz] ---- -include::dtx.dot[] +include::{srcdir}/dtx.dot[] ---- The idea is that each state corresponds to the particular message type which have to be send to L1 next while state transition happens on incoming events like FACCH or Voice frames. There are 3 different classes of of events driving this FSM: diff --git a/OsmoGGSN/osmoggsn-usermanual.adoc b/OsmoGGSN/osmoggsn-usermanual.adoc index 3394121..9bc3885 100644 --- a/OsmoGGSN/osmoggsn-usermanual.adoc +++ b/OsmoGGSN/osmoggsn-usermanual.adoc @@ -5,18 +5,18 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -//include::chapters/control.adoc[] +//include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] include::./common/chapters/control_if.adoc[] diff --git a/OsmoGSMTester/osmo-gsm-tester-manual.adoc b/OsmoGSMTester/osmo-gsm-tester-manual.adoc index b728384..6f0edf7 100644 --- a/OsmoGSMTester/osmo-gsm-tester-manual.adoc +++ b/OsmoGSMTester/osmo-gsm-tester-manual.adoc @@ -7,14 +7,14 @@ *NOTE: The osmo-gsm-tester is still in pre-alpha stage: some parts are still incomplete, and details will still change and move around.* -include::chapters/intro.adoc[] +include::{srcdir}/chapters/intro.adoc[] -include::chapters/install.adoc[] +include::{srcdir}/chapters/install.adoc[] -include::chapters/config.adoc[] +include::{srcdir}/chapters/config.adoc[] -include::chapters/trial.adoc[] +include::{srcdir}/chapters/trial.adoc[] -include::chapters/test_api.adoc[] +include::{srcdir}/chapters/test_api.adoc[] -include::chapters/debugging.adoc[] +include::{srcdir}/chapters/debugging.adoc[] diff --git a/OsmoHLR/osmohlr-usermanual.adoc b/OsmoHLR/osmohlr-usermanual.adoc index bc2a614..7e709bd 100644 --- a/OsmoHLR/osmohlr-usermanual.adoc +++ b/OsmoHLR/osmohlr-usermanual.adoc @@ -8,19 +8,19 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/subscribers.adoc[] +include::{srcdir}/chapters/subscribers.adoc[] -include::chapters/ussd.adoc[] +include::{srcdir}/chapters/ussd.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/control_if.adoc[] diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc index 55e9090..b0bc83d 100644 --- a/OsmoMGW/osmomgw-usermanual.adoc +++ b/OsmoMGW/osmomgw-usermanual.adoc @@ -8,19 +8,19 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::chapters/mgcp_extensions.adoc[] +include::{srcdir}/chapters/mgcp_extensions.adoc[] -//include::chapters/counters.adoc[] +//include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoMSC/osmomsc-usermanual.adoc b/OsmoMSC/osmomsc-usermanual.adoc index 1b48435..4fd0cc7 100644 --- a/OsmoMSC/osmomsc-usermanual.adoc +++ b/OsmoMSC/osmomsc-usermanual.adoc @@ -8,19 +8,19 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/net.adoc[] +include::{srcdir}/chapters/net.adoc[] include::./common/chapters/smpp.adoc[] diff --git a/OsmoNITB/osmonitb-usermanual.adoc b/OsmoNITB/osmonitb-usermanual.adoc index d836f7b..42afe89 100644 --- a/OsmoNITB/osmonitb-usermanual.adoc +++ b/OsmoNITB/osmonitb-usermanual.adoc @@ -8,25 +8,25 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/net.adoc[] +include::{srcdir}/chapters/net.adoc[] include::./common/chapters/bsc.adoc[] include::./common/chapters/bts.adoc[] -include::chapters/bts-examples.adoc[] +include::{srcdir}/chapters/bts-examples.adoc[] -include::chapters/hlr.adoc[] +include::{srcdir}/chapters/hlr.adoc[] include::./common/chapters/smpp.adoc[] diff --git a/OsmoPCU/osmopcu-gb.adoc b/OsmoPCU/osmopcu-gb.adoc index af5ea27..00576c9 100644 --- a/OsmoPCU/osmopcu-gb.adoc +++ b/OsmoPCU/osmopcu-gb.adoc @@ -60,7 +60,7 @@ .Overview of Gb link establishment ["mscgen"] ---- -include::gb/gb-startup.msc[] +include::{srcdir}/gb/gb-startup.msc[] ---- [[ident]] @@ -84,9 +84,9 @@ This means that typically each OsmoPCU has one unique set of NSEI, NSVCI and BVCI in your network. -include::gb/ns.adoc[] +include::{srcdir}/gb/ns.adoc[] -include::gb/bssgp.adoc[] +include::{srcdir}/gb/bssgp.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoPCU/osmopcu-usermanual.adoc b/OsmoPCU/osmopcu-usermanual.adoc index 810772e..bf25cfd 100644 --- a/OsmoPCU/osmopcu-usermanual.adoc +++ b/OsmoPCU/osmopcu-usermanual.adoc @@ -7,17 +7,17 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/gb.adoc[] diff --git a/OsmoSGSN/osmosgsn-usermanual.adoc b/OsmoSGSN/osmosgsn-usermanual.adoc index c85fc6e..dea91a9 100644 --- a/OsmoSGSN/osmosgsn-usermanual.adoc +++ b/OsmoSGSN/osmosgsn-usermanual.adoc @@ -7,17 +7,17 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] include::./common/chapters/gb.adoc[] @@ -27,7 +27,7 @@ include::./common/chapters/gsup.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoSIPConnector/osmosipconnector-usermanual.adoc b/OsmoSIPConnector/osmosipconnector-usermanual.adoc index 67a0e52..72d7127 100644 --- a/OsmoSIPConnector/osmosipconnector-usermanual.adoc +++ b/OsmoSIPConnector/osmosipconnector-usermanual.adoc @@ -8,15 +8,15 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] include::./common/chapters/port_numbers.adoc[] diff --git a/OsmoSTP/osmostp-usermanual.adoc b/OsmoSTP/osmostp-usermanual.adoc index 5c919b9..9f41e5d 100644 --- a/OsmoSTP/osmostp-usermanual.adoc +++ b/OsmoSTP/osmostp-usermanual.adoc @@ -5,14 +5,14 @@ include::./common/chapters/preface.adoc[] -// include::chapters/overview.adoc[] +// include::{srcdir}/chapters/overview.adoc[] include::./common/chapters/sigtran.adoc[] include::./common/chapters/sigtran-osmocom.adoc[] -//include::chapters/running.adoc[] -// include::chapters/control.adoc[] +//include::{srcdir}/chapters/running.adoc[] +// include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc index fdd9c8a..a17a899 100644 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ b/OsmoTRX/osmotrx-usermanual.adoc @@ -7,29 +7,29 @@ include::./common/chapters/preface.adoc[] -include::chapters/overview.adoc[] +include::{srcdir}/chapters/overview.adoc[] -include::chapters/running.adoc[] +include::{srcdir}/chapters/running.adoc[] include::./common/chapters/control_if.adoc[] -include::chapters/control.adoc[] +include::{srcdir}/chapters/control.adoc[] include::./common/chapters/vty.adoc[] include::./common/chapters/logging.adoc[] -include::chapters/counters.adoc[] +include::{srcdir}/chapters/counters.adoc[] -include::chapters/configuration.adoc[] +include::{srcdir}/chapters/configuration.adoc[] -include::chapters/trx-architectures.adoc[] +include::{srcdir}/chapters/trx-architectures.adoc[] -include::chapters/trx-devices.adoc[] +include::{srcdir}/chapters/trx-devices.adoc[] -include::chapters/trx-backends.adoc[] +include::{srcdir}/chapters/trx-backends.adoc[] -include::chapters/code-architecture.adoc[] +include::{srcdir}/chapters/code-architecture.adoc[] include::./common/chapters/trx_if.adoc[] diff --git a/OsmocomBB/osmocombb-usermanual.adoc b/OsmocomBB/osmocombb-usermanual.adoc index c055577..024fc79 100644 --- a/OsmocomBB/osmocombb-usermanual.adoc +++ b/OsmocomBB/osmocombb-usermanual.adoc @@ -5,7 +5,7 @@ include::./common/chapters/preface.adoc[] -include::chapters/scripting.adoc[] +include::{srcdir}/chapters/scripting.adoc[] include::./common/chapters/vty.adoc[] diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index 2e3db86..fb44a63 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -36,7 +36,7 @@ CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) UPLOAD_FILES += $(ASCIIDOC_PDF) -ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf +ASCIIDOC_OPTS := -f $(BUILDDIR)/mscgen-filter.conf -f $(BUILDDIR)/diag-filter.conf -f $(BUILDDIR)/docinfo-releaseinfo.conf -f $(BUILDDIR)/python2-filter.conf -a srcdir='$(srcdir)' DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0 ifeq (,$(BUILD_RELEASE)) -- To view, visit https://gerrit.osmocom.org/11804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I823e3d534cbc9ffceb68d3ab14c9f6710ff2eb2a Gerrit-Change-Number: 11804 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:56 +0000 Subject: Change in osmo-gsm-manuals[master]: copy NITB's osmobsc-usermanual.adoc to OsmoBSC In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11805 ) Change subject: copy NITB's osmobsc-usermanual.adoc to OsmoBSC ...................................................................... copy NITB's osmobsc-usermanual.adoc to OsmoBSC Includes from other projects don't work anymore when moving project specific manuals into other repositories. (moving manuals to project repositories 14/19) Related: OS#3385 Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad --- A OsmoBSC/chapters/bts-examples.adoc M OsmoBSC/osmobsc-usermanual.adoc 2 files changed, 282 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/OsmoBSC/chapters/bts-examples.adoc b/OsmoBSC/chapters/bts-examples.adoc new file mode 100644 index 0000000..b15fb99 --- /dev/null +++ b/OsmoBSC/chapters/bts-examples.adoc @@ -0,0 +1,281 @@ +[[bts-examples]] +== OsmoNITB example configuration files + +The `openbsc/doc/examples/osmo-nitb` directory in the OpenBSC source +tree contains a collection of example configuration files, sorted by BTS +type. + +This chapter is illustrating some excerpts from those examples + +[[bts_example_bs11]] +=== Example configuration for OsmoNITB with one dual-TRX BS-11 + +.OsmoNITB with BS11, 2 TRX, no frequency hopping +==== + +---- +e1_input + e1_line 0 driver misdn +network + network country code 1 + mobile network code 1 + short name OpenBSC + long name OpenBSC + timer t3101 10 + timer t3113 60 + bts 0 + type bs11 <1> + band GSM900 + cell_identity 1 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + oml e1 line 0 timeslot 1 sub-slot full <2> + oml e1 tei 25 <3> + trx 0 + arfcn 121 + max_power_red 0 + rsl e1 line 0 timeslot 1 sub-slot full <4> + rsl e1 tei 1 <5> + timeslot 0 + phys_chan_config CCCH+SDCCH4 + e1 line 0 timeslot 1 sub-slot full + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 1 <6> + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 2 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 3 sub-slot 3 + trx 1 + arfcn 123 + max_power_red 0 + rsl e1 line 0 timeslot 1 sub-slot full <4> + rsl e1 tei 2 <5> + timeslot 0 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 0 <6> + timeslot 1 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 1 + timeslot 2 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 2 + timeslot 3 + phys_chan_config TCH/F + e1 line 0 timeslot 4 sub-slot 3 + timeslot 4 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 0 + timeslot 5 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 1 + timeslot 6 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 2 + timeslot 7 + phys_chan_config TCH/F + e1 line 0 timeslot 5 sub-slot 3 +---- +==== + +<1> The BTS type must be set to __bs11__ +<2> The OML E1 timeslot needs to be identical with what was on the BTS side using LMT. +<3> The OML TEI value needs to be identical with what was configured on the BTS side using LMT. +<4> The RSL E1 timeslot can be identical for all TRX. +<5> The RSL TEI values __must__ be different if multiple TRX share one E1 signalling timeslot. +<6> The TCH all need to be allocated one 16k sub-slot on the E1 + +[[bts_example_nbts]] +=== Example configuration for OsmoNITB with one single-TRX nanoBTS + +.OsmoNITB with one single-TRX nanoBTS +==== + +---- +e1_input + e1_line 0 driver ipa <1> +network + network country code 1 + mobile network code 1 + short name OpenBSC + long name OpenBSC + auth policy closed + location updating reject cause 13 + encryption a5 0 + neci 1 + rrlp mode none + mm info 1 + handover 0 + bts 0 + type nanobts <2> + band DCS1800 <3> + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + ip.access unit_id 1801 0 <4> + oml ip.access stream_id 255 line 0 + gprs mode none + trx 0 + rf_locked 0 + arfcn 871 <5> + nominal power 23 + max_power_red 20 <6> + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F +---- +==== + +<1> You have to configure one virtual E1 line with the + IPA driver in order to use Abis/IP. One e1_line is + sufficient for any number of A-bis/IP BTSs, there is no + limit like in physical E1 lines. +<2> The BTS type must be set using `type nanobts` +<3> The GSM band must be set according to the BTS hardware. +<4> The IPA Unit ID parameter must be set to what has been configured on + the BTS side using the __BTS Manager__ or `ipaccess-config`. +<5> The ARFCN of the BTS. +<6> All known nanoBTS units have a nominal transmit power of 23 dBm. If + a `max_power_red` of 20 (dB) is configured, the resulting output + power at the BTS Tx port is 23 - 20 = 3 dBm. + +[NOTE] +==== +The `nominal_power` setting does __not__ influence the transmitted power +to the BTS! It is a setting by which the system administrator tells the +BSC about the nominal output power of the BTS. The BSC uses this as +basis for calculations. +==== + + +[[bts_example_nbts_multi]] +=== Example configuration for OsmoNITB with multi-TRX nanoBTS + +.OsmoNITB configured for dual-TRX (stacked) nanoBTS +==== + +---- +e1_input + e1_line 0 driver ipa +network + network country code 1 + mobile network code 1 + short name OpenBSC + long name OpenBSC + auth policy closed + location updating reject cause 13 + encryption a5 0 + neci 1 + rrlp mode none + mm info 0 + handover 0 + bts 0 + type nanobts + band DCS1800 + cell_identity 0 + location_area_code 1 + training_sequence_code 7 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + ip.access unit_id 1800 0 <1> + oml ip.access stream_id 255 line 0 + gprs mode none + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 0 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + timeslot 1 + phys_chan_config SDCCH8 + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F + trx 1 + rf_locked 0 + arfcn 873 + nominal power 23 + max_power_red 0 + rsl e1 tei 0 + timeslot 0 + phys_chan_config SDCCH8 + timeslot 1 + phys_chan_config TCH/F + timeslot 2 + phys_chan_config TCH/F + timeslot 3 + phys_chan_config TCH/F + timeslot 4 + phys_chan_config TCH/F + timeslot 5 + phys_chan_config TCH/F + timeslot 6 + phys_chan_config TCH/F + timeslot 7 + phys_chan_config TCH/F +---- +==== + +<1> In this example, the IPA Unit ID is specified as `1800 0`. Thus, the + first nanoBTS unit (`trx 0`) needs to be configured to 1800/0/0 and + the second nanoBTS unit (`trx 1`) needs to be configured to 1800/0/1. + You can configure the BTS unit IDs using the `ipaccess-config` + utility included in OpenBSC. + +[NOTE] +==== +For building a multi-TRX setup, you also need to connect the TIB cables +between the two nanoBTS units, as well as the coaxial/RF AUX cabling. +==== diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index 7f7f450..eec77d7 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -23,7 +23,7 @@ include::./common/chapters/bts.adoc[] -include::../OsmoNITB/chapters/bts-examples.adoc[] +include::{srcdir}/chapters/bts-examples.adoc[] include::./common/chapters/bsc.adoc[] -- To view, visit https://gerrit.osmocom.org/11805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I96933dd4dd6cac159847647f1c642215051a9aad Gerrit-Change-Number: 11805 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:56 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:56 +0000 Subject: Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: chmod xsltproc output In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11843 ) Change subject: vty_reference_combine.sh: chmod xsltproc output ...................................................................... vty_reference_combine.sh: chmod xsltproc output Force the xsltproc output file to be writable, if it exists already. This is needed for 'make distcheck': xsltproc gives output files the same permissions as input files. We need to change the output file in multiple iterations in vty_reference_combine.sh, hence it must be writable. (moving manuals to project repositories 15/19) Related: OS#3385 Change-Id: I693e12ee15665d01cbc50187e6cb3ca74ad0356a --- M build/vty_reference_combine.sh 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh index cb18e9e..449b227 100755 --- a/build/vty_reference_combine.sh +++ b/build/vty_reference_combine.sh @@ -22,6 +22,14 @@ while [ -n "$1" ]; do addition="$(realpath "$1")" shift + + # Fix permissions: xsltproc sets the output permissions the same as the + # input file, which means during "make distcheck" our output file will + # become read-only. + if [ -f "$combine_src" ]; then + chmod 644 "$combine_src" + fi + mv "$combined" "$combine_src" xsltproc -o "$combined" \ --stringparam with "$addition" \ -- To view, visit https://gerrit.osmocom.org/11843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I693e12ee15665d01cbc50187e6cb3ca74ad0356a Gerrit-Change-Number: 11843 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:57 +0000 Subject: Change in osmo-gsm-manuals[master]: gitignore: add "make distcheck" generated files In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11844 ) Change subject: gitignore: add "make distcheck" generated files ...................................................................... gitignore: add "make distcheck" generated files (moving manuals to project repositories 16/19) Related: OS#3385 Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 --- M .gitignore 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index b174bb9..d823675 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,10 @@ Makefile.in Makefile +# make distcheck +osmo-gsm-manuals-*/ +osmo-gsm-manuals-*.tar.* + # symlinks to shared dirs (needed for out-of-tree builds) */common */build -- To view, visit https://gerrit.osmocom.org/11844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I876b0fa08d2987d285b6d77ef13069228c8b8d37 Gerrit-Change-Number: 11844 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:57 +0000 Subject: Change in osmo-gsm-manuals[master]: */Makefile.am: add EXTRA_DIST In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11845 ) Change subject: */Makefile.am: add EXTRA_DIST ...................................................................... */Makefile.am: add EXTRA_DIST Necessary for 'make distcheck': the files will otherwise not end up in the dist archives. (moving manuals to project repositories 17/19) Related: OS#3385 Change-Id: I5a2d6e572d346addc8770d1331c9223a56635869 --- M OsmoBSC/Makefile.am M OsmoBTS/Makefile.am M OsmoGGSN/Makefile.am M OsmoGSMTester/Makefile.am M OsmoHLR/Makefile.am M OsmoMGCP/Makefile.am M OsmoMGW/Makefile.am M OsmoMSC/Makefile.am M OsmoNAT/Makefile.am M OsmoNITB/Makefile.am M OsmoPCU/Makefile.am M OsmoSGSN/Makefile.am M OsmoSIPConnector/Makefile.am M OsmoSTP/Makefile.am M OsmoTRX/Makefile.am M OsmocomBB/Makefile.am M tests/Makefile.am 17 files changed, 93 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/OsmoBSC/Makefile.am b/OsmoBSC/Makefile.am index 3e71048..3c9cba5 100644 --- a/OsmoBSC/Makefile.am +++ b/OsmoBSC/Makefile.am @@ -1,4 +1,16 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = aoip-mgw-options.adoc \ + aoip-mgw-options-docinfo.xml \ + osmobsc-usermanual.adoc \ + osmobsc-usermanual-docinfo.xml \ + osmobsc-vty-reference.xml \ + osmux-reference.adoc \ + osmux-reference-docinfo.xml \ + chapters \ + message-sequences \ + mgw \ + om2000 \ + vty ASCIIDOC = osmobsc-usermanual.adoc osmux-reference.adoc aoip-mgw-options.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/OsmoBTS/Makefile.am b/OsmoBTS/Makefile.am index c97cb3a..92bf714 100644 --- a/OsmoBTS/Makefile.am +++ b/OsmoBTS/Makefile.am @@ -1,4 +1,15 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = dtx.dot \ + osmobts-abis.adoc \ + osmobts-abis-docinfo.xml \ + osmobts-usermanual.adoc \ + osmobts-usermanual-docinfo.xml \ + osmobts-vty-reference.xml \ + rtp-amr.adoc \ + rtp-amr-docinfo.xml \ + abis \ + chapters \ + vty ASCIIDOC = osmobts-usermanual.adoc osmobts-abis.adoc rtp-amr.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/OsmoGGSN/Makefile.am b/OsmoGGSN/Makefile.am index ec1e8db..4cbff6d 100644 --- a/OsmoGGSN/Makefile.am +++ b/OsmoGGSN/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmoggsn-usermanual.adoc \ + osmoggsn-usermanual-docinfo.xml \ + osmoggsn-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmoggsn-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoGSMTester/Makefile.am b/OsmoGSMTester/Makefile.am index 6bba962..4301ab9 100644 --- a/OsmoGSMTester/Makefile.am +++ b/OsmoGSMTester/Makefile.am @@ -1,4 +1,7 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmo-gsm-tester-manual.adoc \ + osmo-gsm-tester-manual-docinfo.xml \ + chapters ASCIIDOC = osmo-gsm-tester-manual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoHLR/Makefile.am b/OsmoHLR/Makefile.am index 45d534a..25d782d 100644 --- a/OsmoHLR/Makefile.am +++ b/OsmoHLR/Makefile.am @@ -1,4 +1,12 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = example_subscriber_add_update_delete.vty \ + example_subscriber_cs_ps_enabled.ctrl \ + example_subscriber_info.ctrl \ + osmohlr-usermanual.adoc \ + osmohlr-usermanual-docinfo.xml \ + osmohlr-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmohlr-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.vty $(srcdir)/*.ctrl diff --git a/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am index 8650693..2c14728 100644 --- a/OsmoMGCP/Makefile.am +++ b/OsmoMGCP/Makefile.am @@ -1,4 +1,6 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmomgcp-vty-reference.xml \ + vty VTY_REFERENCE = osmomgcp-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoMGW/Makefile.am b/OsmoMGW/Makefile.am index a00722b..4c0e469 100644 --- a/OsmoMGW/Makefile.am +++ b/OsmoMGW/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmomgw-usermanual.adoc \ + osmomgw-usermanual-docinfo.xml \ + osmomgw-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmomgw-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoMSC/Makefile.am b/OsmoMSC/Makefile.am index fe9a8c0..0fcd1ff 100644 --- a/OsmoMSC/Makefile.am +++ b/OsmoMSC/Makefile.am @@ -1,4 +1,10 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmomsc-usermanual.adoc \ + osmomsc-usermanual-docinfo.xml \ + osmomsc-vty-reference.xml \ + chapters \ + images \ + vty ASCIIDOC = osmomsc-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am index 64b18e2..a7b0430 100644 --- a/OsmoNAT/Makefile.am +++ b/OsmoNAT/Makefile.am @@ -1,4 +1,6 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmonat-vty-reference.xml \ + vty VTY_REFERENCE = osmonat-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc diff --git a/OsmoNITB/Makefile.am b/OsmoNITB/Makefile.am index 11ec5b1..3735c5b 100644 --- a/OsmoNITB/Makefile.am +++ b/OsmoNITB/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmonitb-usermanual.adoc \ + osmonitb-usermanual-docinfo.xml \ + osmonitb-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmonitb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoPCU/Makefile.am b/OsmoPCU/Makefile.am index 9830701..a741f9b 100644 --- a/OsmoPCU/Makefile.am +++ b/OsmoPCU/Makefile.am @@ -1,4 +1,12 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmopcu-gb.adoc \ + osmopcu-gb-docinfo.xml \ + osmopcu-usermanual.adoc \ + osmopcu-usermanual-docinfo.xml \ + osmopcu-vty-reference.xml \ + chapters \ + gb \ + vty ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/OsmoSGSN/Makefile.am b/OsmoSGSN/Makefile.am index b2ab73b..775fa1d 100644 --- a/OsmoSGSN/Makefile.am +++ b/OsmoSGSN/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmosgsn-usermanual.adoc \ + osmosgsn-usermanual-docinfo.xml \ + osmosgsn-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmosgsn-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoSIPConnector/Makefile.am b/OsmoSIPConnector/Makefile.am index 36f3452..f2bb064 100644 --- a/OsmoSIPConnector/Makefile.am +++ b/OsmoSIPConnector/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmosipconnector-usermanual.adoc \ + osmosipconnector-usermanual-docinfo.xml \ + osmosipconnector-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmosipconnector-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmoSTP/Makefile.am b/OsmoSTP/Makefile.am index 2eefccd..eb4ec9d 100644 --- a/OsmoSTP/Makefile.am +++ b/OsmoSTP/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmostp-usermanual.adoc \ + osmostp-usermanual-docinfo.xml \ + osmostp-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmostp-usermanual.adoc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc diff --git a/OsmoTRX/Makefile.am b/OsmoTRX/Makefile.am index ed8287a..ce5f241 100644 --- a/OsmoTRX/Makefile.am +++ b/OsmoTRX/Makefile.am @@ -1,4 +1,9 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmotrx-usermanual.adoc \ + osmotrx-usermanual-docinfo.xml \ + osmotrx-vty-reference.xml \ + chapters \ + vty ASCIIDOC = osmotrx-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am index f5ed510..61ccafa 100644 --- a/OsmocomBB/Makefile.am +++ b/OsmocomBB/Makefile.am @@ -1,4 +1,7 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = osmocombb-usermanual.adoc \ + osmocombb-usermanual-docinfo.xml \ + chapters ASCIIDOC = osmocombb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/tests/Makefile.am b/tests/Makefile.am index 3d03edd..32f23b0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,7 @@ OSMO_GSM_MANUALS_DIR = $(top_srcdir) +EXTRA_DIST = test-usermanual-docinfo.xml \ + test-vty-reference.xml \ + vty # Generate adoc file that includes all chapters ASCIIDOC = test-usermanual.adoc -- To view, visit https://gerrit.osmocom.org/11845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5a2d6e572d346addc8770d1331c9223a56635869 Gerrit-Change-Number: 11845 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:57 +0000 Subject: Change in osmo-gsm-manuals[master]: jenkins.sh: run 'make distcheck' In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11846 ) Change subject: jenkins.sh: run 'make distcheck' ...................................................................... jenkins.sh: run 'make distcheck' Everything is in place for 'make distcheck' now. (moving manuals to project repositories 18/19) Related: OS#3385 Change-Id: Ie31fba3d1afd31c25489ce08169101d9ed9de536 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 1fd19d1..626160e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -10,6 +10,7 @@ ./configure $MAKE $PARALLEL_MAKE $MAKE $PARALLEL_MAKE check +$MAKE $PARALLEL_MAKE distcheck if [ "x$publish" = "x--publish" ]; then mkdir out/ -- To view, visit https://gerrit.osmocom.org/11846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie31fba3d1afd31c25489ce08169101d9ed9de536 Gerrit-Change-Number: 11846 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:12:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:12:57 +0000 Subject: Change in osmo-gsm-manuals[master]: publish from project repos, not this repo anymore In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11740 ) Change subject: publish from project repos, not this repo anymore ...................................................................... publish from project repos, not this repo anymore Do not publish PDFs for all projects anymore with jenkins.sh --publish or "make publish". Extract known_hosts from jenkins.sh, and install it along with the other shared files in OSMO_GSM_MANUALS_DIR. Add a "publish" target to Makefile.common.inc, so we can use it from the project repositories. Document its usage in INSTALL.txt. No automatism for building and publishing the documentation of all projects will be implemented in this patch series, as discussed here: https://osmocom.org/issues/3385#note-7 (moving manuals to project repositories 19/19) Related: OS#3385 Change-Id: Ibe0424ceace151115985896b6d43035c69067c50 --- M INSTALL.txt M build/Makefile.common.inc A build/known_hosts M contrib/jenkins.sh 4 files changed, 32 insertions(+), 18 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/INSTALL.txt b/INSTALL.txt index 6efe8d1..c3caefe 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -14,13 +14,26 @@ (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.) -Build PDFs, run: +Prepare your build dir: autoreconf -fi ./configure - make -or for a parallel build using more CPU cores, replace make with: - make -j 5 +Optionally test building all shared content (use -j for parallel building): + make # generate test PDFs + make check # test for asciidoc errors + +Install osmo-gsm-manuals: + make install + +Build the manuals of a specific Osmocom project: + cd ../osmo-msc # enter the project dir, clone first if needed + ./configure --enable-manuals + make + ls doc/manuals/*.pdf # find the PDFs here + +Publish PDFs to the Osmocom server: + cd ../osmo-msc # enter the project dir + make -C doc/manuals publish To update the VTY reference for a given program, use 'osmo_interact_vty.py -X', available from git.osmocom.org/python/osmo-python-tests: diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index efd56f6..0ee648a 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -5,6 +5,7 @@ # # Include this file at the end to have the common targets (upload, clean etc.). +SSH_COMMAND = ssh -o 'UserKnownHostsFile=$(OSMO_GSM_MANUALS_DIR)/build/known_hosts' -p 48 UPLOAD_PATH ?= generic at sysmocom-downloads:documents SYMLINKS = common build CLEAN_FILES += $(SYMLINKS) @@ -19,3 +20,8 @@ -rm -rf $(CLEAN_FILES) distclean: clean + +publish: all check + mkdir -p out + cp *.pdf out + rsync -avz -e "$(SSH_COMMAND)" ./out/ docs at rita.osmocom.org:web-files/latest/ diff --git a/build/known_hosts b/build/known_hosts new file mode 100644 index 0000000..c78b03d --- /dev/null +++ b/build/known_hosts @@ -0,0 +1,3 @@ +[rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 +[rita.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= +[rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 626160e..7d4d8df 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -2,7 +2,12 @@ set -ex -publish="$1" +if [ -n "$1" ]; then + echo "ERROR: --publish has been deprecated!" + echo "Manuals have been moved to the projects, and need to be published from there." + echo "See INSTALL.txt for more information." + exit 1 +fi osmo-clean-workspace.sh @@ -12,17 +17,4 @@ $MAKE $PARALLEL_MAKE check $MAKE $PARALLEL_MAKE distcheck -if [ "x$publish" = "x--publish" ]; then - mkdir out/ - cp */*.pdf out/ - - cat > "$WORKSPACE/known_hosts" < Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 21 15:15:08 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 21 Nov 2018 15:15:08 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-gsm-manuals_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2341?= In-Reply-To: <2006565299.772.1542810480657.JavaMail.jenkins@jenkins.osmocom.org> References: <2006565299.772.1542810480657.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1096225485.774.1542813308776.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Oliver Smith] use autotools to add "make install" target [Oliver Smith] cosmetic: update usage of OSMO_GSM_MANUALS_DIR [Oliver Smith] *filter.conf/*.sty: use symlinks to build, common [Oliver Smith] *.adoc: include from ./common, not ../common [Oliver Smith] *-vty-reference.xml: use ./common, not ../common [Oliver Smith] vty_reference_combine.sh: add *reference.xml arg [Oliver Smith] Osmo*/Makefile.am: use $(srcdir), $(top_srcdir) [Oliver Smith] Makefile.*.inc: adjust to out-of-tree building [Oliver Smith] *.adoc: use {srcdir} for out-of-tree builds [Oliver Smith] copy NITB's osmobsc-usermanual.adoc to OsmoBSC [Oliver Smith] vty_reference_combine.sh: chmod xsltproc output [Oliver Smith] gitignore: add "make distcheck" generated files [Oliver Smith] */Makefile.am: add EXTRA_DIST [Oliver Smith] jenkins.sh: run 'make distcheck' [Oliver Smith] publish from project repos, not this repo anymore ------------------------------------------ Started by upstream project "master-osmo-gsm-manuals" build number 2341 originally caused by: Started by an SCM change Building remotely on build2-deb9build-ansible (ttcn3 osmo-gsm-tester-build osmocom-gerrit-debian9 osmocom-master-debian9 coverity) in workspace [ssh-agent] Looking for ssh-agent implementation... [ssh-agent] Exec ssh-agent (binary ssh-agent on a remote machine) $ ssh-agent SSH_AUTH_SOCK=/tmp/ssh-Ac2GFxsiiy7t/agent.24571 SSH_AGENT_PID=24573 [ssh-agent] Started. Running ssh-add (command line suppressed) Identity added: ( [ssh-agent] Using credentials api > git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url git://git.osmocom.org/osmo-gsm-manuals # timeout=10 Fetching upstream changes from git://git.osmocom.org/osmo-gsm-manuals > git --version # timeout=10 > git fetch --tags --progress git://git.osmocom.org/osmo-gsm-manuals +refs/heads/*:refs/remotes/origin/* Checking out Revision e7446e88104796a76bc74929b21e320ddb3d4a62 (refs/remotes/origin/master) > git config core.sparsecheckout # timeout=10 > git checkout -f e7446e88104796a76bc74929b21e320ddb3d4a62 Commit message: "publish from project repos, not this repo anymore" > git rev-list --no-walk fc9426e02ee6a448f22a42b95866a2c91b77fd4e # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins5162874840576146650.sh + ./contrib/jenkins.sh --publish + [ -n --publish ] + echo ERROR: --publish has been deprecated! ERROR: --publish has been deprecated! + echo Manuals have been moved to the projects, and need to be published from there. Manuals have been moved to the projects, and need to be published from there. + echo See INSTALL.txt for more information. See INSTALL.txt for more information. + exit 1 Build step 'Execute shell' marked build as failure $ ssh-agent -k unset SSH_AUTH_SOCK; unset SSH_AGENT_PID; echo Agent pid 24573 killed; [ssh-agent] Stopped. [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:25:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 21 Nov 2018 15:25:30 +0000 Subject: Change in osmo-ggsn[master]: fix a format string directives in queue_seqset() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11862 ) Change subject: fix a format string directives in queue_seqset() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11862/1/gtp/queue.c File gtp/queue.c: https://gerrit.osmocom.org/#/c/11862/1/gtp/queue.c at 82 PS1, Line 82: %zd, *PEER %zd Why not '%zu'? -- To view, visit https://gerrit.osmocom.org/11862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I889019aad963932fdc032421e60a72c809a93bca Gerrit-Change-Number: 11862 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 21 Nov 2018 15:25:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:26:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:26:55 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: don't publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11863 Change subject: jobs/master-builds.yml: don't publish manuals ...................................................................... jobs/master-builds.yml: don't publish manuals Do not publish PDFs for all projects anymore, as we are moving the manuals to each project's git repository. They will be published from there instead (see INSTALL.txt in osmo-gsm-manuals.git). No automatism for building and publishing the documentation of all projects will be implemented right now, as discussed here: https://osmocom.org/issues/3385#note-7 Related: OS#3385 Change-Id: I705e20a4f94b308c250580aa1289ee9b2967beef --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/63/11863/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 1c36d6f..585a3d7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -212,15 +212,9 @@ - osmo-gsm-manuals: node: 'osmocom-master-debian9' - # publishing once is plenty cmd: > # keep first line with less indent to preserve newlines - ./contrib/jenkins.sh --publish - # requires to have a ssh-key credentials called "api" (Id) - wrappers: - - ssh-agent-credentials: - users: - - api + ./contrib/jenkins.sh - osmo-hlr -- To view, visit https://gerrit.osmocom.org/11863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I705e20a4f94b308c250580aa1289ee9b2967beef Gerrit-Change-Number: 11863 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:28:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:28:04 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: don't publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11863 ) Change subject: jobs/master-builds.yml: don't publish manuals ...................................................................... Patch Set 1: I've updated the jenkins job already, and it's running right now: https://jenkins.osmocom.org/jenkins/job/master-osmo-gsm-manuals/a1=default,a2=default,a3=default,label=osmocom-master-debian9/2342/ -- To view, visit https://gerrit.osmocom.org/11863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I705e20a4f94b308c250580aa1289ee9b2967beef Gerrit-Change-Number: 11863 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 15:28:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 21 15:30:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 21 Nov 2018 15:30:30 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_norma?= =?UTF-8?Q?l_:_master-osmo-gsm-manuals_=C2=BB_?= =?UTF-8?Q?a1=3Ddefault,a2=3Ddefault,a3=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#2342?= In-Reply-To: <1096225485.774.1542813308776.JavaMail.jenkins@jenkins.osmocom.org> References: <1096225485.774.1542813308776.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <425095952.775.1542814230283.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:41:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 15:41:45 +0000 Subject: Change in osmo-ggsn[master]: replace bogus memcpy() call in ippool_newip() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11861 ) Change subject: replace bogus memcpy() call in ippool_newip() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11861/1/lib/ippool.c File lib/ippool.c: https://gerrit.osmocom.org/#/c/11861/1/lib/ippool.c at 522 PS1, Line 522: OSMO_ASSERT(false); Don't do that. Better return like done in check in line 464. It could be that you requested an IPv6 addr for an IPv4 pool. In practice it doesn't matter much because we don't support static configs yet in osmo-ggsn afair, but anyway, let's avoid adding ASSERTs were we can simply return an error (IMHO is best practice a library should never call abort()). -- To view, visit https://gerrit.osmocom.org/11861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Gerrit-Change-Number: 11861 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 15:41:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:44:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 15:44:08 +0000 Subject: Change in osmo-ggsn[master]: check ioctl() call return value in tun_new() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11856 ) Change subject: check ioctl() call return value in tun_new() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88da2164d975d7a232619b8d31c5eadeef0f3a80 Gerrit-Change-Number: 11856 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 21 Nov 2018 15:44:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:48:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 15:48:23 +0000 Subject: Change in osmo-ggsn[master]: fix a format string directives in queue_seqset() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11862 ) Change subject: fix a format string directives in queue_seqset() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11862/1/gtp/queue.c File gtp/queue.c: https://gerrit.osmocom.org/#/c/11862/1/gtp/queue.c at 82 PS1, Line 82: %zd, *PEER %zd > Why not '%zu'? isn't %z enough? (id need to check). Otherwise, if %xu is valid, then %zu looks better than %zd. -- To view, visit https://gerrit.osmocom.org/11862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I889019aad963932fdc032421e60a72c809a93bca Gerrit-Change-Number: 11862 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 21 Nov 2018 15:48:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:50:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 15:50:44 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: don't publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11863 ) Change subject: jobs/master-builds.yml: don't publish manuals ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I705e20a4f94b308c250580aa1289ee9b2967beef Gerrit-Change-Number: 11863 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 15:50:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:55:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 15:55:09 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: don't publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11863 ) Change subject: jobs/master-builds.yml: don't publish manuals ...................................................................... Patch Set 1: Verified+1 Job completed successfully. -- To view, visit https://gerrit.osmocom.org/11863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I705e20a4f94b308c250580aa1289ee9b2967beef Gerrit-Change-Number: 11863 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 15:55:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:56:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 15:56:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_paging_resp_unsol In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11604 to look at the new patch set (#3). Change subject: bsc: Introduce test TC_paging_resp_unsol ...................................................................... bsc: Introduce test TC_paging_resp_unsol With this test we want to verify that channels are released if BSC fails to complete an L3 request, for instance because no pending Paging CMD is found for a received Paging Response. Related: OS#3680 Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/11604/3 -- To view, visit https://gerrit.osmocom.org/11604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce Gerrit-Change-Number: 11604 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 15:57:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 15:57:09 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: don't publish manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11863 ) Change subject: jobs/master-builds.yml: don't publish manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I705e20a4f94b308c250580aa1289ee9b2967beef Gerrit-Change-Number: 11863 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 21 Nov 2018 15:57:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 16:13:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 21 Nov 2018 16:13:27 +0000 Subject: Change in osmo-ci[master]: jobs/master-builds.yml: don't publish manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11863 ) Change subject: jobs/master-builds.yml: don't publish manuals ...................................................................... jobs/master-builds.yml: don't publish manuals Do not publish PDFs for all projects anymore, as we are moving the manuals to each project's git repository. They will be published from there instead (see INSTALL.txt in osmo-gsm-manuals.git). No automatism for building and publishing the documentation of all projects will be implemented right now, as discussed here: https://osmocom.org/issues/3385#note-7 Related: OS#3385 Change-Id: I705e20a4f94b308c250580aa1289ee9b2967beef --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 7 deletions(-) Approvals: osmith: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 1c36d6f..585a3d7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -212,15 +212,9 @@ - osmo-gsm-manuals: node: 'osmocom-master-debian9' - # publishing once is plenty cmd: > # keep first line with less indent to preserve newlines - ./contrib/jenkins.sh --publish - # requires to have a ssh-key credentials called "api" (Id) - wrappers: - - ssh-agent-credentials: - users: - - api + ./contrib/jenkins.sh - osmo-hlr -- To view, visit https://gerrit.osmocom.org/11863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I705e20a4f94b308c250580aa1289ee9b2967beef Gerrit-Change-Number: 11863 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 16:29:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 16:29:40 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Introduce -q quiet param In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11687 to look at the new patch set (#8). Change subject: ipaccess-config: Introduce -q quiet param ...................................................................... ipaccess-config: Introduce -q quiet param This way only formated output is pinted to stdout when using -G and can be used by other tools (osmo-gsm-tester) to get a json dictionary with interesting information. Related: OS#3624 Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e --- M src/ipaccess/ipaccess-config.c 1 file changed, 43 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11687/8 -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 8 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 17:00:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 17:00:57 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11606 to look at the new patch set (#3). Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... gsm0408_rcvmsg: Release lchan if L3 fails to complete gscon_release_lchans stub is added to gsm0408_test.c to make linker happy. Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 --- M src/osmo-bsc/gsm_04_08_rr.c M tests/gsm0408/gsm0408_test.c 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/11606/3 -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 17:13:38 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 17:13:38 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR routines In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS: add GCR routines ...................................................................... Patch Set 7: Code-Review-1 (9 comments) https://gerrit.osmocom.org/#/c/11827/7/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/11827/7/include/osmocom/gsm/gsm0808_utils.h at 71 PS7, Line 71: uint8_t net[5]; /* Network ID, ITU-T Q.1902.3 */ doxygen wise, these comments should be of the form /*< doc */ because otherwise they end up being associated to the following item instead of the previous one. actually ... I guess they get dropped by doxygen... I also see the rest of this file not doing that, so I guess this is optional. Maybe we should just drop doxygen altogether... https://gerrit.osmocom.org/#/c/11827/7/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11827/7/src/gsm/gsm0808.c at 408 PS7, Line 408: /*! Create BSSMAP Global Call Reference IIUC the GCR is some IE or IE content, so this should be a gsm0808_enc_gcr() function with similar semantics like the other gsm0808_enc_* functions. i.e. pass a target msgb to this function and make it append the GCR to that, instead of returning an entire msgb just containing the GCR. https://gerrit.osmocom.org/#/c/11827/7/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/11827/7/src/gsm/gsm0808_utils.c at 675 PS7, Line 675: int gsm0808_dec_gcr(struct gsm0808_gcr *gcr, const struct msgb *msg) I'm expecting that the GCR is some IE or IE content, so instead it would make more sense to pass {pointer,max_length} to this function and parse that instead of an entire msgb. The current code implies that we decode the same TLV structure all over for every single IE. See the other *_dec_* functions in this file. Why is the decoding function in a different .c file than the encoding function? Let's put all of them at the bottom of all the existing gsm0808_{enc,dec} function definitions. https://gerrit.osmocom.org/#/c/11827/7/src/gsm/gsm0808_utils.c at 700 PS7, Line 700: if (buf[point] != 5) /* see Table B 2.1.9.2 */ (prefer comment above the 'if') https://gerrit.osmocom.org/#/c/11827/7/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/11827/7/tests/gsm0808/gsm0808_test.c at 137 PS7, Line 137: struct gsm0808_gcr g = { .net_len = 3, .node = 0xDEAD }, p = { 0 }; (BTW, just writing '{}' is identical to '{ 0 }' and it also works with all other structs and arrays even if the first member is not an int) (normally we prefer one var def per line) https://gerrit.osmocom.org/#/c/11827/7/tests/gsm0808/gsm0808_test.c at 141 PS7, Line 141: memset(g.net, 'U', g.net_len); ... F. U? are you telling me something?? :) https://gerrit.osmocom.org/#/c/11827/7/tests/gsm0808/gsm0808_test.c at 145 PS7, Line 145: msg->l3h = msgb_wrap_with_TL(msg, GSM0808_IE_GLOBAL_CALL_REF); seeing this, I believe the IE discriminator should also be part of gsm0808_enc_gcr(). https://gerrit.osmocom.org/#/c/11827/7/tests/gsm0808/gsm0808_test.c at 149 PS7, Line 149: if (rc < 0) (technically this should exit now, but nevermind) https://gerrit.osmocom.org/#/c/11827/7/tests/gsm0808/gsm0808_test.c at 1811 PS7, Line 1811: test_create_gcr(); so the function definition is above test_create_reset(), but it gets called after it? why not just put the new test at the bottom, both def and invocation? -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 17:13:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 17:17:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 17:17:01 +0000 Subject: Change in libosmocore[master]: LCLS: add GCR routines In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS: add GCR routines ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/#/c/11827/7/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/11827/7/tests/gsm0808/gsm0808_test.c at 137 PS7, Line 137: struct gsm0808_gcr g = { .net_len = 3, .node = 0xDEAD }, p = { 0 }; > (BTW, just writing '{}' is identical to '{ 0 }' and it also works with all other structs and arrays [?] Be careful, iirc I had to fix some struct iniitalizer from {} to {0} in osmocom code once because some gcc versions fail to build that. -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 7 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 17:17:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 17:45:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 21 Nov 2018 17:45:34 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Patch Set 2: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/bsc_subscr_conn_fsm.c at 859 PS2, Line 859: /* initialize to some magic values that indicate "IE not [yet] received" */ (could drop the comment up to "indicate") https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c at 164 PS2, Line 164: old_cfg_csc.config = conn->lcls.config; please use a construct like this: old_cfg_csc = (struct old_cfg_csc){ .config = conn->lcls.config, ... }; because that ensures that all struct members are initialized, and that there are no leftovers from a previous call. (because any member that isn't mentioned gets zero-initialized implicitly) https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c at 167 PS2, Line 167: if (new_cfg_csc->config != 0xff) { a magic nr left over https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c at 175 PS2, Line 175: if (new_cfg_csc->control != 0xff) { another magic nr https://gerrit.osmocom.org/#/c/11820/2/src/osmo-bsc/osmo_bsc_lcls.c at 192 PS2, Line 192: old_cfg_csc = update_lcls_cfg_csc(conn, new_cfg_csc); unrelated to this particular patch, but how can this make sense if the returned cfg is never used anywhere?? Also I think the naming is weird, since the returned cfg should be the updated one, not the old one? If I'm right about this, could you plz create a new issue and possibly a patch... -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 17:45:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 19:07:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 19:07:29 +0000 Subject: Change in osmo-bts[master]: bts: Fix TRX0 param initialization Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11864 Change subject: bts: Fix TRX0 param initialization ...................................................................... bts: Fix TRX0 param initialization TRX0 is allocated in a different place than other TRX. Commit that introduced the bug added an initialization step (bts_trx_init) applied in VTY cmd "trx <0-254>", where TRX are allocated since same commit, but doesn't initialize TRX0 for reasons explained in first paragraph. As a result, some parameters were not applied to TRX0, like power ramping increment step, which prevented MS from finding the network in osmo-gsm-tester tests. Fixes: eebb6a4216f136132400831ca35ed70e7502e92a ("bts: Allocate TRX for BTS dynamically, deprecate -t") Change-Id: I5afd66548634ff53e2af24dc7055d408ca8ca4e3 --- M src/common/bts.c M src/common/gsm_data_shared.c M src/common/vty.c 3 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/11864/1 diff --git a/src/common/bts.c b/src/common/bts.c index 2b17ec6..abbaeb4 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -177,6 +177,8 @@ return rc; } + /* TRX0 was allocated early during gsm_bts_alloc, not later through VTY */ + bts_trx_init(bts->c0); bts_gsmnet.num_bts++; if (!initialized) { diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 21e5781..beb3107 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -333,7 +333,7 @@ memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, sizeof(bts->gprs.cell.rlc_cfg)); - /* create our primary TRX */ + /* create our primary TRX. It will be initialized during bts_init() */ bts->c0 = gsm_bts_trx_alloc(bts); if (!bts->c0) { talloc_free(bts); diff --git a/src/common/vty.c b/src/common/vty.c index f305413..7c2900f 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -233,7 +233,10 @@ bts->num_trx, VTY_NEWLINE); return CMD_WARNING; } else if (trx_nr == bts->num_trx) { - /* allocate a new one */ + /* Allocate a new TRX + * Remark: TRX0 was already created during gsm_bts_alloc() and + * initialized in bts_init(), not here. + */ trx = gsm_bts_trx_alloc(bts); if (trx) bts_trx_init(trx); -- To view, visit https://gerrit.osmocom.org/11864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5afd66548634ff53e2af24dc7055d408ca8ca4e3 Gerrit-Change-Number: 11864 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 19:23:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 21 Nov 2018 19:23:13 +0000 Subject: Change in osmo-gsm-tester[master]: templates: bsc/nitb: Remove explicit no force-combined-si In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11847 to look at the new patch set (#2). Change subject: templates: bsc/nitb: Remove explicit no force-combined-si ...................................................................... templates: bsc/nitb: Remove explicit no force-combined-si It's always been the default anyway, so no need to explicitly state it. Furthermore, recently (osmobsc 167cb828665b91ed7d28007abd4a1862ebbb78c9) force-combined-si was enabled by default for nanoBTS due to issues with some MS not registering when it's not enabled, so let's osmo-bsc decide were should it be enabled. Related: OS#3063 Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 --- M selftest/template_test.ok M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl 3 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/47/11847/2 -- To view, visit https://gerrit.osmocom.org/11847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 Gerrit-Change-Number: 11847 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 20:27:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 21 Nov 2018 20:27:51 +0000 Subject: Change in libosmocore[master]: Don't traverse empty lists in llist_count() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11865 Change subject: Don't traverse empty lists in llist_count() ...................................................................... Don't traverse empty lists in llist_count() While trying to debug odd crash in queue_limit_to(), I've checked llist_count() as a possible culprit. Not sure if it would fix the crash (unable to reproduce locally yet) but it seems like a meaningful optimization anyway. Change-Id: I1e2ede2dd1afbd9e7ed7e393f9ba244179c03b8c --- M include/osmocom/core/linuxlist.h 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/65/11865/1 diff --git a/include/osmocom/core/linuxlist.h b/include/osmocom/core/linuxlist.h index 8d0533f..27bd85a 100644 --- a/include/osmocom/core/linuxlist.h +++ b/include/osmocom/core/linuxlist.h @@ -391,6 +391,10 @@ { struct llist_head *entry; unsigned int i = 0; + + if (llist_empty(head)) + return 0; + llist_for_each(entry, head) i++; return i; -- To view, visit https://gerrit.osmocom.org/11865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1e2ede2dd1afbd9e7ed7e393f9ba244179c03b8c Gerrit-Change-Number: 11865 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 20:34:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 21 Nov 2018 20:34:41 +0000 Subject: Change in osmo-bts[master]: Drop unused function Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11866 Change subject: Drop unused function ...................................................................... Drop unused function Change-Id: Ib1ecc6dcb243da27976ca0e90a83aefa18a65b76 --- M include/osmo-bts/gsm_data_shared.h M src/common/gsm_data_shared.c 2 files changed, 0 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/11866/1 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 61cf81f..56ab5b1 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -818,9 +818,6 @@ gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, const struct abis_om_obj_inst *obj_inst); -/* reset the state of all MO in the BTS */ -void gsm_bts_mo_reset(struct gsm_bts *bts); - uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, uint8_t ts_nr, uint8_t lchan_nr); uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 21e5781..7b0e72d 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -352,30 +352,6 @@ return bts; } -/* reset the state of all MO in the BTS */ -void gsm_bts_mo_reset(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx; - unsigned int i; - - gsm_abis_mo_reset(&bts->mo); - gsm_abis_mo_reset(&bts->site_mgr.mo); - for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) - gsm_abis_mo_reset(&bts->gprs.nsvc[i].mo); - gsm_abis_mo_reset(&bts->gprs.nse.mo); - gsm_abis_mo_reset(&bts->gprs.cell.mo); - - llist_for_each_entry(trx, &bts->trx_list, list) { - gsm_abis_mo_reset(&trx->mo); - gsm_abis_mo_reset(&trx->bb_transc.mo); - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - gsm_abis_mo_reset(&ts->mo); - } - } -} - struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) { struct gsm_bts_trx *trx; -- To view, visit https://gerrit.osmocom.org/11866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1ecc6dcb243da27976ca0e90a83aefa18a65b76 Gerrit-Change-Number: 11866 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 20:38:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 21 Nov 2018 20:38:30 +0000 Subject: Change in osmo-bts[master]: Fix type mismatch Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11867 Change subject: Fix type mismatch ...................................................................... Fix type mismatch llist_count() return unsigned value, let's use it for counter as well. Change-Id: I81097a64ef694bec046afcc23cf995dc539a706b --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/11867/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 8029c88..dba08df 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -149,7 +149,7 @@ /*! limit number of queue entries to %u; drops any surplus messages */ static void queue_limit_to(const char *prefix, struct llist_head *queue, unsigned int limit) { - int count = llist_count(queue); + unsigned int count = llist_count(queue); if (count > limit) LOGP(DL1P, LOGL_NOTICE, "%s: freeing %d queued frames\n", prefix, count-limit); -- To view, visit https://gerrit.osmocom.org/11867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I81097a64ef694bec046afcc23cf995dc539a706b Gerrit-Change-Number: 11867 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 21:04:08 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 21 Nov 2018 21:04:08 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 21 Nov 2018 21:04:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 21:18:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 21 Nov 2018 21:18:16 +0000 Subject: Change in libosmocore[master]: Don't traverse empty lists in llist_count() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11865 ) Change subject: Don't traverse empty lists in llist_count() ...................................................................... Patch Set 1: Code-Review-1 I don't think this does anything at all. -- To view, visit https://gerrit.osmocom.org/11865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e2ede2dd1afbd9e7ed7e393f9ba244179c03b8c Gerrit-Change-Number: 11865 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 21 Nov 2018 21:18:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 21:19:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 21 Nov 2018 21:19:24 +0000 Subject: Change in osmo-bts[master]: bts: Fix TRX0 param initialization In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11864 ) Change subject: bts: Fix TRX0 param initialization ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5afd66548634ff53e2af24dc7055d408ca8ca4e3 Gerrit-Change-Number: 11864 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 21 Nov 2018 21:19:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 21:19:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 21 Nov 2018 21:19:25 +0000 Subject: Change in osmo-bts[master]: bts: Fix TRX0 param initialization In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11864 ) Change subject: bts: Fix TRX0 param initialization ...................................................................... bts: Fix TRX0 param initialization TRX0 is allocated in a different place than other TRX. Commit that introduced the bug added an initialization step (bts_trx_init) applied in VTY cmd "trx <0-254>", where TRX are allocated since same commit, but doesn't initialize TRX0 for reasons explained in first paragraph. As a result, some parameters were not applied to TRX0, like power ramping increment step, which prevented MS from finding the network in osmo-gsm-tester tests. Fixes: eebb6a4216f136132400831ca35ed70e7502e92a ("bts: Allocate TRX for BTS dynamically, deprecate -t") Change-Id: I5afd66548634ff53e2af24dc7055d408ca8ca4e3 --- M src/common/bts.c M src/common/gsm_data_shared.c M src/common/vty.c 3 files changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/bts.c b/src/common/bts.c index 2b17ec6..abbaeb4 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -177,6 +177,8 @@ return rc; } + /* TRX0 was allocated early during gsm_bts_alloc, not later through VTY */ + bts_trx_init(bts->c0); bts_gsmnet.num_bts++; if (!initialized) { diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 21e5781..beb3107 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -333,7 +333,7 @@ memcpy(&bts->gprs.cell.rlc_cfg, &rlc_cfg_default, sizeof(bts->gprs.cell.rlc_cfg)); - /* create our primary TRX */ + /* create our primary TRX. It will be initialized during bts_init() */ bts->c0 = gsm_bts_trx_alloc(bts); if (!bts->c0) { talloc_free(bts); diff --git a/src/common/vty.c b/src/common/vty.c index f305413..7c2900f 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -233,7 +233,10 @@ bts->num_trx, VTY_NEWLINE); return CMD_WARNING; } else if (trx_nr == bts->num_trx) { - /* allocate a new one */ + /* Allocate a new TRX + * Remark: TRX0 was already created during gsm_bts_alloc() and + * initialized in bts_init(), not here. + */ trx = gsm_bts_trx_alloc(bts); if (trx) bts_trx_init(trx); -- To view, visit https://gerrit.osmocom.org/11864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5afd66548634ff53e2af24dc7055d408ca8ca4e3 Gerrit-Change-Number: 11864 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 21:20:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 21 Nov 2018 21:20:12 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11606 ) Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 21 Nov 2018 21:20:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 21:20:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 21 Nov 2018 21:20:14 +0000 Subject: Change in osmo-bsc[master]: gsm0408_rcvmsg: Release lchan if L3 fails to complete In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11606 ) Change subject: gsm0408_rcvmsg: Release lchan if L3 fails to complete ...................................................................... gsm0408_rcvmsg: Release lchan if L3 fails to complete gscon_release_lchans stub is added to gsm0408_test.c to make linker happy. Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 --- M src/osmo-bsc/gsm_04_08_rr.c M tests/gsm0408/gsm0408_test.c 2 files changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 4659c1a..4be5198 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -927,6 +927,7 @@ int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) { struct gsm_lchan *lchan; + int rc; lchan = msg->lchan; if (!lchan_may_receive_data(lchan)) { @@ -948,7 +949,11 @@ lchan->conn->lchan = lchan; /* fwd via bsc_api to send COMPLETE L3 INFO to MSC */ - bsc_compl_l3(lchan->conn, msg, 0); + rc = bsc_compl_l3(lchan->conn, msg, 0); + if (rc < 0) { + gscon_release_lchans(lchan->conn, true); + return rc; + } /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */ } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index d15e149..a30aaf8 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -952,6 +952,10 @@ OSMO_ASSERT(0); } +void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) { + OSMO_ASSERT(0); +} + bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; -- To view, visit https://gerrit.osmocom.org/11606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 Gerrit-Change-Number: 11606 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 21 21:22:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 21 Nov 2018 21:22:22 +0000 Subject: Change in libosmocore[master]: Update gsm0808_create_ass() doxygen Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11868 Change subject: Update gsm0808_create_ass() doxygen ...................................................................... Update gsm0808_create_ass() doxygen * add spec reference * remove LCLS note: CI parameter is optional but have nothing to do with LCLS It's pretty hard to decipher from the spec what CI is useful for and we have not used it anyway so let's just keep it as "Optional" for now. Change-Id: I5552732afcec48047d993ae6ffb73a3e5d7c9202 --- M src/gsm/gsm0808.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/11868/1 diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index a84e717..fe7bc2c 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -424,12 +424,12 @@ return msg; } -/*! Create BSSMAP Assignment Request message +/*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 ?3.2.1.1 * \param[in] ct Channel Type * \param[in] cic Circuit Identity Code (Classic A only) * \param[in] ss Socket Address of MSC-side RTP socket (AoIP only) * \param[in] scl Speech Codec List (AoIP only) - * \param[in] ci Call Identifier (Optional, LCLS) + * \param[in] ci Call Identifier (Optional), ?3.2.2.105 * \returns callee-allocated msgb with BSSMAP Assignment Request message */ struct msgb *gsm0808_create_ass(const struct gsm0808_channel_type *ct, const uint16_t *cic, -- To view, visit https://gerrit.osmocom.org/11868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5552732afcec48047d993ae6ffb73a3e5d7c9202 Gerrit-Change-Number: 11868 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 04:27:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 04:27:38 +0000 Subject: Change in osmo-bts[master]: Fix type mismatch In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11867 ) Change subject: Fix type mismatch ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I81097a64ef694bec046afcc23cf995dc539a706b Gerrit-Change-Number: 11867 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 04:27:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 22 06:52:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 22 Nov 2018 06:52:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#197?= Message-ID: <1172761502.787.1542869523150.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 159.73 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Nov 22 06:56:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 06:56:20 +0000 Subject: Change in osmo-ggsn[master]: fix a format string directives in queue_seqset() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11862 ) Change subject: fix a format string directives in queue_seqset() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11862/1/gtp/queue.c File gtp/queue.c: https://gerrit.osmocom.org/#/c/11862/1/gtp/queue.c at 82 PS1, Line 82: %zd, *PEER %zd > isn't %z enough? (id need to check). Otherwise, if %xu is valid, then %zu looks better than %zd. You're correct, it should be %zu, not %zd. Thanks. I'll fit it in the next patch set. -- To view, visit https://gerrit.osmocom.org/11862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I889019aad963932fdc032421e60a72c809a93bca Gerrit-Change-Number: 11862 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 06:56:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 06:57:09 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 06:57:09 +0000 Subject: Change in osmo-ggsn[master]: fix a format string directives in queue_seqset() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11862 to look at the new patch set (#2). Change subject: fix a format string directives in queue_seqset() ...................................................................... fix a format string directives in queue_seqset() Coverity pointed out that a format string used inappropriate format string directives for variables of type size_t. Change-Id: I889019aad963932fdc032421e60a72c809a93bca Related: CID#135197 --- M gtp/queue.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/62/11862/2 -- To view, visit https://gerrit.osmocom.org/11862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I889019aad963932fdc032421e60a72c809a93bca Gerrit-Change-Number: 11862 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 06:57:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 06:57:57 +0000 Subject: Change in osmo-ggsn[master]: check ioctl() call return value in tun_new() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11856 ) Change subject: check ioctl() call return value in tun_new() ...................................................................... check ioctl() call return value in tun_new() Coverity complains about a missing ioctl() return value check. Check for failure of the TUNSETNOCSUM ioctl and log a warning if it fails. Change-Id: I88da2164d975d7a232619b8d31c5eadeef0f3a80 Related: CID#57661 --- M lib/tun.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/lib/tun.c b/lib/tun.c index fa4c37d..6ae006b 100644 --- a/lib/tun.c +++ b/lib/tun.c @@ -193,7 +193,10 @@ strncpy((*tun)->devname, ifr.ifr_name, IFNAMSIZ); (*tun)->devname[IFNAMSIZ - 1] = 0; - ioctl((*tun)->fd, TUNSETNOCSUM, 1); /* Disable checksums */ + /* Disable checksums */ + if (ioctl((*tun)->fd, TUNSETNOCSUM, 1) < 0) { + SYS_ERR(DTUN, LOGL_NOTICE, errno, "could not disable checksum on %s", (*tun)->devname); + } return 0; } else { strncpy((*tun)->devname, dev_name, IFNAMSIZ); -- To view, visit https://gerrit.osmocom.org/11856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I88da2164d975d7a232619b8d31c5eadeef0f3a80 Gerrit-Change-Number: 11856 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 07:00:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 07:00:34 +0000 Subject: Change in osmo-ggsn[master]: replace bogus memcpy() call in ippool_newip() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11861 to look at the new patch set (#2). Change subject: replace bogus memcpy() call in ippool_newip() ...................................................................... replace bogus memcpy() call in ippool_newip() When copying an address to a reused static hash table member with memcpy(), this code mistakenly passed the size of a pointer as the amount of bytes to be copied, rather than the actual size of the address. This means the IP pool could contain bogus IP addresses because only addr->len (a uint8_t) and 3 further bytes of the address were actually copied on 32 bit platforms. On 64 bit platforms, a sufficient amount of bytes were copied for IPv4 to work correctly, but too few bytes were copied for IPv6. This problem was found by Coverity. Replace the bogus memcpy() call with direct assignments to the appropriate struct in64addr union members, and assert that the length recorded for the address actually corresponds to the length used by the address family (IP4, IPv6). Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Related: CID#57921 --- M lib/ippool.c 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/61/11861/2 -- To view, visit https://gerrit.osmocom.org/11861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Gerrit-Change-Number: 11861 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 07:00:55 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 07:00:55 +0000 Subject: Change in osmo-ggsn[master]: fix allocation of ippool's hash table In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11858 ) Change subject: fix allocation of ippool's hash table ...................................................................... fix allocation of ippool's hash table The calloc() call in ippool_new() had two problems. The first problem is benign: The order of arguments were reversed. Pass the number of elements in the array first, then the size of each element, as calloc() expects. This problem was found by me. There are more instances of this problem in this file, which I'll address in follow-up patches. The second problem is that the requested allocation was larger than necessary: The hash table is an array of pointers to ippoolm_t, not an array of struct ippoolm_t. Fix the required size passed to calloc(). This problem was found by Coverity. Change-Id: I93fa5bc539771ca19714f6a665558c9140e2ce07 Related: CID#57920 --- M lib/ippool.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/lib/ippool.c b/lib/ippool.c index 6561f1f..6ce3cda 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -276,9 +276,8 @@ (*this)->hashmask = (*this)->hashsize - 1; /* Allocate hash table */ - if (! - ((*this)->hash = - calloc(sizeof(struct ippoolm_t), (*this)->hashsize))) { + (*this)->hash = calloc((*this)->hashsize, sizeof(struct ippoolm_t *)); + if (!(*this)->hash) { SYS_ERR(DIP, LOGL_ERROR, 0, "Failed to allocate memory for hash members in ippool"); return -1; -- To view, visit https://gerrit.osmocom.org/11858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I93fa5bc539771ca19714f6a665558c9140e2ce07 Gerrit-Change-Number: 11858 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 07:14:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 07:14:08 +0000 Subject: Change in osmo-ggsn[master]: initialize local variable addr in ippool_new() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11869 Change subject: initialize local variable addr in ippool_new() ...................................................................... initialize local variable addr in ippool_new() Coverity points out that addr.len was potentially being used uninitialized, via calls to in46a_inc(&addr). Change-Id: Idb67394e5f4c2072380a33f46c848d92c4317245 Related: CID#174189 --- M lib/ippool.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/69/11869/1 diff --git a/lib/ippool.c b/lib/ippool.c index 6ce3cda..bf8028a 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -202,7 +202,7 @@ /* Parse only first instance of pool for now */ int i; - struct in46_addr addr; + struct in46_addr addr = { 0 }; size_t addrprefixlen; struct in46_addr stataddr; size_t stataddrprefixlen; -- To view, visit https://gerrit.osmocom.org/11869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idb67394e5f4c2072380a33f46c848d92c4317245 Gerrit-Change-Number: 11869 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 07:20:51 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 07:20:51 +0000 Subject: Change in osmo-ggsn[master]: fix format string error in ippool_printaddr() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11870 Change subject: fix format string error in ippool_printaddr() ...................................................................... fix format string error in ippool_printaddr() The variable this->listsize is an unsigned int, but the format string assumed ptrdiff_t. Found by Coverity. Change-Id: Ib2a55907adae98f8aa7b079f1c9a3b4fc5f67fc5 Related: CID#188879 --- M lib/ippool.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/70/11870/1 diff --git a/lib/ippool.c b/lib/ippool.c index 6ce3cda..fee757b 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -30,7 +30,7 @@ printf("Lastdyn %td\n", this->lastdyn - this->member); printf("Firststat %td\n", this->firststat - this->member); printf("Laststat %td\n", this->laststat - this->member); - printf("Listsize %td\n", this->listsize); + printf("Listsize %u\n", this->listsize); for (n = 0; n < this->listsize; n++) { char s[256]; -- To view, visit https://gerrit.osmocom.org/11870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2a55907adae98f8aa7b079f1c9a3b4fc5f67fc5 Gerrit-Change-Number: 11870 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 07:32:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 07:32:27 +0000 Subject: Change in osmo-ggsn[master]: fix a format string directives in queue_seqset() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11862 ) Change subject: fix a format string directives in queue_seqset() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I889019aad963932fdc032421e60a72c809a93bca Gerrit-Change-Number: 11862 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 07:32:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 07:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 07:40:40 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11871 Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... properly store IPv6 addresses in struct tun_t All addresses in struct tun_t were stored as an in_addr. But IPv6 addresses need an in6_addr, so switch tun_t addresses to the in64_addr wrapper struct. Fixes an out of bounds memcpy() identified by Coverity. Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Related: CID#174278 --- M lib/tun.c M lib/tun.h 2 files changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/71/11871/1 diff --git a/lib/tun.c b/lib/tun.c index 6ae006b..1aeed55 100644 --- a/lib/tun.c +++ b/lib/tun.c @@ -68,10 +68,14 @@ if (rc < 0) return rc; - if (addr) - this->addr.s_addr = addr->s_addr; - if (dstaddr) - this->dstaddr.s_addr = dstaddr->s_addr; + if (addr) { + this->addr.len = sizeof(struct in_addr); + this->addr.v4.s_addr = addr->s_addr; + } + if (dstaddr) { + this->dstaddr.len = sizeof(struct in_addr); + this->dstaddr.v4.s_addr = dstaddr->s_addr; + } if (netmask) this->netmask.s_addr = netmask->s_addr; this->addrs++; @@ -89,8 +93,10 @@ rc = netdev_setaddr6(this->devname, addr, dstaddr, prefixlen); if (rc < 0) return rc; - if (dstaddr) - memcpy(&this->dstaddr, dstaddr, sizeof(*dstaddr)); + if (dstaddr) { + this->dstaddr.len = sizeof(*dstaddr); + memcpy(&this->dstaddr.v6, dstaddr, sizeof(*dstaddr)); + } this->addrs++; #if defined(__FreeBSD__) || defined (__APPLE__) this->routes = 1; @@ -270,7 +276,7 @@ { if (tun->routes) { - netdev_delroute(&tun->dstaddr, &tun->addr, &tun->netmask); + netdev_delroute(&tun->dstaddr.v4, &tun->addr.v4, &tun->netmask); } if (tun->fd >= 0) { @@ -323,7 +329,7 @@ char smask[TUN_ADDRSIZE]; int rc; - strncpy(snet, inet_ntoa(tun->addr), sizeof(snet)); + strncpy(snet, inet_ntoa(tun->addr.v4), sizeof(snet)); snet[sizeof(snet) - 1] = 0; strncpy(smask, inet_ntoa(tun->netmask), sizeof(smask)); smask[sizeof(smask) - 1] = 0; diff --git a/lib/tun.h b/lib/tun.h index 6bf141f..07ca04a 100644 --- a/lib/tun.h +++ b/lib/tun.h @@ -31,8 +31,8 @@ struct tun_t { int fd; /* File descriptor to tun interface */ - struct in_addr addr; - struct in_addr dstaddr; + struct in46_addr addr; + struct in46_addr dstaddr; struct in_addr netmask; int addrs; /* Number of allocated IP addresses */ int routes; /* One if we allocated an automatic route */ -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 07:55:42 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 07:55:42 +0000 Subject: Change in osmo-bts[master]: common/vty.c: fix deprecated osmo_str2lower() usage Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11872 Change subject: common/vty.c: fix deprecated osmo_str2lower() usage ...................................................................... common/vty.c: fix deprecated osmo_str2lower() usage Change-Id: I4f78bc13908c2d9dfbe24195ae6e35fae8575c59 --- M src/common/vty.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/72/11872/1 diff --git a/src/common/vty.c b/src/common/vty.c index 7c2900f..bb88c57 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -259,7 +259,7 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) { struct gsm_bts_trx *trx; - char buf_casecnvt[256]; + const char *sapi_buf; int i; vty_out(vty, "bts %u%s", bts->nr, VTY_NEWLINE); @@ -291,13 +291,13 @@ for (i = 0; i < 32; i++) { if (gsmtap_sapi_mask & (1 << i)) { - osmo_str2lower(buf_casecnvt, get_value_string(gsmtap_sapi_names, i)); - vty_out(vty, " gsmtap-sapi %s%s", buf_casecnvt, VTY_NEWLINE); + sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, i)); + vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } } if (gsmtap_sapi_acch) { - osmo_str2lower(buf_casecnvt, get_value_string(gsmtap_sapi_names, GSMTAP_CHANNEL_ACCH)); - vty_out(vty, " gsmtap-sapi %s%s", buf_casecnvt, VTY_NEWLINE); + sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, GSMTAP_CHANNEL_ACCH)); + vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } vty_out(vty, " min-qual-rach %.0f%s", bts->min_qual_rach * 10.0f, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/11872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4f78bc13908c2d9dfbe24195ae6e35fae8575c59 Gerrit-Change-Number: 11872 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 07:55:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 07:55:43 +0000 Subject: Change in osmo-bts[master]: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11873 Change subject: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() ...................................................................... Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() Change-Id: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7 --- M src/osmo-bts-litecell15/utils.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-oc2g/utils.c M src/osmo-bts-sysmo/utils.c M src/osmo-bts-trx/loops.c 5 files changed, 27 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/11873/1 diff --git a/src/osmo-bts-litecell15/utils.c b/src/osmo-bts-litecell15/utils.c index 8c3eb5a..8d980ba 100644 --- a/src/osmo-bts-litecell15/utils.c +++ b/src/osmo-bts-litecell15/utils.c @@ -82,6 +82,7 @@ { enum gsm_band band; struct gsm_bts *bts = trx->bts; + int rc; if (!bts->auto_band) return band_osmo2lc15(trx, bts->band); @@ -89,7 +90,9 @@ /* * We need to check what will happen now. */ - band = gsm_arfcn2band(arfcn); + rc = gsm_arfcn2band_rc(arfcn, &band); + if (rc) /* wrong ARFCN, give up */ + return -1; /* if we are already on the right band return */ if (band == bts->band) diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index 65ebc1c..f76de92 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -398,7 +398,7 @@ struct msgb *msg; GsmL1_MphInitReq_t *mi_req; GsmL1_DeviceParam_t *dev_par; - int oc2g_band; + int rc, oc2g_band; if (!gsm_abis_mo_check_attr(&trx->mo, trx_rqd_attr, ARRAY_SIZE(trx_rqd_attr))) { @@ -409,7 +409,13 @@ } /* Update TRX band */ - trx->bts->band = gsm_arfcn2band(trx->arfcn); + rc = gsm_arfcn2band_rc(trx->arfcn, &trx->bts->band); + if (rc) { + /* FIXME: abort initialization? */ + LOGP(DL1C, LOGL_ERROR, "Could not pick GSM band " + "for ARFCN %u\n", trx->arfcn); + trx->bts->band = 0x00; + } oc2g_band = oc2gbts_select_oc2g_band(trx, trx->arfcn); if (oc2g_band < 0) { diff --git a/src/osmo-bts-oc2g/utils.c b/src/osmo-bts-oc2g/utils.c index 2894439..cb65f45 100644 --- a/src/osmo-bts-oc2g/utils.c +++ b/src/osmo-bts-oc2g/utils.c @@ -82,13 +82,17 @@ { enum gsm_band band; struct gsm_bts *bts = trx->bts; + int rc; + if (!bts->auto_band) return band_osmo2oc2g(trx, bts->band); /* * We need to check what will happen now. */ - band = gsm_arfcn2band(arfcn); + rc = gsm_arfcn2band_rc(arfcn, &band); + if (rc) /* wrong ARFCN, give up */ + return -1; /* if we are already on the right band return */ if (band == bts->band) diff --git a/src/osmo-bts-sysmo/utils.c b/src/osmo-bts-sysmo/utils.c index 7d1aca7..0e3ef27 100644 --- a/src/osmo-bts-sysmo/utils.c +++ b/src/osmo-bts-sysmo/utils.c @@ -80,6 +80,7 @@ { enum gsm_band band; struct gsm_bts *bts = trx->bts; + int rc; if (!bts->auto_band) return band_osmo2femto(trx, bts->band); @@ -87,7 +88,9 @@ /* * We need to check what will happen now. */ - band = gsm_arfcn2band(arfcn); + rc = gsm_arfcn2band_rc(arfcn, &band); + if (rc) /* wrong ARFCN, give up */ + return -1; /* if we are already on the right band return */ if (band == bts->band) diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index a959a71..7d131a3 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -33,7 +33,7 @@ #include "l1_if.h" #include "loops.h" -#define MS_PWR_DBM(arfcn, lvl) ms_pwr_dbm(gsm_arfcn2band(arfcn), lvl) +#define MS_PWR_DBM(band, lvl) ms_pwr_dbm(band, lvl) /* * MS Power loop @@ -42,6 +42,7 @@ static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; + enum gsm_band band = trx->bts->band; uint16_t arfcn = trx->arfcn; int8_t new_power; @@ -72,7 +73,7 @@ LOGP(DLOOP, LOGL_INFO, "Keeping MS new_power of trx=%u " "chan_nr=0x%02x at control level %d (%d dBm)\n", trx->nr, chan_nr, new_power, - MS_PWR_DBM(arfcn, new_power)); + MS_PWR_DBM(band, new_power)); return 0; } @@ -81,8 +82,8 @@ "control level %d (%d dBm) to %d (%d dBm)\n", (diff > 0) ? "Raising" : "Lowering", trx->nr, chan_nr, lchan->ms_power_ctrl.current, - MS_PWR_DBM(arfcn, lchan->ms_power_ctrl.current), new_power, - MS_PWR_DBM(arfcn, new_power)); + MS_PWR_DBM(band, lchan->ms_power_ctrl.current), new_power, + MS_PWR_DBM(band, new_power)); lchan->ms_power_ctrl.current = new_power; @@ -158,7 +159,7 @@ LOGP(DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current " "MS power: %d (%d dBm) of trx=%u chan_nr=0x%02x\n", rssi, pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current, - MS_PWR_DBM(trx->arfcn, lchan->ms_power_ctrl.current), + MS_PWR_DBM(trx->bts->band, lchan->ms_power_ctrl.current), trx->nr, chan_nr); ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); -- To view, visit https://gerrit.osmocom.org/11873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7 Gerrit-Change-Number: 11873 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 08:20:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 08:20:27 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix deprecated gsm_band_name() usage Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11874 Change subject: trxcon/l1ctl.c: fix deprecated gsm_band_name() usage ...................................................................... trxcon/l1ctl.c: fix deprecated gsm_band_name() usage Change-Id: I99bb935b7cd529c885bf10dc209b6016df8095d8 --- M src/host/trxcon/l1ctl.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/74/11874/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 83cdc2e..f239b30 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -46,6 +46,16 @@ #include "trx_if.h" #include "sched_trx.h" +static const char *arfcn2band_name(uint16_t arfcn) +{ + enum gsm_band band; + + if (gsm_arfcn2band_rc(arfcn, &band) < 0) + return "(invalid)"; + + return gsm_band_name(band); +} + static struct msgb *l1ctl_alloc_msg(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -80,7 +90,7 @@ return -ENOMEM; LOGP(DL1C, LOGL_DEBUG, "Send PM Conf (%s %d = %d dBm)\n", - gsm_band_name(gsm_arfcn2band(band_arfcn)), + arfcn2band_name(band_arfcn), band_arfcn &~ ARFCN_FLAG_MASK, dbm); pmc = (struct l1ctl_pm_conf *) msgb_put(msg, sizeof(*pmc)); @@ -331,7 +341,7 @@ timeout = ntohs(fbsb->timeout); LOGP(DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n", - gsm_band_name(gsm_arfcn2band(band_arfcn)), + arfcn2band_name(band_arfcn), band_arfcn &~ ARFCN_FLAG_MASK); /* Reset scheduler and clock counter */ @@ -385,7 +395,7 @@ LOGP(DL1C, LOGL_NOTICE, "Received power measurement " "request (%s: %d -> %d)\n", - gsm_band_name(gsm_arfcn2band(band_arfcn_start)), + arfcn2band_name(band_arfcn_start), band_arfcn_start &~ ARFCN_FLAG_MASK, band_arfcn_stop &~ ARFCN_FLAG_MASK); -- To view, visit https://gerrit.osmocom.org/11874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I99bb935b7cd529c885bf10dc209b6016df8095d8 Gerrit-Change-Number: 11874 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 08:26:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 08:26:56 +0000 Subject: Change in osmo-bts[master]: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11873 ) Change subject: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11873/1/src/osmo-bts-trx/loops.c File src/osmo-bts-trx/loops.c: https://gerrit.osmocom.org/#/c/11873/1/src/osmo-bts-trx/loops.c at 36 PS1, Line 36: #define MS_PWR_DBM(band, lvl) ms_pwr_dbm(band, lvl) Oh, this definition is useless now. -- To view, visit https://gerrit.osmocom.org/11873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7 Gerrit-Change-Number: 11873 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 08:26:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 08:31:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 08:31:24 +0000 Subject: Change in osmo-bts[master]: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11873 ) Change subject: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7 Gerrit-Change-Number: 11873 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 08:31:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 08:58:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 08:58:32 +0000 Subject: Change in osmo-bts[master]: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11873 ) Change subject: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7 Gerrit-Change-Number: 11873 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 08:58:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 09:00:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 09:00:25 +0000 Subject: Change in osmo-bts[master]: common/vty.c: fix deprecated osmo_str2lower() usage In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11872 ) Change subject: common/vty.c: fix deprecated osmo_str2lower() usage ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4f78bc13908c2d9dfbe24195ae6e35fae8575c59 Gerrit-Change-Number: 11872 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 09:00:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 09:00:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 09:00:29 +0000 Subject: Change in osmo-bts[master]: common/vty.c: fix deprecated osmo_str2lower() usage In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11872 ) Change subject: common/vty.c: fix deprecated osmo_str2lower() usage ...................................................................... common/vty.c: fix deprecated osmo_str2lower() usage Change-Id: I4f78bc13908c2d9dfbe24195ae6e35fae8575c59 --- M src/common/vty.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index 7c2900f..bb88c57 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -259,7 +259,7 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) { struct gsm_bts_trx *trx; - char buf_casecnvt[256]; + const char *sapi_buf; int i; vty_out(vty, "bts %u%s", bts->nr, VTY_NEWLINE); @@ -291,13 +291,13 @@ for (i = 0; i < 32; i++) { if (gsmtap_sapi_mask & (1 << i)) { - osmo_str2lower(buf_casecnvt, get_value_string(gsmtap_sapi_names, i)); - vty_out(vty, " gsmtap-sapi %s%s", buf_casecnvt, VTY_NEWLINE); + sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, i)); + vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } } if (gsmtap_sapi_acch) { - osmo_str2lower(buf_casecnvt, get_value_string(gsmtap_sapi_names, GSMTAP_CHANNEL_ACCH)); - vty_out(vty, " gsmtap-sapi %s%s", buf_casecnvt, VTY_NEWLINE); + sapi_buf = osmo_str_tolower(get_value_string(gsmtap_sapi_names, GSMTAP_CHANNEL_ACCH)); + vty_out(vty, " gsmtap-sapi %s%s", sapi_buf, VTY_NEWLINE); } vty_out(vty, " min-qual-rach %.0f%s", bts->min_qual_rach * 10.0f, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/11872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4f78bc13908c2d9dfbe24195ae6e35fae8575c59 Gerrit-Change-Number: 11872 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 09:00:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 09:00:29 +0000 Subject: Change in osmo-bts[master]: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11873 ) Change subject: Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() ...................................................................... Fix deprecated gsm_arfcn2band(), use gsm_arfcn2band_rc() Change-Id: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7 --- M src/osmo-bts-litecell15/utils.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-oc2g/utils.c M src/osmo-bts-sysmo/utils.c M src/osmo-bts-trx/loops.c 5 files changed, 26 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bts-litecell15/utils.c b/src/osmo-bts-litecell15/utils.c index 8c3eb5a..8d980ba 100644 --- a/src/osmo-bts-litecell15/utils.c +++ b/src/osmo-bts-litecell15/utils.c @@ -82,6 +82,7 @@ { enum gsm_band band; struct gsm_bts *bts = trx->bts; + int rc; if (!bts->auto_band) return band_osmo2lc15(trx, bts->band); @@ -89,7 +90,9 @@ /* * We need to check what will happen now. */ - band = gsm_arfcn2band(arfcn); + rc = gsm_arfcn2band_rc(arfcn, &band); + if (rc) /* wrong ARFCN, give up */ + return -1; /* if we are already on the right band return */ if (band == bts->band) diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index 65ebc1c..f76de92 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -398,7 +398,7 @@ struct msgb *msg; GsmL1_MphInitReq_t *mi_req; GsmL1_DeviceParam_t *dev_par; - int oc2g_band; + int rc, oc2g_band; if (!gsm_abis_mo_check_attr(&trx->mo, trx_rqd_attr, ARRAY_SIZE(trx_rqd_attr))) { @@ -409,7 +409,13 @@ } /* Update TRX band */ - trx->bts->band = gsm_arfcn2band(trx->arfcn); + rc = gsm_arfcn2band_rc(trx->arfcn, &trx->bts->band); + if (rc) { + /* FIXME: abort initialization? */ + LOGP(DL1C, LOGL_ERROR, "Could not pick GSM band " + "for ARFCN %u\n", trx->arfcn); + trx->bts->band = 0x00; + } oc2g_band = oc2gbts_select_oc2g_band(trx, trx->arfcn); if (oc2g_band < 0) { diff --git a/src/osmo-bts-oc2g/utils.c b/src/osmo-bts-oc2g/utils.c index 2894439..cb65f45 100644 --- a/src/osmo-bts-oc2g/utils.c +++ b/src/osmo-bts-oc2g/utils.c @@ -82,13 +82,17 @@ { enum gsm_band band; struct gsm_bts *bts = trx->bts; + int rc; + if (!bts->auto_band) return band_osmo2oc2g(trx, bts->band); /* * We need to check what will happen now. */ - band = gsm_arfcn2band(arfcn); + rc = gsm_arfcn2band_rc(arfcn, &band); + if (rc) /* wrong ARFCN, give up */ + return -1; /* if we are already on the right band return */ if (band == bts->band) diff --git a/src/osmo-bts-sysmo/utils.c b/src/osmo-bts-sysmo/utils.c index 7d1aca7..0e3ef27 100644 --- a/src/osmo-bts-sysmo/utils.c +++ b/src/osmo-bts-sysmo/utils.c @@ -80,6 +80,7 @@ { enum gsm_band band; struct gsm_bts *bts = trx->bts; + int rc; if (!bts->auto_band) return band_osmo2femto(trx, bts->band); @@ -87,7 +88,9 @@ /* * We need to check what will happen now. */ - band = gsm_arfcn2band(arfcn); + rc = gsm_arfcn2band_rc(arfcn, &band); + if (rc) /* wrong ARFCN, give up */ + return -1; /* if we are already on the right band return */ if (band == bts->band) diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index a959a71..926b4c6 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -33,8 +33,6 @@ #include "l1_if.h" #include "loops.h" -#define MS_PWR_DBM(arfcn, lvl) ms_pwr_dbm(gsm_arfcn2band(arfcn), lvl) - /* * MS Power loop */ @@ -42,6 +40,7 @@ static int ms_power_diff(struct gsm_lchan *lchan, uint8_t chan_nr, int8_t diff) { struct gsm_bts_trx *trx = lchan->ts->trx; + enum gsm_band band = trx->bts->band; uint16_t arfcn = trx->arfcn; int8_t new_power; @@ -72,7 +71,7 @@ LOGP(DLOOP, LOGL_INFO, "Keeping MS new_power of trx=%u " "chan_nr=0x%02x at control level %d (%d dBm)\n", trx->nr, chan_nr, new_power, - MS_PWR_DBM(arfcn, new_power)); + ms_pwr_dbm(band, new_power)); return 0; } @@ -81,8 +80,8 @@ "control level %d (%d dBm) to %d (%d dBm)\n", (diff > 0) ? "Raising" : "Lowering", trx->nr, chan_nr, lchan->ms_power_ctrl.current, - MS_PWR_DBM(arfcn, lchan->ms_power_ctrl.current), new_power, - MS_PWR_DBM(arfcn, new_power)); + ms_pwr_dbm(band, lchan->ms_power_ctrl.current), new_power, + ms_pwr_dbm(band, new_power)); lchan->ms_power_ctrl.current = new_power; @@ -158,7 +157,7 @@ LOGP(DLOOP, LOGL_DEBUG, "Lowest RSSI: %d Target RSSI: %d Current " "MS power: %d (%d dBm) of trx=%u chan_nr=0x%02x\n", rssi, pinst->phy_link->u.osmotrx.trx_target_rssi, lchan->ms_power_ctrl.current, - MS_PWR_DBM(trx->arfcn, lchan->ms_power_ctrl.current), + ms_pwr_dbm(trx->bts->band, lchan->ms_power_ctrl.current), trx->nr, chan_nr); ms_power_diff(lchan, chan_nr, pinst->phy_link->u.osmotrx.trx_target_rssi - rssi); -- To view, visit https://gerrit.osmocom.org/11873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I45aae70f4bc3f4f85d267dafb757debdef1bb7d7 Gerrit-Change-Number: 11873 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 09:01:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 09:01:54 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix deprecated gsm_band_name() usage In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11874 ) Change subject: trxcon/l1ctl.c: fix deprecated gsm_band_name() usage ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99bb935b7cd529c885bf10dc209b6016df8095d8 Gerrit-Change-Number: 11874 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 09:01:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 09:01:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 09:01:56 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: fix deprecated gsm_band_name() usage In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11874 ) Change subject: trxcon/l1ctl.c: fix deprecated gsm_band_name() usage ...................................................................... trxcon/l1ctl.c: fix deprecated gsm_band_name() usage Change-Id: I99bb935b7cd529c885bf10dc209b6016df8095d8 --- M src/host/trxcon/l1ctl.c 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 83cdc2e..f239b30 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -46,6 +46,16 @@ #include "trx_if.h" #include "sched_trx.h" +static const char *arfcn2band_name(uint16_t arfcn) +{ + enum gsm_band band; + + if (gsm_arfcn2band_rc(arfcn, &band) < 0) + return "(invalid)"; + + return gsm_band_name(band); +} + static struct msgb *l1ctl_alloc_msg(uint8_t msg_type) { struct l1ctl_hdr *l1h; @@ -80,7 +90,7 @@ return -ENOMEM; LOGP(DL1C, LOGL_DEBUG, "Send PM Conf (%s %d = %d dBm)\n", - gsm_band_name(gsm_arfcn2band(band_arfcn)), + arfcn2band_name(band_arfcn), band_arfcn &~ ARFCN_FLAG_MASK, dbm); pmc = (struct l1ctl_pm_conf *) msgb_put(msg, sizeof(*pmc)); @@ -331,7 +341,7 @@ timeout = ntohs(fbsb->timeout); LOGP(DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n", - gsm_band_name(gsm_arfcn2band(band_arfcn)), + arfcn2band_name(band_arfcn), band_arfcn &~ ARFCN_FLAG_MASK); /* Reset scheduler and clock counter */ @@ -385,7 +395,7 @@ LOGP(DL1C, LOGL_NOTICE, "Received power measurement " "request (%s: %d -> %d)\n", - gsm_band_name(gsm_arfcn2band(band_arfcn_start)), + arfcn2band_name(band_arfcn_start), band_arfcn_start &~ ARFCN_FLAG_MASK, band_arfcn_stop &~ ARFCN_FLAG_MASK); -- To view, visit https://gerrit.osmocom.org/11874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I99bb935b7cd529c885bf10dc209b6016df8095d8 Gerrit-Change-Number: 11874 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 09:02:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 09:02:40 +0000 Subject: Change in osmo-bts[master]: Fix type mismatch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11867 ) Change subject: Fix type mismatch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I81097a64ef694bec046afcc23cf995dc539a706b Gerrit-Change-Number: 11867 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 09:02:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 09:02:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 09:02:42 +0000 Subject: Change in osmo-bts[master]: Fix type mismatch In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11867 ) Change subject: Fix type mismatch ...................................................................... Fix type mismatch llist_count() return unsigned value, let's use it for counter as well. Change-Id: I81097a64ef694bec046afcc23cf995dc539a706b --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 8029c88..dba08df 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -149,7 +149,7 @@ /*! limit number of queue entries to %u; drops any surplus messages */ static void queue_limit_to(const char *prefix, struct llist_head *queue, unsigned int limit) { - int count = llist_count(queue); + unsigned int count = llist_count(queue); if (count > limit) LOGP(DL1P, LOGL_NOTICE, "%s: freeing %d queued frames\n", prefix, count-limit); -- To view, visit https://gerrit.osmocom.org/11867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I81097a64ef694bec046afcc23cf995dc539a706b Gerrit-Change-Number: 11867 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:44:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 10:44:43 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11820/3/src/osmo-bsc/osmo_bsc_lcls.c File src/osmo-bsc/osmo_bsc_lcls.c: https://gerrit.osmocom.org/#/c/11820/3/src/osmo-bsc/osmo_bsc_lcls.c at 163 PS3, Line 163: static struct osmo_lcls old_cfg_csc = { 0 }; I still have the filling this variable being static (aka global) is most probably wrong, since I guess we need to keep this status per-conn/subscriber or per-call. Please have a look at it and submit a patch regarding this issue. -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 10:44:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:49:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 10:49:37 +0000 Subject: Change in osmo-ggsn[master]: replace bogus memcpy() call in ippool_newip() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11861 ) Change subject: replace bogus memcpy() call in ippool_newip() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Gerrit-Change-Number: 11861 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 10:49:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:51:03 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 10:51:03 +0000 Subject: Change in libosmocore[master]: Add basic test for llist counter and empty check Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11875 Change subject: Add basic test for llist counter and empty check ...................................................................... Add basic test for llist counter and empty check Change-Id: Ie1c15c330213849f089032ca742e709e4349b26e --- M tests/utils/utils_test.c M tests/utils/utils_test.ok 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/11875/1 diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index 2bb1f9c..eaaae79 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -798,6 +798,21 @@ OSMO_ASSERT(ok); } +static void test_llist() +{ + static LLIST_HEAD(test_list); + struct llist_head item; + + printf("\nTest list routines\n"); + printf("Initial list [empty %u]: %u items (each is empty %u)\n", llist_empty(&test_list), llist_count(&test_list), llist_empty(&item)); + + llist_add(&item, &test_list); + printf("Added list [empty %u]: %u item\n", llist_empty(&test_list), llist_count(&test_list)); + + llist_del(&item); + printf("Deleted list [empty %u]: %u items\n", llist_empty(&test_list), llist_count(&test_list)); +} + int main(int argc, char **argv) { @@ -815,5 +830,7 @@ isqrt_test(); osmo_sockaddr_to_str_and_uint_test(); osmo_str_tolowupper_test(); + test_llist(); + return 0; } diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok index 3ea8ec6..7c4505e 100644 --- a/tests/utils/utils_test.ok +++ b/tests/utils/utils_test.ok @@ -199,3 +199,8 @@ = 62, "ABCDEFGHIJKLMNOPQRSTUVWXYZA" osmo_str_toupper_buf(28, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()", in-place) = 27, "ABCDEFGHIJKLMNOPQRSTUVWXYZA" + +Test list routines +Initial list [empty 1]: 0 items (each is empty 0) +Added list [empty 0]: 1 item +Deleted list [empty 1]: 0 items -- To view, visit https://gerrit.osmocom.org/11875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1c15c330213849f089032ca742e709e4349b26e Gerrit-Change-Number: 11875 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:51:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 10:51:38 +0000 Subject: Change in libosmocore[master]: Don't traverse empty lists in llist_count() In-Reply-To: References: Message-ID: Max has abandoned this change. ( https://gerrit.osmocom.org/11865 ) Change subject: Don't traverse empty lists in llist_count() ...................................................................... Abandoned Not needed indeed - see 11875. -- To view, visit https://gerrit.osmocom.org/11865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I1e2ede2dd1afbd9e7ed7e393f9ba244179c03b8c Gerrit-Change-Number: 11865 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:54:32 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 10:54:32 +0000 Subject: Change in osmo-bts[master]: Drop unused function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11866 ) Change subject: Drop unused function ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1ecc6dcb243da27976ca0e90a83aefa18a65b76 Gerrit-Change-Number: 11866 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 10:54:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:54:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 10:54:37 +0000 Subject: Change in osmo-bts[master]: Drop unused function In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11866 ) Change subject: Drop unused function ...................................................................... Drop unused function Change-Id: Ib1ecc6dcb243da27976ca0e90a83aefa18a65b76 --- M include/osmo-bts/gsm_data_shared.h M src/common/gsm_data_shared.c 2 files changed, 0 insertions(+), 27 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 61cf81f..56ab5b1 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -818,9 +818,6 @@ gsm_objclass2obj(struct gsm_bts *bts, uint8_t obj_class, const struct abis_om_obj_inst *obj_inst); -/* reset the state of all MO in the BTS */ -void gsm_bts_mo_reset(struct gsm_bts *bts); - uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, uint8_t ts_nr, uint8_t lchan_nr); uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index beb3107..2d9af78 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -352,30 +352,6 @@ return bts; } -/* reset the state of all MO in the BTS */ -void gsm_bts_mo_reset(struct gsm_bts *bts) -{ - struct gsm_bts_trx *trx; - unsigned int i; - - gsm_abis_mo_reset(&bts->mo); - gsm_abis_mo_reset(&bts->site_mgr.mo); - for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) - gsm_abis_mo_reset(&bts->gprs.nsvc[i].mo); - gsm_abis_mo_reset(&bts->gprs.nse.mo); - gsm_abis_mo_reset(&bts->gprs.cell.mo); - - llist_for_each_entry(trx, &bts->trx_list, list) { - gsm_abis_mo_reset(&trx->mo); - gsm_abis_mo_reset(&trx->bb_transc.mo); - - for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - struct gsm_bts_trx_ts *ts = &trx->ts[i]; - gsm_abis_mo_reset(&ts->mo); - } - } -} - struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num) { struct gsm_bts_trx *trx; -- To view, visit https://gerrit.osmocom.org/11866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1ecc6dcb243da27976ca0e90a83aefa18a65b76 Gerrit-Change-Number: 11866 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:55:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 10:55:44 +0000 Subject: Change in osmo-ggsn[master]: initialize local variable addr in ippool_new() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11869 ) Change subject: initialize local variable addr in ippool_new() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb67394e5f4c2072380a33f46c848d92c4317245 Gerrit-Change-Number: 11869 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 10:55:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:56:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 10:56:09 +0000 Subject: Change in osmo-ggsn[master]: fix format string error in ippool_printaddr() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11870 ) Change subject: fix format string error in ippool_printaddr() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2a55907adae98f8aa7b079f1c9a3b4fc5f67fc5 Gerrit-Change-Number: 11870 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 10:56:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 10:56:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 10:56:40 +0000 Subject: Change in osmo-ggsn[master]: fix a format string directives in queue_seqset() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11862 ) Change subject: fix a format string directives in queue_seqset() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I889019aad963932fdc032421e60a72c809a93bca Gerrit-Change-Number: 11862 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 10:56:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 11:01:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 11:01:39 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11871 ) Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c File lib/tun.c: https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c at 279 PS1, Line 279: netdev_delroute(&tun->dstaddr.v4, &tun->addr.v4, &tun->netmask); Just wondering, is this only needed for IPV4? What about IPv6? I see we also have a dstaddr in tun_setaddr6. https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c at 332 PS1, Line 332: strncpy(snet, inet_ntoa(tun->addr.v4), sizeof(snet)); Isn't this reading out of bounds? (also before this change). -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 11:01:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 22 11:19:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 22 Nov 2018 11:19:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-cellmgr-ng_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#53?= In-Reply-To: <1887923511.331.1528111146368.JavaMail.jenkins@jenkins.osmocom.org> References: <1887923511.331.1528111146368.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <541592031.790.1542885542042.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 158.27 KB...] config.status: executing libtool commands + PKG_CONFIG_PATH=/build/deps/libosmo-sccp/..//install/lib/pkgconfig + make -j 8 install echo 0.10.0.29-c382 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in mtp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' Making install in sccp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC mtp_pcap.o CC sccp.o CC sccp_sap.lo CC sua.lo CC libxua_a-xua_msg.o CC sccp_helpers.lo CC xua_msg.lo CC m3ua.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:1032:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/libosmo-sccp/../install/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/libosmo-sccp/../install/lib' ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libsccp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libmtp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/libosmo-sccp/../install/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/libosmo-sccp/../install/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' Making install in vty make[3]: Entering directory '/build/deps/libosmo-sccp/tests/vty' CC ss7_asp_vty_test.o CCLD ss7_asp_vty_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/vty' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_vty.o CC sccp_test_server.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/libosmo-sccp/../install/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/libosmo-sccp/../install/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:326: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: *** [install-systemdsystemunitDATA] Error 1 make[3]: *** [install-am] Error 2 Makefile:396: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[2]: *** [install-recursive] Error 1 Makefile:360: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' Makefile:487: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:786: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:07:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 12:07:27 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11871 ) Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c File lib/tun.c: https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c at 279 PS1, Line 279: netdev_delroute(&tun->dstaddr.v4, &tun->addr.v4, &tun->netmask); > Just wondering, is this only needed for IPV4? What about IPv6? I see we also have a dstaddr in tun_s [?] Yes it looks wrong. But I'd prefer to not mix functional changes in here. https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c at 332 PS1, Line 332: strncpy(snet, inet_ntoa(tun->addr.v4), sizeof(snet)); > Isn't this reading out of bounds? (also before this change). OMG I didn't even realize that this is using strncpy() to copy an in_addr ?!? -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 12:07:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:09:10 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 12:09:10 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11871 ) Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c File lib/tun.c: https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c at 332 PS1, Line 332: strncpy(snet, inet_ntoa(tun->addr.v4), sizeof(snet)); > OMG I didn't even realize that this is using strncpy() to copy an in_addr ?!? Ah it's copying whatever inet_ntoa returns. So that's a string. -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 12:09:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:12:23 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 12:12:23 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11871 ) Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c File lib/tun.c: https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c at 332 PS1, Line 332: strncpy(snet, inet_ntoa(tun->addr.v4), sizeof(snet)); > Ah it's copying whatever inet_ntoa returns. So that's a string. Looks ugly but is legal. inet_ntoa returns a pointer to a static memory area so we can assume it won't fail. strncpy will only copy up to the NUL terminator and zero-fill the rest of snet. -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 12:12:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:34:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 12:34:24 +0000 Subject: Change in osmo-sgsn[master]: consistently check the result of osmo_shift_v_fixed() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11876 Change subject: consistently check the result of osmo_shift_v_fixed() ...................................................................... consistently check the result of osmo_shift_v_fixed() Coverity points out we forgot to check the return value of osmo_shift_v_fixed() in some places. Add checks which verify the expected length of data which is skipped by the parser. Change-Id: I20406f411810e966443d6fd5a4620b9a66cd9809 Related: CID#135160 --- M src/gprs/gprs_gb_parse.c 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/76/11876/1 diff --git a/src/gprs/gprs_gb_parse.c b/src/gprs/gprs_gb_parse.c index 18565ae..93b90a2 100644 --- a/src/gprs/gprs_gb_parse.c +++ b/src/gprs/gprs_gb_parse.c @@ -46,7 +46,8 @@ /* Skip Attach type */ /* Skip Ciphering key sequence number */ /* Skip DRX parameter */ - osmo_shift_v_fixed(&data, &data_len, 3, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 3, NULL) < 3) + return 0; /* Get Mobile identity */ if (osmo_shift_lv(&data, &data_len, &value, &value_len) <= 0 || @@ -82,7 +83,8 @@ /* Skip Periodic RA update timer */ /* Skip Radio priority for SMS */ /* Skip Spare half octet */ - osmo_shift_v_fixed(&data, &data_len, 3, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 3, NULL) < 3) + return 0; if (osmo_shift_v_fixed(&data, &data_len, 6, &value) <= 0) return 0; @@ -170,7 +172,8 @@ /* Skip Update type */ /* Skip GPRS ciphering key sequence number */ - osmo_shift_v_fixed(&data, &data_len, 1, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 1, NULL) < 1) + return 0; if (osmo_shift_v_fixed(&data, &data_len, 6, &value) <= 0) return 0; @@ -221,7 +224,8 @@ /* Skip Force to standby */ /* Skip Update result */ /* Skip Periodic RA update timer */ - osmo_shift_v_fixed(&data, &data_len, 2, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 2, NULL) < 2) + return 0; if (osmo_shift_v_fixed(&data, &data_len, 6, &value) <= 0) return 0; @@ -299,7 +303,8 @@ /* Skip Requested NSAPI */ /* Skip Requested LLC SAPI */ - osmo_shift_v_fixed(&data, &data_len, 2, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 2, NULL) < 2) + return 0; /* Skip Requested QoS (support 04.08 and 24.008) */ if (osmo_shift_lv(&data, &data_len, NULL, &value_len) <= 0 || -- To view, visit https://gerrit.osmocom.org/11876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I20406f411810e966443d6fd5a4620b9a66cd9809 Gerrit-Change-Number: 11876 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:42:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 12:42:13 +0000 Subject: Change in osmo-sysmon[master]: Add git-review config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11877 Change subject: Add git-review config ...................................................................... Add git-review config Change-Id: Ie49cfcf38cc28a42c97eb4119231d8d885443a26 --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/77/11877/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..f81ef15 --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=osmo-sysmon -- To view, visit https://gerrit.osmocom.org/11877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie49cfcf38cc28a42c97eb4119231d8d885443a26 Gerrit-Change-Number: 11877 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:42:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 12:42:13 +0000 Subject: Change in osmo-sysmon[master]: Update gitignore Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11878 Change subject: Update gitignore ...................................................................... Update gitignore Change-Id: I2e63890653240b641b3c8b4b92b76b3833667ff3 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/78/11878/1 diff --git a/.gitignore b/.gitignore index 13ae7b9..c89e9b0 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ # apps and app data osysmon +osmo-sysmon osmo-ctrl-client tags -- To view, visit https://gerrit.osmocom.org/11878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2e63890653240b641b3c8b4b92b76b3833667ff3 Gerrit-Change-Number: 11878 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:42:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 12:42:13 +0000 Subject: Change in osmo-sysmon[master]: Report config file name on error Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11879 Change subject: Report config file name on error ...................................................................... Report config file name on error Change-Id: If3f97452e4defb5c8dd540dd75045d37824fb305 --- M osysmon_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/79/11879/1 diff --git a/osysmon_main.c b/osysmon_main.c index eaed1a9..98859ed 100644 --- a/osysmon_main.c +++ b/osysmon_main.c @@ -129,7 +129,7 @@ rc = vty_read_config_file(config_file, NULL); if (rc < 0) { - fprintf(stderr, "Failed to parse the config file\n"); + fprintf(stderr, "Failed to parse the config file %s\n", config_file); exit(2); } -- To view, visit https://gerrit.osmocom.org/11879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If3f97452e4defb5c8dd540dd75045d37824fb305 Gerrit-Change-Number: 11879 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:42:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 12:42:14 +0000 Subject: Change in osmo-sysmon[master]: Update default config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11880 Change subject: Update default config ...................................................................... Update default config Rename default config to match the binary name and add config exampe. Change-Id: Iabfc78c95e904af7372f10c195b2b979675d34f3 Related: SYS#2655 --- M configure.ac A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-sysmon.cfg M osysmon_main.c 5 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/80/11880/1 diff --git a/configure.ac b/configure.ac index 7f5ae80..13082b7 100644 --- a/configure.ac +++ b/configure.ac @@ -127,4 +127,6 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT( + doc/Makefile + doc/examples/Makefile Makefile) diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..cf728a4 --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,7 @@ +examples_sysmondir = $(docdir)/examples/osmo-sysmon +examples_sysmon_DATA = osmo-sysmon.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-sysmon.cfg + +EXTRA_DIST = osmo-sysmon.cfg diff --git a/doc/examples/osmo-sysmon.cfg b/doc/examples/osmo-sysmon.cfg new file mode 100644 index 0000000..933df93 --- /dev/null +++ b/doc/examples/osmo-sysmon.cfg @@ -0,0 +1,5 @@ +ctrl-client bsc 127.0.0.1 4249 + get-variable bts_connection_status + get-variable msc.0.connection_status +netdev eth0 +netdev tun0 diff --git a/osysmon_main.c b/osysmon_main.c index 98859ed..5983212 100644 --- a/osysmon_main.c +++ b/osysmon_main.c @@ -70,7 +70,7 @@ }; -static const char *config_file = "osysmon.cfg"; +static const char *config_file = "osmo-sysmon.cfg"; struct osysmon_state *g_oss; -- To view, visit https://gerrit.osmocom.org/11880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iabfc78c95e904af7372f10c195b2b979675d34f3 Gerrit-Change-Number: 11880 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:44:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:44:22 +0000 Subject: Change in osmo-sysmon[master]: Add git-review config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11877 ) Change subject: Add git-review config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie49cfcf38cc28a42c97eb4119231d8d885443a26 Gerrit-Change-Number: 11877 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 12:44:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:44:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:44:24 +0000 Subject: Change in osmo-sysmon[master]: Update gitignore In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11878 ) Change subject: Update gitignore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2e63890653240b641b3c8b4b92b76b3833667ff3 Gerrit-Change-Number: 11878 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 12:44:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:44:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:44:33 +0000 Subject: Change in osmo-sysmon[master]: Report config file name on error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11879 ) Change subject: Report config file name on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If3f97452e4defb5c8dd540dd75045d37824fb305 Gerrit-Change-Number: 11879 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 12:44:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:44:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:44:51 +0000 Subject: Change in osmo-sysmon[master]: Add git-review config In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11877 ) Change subject: Add git-review config ...................................................................... Add git-review config Change-Id: Ie49cfcf38cc28a42c97eb4119231d8d885443a26 --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..f81ef15 --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=osmo-sysmon -- To view, visit https://gerrit.osmocom.org/11877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie49cfcf38cc28a42c97eb4119231d8d885443a26 Gerrit-Change-Number: 11877 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:44:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:44:51 +0000 Subject: Change in osmo-sysmon[master]: Update gitignore In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11878 ) Change subject: Update gitignore ...................................................................... Update gitignore Change-Id: I2e63890653240b641b3c8b4b92b76b3833667ff3 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 13ae7b9..c89e9b0 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ # apps and app data osysmon +osmo-sysmon osmo-ctrl-client tags -- To view, visit https://gerrit.osmocom.org/11878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2e63890653240b641b3c8b4b92b76b3833667ff3 Gerrit-Change-Number: 11878 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:44:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:44:52 +0000 Subject: Change in osmo-sysmon[master]: Report config file name on error In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11879 ) Change subject: Report config file name on error ...................................................................... Report config file name on error Change-Id: If3f97452e4defb5c8dd540dd75045d37824fb305 --- M osysmon_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/osysmon_main.c b/osysmon_main.c index eaed1a9..98859ed 100644 --- a/osysmon_main.c +++ b/osysmon_main.c @@ -129,7 +129,7 @@ rc = vty_read_config_file(config_file, NULL); if (rc < 0) { - fprintf(stderr, "Failed to parse the config file\n"); + fprintf(stderr, "Failed to parse the config file %s\n", config_file); exit(2); } -- To view, visit https://gerrit.osmocom.org/11879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If3f97452e4defb5c8dd540dd75045d37824fb305 Gerrit-Change-Number: 11879 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:45:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:45:20 +0000 Subject: Change in osmo-sgsn[master]: consistently check the result of osmo_shift_v_fixed() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11876 ) Change subject: consistently check the result of osmo_shift_v_fixed() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I20406f411810e966443d6fd5a4620b9a66cd9809 Gerrit-Change-Number: 11876 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 12:45:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:48:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:48:21 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11871 ) Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... Patch Set 1: Code-Review-1 this causes ABI breakage, IMHO, so it should be mentioned in TODO-RELEASE -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 12:48:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:48:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:48:50 +0000 Subject: Change in libosmocore[master]: Update gsm0808_create_ass() doxygen In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11868 ) Change subject: Update gsm0808_create_ass() doxygen ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5552732afcec48047d993ae6ffb73a3e5d7c9202 Gerrit-Change-Number: 11868 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 22 Nov 2018 12:48:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:53:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:53:02 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 8 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 12:53:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:53:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:53:06 +0000 Subject: Change in osmo-bsc[master]: RSL: restructure MDCX functions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11550 ) Change subject: RSL: restructure MDCX functions ...................................................................... RSL: restructure MDCX functions In preparation for upcoming LCLS changes we have to split IPA RSL MDCX generation into separate function with the ability to set destination explicitly instead of just using the value from lchan which will be used in follow-up patches. Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Related: OS#3659 --- M include/osmocom/bsc/abis_rsl.h M src/osmo-bsc/abis_rsl.c 2 files changed, 19 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index 5ada3fc..098d2e6 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -61,6 +61,7 @@ int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci); /* ip.access specfic RSL extensions */ +struct msgb *rsl_make_ipacc_mdcx(const struct gsm_lchan *lchan, uint32_t dest_ip, uint16_t dest_port); int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan); int rsl_tx_ipacc_mdcx(const struct gsm_lchan *lchan); int rsl_ipacc_mdcx_to_rtpsock(struct gsm_lchan *lchan); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6e8d078..954fb0f 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1847,11 +1847,12 @@ return abis_rsl_sendmsg(msg); } -/*! Send IPA RSL MDCX to configure the RTP port the BTS sends to (MGW). - * \param[in] lchan Logical Channel for which we issue MDCX - * Remote (MGW) IP address, port and payload types for RTP are determined from lchan->abis_ip. +/*! Allocate buffer for IPA RSL MDCX and populate it with given parameters. + * \param[in] lchan Logical Channel for which we make MDCX + * \param[in] dest_ip The IP address to connect to + * \param[in] dest_port The port to connect to */ -int rsl_tx_ipacc_mdcx(const struct gsm_lchan *lchan) +struct msgb *rsl_make_ipacc_mdcx(const struct gsm_lchan *lchan, uint32_t dest_ip, uint16_t dest_port) { struct msgb *msg = rsl_msgb_alloc(); struct abis_rsl_dchan_hdr *dh; @@ -1865,8 +1866,8 @@ msgb_tv16_put(msg, RSL_IE_IPAC_CONN_ID, lchan->abis_ip.conn_id); msgb_v_put(msg, RSL_IE_IPAC_REMOTE_IP); att_ip = (uint32_t *)msgb_put(msg, sizeof(uint32_t)); - *att_ip = htonl(lchan->abis_ip.connect_ip); - msgb_tv16_put(msg, RSL_IE_IPAC_REMOTE_PORT, lchan->abis_ip.connect_port); + *att_ip = htonl(dest_ip); + msgb_tv16_put(msg, RSL_IE_IPAC_REMOTE_PORT, dest_port); msgb_tv_put(msg, RSL_IE_IPAC_SPEECH_MODE, lchan->abis_ip.speech_mode); msgb_tv_put(msg, RSL_IE_IPAC_RTP_PAYLOAD, lchan->abis_ip.rtp_payload); if (lchan->abis_ip.rtp_payload2) @@ -1874,6 +1875,17 @@ msg->dst = lchan->ts->trx->rsl_link; + return msg; +} + +/*! Send IPA RSL MDCX to configure the RTP port the BTS sends to (MGW). + * \param[in] lchan Logical Channel for which we issue MDCX + * Remote (MGW) IP address, port and payload types for RTP are determined from lchan->abis_ip. + */ +int rsl_tx_ipacc_mdcx(const struct gsm_lchan *lchan) +{ + struct msgb *msg = rsl_make_ipacc_mdcx(lchan, lchan->abis_ip.connect_ip, lchan->abis_ip.connect_port); + LOG_LCHAN(lchan, LOGL_DEBUG, "Sending IPACC MDCX to BTS:" " %s:%u rtp_payload=%u rtp_payload2=%u conn_id=%u speech_mode=0x%02x\n", ip_to_a(lchan->abis_ip.connect_ip), -- To view, visit https://gerrit.osmocom.org/11550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iffe2f4f10e841fc36965cce02b4e5f017a5ae6c8 Gerrit-Change-Number: 11550 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:53:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:53:07 +0000 Subject: Change in osmo-bsc[master]: LCLS: add bts-loop variant In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11552 ) Change subject: LCLS: add bts-loop variant ...................................................................... LCLS: add bts-loop variant Add LCLS variant where the loop is closed on BTS level instead of MGW. The main difference is the handling of connection-related messages (we use IPA RSL instead of MGCP), the configuration and correlation logic remains the same. Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Related: OS#3659 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/gsm_data.c M src/osmo-bsc/osmo_bsc_lcls.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 54 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 32b161e..0c2094e 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -56,7 +56,7 @@ enum bsc_lcls_mode { BSC_LCLS_MODE_DISABLED, BSC_LCLS_MODE_MGW_LOOP, - /* we may later introduce BTS_LOOP here: direct RTP between BTSs */ + BSC_LCLS_MODE_BTS_LOOP, }; extern const struct value_string bsc_lcls_mode_names[]; diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 774238b..6d39642 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -50,6 +50,7 @@ const struct value_string bsc_lcls_mode_names[] = { { BSC_LCLS_MODE_DISABLED, "disabled" }, { BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" }, + { BSC_LCLS_MODE_BTS_LOOP, "bts-loop" }, { 0, NULL } }; diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c index 81daaf0..cdd6557 100644 --- a/src/osmo-bsc/osmo_bsc_lcls.c +++ b/src/osmo-bsc/osmo_bsc_lcls.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -227,6 +228,26 @@ osmo_fsm_inst_dispatch(conn->lcls.fi, LCLS_EV_APPLY_CFG_CSC, NULL); } +/* Redirect BTS's RTP traffic via RSL MDCX command: + * when enable == true, redirect to remote BTS's IP:port + * when enable == false, redirect back to the MGW's IP:port + */ +static inline void lcls_rsl(const struct gsm_subscriber_connection *conn, bool enable) +{ + const struct gsm_lchan *lchan = conn->lchan; + /* RSL_IE_IPAC_REMOTE_IP */ + uint32_t ip = enable ? conn->lcls.other->lchan->abis_ip.bound_ip : lchan->abis_ip.connect_ip; + /* RSL_IE_IPAC_REMOTE_PORT */ + uint16_t port = enable ? conn->lcls.other->lchan->abis_ip.bound_port : lchan->abis_ip.connect_port; + + if (!conn->lcls.other) { + LOGPFSM(conn->lcls.fi, "%s LCLS: other conn is not available!\n", enable ? "enable" : "disable"); + return; + } + + abis_rsl_sendmsg(rsl_make_ipacc_mdcx(lchan, ip, port)); +} + static inline bool lcls_check_toggle_allowed(const struct gsm_subscriber_connection *conn, bool enable) { if (conn->lcls.other && @@ -258,6 +279,7 @@ static void lcls_break_local_switching(struct gsm_subscriber_connection *conn) { + struct mgcp_conn_peer mdcx_info; LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS(%s)\n", bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); @@ -265,12 +287,21 @@ if (!lcls_check_toggle_allowed(conn, false)) return; - if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP) { - struct mgcp_conn_peer mdcx_info = (struct mgcp_conn_peer){ - .port = conn->user_plane.msc_assigned_rtp_port, - }; + switch(conn->sccp.msc->lcls_mode) { + case BSC_LCLS_MODE_MGW_LOOP: + mdcx_info.port = conn->user_plane.msc_assigned_rtp_port; osmo_strlcpy(mdcx_info.addr, conn->user_plane.msc_assigned_rtp_addr, sizeof(mdcx_info.addr)); lcls_mdcx(conn, &mdcx_info); + break; + case BSC_LCLS_MODE_BTS_LOOP: + lcls_rsl(conn, false); + break; + case BSC_LCLS_MODE_DISABLED: + LOGPFSM(conn->lcls.fi, "FIXME: attempt to break LCLS loop while LCLS is disabled?!\n"); + break; + default: + LOGPFSM(conn->lcls.fi, "FIXME: unknown LCLS mode %s\n", + bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); } } @@ -597,6 +628,7 @@ struct gsm_subscriber_connection *conn = fi->priv; struct gsm_subscriber_connection *conn_other = conn->lcls.other; const struct mgcp_conn_peer *other_mgw_info; + struct mgcp_conn_peer mdcx_info; OSMO_ASSERT(conn_other); @@ -618,11 +650,22 @@ return; } - if (conn->sccp.msc->lcls_mode == BSC_LCLS_MODE_MGW_LOOP) { - struct mgcp_conn_peer mdcx_info = *other_mgw_info; + switch(conn->sccp.msc->lcls_mode) { + case BSC_LCLS_MODE_MGW_LOOP: + mdcx_info = *other_mgw_info; /* Make sure the request doesn't want to use the other side's endpoint string. */ mdcx_info.endpoint[0] = 0; lcls_mdcx(conn, &mdcx_info); + break; + case BSC_LCLS_MODE_BTS_LOOP: + lcls_rsl(conn, true); + break; + case BSC_LCLS_MODE_DISABLED: + LOGPFSM(conn->lcls.fi, "FIXME: attempt to close LCLS loop while LCLS is disabled?!\n"); + break; + default: + LOGPFSM(conn->lcls.fi, "FIXME: unknown LCLS mode %s\n", + bsc_lcls_mode_name(conn->sccp.msc->lcls_mode)); } } diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index 14fd274..a32f580 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -646,10 +646,11 @@ DEFUN(cfg_net_msc_lcls_mode, cfg_net_msc_lcls_mode_cmd, - "lcls-mode (disabled|mgw-loop)", + "lcls-mode (disabled|mgw-loop|bts-loop)", "Configure 3GPP LCLS (Local Call, Local Switch)\n" "Disable LCLS for all calls of this MSC\n" - "Enable LCLS with loopping traffic in MGW\n") + "Enable LCLS with looping traffic in MGW\n" + "Enable LCLS with looping traffic between BTS\n") { struct bsc_msc_data *data = bsc_msc_data(vty); data->lcls_mode = get_string_value(bsc_lcls_mode_names, argv[0]); -- To view, visit https://gerrit.osmocom.org/11552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7e8379f31037f2c48da69a01919701919a3066a2 Gerrit-Change-Number: 11552 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:53:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:53:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 8 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 12:53:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:54:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 12:54:52 +0000 Subject: Change in libosmocore[master]: Update gsm0808_create_ass() doxygen In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11868 ) Change subject: Update gsm0808_create_ass() doxygen ...................................................................... Update gsm0808_create_ass() doxygen * add spec reference * remove LCLS note: CI parameter is optional but have nothing to do with LCLS It's pretty hard to decipher from the spec what CI is useful for and we have not used it anyway so let's just keep it as "Optional" for now. Change-Id: I5552732afcec48047d993ae6ffb73a3e5d7c9202 --- M src/gsm/gsm0808.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index a84e717..fe7bc2c 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -424,12 +424,12 @@ return msg; } -/*! Create BSSMAP Assignment Request message +/*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 ?3.2.1.1 * \param[in] ct Channel Type * \param[in] cic Circuit Identity Code (Classic A only) * \param[in] ss Socket Address of MSC-side RTP socket (AoIP only) * \param[in] scl Speech Codec List (AoIP only) - * \param[in] ci Call Identifier (Optional, LCLS) + * \param[in] ci Call Identifier (Optional), ?3.2.2.105 * \returns callee-allocated msgb with BSSMAP Assignment Request message */ struct msgb *gsm0808_create_ass(const struct gsm0808_channel_type *ct, const uint16_t *cic, -- To view, visit https://gerrit.osmocom.org/11868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5552732afcec48047d993ae6ffb73a3e5d7c9202 Gerrit-Change-Number: 11868 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 12:55:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 12:55:01 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 2: Code-Review+2 build fails with: ==== handover_fsm.c: In function 'send_handover_performed': handover_fsm.c:678:36: error: storage size of 'ho_perf_params' isn't known struct gsm0808_handover_performed ho_perf_params; ^ handover_fsm.c:718:2: error: implicit declaration of function 'gsm0808_create_handover_performed' [-Werror=implicit-function-declaration] msg = gsm0808_create_handover_performed(&ho_perf_params); ^ handover_fsm.c:678:36: error: unused variable 'ho_perf_params' [-Werror=unused-variable] struct gsm0808_handover_performed ho_perf_params; ^ cc1: all warnings being treated as errors ==== otherwise the patch looks good to me -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 12:55:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:09:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 13:09:48 +0000 Subject: Change in osmo-sysmon[master]: Update default config In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11880 ) Change subject: Update default config ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iabfc78c95e904af7372f10c195b2b979675d34f3 Gerrit-Change-Number: 11880 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 13:09:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:14:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 13:14:19 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11871 to look at the new patch set (#2). Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... properly store IPv6 addresses in struct tun_t All addresses in struct tun_t were stored as an in_addr. But IPv6 addresses need an in6_addr, so switch tun_t addresses to the in64_addr wrapper struct. This is an ABI break, as documented in TODO-RELEASE. Fixes an out of bounds memcpy() identified by Coverity. Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Related: CID#174278 --- M TODO-RELEASE M lib/tun.c M lib/tun.h 3 files changed, 17 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/71/11871/2 -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:16:29 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 13:16:29 +0000 Subject: Change in osmo-ggsn[master]: replace bogus memcpy() call in ippool_newip() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11861 ) Change subject: replace bogus memcpy() call in ippool_newip() ...................................................................... replace bogus memcpy() call in ippool_newip() When copying an address to a reused static hash table member with memcpy(), this code mistakenly passed the size of a pointer as the amount of bytes to be copied, rather than the actual size of the address. This means the IP pool could contain bogus IP addresses because only addr->len (a uint8_t) and 3 further bytes of the address were actually copied on 32 bit platforms. On 64 bit platforms, a sufficient amount of bytes were copied for IPv4 to work correctly, but too few bytes were copied for IPv6. This problem was found by Coverity. Replace the bogus memcpy() call with direct assignments to the appropriate struct in64addr union members, and assert that the length recorded for the address actually corresponds to the length used by the address family (IP4, IPv6). Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Related: CID#57921 --- M lib/ippool.c 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/lib/ippool.c b/lib/ippool.c index 6ce3cda..36121ee 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -512,7 +512,15 @@ p2->next = NULL; p2->prev = NULL; p2->inuse = 2; /* Static address in use */ - memcpy(&p2->addr, addr, sizeof(addr)); + /* p2->addr.len and addr->len already match (see above). */ + if (p2->addr.len == sizeof(struct in_addr)) + p2->addr.v4 = addr->v4; + else if (p2->addr.len == sizeof(struct in6_addr)) + p2->addr.v6 = addr->v6; + else { + SYS_ERR(DIP, LOGL_ERROR, 0, "MS requested unsupported PDP context type"); + return -GTPCAUSE_UNKNOWN_PDP; + } *member = p2; (void)ippool_hashadd(this, *member); if (0) -- To view, visit https://gerrit.osmocom.org/11861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic21560f7519e776107485a8779702fb1279d065c Gerrit-Change-Number: 11861 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:16:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 13:16:50 +0000 Subject: Change in osmo-ggsn[master]: initialize local variable addr in ippool_new() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11869 ) Change subject: initialize local variable addr in ippool_new() ...................................................................... initialize local variable addr in ippool_new() Coverity points out that addr.len was potentially being used uninitialized, via calls to in46a_inc(&addr). Change-Id: Idb67394e5f4c2072380a33f46c848d92c4317245 Related: CID#174189 --- M lib/ippool.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/lib/ippool.c b/lib/ippool.c index 36121ee..6f3d06e 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -202,7 +202,7 @@ /* Parse only first instance of pool for now */ int i; - struct in46_addr addr; + struct in46_addr addr = { 0 }; size_t addrprefixlen; struct in46_addr stataddr; size_t stataddrprefixlen; -- To view, visit https://gerrit.osmocom.org/11869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idb67394e5f4c2072380a33f46c848d92c4317245 Gerrit-Change-Number: 11869 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:17:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 13:17:01 +0000 Subject: Change in osmo-ggsn[master]: fix format string error in ippool_printaddr() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11870 ) Change subject: fix format string error in ippool_printaddr() ...................................................................... fix format string error in ippool_printaddr() The variable this->listsize is an unsigned int, but the format string assumed ptrdiff_t. Found by Coverity. Change-Id: Ib2a55907adae98f8aa7b079f1c9a3b4fc5f67fc5 Related: CID#188879 --- M lib/ippool.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/lib/ippool.c b/lib/ippool.c index 6f3d06e..a405b58 100644 --- a/lib/ippool.c +++ b/lib/ippool.c @@ -30,7 +30,7 @@ printf("Lastdyn %td\n", this->lastdyn - this->member); printf("Firststat %td\n", this->firststat - this->member); printf("Laststat %td\n", this->laststat - this->member); - printf("Listsize %td\n", this->listsize); + printf("Listsize %u\n", this->listsize); for (n = 0; n < this->listsize; n++) { char s[256]; -- To view, visit https://gerrit.osmocom.org/11870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib2a55907adae98f8aa7b079f1c9a3b4fc5f67fc5 Gerrit-Change-Number: 11870 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:17:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 13:17:18 +0000 Subject: Change in osmo-ggsn[master]: fix a format string directives in queue_seqset() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11862 ) Change subject: fix a format string directives in queue_seqset() ...................................................................... fix a format string directives in queue_seqset() Coverity pointed out that a format string used inappropriate format string directives for variables of type size_t. Change-Id: I889019aad963932fdc032421e60a72c809a93bca Related: CID#135197 --- M gtp/queue.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/gtp/queue.c b/gtp/queue.c index 82cd7b4..ebeebe6 100644 --- a/gtp/queue.c +++ b/gtp/queue.c @@ -79,7 +79,7 @@ if (QUEUE_DEBUG) printf("Begin queue_seqset seq = %d\n", (int)seq); if (QUEUE_DEBUG) - printf("SIZEOF PEER %d, *PEER %d\n", sizeof(peer), + printf("SIZEOF PEER %zu, *PEER %zu\n", sizeof(peer), sizeof(*peer)); qmsg->seq = seq; -- To view, visit https://gerrit.osmocom.org/11862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I889019aad963932fdc032421e60a72c809a93bca Gerrit-Change-Number: 11862 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:17:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 13:17:31 +0000 Subject: Change in osmo-sgsn[master]: consistently check the result of osmo_shift_v_fixed() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11876 ) Change subject: consistently check the result of osmo_shift_v_fixed() ...................................................................... consistently check the result of osmo_shift_v_fixed() Coverity points out we forgot to check the return value of osmo_shift_v_fixed() in some places. Add checks which verify the expected length of data which is skipped by the parser. Change-Id: I20406f411810e966443d6fd5a4620b9a66cd9809 Related: CID#135160 --- M src/gprs/gprs_gb_parse.c 1 file changed, 10 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/gprs_gb_parse.c b/src/gprs/gprs_gb_parse.c index 18565ae..93b90a2 100644 --- a/src/gprs/gprs_gb_parse.c +++ b/src/gprs/gprs_gb_parse.c @@ -46,7 +46,8 @@ /* Skip Attach type */ /* Skip Ciphering key sequence number */ /* Skip DRX parameter */ - osmo_shift_v_fixed(&data, &data_len, 3, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 3, NULL) < 3) + return 0; /* Get Mobile identity */ if (osmo_shift_lv(&data, &data_len, &value, &value_len) <= 0 || @@ -82,7 +83,8 @@ /* Skip Periodic RA update timer */ /* Skip Radio priority for SMS */ /* Skip Spare half octet */ - osmo_shift_v_fixed(&data, &data_len, 3, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 3, NULL) < 3) + return 0; if (osmo_shift_v_fixed(&data, &data_len, 6, &value) <= 0) return 0; @@ -170,7 +172,8 @@ /* Skip Update type */ /* Skip GPRS ciphering key sequence number */ - osmo_shift_v_fixed(&data, &data_len, 1, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 1, NULL) < 1) + return 0; if (osmo_shift_v_fixed(&data, &data_len, 6, &value) <= 0) return 0; @@ -221,7 +224,8 @@ /* Skip Force to standby */ /* Skip Update result */ /* Skip Periodic RA update timer */ - osmo_shift_v_fixed(&data, &data_len, 2, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 2, NULL) < 2) + return 0; if (osmo_shift_v_fixed(&data, &data_len, 6, &value) <= 0) return 0; @@ -299,7 +303,8 @@ /* Skip Requested NSAPI */ /* Skip Requested LLC SAPI */ - osmo_shift_v_fixed(&data, &data_len, 2, NULL); + if (osmo_shift_v_fixed(&data, &data_len, 2, NULL) < 2) + return 0; /* Skip Requested QoS (support 04.08 and 24.008) */ if (osmo_shift_lv(&data, &data_len, NULL, &value_len) <= 0 || -- To view, visit https://gerrit.osmocom.org/11876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I20406f411810e966443d6fd5a4620b9a66cd9809 Gerrit-Change-Number: 11876 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:24:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 13:24:37 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests.c: drop duplicating DMM category definition Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11881 Change subject: msc_vlr_tests.c: drop duplicating DMM category definition ...................................................................... msc_vlr_tests.c: drop duplicating DMM category definition Change-Id: I2bf8150580c318ccaa9c30657582c15020f6b711 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/11881/1 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index fd196c8..9515c63 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -486,11 +486,6 @@ .description = "Layer3 Call Control (CC)", .enabled = 1, .loglevel = LOGL_DEBUG, }, - [DMM] = { - .name = "DMM", - .description = "Layer3 Mobility Management (MM)", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, [DVLR] = { .name = "DVLR", .description = "Visitor Location Register", -- To view, visit https://gerrit.osmocom.org/11881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2bf8150580c318ccaa9c30657582c15020f6b711 Gerrit-Change-Number: 11881 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:25:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 13:25:25 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to coverity submission Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11882 Change subject: Add osmo-sysmon to coverity submission ...................................................................... Add osmo-sysmon to coverity submission Change-Id: I1e753d2c14198eccb046c259b3eec582b1921431 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/11882/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 86bb569..650fa0e 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -77,6 +77,7 @@ build_default osmo-iuh build_osmopcu build_osmobts +build_default osmo-sysmon build_default osmo-mgw build_default osmo-bsc build_default osmo-hlr diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index 7aafa5e..6f32474 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -22,6 +22,7 @@ osmo-gmr \ osmo-iuh \ osmo-pcu \ + osmo-sysmon \ osmo-sip-connector \ osmo-trx \ osmo-hlr \ -- To view, visit https://gerrit.osmocom.org/11882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1e753d2c14198eccb046c259b3eec582b1921431 Gerrit-Change-Number: 11882 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:25:26 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 13:25:26 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to default depcheck config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11883 Change subject: Add osmo-sysmon to default depcheck config ...................................................................... Add osmo-sysmon to default depcheck config Change-Id: Ie57d0d55459d492e18b56496c9018a5f8619813a --- M scripts/osmo-depcheck/config.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/83/11883/1 diff --git a/scripts/osmo-depcheck/config.py b/scripts/osmo-depcheck/config.py index 3e993bf..13c1a95 100644 --- a/scripts/osmo-depcheck/config.py +++ b/scripts/osmo-depcheck/config.py @@ -10,6 +10,7 @@ "osmo-hlr", "osmo-mgw", "osmo-msc", + "osmo-sysmon", "osmo-sgsn", "osmo-ggsn") -- To view, visit https://gerrit.osmocom.org/11883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie57d0d55459d492e18b56496c9018a5f8619813a Gerrit-Change-Number: 11883 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:36:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 13:36:50 +0000 Subject: Change in osmo-bsc[master]: LCLS: update parameter representation In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11820 ) Change subject: LCLS: update parameter representation ...................................................................... Patch Set 3: > Please have a look at it and submit a patch regarding this issue. I will but it's certainly belongs to a different patch. -- To view, visit https://gerrit.osmocom.org/11820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5e962d4fbb24bf1fb2398dc13e142a4a3304d858 Gerrit-Change-Number: 11820 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 13:36:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:43:33 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 22 Nov 2018 13:43:33 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to default depcheck config In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11883 ) Change subject: Add osmo-sysmon to default depcheck config ...................................................................... Patch Set 1: Code-Review+1 yay, somebody is using osmo-depcheck :) -- To view, visit https://gerrit.osmocom.org/11883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57d0d55459d492e18b56496c9018a5f8619813a Gerrit-Change-Number: 11883 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 22 Nov 2018 13:43:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:45:09 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 22 Nov 2018 13:45:09 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to coverity submission In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11882 ) Change subject: Add osmo-sysmon to coverity submission ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e753d2c14198eccb046c259b3eec582b1921431 Gerrit-Change-Number: 11882 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 22 Nov 2018 13:45:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 13:49:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 22 Nov 2018 13:49:24 +0000 Subject: Change in libosmocore[master]: add contrib/struct_endianess.py In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11786 ) Change subject: add contrib/struct_endianess.py ...................................................................... add contrib/struct_endianess.py In libosmocore (and likely elsewhere) we have scores of packed structs with sub-byte integer members that lack the necessary member reversal shims to be able to work on big endian architectures. Instead of manually editing each one of them and probably introduce errors in the process, this script handles the change automatically, and in the future allows us to verify correctness in gerrit verifications. Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 --- A contrib/struct_endianess.py 1 file changed, 369 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/struct_endianess.py b/contrib/struct_endianess.py new file mode 100755 index 0000000..be73fbe --- /dev/null +++ b/contrib/struct_endianess.py @@ -0,0 +1,369 @@ +#!/usr/bin/env python3 + +'''Using mad regexes, automatically make sure that all structs with sub-byte +integers have matching big-endian definitions. The idea is to save a lot of +manual effort, and to automatically verify that there are no errors. +This script most certainly has numerous holes and shortcomings, but actually, +if you hit problems with it, rather adjust your coding style so that this +script can deal with it...''' + +import re +import sys +import codecs +import os.path + +re_struct_start = re.compile(r'^struct\s*[a-zA-Z_][a-zA-Z_0-9]*\s*{\s*$') +re_struct_end = re.compile(r'^}[^;]*;\s*$') + +re_substruct_start = re.compile(r'^\s+struct\s*{\s*$') +re_substruct_end = re.compile(r'^\s+}\s*([^;]*\s)[a-zA-Z_][a-zA-Z_0-9]*\s*;\s*$') + +re_int_def = re.compile(r'(^\s*((const|unsigned|signed|char|int|long|int[0-9]+_t|uint[0-9]_t)\s+)+\s*)([^;]*;)', + re.DOTALL | re.MULTILINE) +re_int_members = re.compile(r'([a-zA-Z_][a-zA-Z_0-9]*|[a-zA-Z_][a-zA-Z_0-9]*\s*:\s*[0-9]+)\s*[,;]\s*', re.DOTALL | re.MULTILINE) + +re_little_endian_ifdef = re.compile(r'#\s*(if|elif)\s+OSMO_IS_LITTLE_ENDIAN\s*(==\s*1\s*|)'); +re_big_endian_ifdef = re.compile(r'#\s*(if|elif)\s+OSMO_IS_BIG_ENDIAN\s*'); +re_else = re.compile(r'#\s*else\s*'); +re_endif = re.compile(r'#\s*endif\s*'); + +re_c_comment = re.compile(r'(/\*[^*]+\*/|//.?$)') + +def remove_c_comments(code_str): + return ''.join(re_c_comment.split(code_str)[::2]) + +def section_struct_body(struct_body_lines): + '''divide a top-level-struct body into sections of + ['arbitrary string', ['body;\n', 'lines;\n'], 'arbitrary string', ...] + Aim: handle each sub-struct on its own, and if there already are ifdefs for + little and big endian, keep just the little endian bit and derive big + endian from it. + An arbitrary string is anything other than struct member definitions, like + a 'struct {', '} sub_name;', ... + "body lines" are lines that define struct members (possibly with comments). + Return: list of alternate arbitrary strings and variable definitions. + ''' + + # these globals are needed so that end_def() can change them from inside + # the function. Not very nice style, but easiest implementation. + global struct_body_parts + global arbitrary_part + global def_part + + struct_body_parts = [] + arbitrary_part = [] + def_part = [] + + def end_def(): + '''if there is any content, flush out recorded parts (def_part, + arbitrary_part) and start a new part. In short, cut a section + boundary.''' + global struct_body_parts + global arbitrary_part + global def_part + + if def_part: + struct_body_parts.append(arbitrary_part) + arbitrary_part = [] + struct_body_parts.append(def_part) + def_part = [] + + j = 0 + while j < len(struct_body_lines): + line = struct_body_lines[j] + + if (re_substruct_start.fullmatch(line) + or re_substruct_end.fullmatch(line)): + end_def() + arbitrary_part.append(line) + j += 1 + continue + + if re_big_endian_ifdef.fullmatch(line): + end_def() + # discard big endian section + j += 1 + while j < len(struct_body_lines): + line = struct_body_lines[j] + if re_endif.fullmatch(line): + end_def() + j += 1 + break; + if re_little_endian_ifdef.fullmatch(line): + end_def() + # keep that start of little endian section, not j++ + break; + if re_else.fullmatch(line): + # there's an '#else' after big-endian. Shim a little-endian header in just for the loop. + struct_body_lines[j] = '#if OSMO_IS_LITTLE_ENDIAN\n' + break; + j += 1 + continue + + if re_little_endian_ifdef.fullmatch(line): + end_def() + j += 1 + while j < len(struct_body_lines): + line = struct_body_lines[j] + if re_endif.fullmatch(line): + end_def() + j += 1 + break; + if re_big_endian_ifdef.fullmatch(line): + end_def() + # keep that start of big endian section, not j++ + break; + if re_else.fullmatch(line): + # there's an '#else' after little-endian. Shim a big-endian header in just for the loop. + struct_body_lines[j] = '#if OSMO_IS_BIG_ENDIAN\n' + break; + def_part.append(line) + j += 1 + + continue + + def_part.append(line) + j += 1 + + # flush the last section remaining that didn't see an explicit end + end_def() + # end_def() only flushes arbitrary_part if there was a def_part, so: + if arbitrary_part: + struct_body_parts.append(arbitrary_part) + + return struct_body_parts + +def struct_body_to_big_endian(body_str): + '''Input: a multi-line string containing the body of a struct, i.e. without + sub-structs and without #if OSMO_IS_BIG_ENDIAN. like + + '\tconst char *foo;\n\tuint8_t moo:3, goo:2;\n\tuint8_t loo:3;\n\tvoid *baz;\n' + + Return None to indicate that there is no little/big endian split + required, or return a multi-line string of the big-endian version of this + same struct body, where sub-byte ints are reversed at byte boundaries, and + all others are copied 1:1. If there are no sub-byte integers, return None, + to indicate that there is no little/big endian split required.''' + + # kick comments out of the code analysis. They will end up being stripped + # from big-endian only. + body_str = remove_c_comments(body_str) + + def_strs = body_str.split(';') + def_strs = ('%s;' % def_str for def_str in def_strs if def_str.strip()) + + # classify defs as containing sub-byte members or not + # defs = [ (true, 'uint8_t ', ('foo:3', 'bar:5')), + # (false, 'int baz;'),...] + defs = [] + any_sub_byte_ints = False + for one_def in def_strs: + + # does it have sub-string integers? + int_def = re_int_def.fullmatch(one_def) + if not int_def: + # not even a number, same for big and little endian + defs.append((False, one_def)) + continue + + int_type = int_def.group(1) + members_str = int_def.groups()[-1] + has_sub_byte_ints = False + + members = [] + for int_member in re_int_members.finditer(members_str): + member = int_member.group(1) + members.append(member) + if ':' in member: + has_sub_byte_ints = True + + if not has_sub_byte_ints: + defs.append((False, one_def)) + else: + defs.append((True, one_def, int_type, members)) + any_sub_byte_ints = True + + if not any_sub_byte_ints: + return None + + # now the interesting part, go over the defs, and reverse the sub-byte ints + # at byte boundaries. + + i = 0 + got_bits = 0 + byte_type = None + members_within_a_byte = [] + big_endian_defs = [] + + big_defs = [] + for classified_def in defs: + has_sub_byte_ints = classified_def[0] + + # now the big endian part + if has_sub_byte_ints: + _, one_def, int_type, members = classified_def + + if byte_type and byte_type.strip() != int_type.strip(): + raise Exception('mismatching type continuation after incomplete byte: %r %r to %r' + % (byte_type, members_within_a_byte, int_type)) + byte_type = int_type + + for member in members: + member_name, bits_str = member.split(':') + member_name = member_name.strip() + bits = int(bits_str) + member = '%s:%d' % (member_name, bits) + members_within_a_byte.append(member) + got_bits += bits + + if got_bits == 8: + # reverse these. + big_endian_defs.append('%s%s;' % (byte_type, ', '.join(reversed(members_within_a_byte)))) + members_within_a_byte = [] + byte_type = None + got_bits = 0 + + elif got_bits > 8: + raise Exception('sub-byte int breaks clean byte bounds: %s -- %d + %d = %d bits' + % (member, got_bits - bits, bits, got_bits)) + + elif not has_sub_byte_ints: + if got_bits: + raise Exception('sub-byte members do not add up to clean byte bounds: %r' % members_within_a_byte) + + big_endian_defs.append(classified_def[1]) + + # strip empty lines + lines = [l for l in (''.join(big_endian_defs).split('\n')) if l.strip()] + # clean lines' whitespace errors we might have taken in with the type names + for i in range(len(lines)): + line = lines[i] + while len(line) and line[-1] in ' \t': + line = line[:-1] + lines[i] = line + return '\n'.join(lines) + +def handle_struct_body(body_str): + + big_endian_body_str = struct_body_to_big_endian(body_str) + + if big_endian_body_str: + new_lines = ['#if OSMO_IS_LITTLE_ENDIAN\n'] + new_lines.append(body_str) + new_lines.append('#elif OSMO_IS_BIG_ENDIAN\n' + '/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */\n') + new_lines.append(big_endian_body_str) + new_lines.append('\n#endif\n') + return ''.join(new_lines) + else: + return body_str + +def _check_file(f): + if not (f.endswith('.h') or f.endswith('.c') or f.endswith('.cpp')): + return + + # section the file into + # [ ["no struct def"], ["struct {...};"], ["no struct def"], ... ] + sections = [] + in_struct = False + buf = [] + for line in codecs.open(f, "r", "utf-8").readlines(): + + if not in_struct and re_struct_start.fullmatch(line): + # flush whatever might still be in buf from before + sections.append(buf) + # start an in_struct section + buf = [line] + in_struct = True + elif in_struct and re_struct_end.fullmatch(line): + # add this end to the in_struct section and then start a non-struct section + buf.append(line) + sections.append(buf) + in_struct = False + buf = [] + else: + buf.append(line) + # flush any leftovers in buf + if buf: + sections.append(buf) + + # examine each struct, i.e. every second item in 'sections' + for i in range(len(sections)): + if not (i & 1): + continue + + struct = sections[i] + + # If the struct isn't packed, we need not bother. + # The practical use of this: in some structs we have booleans in the + # form of + # integer flag:1; + # and these don't add up to bytes, and cause errors. So let's skip all + # non-packed structs, then all of those are out of the picture. + if not 'packed' in struct[-1]: + continue + + try: + + # assume the 'struct foo {' is on the first line, the closing brace + # '} __attribute...;' on the last, and the rest are individual + # definitions split by ';'. + struct_body_lines = struct[1:-1] + struct_body_parts = section_struct_body(struct_body_lines) + + new_struct_body_parts = [] + for j in range(len(struct_body_parts)): + part = ''.join(struct_body_parts[j]) + if not (j & 1): + new_struct_body_parts.append(part) + else: + new_struct_body_parts.append(handle_struct_body(part)) + + new_struct = [struct[0], ''.join(new_struct_body_parts), struct[-1]] + sections[i] = new_struct + except Exception as e: + raise Exception('ERROR in struct %r' % struct[0]) + + # phew. result. + result = ''.join((''.join(s) for s in sections)) + + # see if osmocom/core/endian.h is needed and included. + if (not f.endswith('endian.h') + and 'OSMO_IS_LITTLE_ENDIAN' in result + and '#include ' not in result): + # add the include after the last 'osmocom/core' include + last_include_start = result.rfind('#include ' + result[insert_at:] + + with codecs.open(f, "w", "utf-8") as fd: + fd.write(result) + +def check_file(f): + try: + _check_file(f) + except Exception as e: + raise Exception('ERROR IN FILE %r' % f) + +args = sys.argv[1:] +if not args: + args = ['.'] + +for f in args: + if os.path.isdir(f): + for parent_path, subdirs, files in os.walk(f, None, None): + for ff in files: + check_file(os.path.join(parent_path, ff)) + else: + check_file(f) + +# vim: tabstop=4 shiftwidth=4 expandtab -- To view, visit https://gerrit.osmocom.org/11786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e75b17d8071c7b3a2a171ba776fb76854b28a53 Gerrit-Change-Number: 11786 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 22 13:56:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 22 Nov 2018 13:56:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sysmo,?= =?UTF-8?Q?femtobts=5Fv2.7,default,osmocom-master-debian9_#1455?= Message-ID: <1913142548.792.1542894960080.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 35.94 KB...] checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... /usr/bin/doxygen checking whether SYS_getrandom is declared... yes checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.125-7ab5 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc8gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc32gen.c GEN crc64gen.c GEN crc8gen.c GEN crc16gen.c make install-am make[3]: Entering directory ' CC timer.lo CC timer_gettimeofday.lo CC signal.lo CC timer_clockgettime.lo CC select.lo CC bitvec.lo CC bits.lo CC msgb.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo /bin/bash: line 2: 21737 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT logging_syslog.lo -MD -MP -MF $depbase.Tpo -c -o logging_syslog.lo logging_syslog.c Makefile:558: recipe for target 'logging_syslog.lo' failed make[3]: *** [logging_syslog.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:662: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:07:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 22 Nov 2018 14:07:23 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Introduce -q quiet param In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Introduce -q quiet param ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 8 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 14:07:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:07:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 22 Nov 2018 14:07:34 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Introduce -q quiet param In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Introduce -q quiet param ...................................................................... Patch Set 8: phew, that was a lot easier -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 8 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 14:07:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 22 Nov 2018 14:08:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_paging_resp_unsol In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11604 ) Change subject: bsc: Introduce test TC_paging_resp_unsol ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce Gerrit-Change-Number: 11604 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 14:08:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:10:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:10:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_paging_resp_unsol In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11604 ) Change subject: bsc: Introduce test TC_paging_resp_unsol ...................................................................... bsc: Introduce test TC_paging_resp_unsol With this test we want to verify that channels are released if BSC fails to complete an L3 request, for instance because no pending Paging CMD is found for a received Paging Response. Related: OS#3680 Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 27 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9b445f5..a155fef 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1466,6 +1466,30 @@ f_shutdown_helper(); } +/* Verify how we handle unsolicited Paging Response, for instance because we + * receive a Paging Response after T3113 expired (and subscriber information was + * dropped). See OS#3680. + */ +testcase TC_paging_resp_unsol() runs on test_CT { + + f_init(1); + + var BSSAP_N_CONNECT_ind rx_c_ind; + var DchanTuple dt; + var PDU_ML3_MS_NW l3 := valueof(ts_PAG_RESP(valueof(ts_MI_IMSI_LV('001010008880018'H)))); + + /* Send CHAN RQD and wait for allocation; acknowledge it */ + dt.rsl_chan_nr := f_chreq_act_ack(); + + /* Send unsolicited Paging response (no matching Paging CMD stored in BSC) */ + f_ipa_tx(0, ts_RSL_EST_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)), enc_PDU_ML3_MS_NW(l3))); + + /* expect BSC to disable the channel */ + f_expect_chan_rel(0, dt.rsl_chan_nr); + setverdict(pass); + +} + /* Test RSL link drop causes counter increment */ testcase TC_rsl_drop_counter() runs on test_CT { var integer rsl_fail; @@ -3407,6 +3431,7 @@ execute( TC_paging_imsi_a_reset() ); execute( TC_paging_imsi_load() ); execute( TC_paging_counter() ); + execute( TC_paging_resp_unsol() ); execute( TC_rsl_drop_counter() ); execute( TC_rsl_unknown_unit_id() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index ff50990..d558e72 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -59,6 +59,7 @@ + -- To view, visit https://gerrit.osmocom.org/11604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iabe8a51aa13d2fcfec4500cf7aab47d60cc138ce Gerrit-Change-Number: 11604 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:10:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:10:44 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Introduce -q quiet param In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11687 ) Change subject: ipaccess-config: Introduce -q quiet param ...................................................................... ipaccess-config: Introduce -q quiet param This way only formated output is pinted to stdout when using -G and can be used by other tools (osmo-gsm-tester) to get a json dictionary with interesting information. Related: OS#3624 Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e --- M src/ipaccess/ipaccess-config.c 1 file changed, 43 insertions(+), 20 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index dcaa756..7c81c5a 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -73,6 +73,7 @@ static char *firmware_analysis = NULL; static int found_trx = 0; static int loop_tests = 0; +static bool quiet = false; static void *tall_ctx_config = NULL; static struct abis_nm_sw_desc *sw_load1 = NULL; @@ -312,11 +313,13 @@ ipacc_data = signal_data; return ipacc_msg_ack(ipacc_data->msg_type, ipacc_data->trx); case S_NM_IPACC_RESTART_ACK: - printf("The BTS has acked the restart. Exiting.\n"); + if (!quiet) + printf("The BTS has acked the restart. Exiting.\n"); exit(0); break; case S_NM_IPACC_RESTART_NACK: - printf("The BTS has nacked the restart. Exiting.\n"); + if (!quiet) + printf("The BTS has nacked the restart. Exiting.\n"); exit(0); break; case S_NM_STATECHG_OPER: @@ -353,7 +356,8 @@ switch (event) { case NM_MT_LOAD_INIT_ACK: - fprintf(stdout, "Software Load Initiate ACK\n"); + if (!quiet) + fprintf(stdout, "Software Load Initiate ACK\n"); break; case NM_MT_LOAD_INIT_NACK: fprintf(stderr, "ERROR: Software Load Initiate NACK\n"); @@ -379,7 +383,9 @@ msg->l2h[0] = NM_ATT_IPACC_CUR_SW_CFG; msg->l2h[1] = msgb_l3len(msg) >> 8; msg->l2h[2] = msgb_l3len(msg) & 0xff; - printf("Foo l2h: %p l3h: %p... length l2: %u l3: %u\n", msg->l2h, msg->l3h, msgb_l2len(msg), msgb_l3len(msg)); + if (!quiet) + printf("Foo l2h: %p l3h: %p... length l2: %u l3: %u\n", + msg->l2h, msg->l3h, msgb_l2len(msg), msgb_l3len(msg)); abis_nm_ipaccess_set_nvattr(trx, msg->l2h, msgb_l2len(msg)); msgb_free(msg); break; @@ -395,7 +401,7 @@ break; case NM_MT_LOAD_SEG_ACK: percent = abis_nm_software_load_status(trx->bts); - if (percent > percent_old) + if (!quiet && percent > percent_old) printf("Software Download Progress: %d%%\n", percent); percent_old = percent; break; @@ -528,7 +534,8 @@ int need_to_set_attr = 0; int len; - printf("OML link established using TRX %d\n", trx->nr); + if (!quiet) + printf("OML link established using TRX %d\n", trx->nr); if (get_attr) { msgb_put_u8(nmsg_get, NM_ATT_IPACC_PRIM_OML_CFG); @@ -538,7 +545,8 @@ len = strlen(unit_id); if (len > nmsg_set->data_len-10) goto out_err; - printf("setting Unit ID to '%s'\n", unit_id); + if (!quiet) + printf("setting Unit ID to '%s'\n", unit_id); nv_put_unit_id(nmsg_set, unit_id); need_to_set_attr = 1; } @@ -551,13 +559,15 @@ goto out_err; } - printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia)); + if (!quiet) + printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia)); nv_put_prim_oml(nmsg_set, ntohl(ia.s_addr), 0); need_to_set_attr = 1; } if (nv_mask) { - printf("setting NV Flags/Mask to 0x%04x/0x%04x\n", - nv_flags, nv_mask); + if (!quiet) + printf("setting NV Flags/Mask to 0x%04x/0x%04x\n", + nv_flags, nv_mask); nv_put_flags(nmsg_set, nv_flags, nv_mask); need_to_set_attr = 1; } @@ -576,7 +586,8 @@ goto out_err; } - printf("setting static IP Address/Mask\n"); + if (!quiet) + printf("setting static IP Address/Mask\n"); nv_put_ip_if_cfg(nmsg_set, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr)); need_to_set_attr = 1; } @@ -589,7 +600,8 @@ goto out_err; } - printf("setting static IP Gateway\n"); + if (!quiet) + printf("setting static IP Gateway\n"); /* we only set the default gateway with zero addr/mask */ nv_put_gw_cfg(nmsg_set, 0, 0, ntohl(ia_gw.s_addr)); need_to_set_attr = 1; @@ -607,7 +619,8 @@ } if (restart && !prim_oml_ip && !software) { - printf("restarting BTS\n"); + if (!quiet) + printf("restarting BTS\n"); abis_nm_ipaccess_restart(trx); } @@ -636,7 +649,8 @@ phys_conf_min, sizeof(phys_conf_min)); else if (software) { int rc; - printf("Attempting software upload with '%s'\n", software); + if (!quiet) + printf("Attempting software upload with '%s'\n", software); rc = abis_nm_software_load(trx->bts, trx->nr, software, 19, 0, swload_cbfn, trx); if (rc < 0) { fprintf(stderr, "Failed to start software load\n"); @@ -769,7 +783,8 @@ entry = talloc_zero(tall_firm_ctx, struct llist_head); INIT_LLIST_HEAD(entry); - printf("Opening possible firmware '%s'\n", filename); + if (!quiet) + printf("Opening possible firmware '%s'\n", filename); fd = open(filename, O_RDONLY); if (fd < 0) { perror("nada"); @@ -893,6 +908,7 @@ printf(" -f --firmware FIRMWARE\tProvide firmware information\n"); printf(" -w --write-firmware\t\tThis will dump the firmware parts to the filesystem. Use with -f.\n"); printf(" -p --loop\t\t\tLoop the tests executed with the --listen command.\n"); + printf(" -q --quiet\t\t\tAvoid printing unformatted logging to stdout, useful with -G.\n"); } static void print_value_string(const struct value_string *val, int size) @@ -945,9 +961,6 @@ osmo_init_logging2(tall_ctx_config, &log_info); bts_model_nanobts_init(); - printf("ipaccess-config (C) 2009-2010 by Harald Welte and others\n"); - printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); - while (1) { int c; unsigned long ul; @@ -972,10 +985,11 @@ { "write-firmware", 0, 0, 'w' }, { "disable-color", 0, 0, 'c'}, { "loop", 0, 0, 'p' }, + { "quiet", 0, 0, 'q' }, { 0, 0, 0, 0 }, }; - c = getopt_long(argc, argv, "Gu:o:i:g:rn:S:U:l:L:hs:d:f:wcpH", long_options, + c = getopt_long(argc, argv, "Gu:o:i:g:rn:S:U:l:L:hs:d:f:wcpqH", long_options, &option_index); if (c == -1) @@ -1057,6 +1071,9 @@ case 'p': loop_tests = 1; break; + case 'q': + quiet = true; + break; case 'h': print_usage(); print_help(); @@ -1067,6 +1084,11 @@ } }; + if (!quiet) { + printf("ipaccess-config (C) 2009-2010 by Harald Welte and others\n"); + printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); + } + if (firmware_analysis) { analyze_firmware(firmware_analysis); if (argc == optind) /* Nothing more to do, exit successfully */ @@ -1097,7 +1119,8 @@ ipac_nwl_init(); - printf("Trying to connect to ip.access BTS %s...\n", bts_ip); + if (!quiet) + printf("Trying to connect to ip.access BTS %s...\n", bts_ip); memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; -- To view, visit https://gerrit.osmocom.org/11687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I257bfc8d82b49a3641be6b6777e472ecf561a21e Gerrit-Change-Number: 11687 Gerrit-PatchSet: 9 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:11:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:11:00 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to default depcheck config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11883 ) Change subject: Add osmo-sysmon to default depcheck config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57d0d55459d492e18b56496c9018a5f8619813a Gerrit-Change-Number: 11883 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 22 Nov 2018 14:11:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:11:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:11:03 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to coverity submission In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11882 ) Change subject: Add osmo-sysmon to coverity submission ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e753d2c14198eccb046c259b3eec582b1921431 Gerrit-Change-Number: 11882 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 22 Nov 2018 14:11:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:12:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:12:17 +0000 Subject: Change in libosmo-sccp[master]: SS7: safeguard against wrong number of pointcode component In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11707 ) Change subject: SS7: safeguard against wrong number of pointcode component ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib24cdbcf614bad68f3cfa9776a451c5c1e45ae6e Gerrit-Change-Number: 11707 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 22 Nov 2018 14:12:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:12:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:12:18 +0000 Subject: Change in libosmo-sccp[master]: SS7: safeguard against wrong number of pointcode component In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11707 ) Change subject: SS7: safeguard against wrong number of pointcode component ...................................................................... SS7: safeguard against wrong number of pointcode component Previously internal function get_pc_comp_shift() returned negative error code when called with wrong component number despite unsigned return value which wasn't checked for error anyway. Fix this by using explicit assert in the error path. This should not affect external users because this function always called with constant component argument. Change-Id: Ib24cdbcf614bad68f3cfa9776a451c5c1e45ae6e --- M src/osmo_ss7.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 6fb8180..39d92fa 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -198,7 +198,8 @@ case 2: return 0; default: - return -EINVAL; + /* Invalid number of components */ + OSMO_ASSERT(false); } } -- To view, visit https://gerrit.osmocom.org/11707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib24cdbcf614bad68f3cfa9776a451c5c1e45ae6e Gerrit-Change-Number: 11707 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:12:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:12:38 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11871 ) Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 14:12:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:12:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:12:40 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11871 ) Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... properly store IPv6 addresses in struct tun_t All addresses in struct tun_t were stored as an in_addr. But IPv6 addresses need an in6_addr, so switch tun_t addresses to the in64_addr wrapper struct. This is an ABI break, as documented in TODO-RELEASE. Fixes an out of bounds memcpy() identified by Coverity. Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Related: CID#174278 --- M TODO-RELEASE M lib/tun.c M lib/tun.h 3 files changed, 17 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..bbad169 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libmisc tun_t tun_t structure has grown due to switch from in_addr to in46_addr (g#11870) diff --git a/lib/tun.c b/lib/tun.c index 6ae006b..1aeed55 100644 --- a/lib/tun.c +++ b/lib/tun.c @@ -68,10 +68,14 @@ if (rc < 0) return rc; - if (addr) - this->addr.s_addr = addr->s_addr; - if (dstaddr) - this->dstaddr.s_addr = dstaddr->s_addr; + if (addr) { + this->addr.len = sizeof(struct in_addr); + this->addr.v4.s_addr = addr->s_addr; + } + if (dstaddr) { + this->dstaddr.len = sizeof(struct in_addr); + this->dstaddr.v4.s_addr = dstaddr->s_addr; + } if (netmask) this->netmask.s_addr = netmask->s_addr; this->addrs++; @@ -89,8 +93,10 @@ rc = netdev_setaddr6(this->devname, addr, dstaddr, prefixlen); if (rc < 0) return rc; - if (dstaddr) - memcpy(&this->dstaddr, dstaddr, sizeof(*dstaddr)); + if (dstaddr) { + this->dstaddr.len = sizeof(*dstaddr); + memcpy(&this->dstaddr.v6, dstaddr, sizeof(*dstaddr)); + } this->addrs++; #if defined(__FreeBSD__) || defined (__APPLE__) this->routes = 1; @@ -270,7 +276,7 @@ { if (tun->routes) { - netdev_delroute(&tun->dstaddr, &tun->addr, &tun->netmask); + netdev_delroute(&tun->dstaddr.v4, &tun->addr.v4, &tun->netmask); } if (tun->fd >= 0) { @@ -323,7 +329,7 @@ char smask[TUN_ADDRSIZE]; int rc; - strncpy(snet, inet_ntoa(tun->addr), sizeof(snet)); + strncpy(snet, inet_ntoa(tun->addr.v4), sizeof(snet)); snet[sizeof(snet) - 1] = 0; strncpy(smask, inet_ntoa(tun->netmask), sizeof(smask)); smask[sizeof(smask) - 1] = 0; diff --git a/lib/tun.h b/lib/tun.h index 6bf141f..07ca04a 100644 --- a/lib/tun.h +++ b/lib/tun.h @@ -31,8 +31,8 @@ struct tun_t { int fd; /* File descriptor to tun interface */ - struct in_addr addr; - struct in_addr dstaddr; + struct in46_addr addr; + struct in46_addr dstaddr; struct in_addr netmask; int addrs; /* Number of allocated IP addresses */ int routes; /* One if we allocated an automatic route */ -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:12:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:12:52 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests.c: drop duplicating DMM category definition In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11881 ) Change subject: msc_vlr_tests.c: drop duplicating DMM category definition ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2bf8150580c318ccaa9c30657582c15020f6b711 Gerrit-Change-Number: 11881 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 14:12:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:12:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:12:53 +0000 Subject: Change in osmo-msc[master]: msc_vlr_tests.c: drop duplicating DMM category definition In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11881 ) Change subject: msc_vlr_tests.c: drop duplicating DMM category definition ...................................................................... msc_vlr_tests.c: drop duplicating DMM category definition Change-Id: I2bf8150580c318ccaa9c30657582c15020f6b711 --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index fd196c8..9515c63 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -486,11 +486,6 @@ .description = "Layer3 Call Control (CC)", .enabled = 1, .loglevel = LOGL_DEBUG, }, - [DMM] = { - .name = "DMM", - .description = "Layer3 Mobility Management (MM)", - .enabled = 1, .loglevel = LOGL_DEBUG, - }, [DVLR] = { .name = "DVLR", .description = "Visitor Location Register", -- To view, visit https://gerrit.osmocom.org/11881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2bf8150580c318ccaa9c30657582c15020f6b711 Gerrit-Change-Number: 11881 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:13:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:13:28 +0000 Subject: Change in osmo-sysmon[master]: Update default config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11880 ) Change subject: Update default config ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iabfc78c95e904af7372f10c195b2b979675d34f3 Gerrit-Change-Number: 11880 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 14:13:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:13:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 14:13:29 +0000 Subject: Change in osmo-sysmon[master]: Update default config In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11880 ) Change subject: Update default config ...................................................................... Update default config Rename default config to match the binary name and add config exampe. Change-Id: Iabfc78c95e904af7372f10c195b2b979675d34f3 Related: SYS#2655 --- M Makefile.am M configure.ac A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-sysmon.cfg M osysmon_main.c 6 files changed, 18 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 9ad5947..5eb1cfb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = doc + AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir) \ diff --git a/configure.ac b/configure.ac index 7f5ae80..13082b7 100644 --- a/configure.ac +++ b/configure.ac @@ -127,4 +127,6 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT( + doc/Makefile + doc/examples/Makefile Makefile) diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..aee2d7b --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = examples diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..cf728a4 --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,7 @@ +examples_sysmondir = $(docdir)/examples/osmo-sysmon +examples_sysmon_DATA = osmo-sysmon.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = osmo-sysmon.cfg + +EXTRA_DIST = osmo-sysmon.cfg diff --git a/doc/examples/osmo-sysmon.cfg b/doc/examples/osmo-sysmon.cfg new file mode 100644 index 0000000..933df93 --- /dev/null +++ b/doc/examples/osmo-sysmon.cfg @@ -0,0 +1,5 @@ +ctrl-client bsc 127.0.0.1 4249 + get-variable bts_connection_status + get-variable msc.0.connection_status +netdev eth0 +netdev tun0 diff --git a/osysmon_main.c b/osysmon_main.c index 98859ed..5983212 100644 --- a/osysmon_main.c +++ b/osysmon_main.c @@ -70,7 +70,7 @@ }; -static const char *config_file = "osysmon.cfg"; +static const char *config_file = "osmo-sysmon.cfg"; struct osysmon_state *g_oss; -- To view, visit https://gerrit.osmocom.org/11880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iabfc78c95e904af7372f10c195b2b979675d34f3 Gerrit-Change-Number: 11880 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:23:56 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 14:23:56 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to coverity submission In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11882 ) Change subject: Add osmo-sysmon to coverity submission ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e753d2c14198eccb046c259b3eec582b1921431 Gerrit-Change-Number: 11882 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 22 Nov 2018 14:23:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 14:24:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 14:24:34 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to default depcheck config In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11883 ) Change subject: Add osmo-sysmon to default depcheck config ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57d0d55459d492e18b56496c9018a5f8619813a Gerrit-Change-Number: 11883 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 22 Nov 2018 14:24:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 15:06:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 15:06:52 +0000 Subject: Change in osmo-msc[master]: osmo_msc: remove unused parameter from msc_dtap() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11835 ) Change subject: osmo_msc: remove unused parameter from msc_dtap() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da Gerrit-Change-Number: 11835 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 22 Nov 2018 15:06:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 22 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 22 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#315?= In-Reply-To: <785041746.773.1542813007758.JavaMail.jenkins@jenkins.osmocom.org> References: <785041746.773.1542813007758.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <77153510.793.1542899407718.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.81 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Nov 22 15:10:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 15:10:48 +0000 Subject: Change in osmo-bsc[master]: vty: add command to show TRX selectively In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11721 ) Change subject: vty: add command to show TRX selectively ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a Gerrit-Change-Number: 11721 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 22 Nov 2018 15:10:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 15:15:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 15:15:44 +0000 Subject: Change in osmo-dev[master]: Add expect script: 'vty' for easy access to all vtys In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11811 ) Change subject: Add expect script: 'vty' for easy access to all vtys ...................................................................... Patch Set 2: Code-Review+1 For better visibility to end users, maybe we could create a doc/examples directory in libosmocore and add this script there? -- To view, visit https://gerrit.osmocom.org/11811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec Gerrit-Change-Number: 11811 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 22 Nov 2018 15:15:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 15:23:33 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 15:23:33 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3893 PS3, Line 3893: "Calculate T3113 dynamically based on channel config and load\n" > slightly weird: this looks like a general command, yet names T3113 specifically in the doc? [?] I think it would be good to make the name of this command more specific to t3113, for now. -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 22 Nov 2018 15:23:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 15:38:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 15:38:59 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to coverity submission In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11882 ) Change subject: Add osmo-sysmon to coverity submission ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e753d2c14198eccb046c259b3eec582b1921431 Gerrit-Change-Number: 11882 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 22 Nov 2018 15:38:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 15:39:02 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 15:39:02 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to coverity submission In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11882 ) Change subject: Add osmo-sysmon to coverity submission ...................................................................... Add osmo-sysmon to coverity submission Change-Id: I1e753d2c14198eccb046c259b3eec582b1921431 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Max: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 86bb569..650fa0e 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -77,6 +77,7 @@ build_default osmo-iuh build_osmopcu build_osmobts +build_default osmo-sysmon build_default osmo-mgw build_default osmo-bsc build_default osmo-hlr diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index 7aafa5e..6f32474 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -22,6 +22,7 @@ osmo-gmr \ osmo-iuh \ osmo-pcu \ + osmo-sysmon \ osmo-sip-connector \ osmo-trx \ osmo-hlr \ -- To view, visit https://gerrit.osmocom.org/11882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1e753d2c14198eccb046c259b3eec582b1921431 Gerrit-Change-Number: 11882 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 15:53:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 22 Nov 2018 15:53:22 +0000 Subject: Change in osmo-bsc[master]: make MSC Release (MSCR) configurable Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11884 Change subject: make MSC Release (MSCR) configurable ...................................................................... make MSC Release (MSCR) configurable Add msc_release to the config to toggle the bit that indicates R98/R99+ compatibility. Related: OS#3697 Change-Id: I7c3c64c876e2d8e08291ca4be7bd3249979430cb --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/11884/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 4f18d47..f354f98 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -785,6 +785,7 @@ vty_out(vty, " cell_identity %u%s", bts->cell_identity, VTY_NEWLINE); vty_out(vty, " location_area_code %u%s", bts->location_area_code, VTY_NEWLINE); + vty_out(vty, " msc_release %u%s", bts->si_common.chan_desc.mscr, VTY_NEWLINE); if (bts->dtxu != GSM48_DTX_SHALL_NOT_BE_USED) vty_out(vty, " dtx uplink%s%s", (bts->dtxu != GSM48_DTX_SHALL_BE_USED) ? "" : " force", @@ -2089,6 +2090,19 @@ } +DEFUN(cfg_bts_mscr, + cfg_bts_mscr_cmd, + "msc_release (0|1)", + "Set the MSC Release (MSCR) of this BTS\n" + "Release '98 or older" "Release '99 onwards") +{ + struct gsm_bts *bts = vty->index; + bts->si_common.chan_desc.mscr = atoi(argv[0]); + + return CMD_SUCCESS; +} + + /* compatibility wrapper for old config files */ DEFUN_HIDDEN(cfg_bts_tsc, cfg_bts_tsc_cmd, @@ -4991,6 +5005,7 @@ install_element(BTS_NODE, &cfg_bts_no_dtxu_cmd); install_element(BTS_NODE, &cfg_bts_no_dtxd_cmd); install_element(BTS_NODE, &cfg_bts_lac_cmd); + install_element(BTS_NODE, &cfg_bts_mscr_cmd); install_element(BTS_NODE, &cfg_bts_tsc_cmd); install_element(BTS_NODE, &cfg_bts_bsic_cmd); install_element(BTS_NODE, &cfg_bts_unit_id_cmd); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 67fccd3..29f4327 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -444,9 +444,6 @@ for (n=0, i=0; i<8; i++) n += bts->c0->ts[i].pchan_is == GSM_PCHAN_CCCH ? 1 : 0; - /* Indicate R99 MSC in SI3 */ - bts->si_common.chan_desc.mscr = 1; - switch (n) { case 0: bts->si_common.chan_desc.ccch_conf = RSL_BCCH_CCCH_CONF_1_C; -- To view, visit https://gerrit.osmocom.org/11884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7c3c64c876e2d8e08291ca4be7bd3249979430cb Gerrit-Change-Number: 11884 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 15:53:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 15:53:43 +0000 Subject: Change in osmo-sysmon[master]: Add OpenVPN status helper from corresponding ticket Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11885 Change subject: Add OpenVPN status helper from corresponding ticket ...................................................................... Add OpenVPN status helper from corresponding ticket Change-Id: I912d943cdc7024e3ddd92e0a122ac2dd4fbf0a18 Related: SYS#2655 --- A contrib/openvpn-status-export.pl 1 file changed, 136 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/85/11885/1 diff --git a/contrib/openvpn-status-export.pl b/contrib/openvpn-status-export.pl new file mode 100755 index 0000000..cc2c6f2 --- /dev/null +++ b/contrib/openvpn-status-export.pl @@ -0,0 +1,136 @@ +#!/usr/bin/perl -w +use strict; + +# Script to export the OpenVPN daemon status information (which clients +# are connected from where) as a JSON file that can be served via HTTP. +# +# (C) 2015 by sysmocom - s.f.m.c. GmbH, All rights reserved. +# Author: Harald Welte + +use JSON; +use Linux::Inotify2; +use Net::Netmask; + +my $OPENVPN_STATE_FILE = "/var/tmp/openvpn.status"; +my $JSON_OUTPUT_FILE = "/var/www/openvpn/status.json"; + +my $srcip_table = { + 'Iridium' => [ + '172.28.204.0/23', + ], + 'Kabel Deutschland' => [ + '91.64.0.0/16', '91.65.0.0/16', '91.66.0.0/16', '91.67.0.0/16', + ], + 'Scarlet' => [ + '213.49.64.0/18', + ], + 'hmw-consulting' => [ + '83.236.178.200/29', + ], + 'Hetzner' => [ + '144.76.0.0/16', '5.9.81.32/27', + ], + 'Skynet' => [ + '91.183.84.0/22', '81.243.248.0/22', + ], +}; + +my %netblocks; + +sub read_netmask_table($) +{ + my ($t) = @_; + + foreach my $k (keys %$t) { + my $table = {}; + foreach my $net (@{$$t{$k}}) { + my $block = new Net::Netmask($net); + $block->storeNetblock($table); + } + $netblocks{$k} = $table; + } +} + +sub classify_srcip($) +{ + my ($ip) = @_; + foreach my $k (%netblocks) { + my $block = findNetblock($ip, $netblocks{$k}); + if ($block) { + return $k; + } + } + return undef; +} + +# read the openvpn.status file and parse it, return hash reference to +# its contents. +sub get_openvpn_clients($) +{ + my ($fname) = @_; + my $state = 'init'; + my $href; + my @clients; + + $$href{version} = 1; + + open(INFILE, "<", $fname); + while (my $line = ) { + chomp($line); + if ($line =~ /^OpenVPN CLIENT LIST$/) { + $state = 'client_list'; + } elsif ($line =~ /^ROUTING\ TABLE$/) { + $state = 'routing_table'; + } else { + if ($state eq 'client_list') { + my %cl; + if ($line =~ /^Updated,(.*)/) { + $$href{updated} = $1; + } elsif ($line =~ /^(\S+),([0-9\.]+)\:(\d+),(\d+),(\d+),(.*)$/) { + $cl{name} = $1; + $cl{srcip} = $2; + $cl{operator} = classify_srcip($2); + $cl{srcport} = $3 + 0; + $cl{bytes_rx} = $4 + 0; + $cl{bytes_tx} = $5 + 0; + $cl{connected_since} = $6; + push(@clients, \%cl); + } + } + } + } + close(INFILE); + + $$href{clients} = \@clients; + + return $href; +} + +# inotify handler to re-parse/convert openvpn.status on any change +sub status_in_handler +{ + my $e = shift; + + # read/parse openvpn.status + my $cl = get_openvpn_clients($e->fullname); + + # write result to file + open(OUTFILE, ">", $JSON_OUTPUT_FILE); + print(OUTFILE to_json($cl, { pretty => 1 })); + close(OUTFILE); + + # also print it to console for debugging + print(to_json($cl, { pretty => 1 })); +} + + + +# main + +read_netmask_table($srcip_table); + +my $inotify = new Linux::Inotify2 or die("Can't create inotify object: $!"); +$inotify->watch($OPENVPN_STATE_FILE, IN_MODIFY, \&status_in_handler); + +# endless loop, wait for inotify enents +1 while $inotify->poll; -- To view, visit https://gerrit.osmocom.org/11885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I912d943cdc7024e3ddd92e0a122ac2dd4fbf0a18 Gerrit-Change-Number: 11885 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 16:23:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 16:23:49 +0000 Subject: Change in osmo-sysmon[master]: Expand default config Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11886 Change subject: Expand default config ...................................................................... Expand default config * add file watcher example * add more ctrl variables Change-Id: I25ed3936ddaae8452ba9dde325cb3e822b739def Related: SYS#2655 --- M doc/examples/osmo-sysmon.cfg 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/86/11886/1 diff --git a/doc/examples/osmo-sysmon.cfg b/doc/examples/osmo-sysmon.cfg index 933df93..9f49367 100644 --- a/doc/examples/osmo-sysmon.cfg +++ b/doc/examples/osmo-sysmon.cfg @@ -1,5 +1,10 @@ ctrl-client bsc 127.0.0.1 4249 - get-variable bts_connection_status get-variable msc.0.connection_status + get-variable bts_connection_status + get-variable number-of-bts + get-variable bts.0.oml-connection-state + get-variable bts.0.rf_state + get-variable rf_locked netdev eth0 netdev tun0 +file os-image /etc/image-datetime -- To view, visit https://gerrit.osmocom.org/11886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I25ed3936ddaae8452ba9dde325cb3e822b739def Gerrit-Change-Number: 11886 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 16:25:24 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 22 Nov 2018 16:25:24 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 22 Nov 2018 16:25:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 16:33:09 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 16:33:09 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to default depcheck config In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11883 ) Change subject: Add osmo-sysmon to default depcheck config ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie57d0d55459d492e18b56496c9018a5f8619813a Gerrit-Change-Number: 11883 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 22 Nov 2018 16:33:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 16:33:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 16:33:11 +0000 Subject: Change in osmo-ci[master]: Add osmo-sysmon to default depcheck config In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11883 ) Change subject: Add osmo-sysmon to default depcheck config ...................................................................... Add osmo-sysmon to default depcheck config Change-Id: Ie57d0d55459d492e18b56496c9018a5f8619813a --- M scripts/osmo-depcheck/config.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Max: Verified diff --git a/scripts/osmo-depcheck/config.py b/scripts/osmo-depcheck/config.py index 3e993bf..13c1a95 100644 --- a/scripts/osmo-depcheck/config.py +++ b/scripts/osmo-depcheck/config.py @@ -10,6 +10,7 @@ "osmo-hlr", "osmo-mgw", "osmo-msc", + "osmo-sysmon", "osmo-sgsn", "osmo-ggsn") -- To view, visit https://gerrit.osmocom.org/11883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie57d0d55459d492e18b56496c9018a5f8619813a Gerrit-Change-Number: 11883 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:02:47 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 17:02:47 +0000 Subject: Change in libosmocore[master]: NS: fix formatting in gprs_nsvc_state_append() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11887 Change subject: NS: fix formatting in gprs_nsvc_state_append() ...................................................................... NS: fix formatting in gprs_nsvc_state_append() This function so far has been used in ctrl interface only where we do not need any explicit formatting. Let's drop the '\n' - if there'll be users outside of ctrl protocol context, they can add it while printing the result of gprs_nsvc_state_append(). Change-Id: I15ba8779d5100ebeb05ffc99271ba57c6bc4de14 Related: SYS#2655 --- M src/gb/gprs_ns.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/11887/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 1281c9f..c93c5b9 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -1727,7 +1727,7 @@ char *gprs_nsvc_state_append(char *s, struct gprs_nsvc *nsvc) { s = talloc_asprintf_append(s, - "%u,%u,%s,%s,%s,%s,%s\n", + "%u,%u,%s,%s,%s,%s,%s", nsvc->nsei, nsvc->nsvci, NS_DESC_A(nsvc->state), NS_DESC_B(nsvc->state), -- To view, visit https://gerrit.osmocom.org/11887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I15ba8779d5100ebeb05ffc99271ba57c6bc4de14 Gerrit-Change-Number: 11887 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:04:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:04:45 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flag gbproxy_assign_imsi as static Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11888 Change subject: gbproxy: flag gbproxy_assign_imsi as static ...................................................................... gbproxy: flag gbproxy_assign_imsi as static It's currently only used in the same file. Change-Id: I08b51f36263e58f52ef9af2a63a7fcbf06a767c4 --- M src/gprs/gb_proxy_tlli.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/88/11888/1 diff --git a/src/gprs/gb_proxy_tlli.c b/src/gprs/gb_proxy_tlli.c index 1832122..0c027d5 100644 --- a/src/gprs/gb_proxy_tlli.c +++ b/src/gprs/gb_proxy_tlli.c @@ -388,7 +388,7 @@ return link_info != NULL && link_info->is_matching[match_id]; } -void gbproxy_assign_imsi(struct gbproxy_peer *peer, +static void gbproxy_assign_imsi(struct gbproxy_peer *peer, struct gbproxy_link_info *link_info, struct gprs_gb_parse_context *parse_ctx) { -- To view, visit https://gerrit.osmocom.org/11888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I08b51f36263e58f52ef9af2a63a7fcbf06a767c4 Gerrit-Change-Number: 11888 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:04:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:04:46 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Fix abort during APN patch Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11889 Change subject: gbproxy: Fix abort during APN patch ...................................................................... gbproxy: Fix abort during APN patch gbproxy process was aborted with following message during APN patching: <000e> gb_proxy_patch.c:129 Patching ACT_PDP_REQ to SGSN: Replacing APN 'foo' -> 'bar' msgb(0x5555558797d0): Sub area is not fully contained in the msg data During osmo-sgsn 107fb59e84b12bbf6bdfdd4fc241dbcda7332706 old copy of gprs_msgb_resize_area was replaced by more modern libosmocore version called msgb_resize_area. They are mostly identical but the later has some extra verification asserts. One of this asserts was triggering the process abort, but the bug has always been there as far as I could see in git history. The assert triggers because the bssgp buffer and parse_ctx point to "stored_msg", while the data buffer comes from a different msbg "msg", which is clearly wrong behavior. In the modified line, "msg" (the one which provided the imsi now already stored in link_info through gbproxy_update_link_state_ul()->gbproxy_assign_imsi()) is really not needed anymore, and we want to patch the stored msg going to be forwarded. Related: SYS#4397 Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c --- M src/gprs/gb_proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/89/11889/1 diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index fe6a6c6..85c3c47 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -348,7 +348,7 @@ gprs_gb_parse_bssgp(msgb_bssgph(stored_msg), msgb_bssgp_len(stored_msg), &tmp_parse_ctx); - gbproxy_patch_bssgp(msg, msgb_bssgph(stored_msg), + gbproxy_patch_bssgp(stored_msg, msgb_bssgph(stored_msg), msgb_bssgp_len(stored_msg), peer, link_info, &len_change, &tmp_parse_ctx); -- To view, visit https://gerrit.osmocom.org/11889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c Gerrit-Change-Number: 11889 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:04:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:04:46 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Remove unneeded parse_ctx param Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11890 Change subject: gbproxy: Remove unneeded parse_ctx param ...................................................................... gbproxy: Remove unneeded parse_ctx param The only use inside the function is only to log information which should actually be provided by tmp_parse_ctx of each stored msg. Change-Id: Ic186b92fa9bd0a2b853a0cf525c6f6feb9493897 --- M src/gprs/gb_proxy.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/90/11890/1 diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 85c3c47..faf4a8b 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -324,8 +324,7 @@ static int gbproxy_flush_stored_messages(struct gbproxy_peer *peer, struct msgb *msg, time_t now, - struct gbproxy_link_info* link_info, - struct gprs_gb_parse_context *parse_ctx) + struct gbproxy_link_info* link_info) { int rc; struct msgb *stored_msg; @@ -369,8 +368,8 @@ "NSEI=%d(BSS) failed to send stored message " "(%s)\n", msgb_nsei(msg), - parse_ctx->llc_msg_name ? - parse_ctx->llc_msg_name : "BSSGP"); + tmp_parse_ctx.llc_msg_name ? + tmp_parse_ctx.llc_msg_name : "BSSGP"); msgb_free(stored_msg); } @@ -479,8 +478,7 @@ /* The IMSI is now available. If flushing the messages fails, * then link_info has been deleted and we should return * immediately. */ - if (gbproxy_flush_stored_messages(peer, msg, now, link_info, - parse_ctx) < 0) + if (gbproxy_flush_stored_messages(peer, msg, now, link_info) < 0) return 0; gbproxy_reset_imsi_acquisition(link_info); -- To view, visit https://gerrit.osmocom.org/11890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic186b92fa9bd0a2b853a0cf525c6f6feb9493897 Gerrit-Change-Number: 11890 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:04:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:04:46 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Move comment to func description Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11891 Change subject: gbproxy: flush_stored_messages: Move comment to func description ...................................................................... gbproxy: flush_stored_messages: Move comment to func description Change-Id: I14a90d1957a2cbd8fd53002b035fe481ab3abbbf --- M src/gprs/gb_proxy.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/91/11891/1 diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index faf4a8b..d43b034 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -321,6 +321,8 @@ link_info->vu_gen_tx_bss = GBPROXY_INIT_VU_GEN_TX; } +/* Got identity response with IMSI, assuming the request had + * been generated by the gbproxy */ static int gbproxy_flush_stored_messages(struct gbproxy_peer *peer, struct msgb *msg, time_t now, @@ -328,8 +330,6 @@ { int rc; struct msgb *stored_msg; - /* Got identity response with IMSI, assuming the request had - * been generated by the gbproxy */ LOGP(DLLC, LOGL_DEBUG, "NSEI=%d(BSS) IMSI acquisition succeeded, " -- To view, visit https://gerrit.osmocom.org/11891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I14a90d1957a2cbd8fd53002b035fe481ab3abbbf Gerrit-Change-Number: 11891 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:04:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:04:46 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Log and route using stored_msg info Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11892 Change subject: gbproxy: flush_stored_messages: Log and route using stored_msg info ...................................................................... gbproxy: flush_stored_messages: Log and route using stored_msg info It makes no sense to print every stored_msg with BVCI from msg, same for routing. This will allow getting rid of "msg" completelly in next commit. Change-Id: I95eafbf41012be3e02c68fc996773dd02b174fe6 --- M src/gprs/gb_proxy.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/92/11892/1 diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index d43b034..331ebc8 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -361,13 +361,13 @@ } rc = gbprox_relay2sgsn(peer->cfg, stored_msg, - msgb_bvci(msg), link_info->sgsn_nsei); + msgb_bvci(stored_msg), link_info->sgsn_nsei); if (rc < 0) LOGP(DLLC, LOGL_ERROR, "NSEI=%d(BSS) failed to send stored message " "(%s)\n", - msgb_nsei(msg), + tmp_parse_ctx.peer_nsei, tmp_parse_ctx.llc_msg_name ? tmp_parse_ctx.llc_msg_name : "BSSGP"); msgb_free(stored_msg); -- To view, visit https://gerrit.osmocom.org/11892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I95eafbf41012be3e02c68fc996773dd02b174fe6 Gerrit-Change-Number: 11892 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:04:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:04:47 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Get rid of msg param Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11893 Change subject: gbproxy: flush_stored_messages: Get rid of msg param ...................................................................... gbproxy: flush_stored_messages: Get rid of msg param Log line actually makes more sense out of the function where IMSI acq is resolved. We can then get rid of msg param which may cause confusion and add complexitiy to code for no good reason. Change-Id: I6716a260e12a3cf36af0501ce611c6c1e608f537 --- M src/gprs/gb_proxy.c 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/93/11893/1 diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 331ebc8..0b5758a 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -324,18 +324,12 @@ /* Got identity response with IMSI, assuming the request had * been generated by the gbproxy */ static int gbproxy_flush_stored_messages(struct gbproxy_peer *peer, - struct msgb *msg, time_t now, struct gbproxy_link_info* link_info) { int rc; struct msgb *stored_msg; - LOGP(DLLC, LOGL_DEBUG, - "NSEI=%d(BSS) IMSI acquisition succeeded, " - "flushing stored messages\n", - msgb_nsei(msg)); - /* Patch and flush stored messages towards the SGSN */ while ((stored_msg = msgb_dequeue_count(&link_info->stored_msgs, &link_info->stored_msgs_len))) { @@ -475,10 +469,14 @@ gsm48_hdr_pdisc(parse_ctx->g48_hdr) == GSM48_PDISC_MM_GPRS && gsm48_hdr_msg_type(parse_ctx->g48_hdr) == GSM48_MT_GMM_ID_RESP; + LOGP(DLLC, LOGL_DEBUG, + "NSEI=%d(BSS) IMSI acquisition succeeded, " + "flushing stored messages\n", + msgb_nsei(msg)); /* The IMSI is now available. If flushing the messages fails, * then link_info has been deleted and we should return * immediately. */ - if (gbproxy_flush_stored_messages(peer, msg, now, link_info) < 0) + if (gbproxy_flush_stored_messages(peer, now, link_info) < 0) return 0; gbproxy_reset_imsi_acquisition(link_info); -- To view, visit https://gerrit.osmocom.org/11893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6716a260e12a3cf36af0501ce611c6c1e608f537 Gerrit-Change-Number: 11893 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:15:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 17:15:11 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: fix formatting in gbproxy-state command Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11894 Change subject: gbproxy: fix formatting in gbproxy-state command ...................................................................... gbproxy: fix formatting in gbproxy-state command In ctrl protocol we don't need any explicit formatting as it might interfere with client processing our response. Let's drop trailing '\n'. Change-Id: I3f32e01dd50a53991c292aeee57a78d81cdc5429 Related: SYS#2655 --- M src/gprs/gb_proxy_ctrl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/94/11894/1 diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gprs/gb_proxy_ctrl.c index 032d8d4..694a2f7 100644 --- a/src/gprs/gb_proxy_ctrl.c +++ b/src/gprs/gb_proxy_ctrl.c @@ -64,7 +64,7 @@ struct gprs_ra_id raid; gsm48_parse_ra(&raid, peer->ra); - cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", + cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s", peer->nsei, peer->bvci, raid.mcc, raid.mnc, raid.lac, raid.rac, -- To view, visit https://gerrit.osmocom.org/11894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3f32e01dd50a53991c292aeee57a78d81cdc5429 Gerrit-Change-Number: 11894 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:15:12 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 17:15:12 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: add number-of-peers ctrl command Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11895 Change subject: gbproxy: add number-of-peers ctrl command ...................................................................... gbproxy: add number-of-peers ctrl command Return number of BTS peers. This is especially useful when no peers are available because "gbproxy-state" command returns empty sstring in this case. Change-Id: I29b0664e60f7c81c3c7b495c1c8f2700e3f7e033 Related: SYS#2655 --- M src/gprs/gb_proxy_ctrl.c 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/95/11895/1 diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gprs/gb_proxy_ctrl.c index 694a2f7..829d6f6 100644 --- a/src/gprs/gb_proxy_ctrl.c +++ b/src/gprs/gb_proxy_ctrl.c @@ -76,10 +76,23 @@ CTRL_CMD_DEFINE_RO(gbproxy_state, "gbproxy-state"); +static int get_num_peers(struct ctrl_cmd *cmd, void *data) +{ + struct gbproxy_config *cfg = data; + + cmd->reply = talloc_strdup(cmd, ""); + cmd->reply = talloc_asprintf_append(cmd->reply, "%u", llist_count(&cfg->bts_peers)); + + return CTRL_CMD_REPLY; +} +CTRL_CMD_DEFINE_RO(num_peers, "number-of-peers"); + int gb_ctrl_cmds_install(void) { int rc = 0; rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_nsvc_state); rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_gbproxy_state); + rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_num_peers); + return rc; } -- To view, visit https://gerrit.osmocom.org/11895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I29b0664e60f7c81c3c7b495c1c8f2700e3f7e033 Gerrit-Change-Number: 11895 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:28:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:28:23 +0000 Subject: Change in osmo-ggsn[master]: properly store IPv6 addresses in struct tun_t In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11871 ) Change subject: properly store IPv6 addresses in struct tun_t ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c File lib/tun.c: https://gerrit.osmocom.org/#/c/11871/1/lib/tun.c at 279 PS1, Line 279: netdev_delroute(&tun->dstaddr.v4, &tun->addr.v4, &tun->netmask); > Yes it looks wrong. But I'd prefer to not mix functional changes in here. Sure, just make sure to push a patch for it if possible, or open a ticket or whatever. -- To view, visit https://gerrit.osmocom.org/11871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd2431ad25d7fa182e52e2bd5231ceb04d427c34 Gerrit-Change-Number: 11871 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 17:28:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:32:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:32:13 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: fix formatting in gbproxy-state command In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11894 ) Change subject: gbproxy: fix formatting in gbproxy-state command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f32e01dd50a53991c292aeee57a78d81cdc5429 Gerrit-Change-Number: 11894 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 22 Nov 2018 17:32:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:32:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:32:20 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: add number-of-peers ctrl command In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11895 ) Change subject: gbproxy: add number-of-peers ctrl command ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I29b0664e60f7c81c3c7b495c1c8f2700e3f7e033 Gerrit-Change-Number: 11895 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Thu, 22 Nov 2018 17:32:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:32:21 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: fix formatting in gbproxy-state command In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11894 ) Change subject: gbproxy: fix formatting in gbproxy-state command ...................................................................... gbproxy: fix formatting in gbproxy-state command In ctrl protocol we don't need any explicit formatting as it might interfere with client processing our response. Let's drop trailing '\n'. Change-Id: I3f32e01dd50a53991c292aeee57a78d81cdc5429 Related: SYS#2655 --- M src/gprs/gb_proxy_ctrl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gprs/gb_proxy_ctrl.c index 032d8d4..694a2f7 100644 --- a/src/gprs/gb_proxy_ctrl.c +++ b/src/gprs/gb_proxy_ctrl.c @@ -64,7 +64,7 @@ struct gprs_ra_id raid; gsm48_parse_ra(&raid, peer->ra); - cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", + cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s", peer->nsei, peer->bvci, raid.mcc, raid.mnc, raid.lac, raid.rac, -- To view, visit https://gerrit.osmocom.org/11894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3f32e01dd50a53991c292aeee57a78d81cdc5429 Gerrit-Change-Number: 11894 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:32:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:32:21 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: add number-of-peers ctrl command In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11895 ) Change subject: gbproxy: add number-of-peers ctrl command ...................................................................... gbproxy: add number-of-peers ctrl command Return number of BTS peers. This is especially useful when no peers are available because "gbproxy-state" command returns empty sstring in this case. Change-Id: I29b0664e60f7c81c3c7b495c1c8f2700e3f7e033 Related: SYS#2655 --- M src/gprs/gb_proxy_ctrl.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gprs/gb_proxy_ctrl.c index 694a2f7..829d6f6 100644 --- a/src/gprs/gb_proxy_ctrl.c +++ b/src/gprs/gb_proxy_ctrl.c @@ -76,10 +76,23 @@ CTRL_CMD_DEFINE_RO(gbproxy_state, "gbproxy-state"); +static int get_num_peers(struct ctrl_cmd *cmd, void *data) +{ + struct gbproxy_config *cfg = data; + + cmd->reply = talloc_strdup(cmd, ""); + cmd->reply = talloc_asprintf_append(cmd->reply, "%u", llist_count(&cfg->bts_peers)); + + return CTRL_CMD_REPLY; +} +CTRL_CMD_DEFINE_RO(num_peers, "number-of-peers"); + int gb_ctrl_cmds_install(void) { int rc = 0; rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_nsvc_state); rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_gbproxy_state); + rc |= ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_num_peers); + return rc; } -- To view, visit https://gerrit.osmocom.org/11895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I29b0664e60f7c81c3c7b495c1c8f2700e3f7e033 Gerrit-Change-Number: 11895 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:32:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:32:47 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flag gbproxy_assign_imsi as static In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11888 ) Change subject: gbproxy: flag gbproxy_assign_imsi as static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08b51f36263e58f52ef9af2a63a7fcbf06a767c4 Gerrit-Change-Number: 11888 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 17:32:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:33:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:33:04 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Fix abort during APN patch In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11889 ) Change subject: gbproxy: Fix abort during APN patch ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c Gerrit-Change-Number: 11889 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 17:33:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:33:30 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 17:33:30 +0000 Subject: Change in osmo-sysmon[master]: Expand default config In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11886 ) Change subject: Expand default config ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I25ed3936ddaae8452ba9dde325cb3e822b739def Gerrit-Change-Number: 11886 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 17:33:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:33:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:33:36 +0000 Subject: Change in osmo-msc[master]: osmo_msc: remove unused parameter from msc_dtap() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11835 ) Change subject: osmo_msc: remove unused parameter from msc_dtap() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da Gerrit-Change-Number: 11835 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 22 Nov 2018 17:33:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:33:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:33:38 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Remove unneeded parse_ctx param In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11890 ) Change subject: gbproxy: Remove unneeded parse_ctx param ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic186b92fa9bd0a2b853a0cf525c6f6feb9493897 Gerrit-Change-Number: 11890 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 17:33:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:33:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:33:47 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Move comment to func description In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11891 ) Change subject: gbproxy: flush_stored_messages: Move comment to func description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I14a90d1957a2cbd8fd53002b035fe481ab3abbbf Gerrit-Change-Number: 11891 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 17:33:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:34:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:34:29 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Log and route using stored_msg info In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11892 ) Change subject: gbproxy: flush_stored_messages: Log and route using stored_msg info ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I95eafbf41012be3e02c68fc996773dd02b174fe6 Gerrit-Change-Number: 11892 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 17:34:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:34:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:34:43 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Get rid of msg param In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11893 ) Change subject: gbproxy: flush_stored_messages: Get rid of msg param ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6716a260e12a3cf36af0501ce611c6c1e608f537 Gerrit-Change-Number: 11893 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 17:34:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:35:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:35:05 +0000 Subject: Change in osmo-sysmon[master]: Expand default config In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11886 ) Change subject: Expand default config ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I25ed3936ddaae8452ba9dde325cb3e822b739def Gerrit-Change-Number: 11886 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 22 Nov 2018 17:35:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:35:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 22 Nov 2018 17:35:07 +0000 Subject: Change in osmo-sysmon[master]: Expand default config In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11886 ) Change subject: Expand default config ...................................................................... Expand default config * add file watcher example * add more ctrl variables Change-Id: I25ed3936ddaae8452ba9dde325cb3e822b739def Related: SYS#2655 --- M doc/examples/osmo-sysmon.cfg 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/examples/osmo-sysmon.cfg b/doc/examples/osmo-sysmon.cfg index 933df93..e3adab9 100644 --- a/doc/examples/osmo-sysmon.cfg +++ b/doc/examples/osmo-sysmon.cfg @@ -1,5 +1,14 @@ ctrl-client bsc 127.0.0.1 4249 - get-variable bts_connection_status get-variable msc.0.connection_status + get-variable bts_connection_status + get-variable number-of-bts + get-variable bts.0.oml-connection-state + get-variable bts.0.rf_state + get-variable rf_locked +ctrl-client gbproxy 127.0.0.1 4263 + get-variable nsvc-state + get-variable number-of-peers + get-variable gbproxy-state netdev eth0 netdev tun0 +file os-image /etc/image-datetime -- To view, visit https://gerrit.osmocom.org/11886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I25ed3936ddaae8452ba9dde325cb3e822b739def Gerrit-Change-Number: 11886 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:35:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:35:28 +0000 Subject: Change in osmo-bsc[master]: vty: add command to show TRX selectively In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11721 ) Change subject: vty: add command to show TRX selectively ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a Gerrit-Change-Number: 11721 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 22 Nov 2018 17:35:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:46:24 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 17:46:24 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi.py: log address on errors Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11896 Change subject: ctrl2cgi.py: log address on errors ...................................................................... ctrl2cgi.py: log address on errors Change-Id: I80cdcda134766c679c2b80b848fb9db853321cfd Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/96/11896/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 6be36c4..1b5e952 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -141,7 +141,7 @@ params['h'] = gen_hash(params, self.factory.secret_key) d = post(self.factory.location, None, params=params) d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s" % (e, bsc)), bsc) # handle HTTP errors + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: yield self.factory.semaphore.acquire() yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit -- To view, visit https://gerrit.osmocom.org/11896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I80cdcda134766c679c2b80b848fb9db853321cfd Gerrit-Change-Number: 11896 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:50:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 17:50:43 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi.py: log address on errors In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11896 ) Change subject: ctrl2cgi.py: log address on errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I80cdcda134766c679c2b80b848fb9db853321cfd Gerrit-Change-Number: 11896 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 17:50:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 17:59:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 22 Nov 2018 17:59:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP: MSC_Tests: First SGs testcases In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11488 ) Change subject: WIP: MSC_Tests: First SGs testcases ...................................................................... Patch Set 8: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11488/8/msc/BSC_ConnectionHandler.ttcn File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/#/c/11488/8/msc/BSC_ConnectionHandler.ttcn at 922 PS8, Line 922: : : : : : : : : Please remove this white space. https://gerrit.osmocom.org/#/c/11488/8/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11488/8/msc/MSC_Tests.ttcn at 3108 PS8, Line 3108: : : : : : : : : : : : : : : : : : : Same here, what is the purpose of that?!? o_O https://gerrit.osmocom.org/#/c/11488/8/msc/MSC_Tests.ttcn at 3186 PS8, Line 3186: : : : Here too... If both parts of this file are tooo unrelated, let's have \n\n, but not such a lot. -- To view, visit https://gerrit.osmocom.org/11488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38543c35a9e74cea276e58d1d7ef01ef07ffe858 Gerrit-Change-Number: 11488 Gerrit-PatchSet: 8 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 22 Nov 2018 17:59:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 18:02:07 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 22 Nov 2018 18:02:07 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi.py: log address on errors In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11896 ) Change subject: ctrl2cgi.py: log address on errors ...................................................................... ctrl2cgi.py: log address on errors Change-Id: I80cdcda134766c679c2b80b848fb9db853321cfd Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 6be36c4..1b5e952 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -141,7 +141,7 @@ params['h'] = gen_hash(params, self.factory.secret_key) d = post(self.factory.location, None, params=params) d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s" % (e, bsc)), bsc) # handle HTTP errors + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: yield self.factory.semaphore.acquire() yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit -- To view, visit https://gerrit.osmocom.org/11896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I80cdcda134766c679c2b80b848fb9db853321cfd Gerrit-Change-Number: 11896 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 18:04:56 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 22 Nov 2018 18:04:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11897 Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... MSC_Test: Test what happens when Paging for SMS is unanswered Trigger sending of an SMS, but ignore any paging requests from the MSC, make sure that the MSC is not paging infinitly Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Related: OS#3704 --- M msc/MSC_Tests.ttcn 1 file changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11897/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 2a6c034..a7de280 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1961,6 +1961,74 @@ vc_conn.done; } +/* Paging for MT SMS but no response */ +private function f_tc_lu_and_mt_sms_paging_and_nothing(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var OCT4 tmsi; + var integer page_count := 0; + f_init_handler(pars, 150.0); + + /* Perform location update */ + f_perform_lu(); + + /* register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + tmsi := g_pars.tmsi; + } else { + tmsi := 'FFFFFFFF'O; + } + f_bssmap_register_imsi(g_pars.imsi, tmsi); + + /* FIXME: actually cause MSC to send a SMS via VTY or SMPP */ + + /* Expect the MSC to page exactly 10 times before giving up */ + alt { + [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) + { + page_count := page_count + 1; + + if (page_count < 10) { + repeat; + } + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message received"); + self.stop; + } + } + + /* Wait some time to make sure the MSC is not delivering any further + * paging messages or anything else that could be unexpected. */ + timer T := 20.0; + T.start + alt { + [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) + { + setverdict(fail, "paging seems not to stop!"); + mtc.stop; + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message received"); + self.stop; + } + [] T.timeout { + setverdict(pass); + } + } + + setverdict(pass); +} +testcase TC_lu_and_mt_sms_paging_and_nothing() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(43); + vc_conn := f_start_handler_with_pars(refers(f_tc_lu_and_mt_sms_paging_and_nothing), pars); + f_sleep(2.0); + f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); + vc_conn.done; +} + /* mobile originated SMS from MS/BTS/BSC side to SMPP */ private function f_tc_smpp_mo_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars); @@ -2772,6 +2840,7 @@ execute( TC_lu_and_mo_sms() ); execute( TC_lu_and_mt_sms() ); + execute( TC_lu_and_mt_sms_paging_and_nothing() ); execute( TC_smpp_mo_sms() ); execute( TC_smpp_mt_sms() ); -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 18:06:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 18:06:46 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 3: (3 comments) https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3893 PS3, Line 3893: "Calculate T3113 dynamically based on channel config and load\n" > I think it would be good to make the name of this command more specific to t3113, for now. "for now" means having to keep backward compatibility with commands later, and I want to avoid that. So indeed the implementation is so far quite specific to T3113, but same VTY cmd can be used later on for more timers if we decide so, without needing to add more commands or deprecating all ones. https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3916 PS3, Line 3916: "Calculate T3113 dynamically based on channel config and load\n" > with the preceding "no", it's ok to here write "Set given timer to non-dynamic and use the default o [?] I didn't completely get what you mean here regarding docs, but anyway that sounds confusing to me when reading because I would read: NO_STR "Set given timer to non-dynamic and use the default or user provided fixed value" which in my head would mean: "Don't set given timer to non-dynamic and use the default or user provided fixed value" which by boolean !(!a&&b): "Set given timer to dynamic or don't use default provided fixed value" And that's basically the opposite of what this command does. https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3927 PS3, Line 3927: vty_out(vty, "T%d has no dynamic setting%s", d->T, VTY_NEWLINE); > technically would be ok to ignore this, because setting a non-dynamic timer to non-dynamic is a no-o [?] Sure, but anyway nowadays doesn't make sense, to let's better tell the user probably he's doing something having no effect (so he doesn't expect an effect, or detects he mistyped the timer reference). -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 22 Nov 2018 18:06:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 18:09:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 18:09:18 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11654 to look at the new patch set (#4). Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... paging: Add VTY options to calculate T3113 timeout dynamically The idea is to have a base static value which is set like before "timer t3113 [seconds]", but now have a part of this timeout calculated dynamically based on BTS channel configuration and channel load. This patch only implements initial support to calculate based on channel configuration, but doesn't include code to calculate based on channel load. To implement the later part, we probably need to keep track of BTS paging queues per paging group, which we don't do nowadays. Dynamic calculation is enabled by default, and default static base value is decreased accordingly. This way, in a typical setup were the default 10 seconds were used, now the calculated final value is 11 seconds. That's intended because it was observed experimentally in osmo-gsm-tester with a similar channel setup that sometimes paging response can arrive slightly later than 10 seconds. Related: OS#3680 Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/gsm_timers.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/gsm_timers_vty.c M src/osmo-bsc/net_init.c M src/osmo-bsc/paging.c 7 files changed, 81 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11654/4 -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 18:10:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 18:10:53 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flag gbproxy_assign_imsi as static In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11888 ) Change subject: gbproxy: flag gbproxy_assign_imsi as static ...................................................................... gbproxy: flag gbproxy_assign_imsi as static It's currently only used in the same file. Change-Id: I08b51f36263e58f52ef9af2a63a7fcbf06a767c4 --- M src/gprs/gb_proxy_tlli.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gb_proxy_tlli.c b/src/gprs/gb_proxy_tlli.c index 1832122..0c027d5 100644 --- a/src/gprs/gb_proxy_tlli.c +++ b/src/gprs/gb_proxy_tlli.c @@ -388,7 +388,7 @@ return link_info != NULL && link_info->is_matching[match_id]; } -void gbproxy_assign_imsi(struct gbproxy_peer *peer, +static void gbproxy_assign_imsi(struct gbproxy_peer *peer, struct gbproxy_link_info *link_info, struct gprs_gb_parse_context *parse_ctx) { -- To view, visit https://gerrit.osmocom.org/11888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I08b51f36263e58f52ef9af2a63a7fcbf06a767c4 Gerrit-Change-Number: 11888 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 18:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 22 Nov 2018 18:15:04 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11898 Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database This introduces a new 'meta' table for meta-data, and adds the first meta data item 'revision' which indicates the database schema version. The present schema is now known as 'version 0' and automatically upgraded to schema version 1 when a database is opened. Furthermore, introduce a new column to the subscriber table which is intended to track the timestamp of the last LU received from a given subscriber. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h 3 files changed, 103 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/1 diff --git a/sql/hlr.sql b/sql/hlr.sql index 80eb3e5..6a08e6f 100644 --- a/sql/hlr.sql +++ b/sql/hlr.sql @@ -1,3 +1,9 @@ +CREATE TABLE IF NOT EXISTS meta ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + key TEXT UNIQUE NOT NULL, + value TEXT NOT NULL +); + CREATE TABLE IF NOT EXISTS subscriber ( -- OsmoHLR's DB scheme is modelled roughly after TS 23.008 version 13.3.0 id INTEGER PRIMARY KEY, @@ -37,6 +43,9 @@ ms_purged_cs BOOLEAN NOT NULL DEFAULT 0, -- Chapter 2.7.6 ms_purged_ps BOOLEAN NOT NULL DEFAULT 0 + + -- Further fields added on the fly during DB upgrades: + -- last_lu_seen TIMESTAMP default NULL ); CREATE TABLE IF NOT EXISTS subscriber_apn ( diff --git a/src/db.c b/src/db.c index 4b0577f..4a328d4 100644 --- a/src/db.c +++ b/src/db.c @@ -27,6 +27,14 @@ #include "db.h" #include "db_bootstrap.h" +/* + * Database schema version history: + * Version 0: Did not have a 'meta' table. + * Version 1: Added the 'meta' table with schema version 1, and + * added the 'last_lu_seen' column to table 'subscriber'. + */ +#define CURRENT_SCHEMA_VERSION 1 + #define SEL_COLUMNS \ "id," \ "imsi," \ @@ -40,9 +48,12 @@ "nam_ps," \ "lmsi," \ "ms_purged_cs," \ - "ms_purged_ps" + "ms_purged_ps," \ + "last_lu_seen" static const char *stmt_sql[] = { + [DB_STMT_ADD_SCHEMA_VERSION] = "INSERT INTO meta (key, value) VALUES ('revision', 1)", + [DB_STMT_SEL_SCHEMA_VERSION] = "SELECT value FROM meta WHERE key = 'revision'", [DB_STMT_SEL_BY_IMSI] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE imsi = ?", [DB_STMT_SEL_BY_MSISDN] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE msisdn = ?", [DB_STMT_SEL_BY_ID] = "SELECT " SEL_COLUMNS " FROM subscriber WHERE id = ?", @@ -70,6 +81,7 @@ "INSERT INTO auc_3g (subscriber_id, algo_id_3g, k, op, opc, ind_bitlen)" " VALUES($subscriber_id, $algo_id_3g, $k, $op, $opc, $ind_bitlen)", [DB_STMT_AUC_3G_DELETE] = "DELETE FROM auc_3g WHERE subscriber_id = $subscriber_id", + [DB_STMT_UPD_LAST_LU_SEEN] = "UPDATE subscriber SET last_lu_seen = $val WHERE imsi = $imsi", }; static void sql3_error_log_cb(void *arg, int err_code, const char *msg) @@ -220,6 +232,64 @@ return SQLITE_OK; } +static int +read_schema_version(struct db_context *dbc) +{ + sqlite3_stmt *stmt; + int rc; + + rc = sqlite3_prepare_v2(dbc->db, stmt_sql[DB_STMT_SEL_SCHEMA_VERSION], -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", stmt_sql[DB_STMT_SEL_SCHEMA_VERSION]); + return rc; + } + + rc = sqlite3_step(stmt); + if (rc == SQLITE_ROW) { + dbc->schema_version = sqlite3_column_int(stmt, 0); + rc = sqlite3_step(stmt); + } else { + /* Assume 'meta' table does not exist, i.e. this is schema version zero. */ + dbc->schema_version = 0; + rc = SQLITE_DONE; + } + + db_remove_reset(stmt); + return rc; +} + +static int +db_update_v1(struct db_context *dbc) +{ + sqlite3_stmt *stmt; + int rc; + const char *update_stmt_sql = "ALTER TABLE subscriber ADD COLUMN last_lu_seen TIMESTAMP default NULL"; + + rc = sqlite3_prepare_v2(dbc->db, update_stmt_sql, -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", update_stmt_sql); + return rc; + } + rc = sqlite3_step(stmt); + db_remove_reset(stmt); + if (rc != SQLITE_DONE) { + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + return rc; + } + + rc = sqlite3_prepare_v2(dbc->db, stmt_sql[DB_STMT_ADD_SCHEMA_VERSION], -1, &stmt, NULL); + if (rc != SQLITE_OK) { + LOGP(DDB, LOGL_ERROR, "Unable to prepare SQL statement '%s'\n", stmt_sql[DB_STMT_ADD_SCHEMA_VERSION]); + return rc; + } + rc = sqlite3_step(stmt); + if (rc != SQLITE_DONE) + LOGP(DDB, LOGL_ERROR, "Unable to update HLR database schema to version %d\n", 1); + + db_remove_reset(stmt); + return rc; +} + struct db_context *db_open(void *ctx, const char *fname, bool enable_sqlite_logging) { struct db_context *dbc = talloc_zero(ctx, struct db_context); @@ -281,6 +351,25 @@ goto out_free; } + rc = read_schema_version(dbc); + if (rc != SQLITE_DONE) + goto out_free; + switch (dbc->schema_version) { + case 0: + if (db_update_v1(dbc) != SQLITE_DONE) + break; + /* fall through */ + case 1: + /* fall through */ + /* case N: */ + /* fall through */ + /* case N+1: */ + break; + default: + LOGP(DDB, LOGL_ERROR, "Unknown HLR database schema version: '%d'\n", dbc->schema_version); + goto out_free; + } + /* prepare all SQL statements */ for (i = 0; i < ARRAY_SIZE(dbc->stmt); i++) { rc = sqlite3_prepare_v2(dbc->db, stmt_sql[i], -1, diff --git a/src/db.h b/src/db.h index 956b5ed..c688249 100644 --- a/src/db.h +++ b/src/db.h @@ -6,6 +6,8 @@ struct hlr; enum stmt_idx { + DB_STMT_ADD_SCHEMA_VERSION, + DB_STMT_SEL_SCHEMA_VERSION, DB_STMT_SEL_BY_IMSI, DB_STMT_SEL_BY_MSISDN, DB_STMT_SEL_BY_ID, @@ -24,6 +26,7 @@ DB_STMT_AUC_2G_DELETE, DB_STMT_AUC_3G_INSERT, DB_STMT_AUC_3G_DELETE, + DB_STMT_UPD_LAST_LU_SEEN, _NUM_DB_STMT }; @@ -31,6 +34,7 @@ char *fname; sqlite3 *db; sqlite3_stmt *stmt[_NUM_DB_STMT]; + int schema_version; }; void db_remove_reset(sqlite3_stmt *stmt); -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 18:20:32 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 22 Nov 2018 18:20:32 +0000 Subject: Change in osmo-msc[master]: sms_sueue: count GSM_PAGING_BUSY and GSM_PAGING_EXPIRED Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/11899 Change subject: sms_sueue: count GSM_PAGING_BUSY and GSM_PAGING_EXPIRED ...................................................................... sms_sueue: count GSM_PAGING_BUSY and GSM_PAGING_EXPIRED When sms delivery fails normally db_sms_inc_deliver_attempts() is executed to increase a counter in the database. Once the counter reaches a maxium (10 by default) the SM queue gives up on doing further delivery attempts. For some reason GSM_PAGING_EXPIRED and GSM_PAGING_BUSY are not taken into account by the mechanism, which causes an infinite number of SMS delivery attempts. - Count GSM_PAGING_BUSY as failed delivery attempt - Count GSM_PAGING_EXPIRED as failed delivery ttempt Change-Id: I88a51568b43a1414e72ce74d7ba2e9406cf07f9f Related: OS#3704 --- M src/libmsc/sms_queue.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/99/11899/1 diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 252e529..d7ba41a 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -509,9 +509,11 @@ sms_pending_failed(pending, 0); break; case GSM_PAGING_EXPIRED: + db_sms_inc_deliver_attempts(sig_sms->sms); sms_pending_failed(pending, 1); break; case GSM_PAGING_BUSY: + db_sms_inc_deliver_attempts(sig_sms->sms); network->sms_queue->pending -= 1; sms_pending_free(pending); sms_queue_trigger(network->sms_queue); -- To view, visit https://gerrit.osmocom.org/11899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I88a51568b43a1414e72ce74d7ba2e9406cf07f9f Gerrit-Change-Number: 11899 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 22 18:34:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 22 Nov 2018 18:34:39 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/11898/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11898/1//COMMIT_MSG at 17 PS1, Line 17: Maybe specify that this functionality will be implemented in forthcoming patches. https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql at 48 PS1, Line 48: -- last_lu_seen TIMESTAMP default NULL I'm fine with possibility to update on the fly, but why requiring everybody who uses this .sql file to go through the entire process? Just provide here the field and one INSERT to the meta table with version=1. https://gerrit.osmocom.org/#/c/11898/1/src/db.c File src/db.c: https://gerrit.osmocom.org/#/c/11898/1/src/db.c at 251 PS1, Line 251: } else { Would probably make sense to check which specific error is returned if the table doesn't exist, and apply this schema_version=0, and return an error for other errors. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 22 Nov 2018 18:34:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 22 23:20:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 22 Nov 2018 23:20:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_sy?= =?UTF-8?Q?smo,femtobts=5Fv2.7,default,osmocom-master-debian9_#1456?= In-Reply-To: <1913142548.792.1542894960080.JavaMail.jenkins@jenkins.osmocom.org> References: <1913142548.792.1542894960080.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <722086705.794.1542928823296.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Nov 23 00:03:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 00:03:40 +0000 Subject: Change in osmo-bsc[master]: vty: add command to show TRX selectively In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11721 ) Change subject: vty: add command to show TRX selectively ...................................................................... vty: add command to show TRX selectively Add following commands showing only TRX with appropriate RSL link status: * show trx connected * show trx disconnected This simplifies troubleshooting of complex setup with multiple BTS with several TRX each. Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a --- M src/osmo-bsc/bsc_vty.c 1 file changed, 46 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 4f18d47..983dcb9 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1079,8 +1079,14 @@ return CMD_SUCCESS; } -static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx) +static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx, bool print_rsl, bool show_connected) { + if (show_connected && !trx->rsl_link) + return; + + if (!show_connected && trx->rsl_link) + return; + vty_out(vty, "TRX %u of BTS %u is on ARFCN %u%s", trx->nr, trx->bts->nr, trx->arfcn, VTY_NEWLINE); vty_out(vty, "Description: %s%s", @@ -1091,7 +1097,8 @@ trx->nominal_power - trx->max_power_red, VTY_NEWLINE); vty_out(vty, " NM State: "); net_dump_nmstate(vty, &trx->mo.nm_state); - vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); + if (print_rsl) + vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); vty_out(vty, " Baseband Transceiver NM State: "); net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); if (is_ipaccess_bts(trx->bts)) { @@ -1103,11 +1110,17 @@ } } +static void trx_dump_vty_all(struct vty *vty, struct gsm_bts_trx *trx) +{ + trx_dump_vty(vty, trx, true, true); + trx_dump_vty(vty, trx, true, false); +} + static inline void print_all_trx(struct vty *vty, const struct gsm_bts *bts) { uint8_t trx_nr; for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) - trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr)); + trx_dump_vty_all(vty, gsm_bts_trx_num(bts, trx_nr)); } DEFUN(show_trx, @@ -1137,7 +1150,8 @@ VTY_NEWLINE); return CMD_WARNING; } - trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr)); + trx_dump_vty_all(vty, gsm_bts_trx_num(bts, trx_nr)); + return CMD_SUCCESS; } if (bts) { @@ -1320,6 +1334,33 @@ meas_rep_dump_uni_vty(vty, &mr->ul, prefix, "ul"); } +static inline void print_all_trx_ext(struct vty *vty, bool show_connected) +{ + struct gsm_network *net = gsmnet_from_vty(vty); + struct gsm_bts *bts = NULL; + uint8_t bts_nr; + for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { + uint8_t trx_nr; + bts = gsm_bts_num(net, bts_nr); + for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) + trx_dump_vty(vty, gsm_bts_trx_num(bts, trx_nr), false, show_connected); + } +} + +DEFUN(show_trx_con, + show_trx_con_cmd, + "show trx (connected|disconnected)", + SHOW_STR "Display information about a TRX\n" + "Show TRX with RSL connected\n" + "Show TRX with RSL disconnected\n") +{ + if (!strcmp(argv[0], "connected")) + print_all_trx_ext(vty, true); + else + print_all_trx_ext(vty, false); + + return CMD_SUCCESS; +} static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan) { @@ -4956,6 +4997,7 @@ install_element_ve(&show_bts_cmd); install_element_ve(&show_rejected_bts_cmd); install_element_ve(&show_trx_cmd); + install_element_ve(&show_trx_con_cmd); install_element_ve(&show_ts_cmd); install_element_ve(&show_lchan_cmd); install_element_ve(&show_lchan_summary_cmd); -- To view, visit https://gerrit.osmocom.org/11721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I48866ce311a3e2c63235f60a497efe97bbd05a4a Gerrit-Change-Number: 11721 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 23 06:52:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 23 Nov 2018 06:52:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#198?= In-Reply-To: <1172761502.787.1542869523150.JavaMail.jenkins@jenkins.osmocom.org> References: <1172761502.787.1542869523150.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1642458193.806.1542955922517.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.31 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Nov 23 10:04:29 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 23 Nov 2018 10:04:29 +0000 Subject: Change in osmo-msc[master]: osmo_msc: remove unused parameter from msc_dtap() In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/11835 ) Change subject: osmo_msc: remove unused parameter from msc_dtap() ...................................................................... osmo_msc: remove unused parameter from msc_dtap() The parameter link_id in the function msc_dtap() is unused. Lets remove it. Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface_bssap.c M src/libmsc/iucs.c M src/libmsc/osmo_msc.c M tests/msc_vlr/msc_vlr_tests.c 5 files changed, 5 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Stefan Sperling: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 3ffb65c..a757a99 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -63,8 +63,7 @@ int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause); int msc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint16_t chosen_channel); -void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, - struct msgb *msg); +void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg); int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index c11347e..9a2333d 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -686,7 +686,7 @@ OMSC_LINKID_CB(msg) = dtap->link_id; /* Forward dtap payload into the msc */ - msc_dtap(conn, conn->a.conn_id, msg); + msc_dtap(conn, msg); return 0; } diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index a3092f8..95bbbee 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -173,7 +173,7 @@ uint8_t pdisc = gh->proto_discr & 0x0f; OSMO_ASSERT(pdisc != GSM48_PDISC_RR); - msc_dtap(conn, ue_ctx->conn_id, msg); + msc_dtap(conn, msg); rc = 0; } else { /* allocate a new connection */ diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index c9ecb64..f2c84e6 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -121,7 +121,7 @@ } /* Receive a DTAP message from BSC */ -void msc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) +void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg) { msc_subscr_conn_get(conn, MSC_CONN_USE_DTAP); gsm0408_dispatch(conn, msg); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 9515c63..6cf927c 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -232,7 +232,7 @@ && (gsm48_hdr_msg_type(gh) == GSM48_MT_RR_CIPH_M_COMPL)) msc_cipher_mode_compl(g_conn, msg, 0); else - msc_dtap(g_conn, 23, msg); + msc_dtap(g_conn, msg); } if (!conn_exists(g_conn)) -- To view, visit https://gerrit.osmocom.org/11835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7ba67b0cb514c91bc87a7b396ed3962b7a68e7da Gerrit-Change-Number: 11835 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 10:31:32 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 23 Nov 2018 10:31:32 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql at 48 PS1, Line 48: -- last_lu_seen TIMESTAMP default NULL > I'm fine with possibility to update on the fly, but why requiring everybody who uses this . [?] I understand where you are coming from. Having spent some time on this already, and having already tried both approaches, my current response to this request is: Yes it would be nice, but it's not trivial to do. One advantage of the proposed method is that schema upgrades will be extensively tested. Another is that we have a single code path which covers all of these cases: - A new DB is created from scratch. - An existing DB which confirms to the current schema is opened. - An existing DB which needs to be upgraded is opened. And schema upgrades are a very cheap one-time operations, so the cost at run-time is minimal. The main downside is of course that the complete schema can only be obtained by running '.fullschema' on an hlr.db. I couldn't yet find a working solution when the schema is created with the current format to begin with and works for all 3 cases outlined above. There are several error conditions which show up in various approaches I have tried, and they are all somehow linked to sqlite's limited support for ALTER TABLE. The ALTER TABLE statement cannot be prepared if the last_lu_seen column already exists: DDB ERROR (1) duplicate column name: last_lu_seen (db.c:88) DDB ERROR Unable to prepare SQL statement 'ALTER TABLE subscriber ADD COLUMN last_lu_seen TIMESTAMP default NULL If the meta data version is inserted by hlr.sql, then upgrades don't work because an existing subscriber table can't be modified by hlr.sql. But the upgrade code sees version number 1 and won't alter the table, so preparing our statements now fails with: DDB ERROR (1) no such column: last_lu_seen (db.c:88) DDB ERROR Unable to prepare SQL statement 'SELECT id,imsi,msisdn,vlr_number,sgsn_number,sgsn_address,periodic_lu_tmr,periodic_rau_tau_tmr,nam_cs,nam_ps,lmsi,ms_purged_cs,ms_purged_ps,last_lu_seen FROM subscriber WHERE imsi = ?' (db.c:424) Also note that the sqlite API does not provide distinct error codes that tell us why a statement failed, which makes it difficult to handle such specific error cases in C code. It can likely be done somehow, but as far as I can tell it will require more code, not less. Do you have a working suggestion? This would all be much easier if a version number had been included in the DB schema the first place. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 10:31:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 10:35:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 23 Nov 2018 10:35:27 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11898/1/src/db.c File src/db.c: https://gerrit.osmocom.org/#/c/11898/1/src/db.c at 251 PS1, Line 251: } else { > Would probably make sense to check which specific error is returned if the table doesn't exist, and [?] Tell me how to do this with sqlite's API and I'll do it. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 10:35:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 10:44:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 23 Nov 2018 10:44:25 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11898 to look at the new patch set (#2). Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database This introduces a new 'meta' table for meta-data, and adds the first meta data item 'revision' which indicates the database schema version. The present schema is now known as 'version 0' and automatically upgraded to schema version 1 when a database is opened. Furthermore, introduce a new column to the subscriber table which is intended to track the timestamp of the last LU received from a given subscriber. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h 3 files changed, 106 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/2 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 10:49:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 23 Nov 2018 10:49:24 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11898 to look at the new patch set (#3). Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database This introduces a new 'meta' table for meta-data, and adds the first meta data item 'revision' which indicates the database schema version. The present schema is now known as 'version 0' and automatically upgraded to schema version 1 when a database is opened. Furthermore, introduce a new column to the subscriber table which is intended to track the timestamp of the last LU received from a given subscriber. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h 3 files changed, 105 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/3 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 10:52:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 23 Nov 2018 10:52:52 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11898 to look at the new patch set (#4). Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database This introduces a new 'meta' table for meta-data, and adds the first meta data item 'revision' which indicates the database schema version. The present schema is now known as 'version 0' and automatically upgraded to schema version 1 when a database is opened. Furthermore, introduce a new column to the subscriber table which is intended to track the timestamp of the last LU received from a given subscriber. This functionality is not yet implemented; this patch only prepares foundations for this feature. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/hlr.sql M src/db.c M src/db.h 3 files changed, 105 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/4 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 11:07:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 11:07:41 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql at 48 PS1, Line 48: -- last_lu_seen TIMESTAMP default NULL > I understand where you are coming from. Having spent some time on this already, [?] I really fail to see your arguments related to what I am asking, maybe I expressed myself in a wrong way or there's something I'm not understanding myself. I'm asking to leave everything exactly as it is in this patch, but modify this hlr.sql to be a representation of v1 table, that is add the new field in the subscriber database, and add an INSERT statement that adds version=1 to "meta" table. This file is only used in case a new database needs to be created. In that case, we know it will always be latest supported version, so in that code path we don't need to go through upgrade procedure. With this change I request, all other code paths work exactly the same. I don't want requiring to run osmo-hlr process (and having to provide a related working config and setup with IP, port, etc.) to get a .db file that is up to date and which I can populate. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 11:07:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 11:11:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 11:11:39 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Fix abort during APN patch In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11889 ) Change subject: gbproxy: Fix abort during APN patch ...................................................................... Patch Set 1: Tested by a customer it avoids the mentioned abort. -- To view, visit https://gerrit.osmocom.org/11889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c Gerrit-Change-Number: 11889 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 11:11:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 11:15:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 23 Nov 2018 11:15:47 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql at 48 PS1, Line 48: -- last_lu_seen TIMESTAMP default NULL > This file is only used in case a new database needs to be created. Based on my understand of the code and the testing I have done, this assumption is incorrect. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 11:15:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 23 11:19:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 23 Nov 2018 11:19:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-cellmgr-ng_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#54?= In-Reply-To: <541592031.790.1542885542042.JavaMail.jenkins@jenkins.osmocom.org> References: <541592031.790.1542885542042.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <663594879.808.1542971940788.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 172.45 KB...] config.status: executing libtool commands + PKG_CONFIG_PATH=/build/deps/libosmo-sccp/..//install/lib/pkgconfig + make -j 8 install echo 0.10.0.30-5371 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in mtp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' Making install in sccp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC sccp_sap.lo CC mtp_pcap.o CC libxua_a-xua_msg.o CC m3ua.lo CC sua.lo CC sccp_helpers.lo CC xua_msg.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:1032:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/libosmo-sccp/../install/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/libosmo-sccp/../install/lib' ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libsccp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libmtp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/libosmo-sccp/../install/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/libosmo-sccp/../install/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' Making install in vty make[3]: Entering directory '/build/deps/libosmo-sccp/tests/vty' CC ss7_asp_vty_test.o CCLD ss7_asp_vty_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/vty' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_test_server.o CC sccp_demo_user.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/libosmo-sccp/../install/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/libosmo-sccp/../install/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:326: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:396: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[3]: *** [install-am] Error 2 Makefile:360: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' make[2]: *** [install-recursive] Error 1 Makefile:487: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:786: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Nov 23 11:29:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 11:29:52 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql at 48 PS1, Line 48: -- last_lu_seen TIMESTAMP default NULL > > This file is only used in case a new database needs to be created. [?] Ah I see, so the CREATE TABLE stuff is called everytime during db_bootstrap, and it just succeeds every time? I must say that's pretty strange way of doing stuff imho, but fine then. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Stefan Sperling Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 11:29:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 11:30:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 11:30:00 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 23 Nov 2018 11:30:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 11:40:58 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 23 Nov 2018 11:40:58 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 3: (3 comments) > build fails with: > ==== > handover_fsm.c: In function 'send_handover_performed': > handover_fsm.c:678:36: error: storage size of 'ho_perf_params' > isn't known > struct gsm0808_handover_performed ho_perf_params; > ^ > handover_fsm.c:718:2: error: implicit declaration of function > 'gsm0808_create_handover_performed' [-Werror=implicit-function-declaration] > msg = gsm0808_create_handover_performed(&ho_perf_params); > ^ > handover_fsm.c:678:36: error: unused variable 'ho_perf_params' > [-Werror=unused-variable] > struct gsm0808_handover_performed ho_perf_params; > ^ > cc1: all warnings being treated as errors > ==== > > otherwise the patch looks good to me I think this is just because the related libosmocore patch is not merged. It should build after #11728 is merged. https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 791 PS1, Line 791: if (result == HO_RESULT_OK && (ho->scope & HO_INTRA_CELL || ho->scope & HO_INTRA_BSC)) > && (ho->scope & (HO_INTRA_CELL | HO_INTRA_BSC)) [?] Done https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 792 PS1, Line 792: send_handover_performed(conn); > as I commented in https://gerrit.osmocom. [?] Done https://gerrit.osmocom.org/#/c/11734/1/src/osmo-bsc/handover_fsm.c at 792 PS1, Line 792: send_handover_performed(conn); > should we *always* send a handover performed, or only when the codec changed? IIUC the MSC need not [?] See 3GPP TS 48.008, 3.2.1.25. There it reads "This message is sent from the BSS to the MSC in order to indicate that the BSS has performed an internal handover." So I think yes, it is sent always. The message contains the cell id as mandatory element, so maybe this is also related to location based services. -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 11:40:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 11:41:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 23 Nov 2018 11:41:43 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/11898/1/sql/hlr.sql at 48 PS1, Line 48: -- last_lu_seen TIMESTAMP default NULL > Ah I see, so the CREATE TABLE stuff is called everytime during db_bootstrap, and it just succeeds ev [?] Yes, that's the way it has been implemented from the beginning. I'd rather keep this as-is. I don't see how we could tell apart a fresh db from an existing one after sqlite3_open() on a non-racy way. This seems to be impossible without running into TOCTOU issues (time of check vs time of use). -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 23 Nov 2018 11:41:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From pespin at sysmocom.de Fri Nov 23 12:19:32 2018 From: pespin at sysmocom.de (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:19:32 +0100 Subject: =?UTF-8?Q?cellmgr-ng_rotten_=28Re=3a_Build_failed_in_Jenkins=3a_mas?= =?UTF-8?Q?ter-cellmgr-ng_=c2=bb_a1=3ddefault=2ca2=3ddefault=2ca3=3ddefault?= =?UTF-8?Q?=2cosmocom-master-debian9_=2354=29?= In-Reply-To: <663594879.808.1542971940788.JavaMail.jenkins@jenkins.osmocom.org> References: <541592031.790.1542885542042.JavaMail.jenkins@jenkins.osmocom.org> <663594879.808.1542971940788.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: Hi all, I started looking at this failure and found out code in this repository is really old, with nobody maintain it (13 months since last commits?). I started by updating the contrib/jenkins.sh to use osmo-build-dep.sh and osmo-clean-workspace.sh like we do in other repos, because i felt it was not building up to date stuff. After updating that script, indeed it seems cellmgr-ng cannot be built against new libosmo-sccp due to some M3UA headers /API changes. There's even a tag during that commit in libosmo-sccp called "old_sua". After that commit, cellmgr-ng fails to build. If I try to build it against "old_sua", still cannot build fine with updated contrib/jenkins.sh script due to missing LIBOSMOSCCP_CFLAGS in tests/Makefile.am, and then still other headers are not found in other places, etc. I stopped at this point because I'm starting to spent too muhch time on this and it seems nobody is using it anyway. Can we disable the build of this project? Does somebody want to take care of it? Regards, Pau -- - Pau Espin Pedrol http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Director: Harald Welte From gerrit-no-reply at lists.osmocom.org Fri Nov 23 13:14:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:14:00 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: Set UHD identifiers on B200 devices Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11900 Change subject: resources.conf: Set UHD identifiers on B200 devices ...................................................................... resources.conf: Set UHD identifiers on B200 devices osmo-trx-uhd uses these args during device search/selection process. As those were not set until now for B200, it means when a B200 was used by osmo-gsm-tester any UHD device could be picked up and used by UHD. That was actually happening since inclusion of UmTRX devices in Prod setup, when running tests against desired B200, actually the UmTRX device was being used. Change-Id: I696bbc800b05fdd9a68a77f363d76dcc53ef24ee --- M example/resources.conf.prod M example/resources.conf.rnd 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/00/11900/1 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 35704ff..e786836 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -31,6 +31,7 @@ launch_trx: true remote_user: jenkins trx_ip: 10.42.42.116 + dev_args: "type=b200,serial=306BD11" clock_reference: external multi_arfcn: true @@ -45,7 +46,7 @@ launch_trx: true remote_user: jenkins trx_ip: 10.42.42.118 - dev_args: addr=10.42.42.130,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345 + dev_args: "addr=10.42.42.130,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345" clock_reference: internal - label: LimeSDR-USB diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index dc0251a..0fad50f 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -32,6 +32,7 @@ multi_arfcn: true remote_user: jenkins trx_ip: 127.0.0.1 + dev_args: "type=b200,serial=30A9FFB" ciphers: [a5_0, a5_1] - label: NanoBTS-ONW-1900 -- To view, visit https://gerrit.osmocom.org/11900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I696bbc800b05fdd9a68a77f363d76dcc53ef24ee Gerrit-Change-Number: 11900 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 13:19:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:19:54 +0000 Subject: Change in osmo-gsm-tester[master]: templates: bsc/nitb: Remove explicit no force-combined-si In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11847 ) Change subject: templates: bsc/nitb: Remove explicit no force-combined-si ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 Gerrit-Change-Number: 11847 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 13:19:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 13:19:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:19:56 +0000 Subject: Change in osmo-gsm-tester[master]: templates: bsc/nitb: Remove explicit no force-combined-si In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11847 ) Change subject: templates: bsc/nitb: Remove explicit no force-combined-si ...................................................................... templates: bsc/nitb: Remove explicit no force-combined-si It's always been the default anyway, so no need to explicitly state it. Furthermore, recently (osmobsc 167cb828665b91ed7d28007abd4a1862ebbb78c9) force-combined-si was enabled by default for nanoBTS due to issues with some MS not registering when it's not enabled, so let's osmo-bsc decide were should it be enabled. Related: OS#3063 Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 --- M selftest/template_test.ok M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl 3 files changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/selftest/template_test.ok b/selftest/template_test.ok index f970bf6..88b77b0 100644 --- a/selftest/template_test.ok +++ b/selftest/template_test.ok @@ -77,7 +77,6 @@ gprs nsvc 0 local udp port 23020 gprs nsvc 0 remote udp port 23000 gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts0 - no force-combined-si trx 0 rf_locked 0 arfcn val_trx_arfcn_trx0 @@ -148,7 +147,6 @@ gprs nsvc 0 local udp port 23020 gprs nsvc 0 remote udp port 23000 gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts1 - no force-combined-si trx 0 rf_locked 0 arfcn val_trx_arfcn_trx0 diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 4f39f79..53e683b 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -85,7 +85,6 @@ gprs nsvc 0 local udp port 23020 gprs nsvc 0 remote udp port 23000 gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr} - no force-combined-si % else: gprs mode none % endif diff --git a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl index 764ca94..ee7381f 100644 --- a/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl @@ -77,7 +77,6 @@ gprs nsvc 0 local udp port 23020 gprs nsvc 0 remote udp port 23000 gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr} - no force-combined-si % else: gprs mode none % endif -- To view, visit https://gerrit.osmocom.org/11847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I97b10406a4a0048c66a47aa7d32a113f0c0366d1 Gerrit-Change-Number: 11847 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 13:40:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:40:00 +0000 Subject: Change in osmo-trx[master]: lms: Use LimeSuite.h log level defines instead of hardcoded values Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11901 Change subject: lms: Use LimeSuite.h log level defines instead of hardcoded values ...................................................................... lms: Use LimeSuite.h log level defines instead of hardcoded values Change-Id: Iee693da1a0fa1db23deafa8d3845c04171e24799 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/01/11901/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 32c3d15..318df17 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -62,10 +62,10 @@ /* map lime specific log levels */ static const int lvl_map[5] = { [0] = LOGL_FATAL, - [1] = LOGL_ERROR, - [2] = LOGL_NOTICE, - [3] = LOGL_INFO, - [4] = LOGL_DEBUG, + [LMS_LOG_ERROR] = LOGL_ERROR, + [LMS_LOG_WARNING] = LOGL_NOTICE, + [LMS_LOG_INFO] = LOGL_INFO, + [LMS_LOG_DEBUG] = LOGL_DEBUG, }; /* protect against future higher log level values (lower importance) */ if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map)) -- To view, visit https://gerrit.osmocom.org/11901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iee693da1a0fa1db23deafa8d3845c04171e24799 Gerrit-Change-Number: 11901 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 13:40:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:40:00 +0000 Subject: Change in osmo-trx[master]: lms: Apply LMS->OSMO log level conversion Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11902 Change subject: lms: Apply LMS->OSMO log level conversion ...................................................................... lms: Apply LMS->OSMO log level conversion Change-Id: I3a8fbcc7cacebc7038c60175a8ae43b21f713cbb --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/02/11902/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 318df17..0a6c4a2 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -71,7 +71,7 @@ if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map)) lvl = ARRAY_SIZE(lvl_map)-1; - LOGLV(DLMS, lvl) << msg; + LOGLV(DLMS, lvl_map[lvl]) << msg; } static void thread_enable_cancel(bool cancel) -- To view, visit https://gerrit.osmocom.org/11902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3a8fbcc7cacebc7038c60175a8ae43b21f713cbb Gerrit-Change-Number: 11902 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 13:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:42:34 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: Set UHD identifiers on B200 devices In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11900 ) Change subject: resources.conf: Set UHD identifiers on B200 devices ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I696bbc800b05fdd9a68a77f363d76dcc53ef24ee Gerrit-Change-Number: 11900 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 13:42:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 13:42:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:42:36 +0000 Subject: Change in osmo-gsm-tester[master]: resources.conf: Set UHD identifiers on B200 devices In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11900 ) Change subject: resources.conf: Set UHD identifiers on B200 devices ...................................................................... resources.conf: Set UHD identifiers on B200 devices osmo-trx-uhd uses these args during device search/selection process. As those were not set until now for B200, it means when a B200 was used by osmo-gsm-tester any UHD device could be picked up and used by UHD. That was actually happening since inclusion of UmTRX devices in Prod setup, when running tests against desired B200, actually the UmTRX device was being used. Change-Id: I696bbc800b05fdd9a68a77f363d76dcc53ef24ee --- M example/resources.conf.prod M example/resources.conf.rnd 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 35704ff..e786836 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -31,6 +31,7 @@ launch_trx: true remote_user: jenkins trx_ip: 10.42.42.116 + dev_args: "type=b200,serial=306BD11" clock_reference: external multi_arfcn: true @@ -45,7 +46,7 @@ launch_trx: true remote_user: jenkins trx_ip: 10.42.42.118 - dev_args: addr=10.42.42.130,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345 + dev_args: "addr=10.42.42.130,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345" clock_reference: internal - label: LimeSDR-USB diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index dc0251a..0fad50f 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -32,6 +32,7 @@ multi_arfcn: true remote_user: jenkins trx_ip: 127.0.0.1 + dev_args: "type=b200,serial=30A9FFB" ciphers: [a5_0, a5_1] - label: NanoBTS-ONW-1900 -- To view, visit https://gerrit.osmocom.org/11900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I696bbc800b05fdd9a68a77f363d76dcc53ef24ee Gerrit-Change-Number: 11900 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 13:50:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 13:50:57 +0000 Subject: Change in openbsc[master]: bsc-nat: Enable octet-aligned when ensuring mode set In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/6598 ) Change subject: bsc-nat: Enable octet-aligned when ensuring mode set ...................................................................... Patch Set 2: -Code-Review ping. RFC. -- To view, visit https://gerrit.osmocom.org/6598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4db7f6d18f650f36f3186965096771f748de5fd Gerrit-Change-Number: 6598 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 23 Nov 2018 13:50:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 15:08:20 +0000 Subject: Change in osmo-gsm-tester[master]: suites: gprs: Add test to verify MS can use gprs after long idle time In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11853 ) Change subject: suites: gprs: Add test to verify MS can use gprs after long idle time ...................................................................... suites: gprs: Add test to verify MS can use gprs after long idle time Change-Id: I1a726049d1e4a95f1145dcf1f654c63503ceb78a --- A suites/gprs/ping_idle_ping.py 1 file changed, 66 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/suites/gprs/ping_idle_ping.py b/suites/gprs/ping_idle_ping.py new file mode 100755 index 0000000..e0968ac --- /dev/null +++ b/suites/gprs/ping_idle_ping.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 + +# Following test verifies GPRS works fine after MS stays idle (no data +# sent/received) for a long while. +# See OS#3678 and OS#2455 for more information. + +from osmo_gsm_tester.testenv import * + +hlr = suite.hlr() +bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms = suite.modem() + +bsc.bts_add(bts) +sgsn.bts_add(bts) + +print('start network...') +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() + +hlr.subscriber_add(ms) + +ms.connect(msc.mcc_mnc()) +ms.attach() + +ms.log_info() + +print('waiting for modems to attach...') +wait(ms.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms) + +print('waiting for modems to attach to data services...') +wait(ms.is_attached) + +# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) +ctx_id_v4 = ms.activate_context(apn='inet46', protocol=ms.CTX_PROT_IPv4) +print("Setting up data plane for %r" % repr(ctx_id_v4)) +ms.setup_context_data_plane(ctx_id_v4) +print("[1] Running 10 ping requests for %r" % repr(ctx_id_v4)) +ms.run_netns_wait('ping1', ('ping', '-c', '10', ggsn.addr())) + +print("Sleeping for 60 seconds") +sleep(60) + +print("[2] Running 10 ping requests for %r" % repr(ctx_id_v4)) +ms.run_netns_wait('ping2', ('ping', '-c', '10', ggsn.addr())) +ms.deactivate_context(ctx_id_v4) -- To view, visit https://gerrit.osmocom.org/11853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1a726049d1e4a95f1145dcf1f654c63503ceb78a Gerrit-Change-Number: 11853 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 15:08:20 +0000 Subject: Change in osmo-gsm-tester[master]: suites: gprs: Add test to verify CS paging works while MS is GPRS att... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11857 ) Change subject: suites: gprs: Add test to verify CS paging works while MS is GPRS attached ...................................................................... suites: gprs: Add test to verify CS paging works while MS is GPRS attached Related: OS#2204 Change-Id: If2844d78b52eda59c1f6d9e18363b858f2b5f007 --- A suites/gprs/cs_paging_gprs_active.py M suites/gprs/suite.conf 2 files changed, 88 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/suites/gprs/cs_paging_gprs_active.py b/suites/gprs/cs_paging_gprs_active.py new file mode 100755 index 0000000..fc0e160 --- /dev/null +++ b/suites/gprs/cs_paging_gprs_active.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 + +# Following test verifies CS paging works when MS is GPRS attached. +# See OS#2204 for more information. + +from osmo_gsm_tester.testenv import * + +hlr = suite.hlr() +bts = suite.bts() +pcu = bts.pcu() +mgw_msc = suite.mgw() +mgw_bsc = suite.mgw() +stp = suite.stp() +ggsn = suite.ggsn() +sgsn = suite.sgsn(hlr, ggsn) +msc = suite.msc(hlr, mgw_msc, stp) +bsc = suite.bsc(msc, mgw_bsc, stp) +ms_mo = suite.modem() +ms_mt = suite.modem() + +bsc.bts_add(bts) +sgsn.bts_add(bts) + +print('start network...') +hlr.start() +stp.start() +ggsn.start() +sgsn.start() +msc.start() +mgw_msc.start() +mgw_bsc.start() +bsc.start() + +bts.start() +wait(bsc.bts_is_connected, bts) +print('Waiting for bts to be ready...') +wait(bts.ready_for_pcu) +pcu.start() + +hlr.subscriber_add(ms_mo) +hlr.subscriber_add(ms_mt) + +ms_mo.connect(msc.mcc_mnc()) +ms_mt.connect(msc.mcc_mnc()) +ms_mo.attach() +ms_mt.attach() + +ms_mo.log_info() +ms_mt.log_info() + +print('waiting for modems to attach...') +wait(ms_mo.is_connected, msc.mcc_mnc()) +wait(ms_mt.is_connected, msc.mcc_mnc()) +wait(msc.subscriber_attached, ms_mo, ms_mt) + +print('waiting for modems to attach to data services...') +wait(ms_mo.is_attached) +wait(ms_mt.is_attached) + +# We need to use inet46 since ofono qmi only uses ipv4v6 eua (OS#2713) +ctx_id_v4_mo = ms_mo.activate_context(apn='inet46', protocol=ms_mo.CTX_PROT_IPv4) +ctx_id_v4_mt = ms_mt.activate_context(apn='inet46', protocol=ms_mt.CTX_PROT_IPv4) + +assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 +mo_cid = ms_mo.call_dial(ms_mt) +mt_cid = ms_mt.call_wait_incoming(ms_mo) +print('dial success') + +assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) +ms_mt.call_answer(mt_cid) +wait(ms_mo.call_is_active, mo_cid) +wait(ms_mt.call_is_active, mt_cid) +print('answer success, call established and ongoing') + +sleep(5) # maintain the call active for 5 seconds + +assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) +ms_mt.call_hangup(mt_cid) +wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) +print('hangup success') + +ms_mo.deactivate_context(ctx_id_v4_mo) +ms_mt.deactivate_context(ctx_id_v4_mt) diff --git a/suites/gprs/suite.conf b/suites/gprs/suite.conf index 3d4fe48..d40c1e5 100644 --- a/suites/gprs/suite.conf +++ b/suites/gprs/suite.conf @@ -4,6 +4,10 @@ bts: - times: 1 modem: - - times: 4 + - times: 2 + features: + - gprs + - voice + - times: 2 features: - gprs -- To view, visit https://gerrit.osmocom.org/11857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If2844d78b52eda59c1f6d9e18363b858f2b5f007 Gerrit-Change-Number: 11857 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 23 15:13:18 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 23 Nov 2018 15:13:18 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#316?= In-Reply-To: <77153510.793.1542899407718.JavaMail.jenkins@jenkins.osmocom.org> References: <77153510.793.1542899407718.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <121365639.810.1542985998897.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:21:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 23 Nov 2018 15:21:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 23 Nov 2018 15:21:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:27:30 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 23 Nov 2018 15:27:30 +0000 Subject: Change in libosmocore[master]: NS: fix formatting in gprs_nsvc_state_append() In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11887 ) Change subject: NS: fix formatting in gprs_nsvc_state_append() ...................................................................... Patch Set 1: Code-Review-1 I don't think this is correct - \n is how we separate different records from one another. See gb_proxy_ctrl.c in osmo-sgsn for example. Ctrl cmd get_nsvc_state will iterate though all NSVCs and append their state. The individual entries in a state are separated by commas, but with your change there would be no separation at all between NS_DESC_B(nsvc->remote_state) of one NSVC and nsvc->nsei of the next. -- To view, visit https://gerrit.osmocom.org/11887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I15ba8779d5100ebeb05ffc99271ba57c6bc4de14 Gerrit-Change-Number: 11887 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 23 Nov 2018 15:27:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:31:01 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 23 Nov 2018 15:31:01 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: fix formatting in gbproxy-state command In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11894 ) Change subject: gbproxy: fix formatting in gbproxy-state command ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11894/1/src/gprs/gb_proxy_ctrl.c File src/gprs/gb_proxy_ctrl.c: https://gerrit.osmocom.org/#/c/11894/1/src/gprs/gb_proxy_ctrl.c at 63 PS1, Line 63: llist_for_each_entry(peer, &cfg->bts_peers, list) { We can have multiple bts peers which leaves the individual entries without any separation -- To view, visit https://gerrit.osmocom.org/11894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f32e01dd50a53991c292aeee57a78d81cdc5429 Gerrit-Change-Number: 11894 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 23 Nov 2018 15:31:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:31:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 23 Nov 2018 15:31:03 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: Code-Review-1 (2 comments) You're right in IRC, I have a lot of suggestions and also agree with Pau: I also kind of dislike that the current db schema is hidden in the upgrade code path. Instead, I would also prefer the current schema completely written out in hlr.sql, and figure out an upgrade path before. I understand that testing the upgrade path would be nice, and another drawback is that we would duplicate the commands to add new columns: once in the current hlr.sql and once in the upgrade path. But I think the cost of a reader having to head-scratch and figure to understand what the current db definition is is just too high. Using the current status should be canonical because everyone uses that all the time, and rather have an obscure upgrade path since that is rarely interesting to look at. My humble idea would go as follows: - hlr.sql contains the latest db schema (including setting the version) - In an initial step determine the version. (If there's neither meta nor subscriber = new db, just call db_bootstrap(); only subscriber = v0 db; otherwise get meta.version...). - If needed, run upgrade commands. I think I would put them in a separate .sql file and make a string array of it, exactly like db_bootstrap.h is generated from hlr.sql; e.g. upgrade_0_to_1.sql generates upgrade_0_to_1.h? We'd probably rename db_bootstrap.sed to sql_to_c.sed and re-use. I mean, it's ok to do the upgrade with SQL strings directly in C, but so far we're keeping the SQL strings apart from C pretty nicely, and it's less cluttered to write SQL in a separate file without C quotes. - If the db was empty (no meta and no subscriber table), run db_bootstrap() creating the latest scheme from hlr.sql. - If the version already matched current, then be merry and nothing to do. From before, we know whether a db_bootstrap() is even needed, only run that on an empty db. This way we could drop the weird "IF NOT EXISTS" from hlr.sql. Also, I think an upgrade should be opt-in. Add a --db-allow-upgrade cmdline option and otherwise error out hinting at that option if an upgrade would be required. To test the upgrade code path, we should probably add a tests/upgrade/ with a hlr_v0.sql that also adds some data, and write an explicit test (.sh?) to invoke 'osmo-hlr --db-allow-upgrade' and verify the result (`sqlite3 db .dump`?). (maybe useful for that would be a '--check-db-and-exit' option as well) Sorry if this blows up the amount of work on this issue, but IMHO it is worth the effort to invent a good and proper db schema upgrade path, because we'll be using it for every other future upgrade. If you'd rather have someone else worry about that, then shout out. Personally I think it might be fun to pan this out... https://gerrit.osmocom.org/#/c/11898/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11898/4//COMMIT_MSG at 14 PS4, Line 14: Furthermore, introduce a new column to the subscriber table which is when a commit log has a paragraph starting in the bottom with "Furthermore", that's an almost certain indicator that it should be a separate patch. Let's add the schema and meta data first, and in a separate patch add the new subscriber column and just bump the db schema version. https://gerrit.osmocom.org/#/c/11898/4/sql/hlr.sql File sql/hlr.sql: https://gerrit.osmocom.org/#/c/11898/4/sql/hlr.sql at 4 PS4, Line 4: value TEXT NOT NULL Is this taken from some example, or why are you opening another layer of name-value on top of the name-value already supplied by SQL? wouldn't it be simpler to just have a single-row-table of version INTEGER we can still always "select version from meta" backwards compatibly, and then read any other specific fields we might add in the future? Otherwise we have to query each meta value separately, and cannot use sqlite's get-by-name API that already exists to get all values with a single row query. To criticise my own plan, the meta table would always need to be enforced to have exactly one row. What is making more sense? -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 23 Nov 2018 15:31:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:38:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 23 Nov 2018 15:38:39 +0000 Subject: Change in libsmpp34[master]: fix use of partly initialized struct in tcp test In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11854 ) Change subject: fix use of partly initialized struct in tcp test ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11854/1/test_apps/tcp.c File test_apps/tcp.c: https://gerrit.osmocom.org/#/c/11854/1/test_apps/tcp.c at 72 PS1, Line 72: memset(&name, 0, sizeof(name)); (personally I like 'name = (struct sockaddr_in){};' -- whatever) -- To view, visit https://gerrit.osmocom.org/11854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6e488308a72be96cca6aa661f088d2c3c67a6a3 Gerrit-Change-Number: 11854 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 15:38:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:43:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 23 Nov 2018 15:43:08 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 23 Nov 2018 15:43:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:46:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 23 Nov 2018 15:46:50 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11898/4/src/db.h File src/db.h: https://gerrit.osmocom.org/#/c/11898/4/src/db.h at 9 PS4, Line 9: DB_STMT_SEL_SCHEMA_VERSION Wouldn't adding this *to the beginning* shift all other definitions and break backwards compatibility? https://gerrit.osmocom.org/#/c/11898/4/src/db.c File src/db.c: https://gerrit.osmocom.org/#/c/11898/4/src/db.c at 55 PS4, Line 55: DB_STMT_SEL_SCHEMA_VERSION Ah, oh, if the value isn't stored in the DB, it wouldn't break. https://gerrit.osmocom.org/#/c/11898/4/src/db.c at 83 PS4, Line 83: DB_STMT_UPD_LAST_LU_SEEN I don't think this is related to "database schema versioning"... Maybe, in a separate change? -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 15:46:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 15:47:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 23 Nov 2018 15:47:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 15:47:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 16:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 16:02:38 +0000 Subject: Change in osmo-bts[master]: rsl: Log lchan state during dynts PDCH->TCH Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11903 Change subject: rsl: Log lchan state during dynts PDCH->TCH ...................................................................... rsl: Log lchan state during dynts PDCH->TCH Change-Id: Iee5ac0550afda71fce67b0340749c111b364bb4f --- M src/common/rsl.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/11903/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index b221754..d4bd2f0 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2201,8 +2201,9 @@ if (lchan->state != LCHAN_S_NONE) { LOGP(DRSL, LOGL_ERROR, - "%s Request to PDCH %s, but lchan is still active\n", - gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT"); + "%s Request to PDCH %s, but lchan is still in state %s\n", + gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT", + gsm_lchans_name(lchan->state)); rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC); } -- To view, visit https://gerrit.osmocom.org/11903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iee5ac0550afda71fce67b0340749c111b364bb4f Gerrit-Change-Number: 11903 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 16:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 16:02:38 +0000 Subject: Change in osmo-bts[master]: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11904 Change subject: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK ...................................................................... rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK It was spotted during osmo-gsm-tester test dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr-any that osmo-bts-trx was answering to PDCH DEACT from BSC first with a NACK followed immediatelly after by an ACK. That happens after the test does a GPRS pdp ctx act successfuly and then deactivates the ctx and the 2 MS try to place a call between them (and thus channels need to be moved to TCH/F). Most probably the if condition where the lines for this commit are modified need to be fine-grained. Patch before this one should help to understand the steates/situation in this scenario, and then a follow-up patch can be created to improve the logic. Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd --- M src/common/rsl.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/11904/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index d4bd2f0..b4cea2c 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2200,11 +2200,10 @@ } if (lchan->state != LCHAN_S_NONE) { - LOGP(DRSL, LOGL_ERROR, + LOGP(DRSL, LOGL_NOTICE, "%s Request to PDCH %s, but lchan is still in state %s\n", gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT", gsm_lchans_name(lchan->state)); - rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC); } ts->flags |= pdch_act? TS_F_PDCH_ACT_PENDING -- To view, visit https://gerrit.osmocom.org/11904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd Gerrit-Change-Number: 11904 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 16:04:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 16:04:52 +0000 Subject: Change in libsmpp34[master]: fix use of partly initialized struct in tcp test In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11854 ) Change subject: fix use of partly initialized struct in tcp test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id6e488308a72be96cca6aa661f088d2c3c67a6a3 Gerrit-Change-Number: 11854 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 16:04:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 16:44:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 16:44:39 +0000 Subject: Change in osmo-bts[master]: bts-trx: early return on POWERON success Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11905 Change subject: bts-trx: early return on POWERON success ...................................................................... bts-trx: early return on POWERON success Later on it's expected to add more rsp parsing, so let's return here and not depend on generic return further down. Change-Id: I8ddee46374ab329c47dc68e720e236f13d393f66 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/11905/1 diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index b048170..abe6846 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -450,6 +450,7 @@ if (rsp->status == 0) { if (pinst->phy_link->state != PHY_LINK_CONNECTED) phy_link_state_set(pinst->phy_link, PHY_LINK_CONNECTED); + return 0; } else { LOGP(DTRX, LOGL_NOTICE, "transceiver (%s) rejected POWERON command (%d), re-trying in a few seconds\n", -- To view, visit https://gerrit.osmocom.org/11905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8ddee46374ab329c47dc68e720e236f13d393f66 Gerrit-Change-Number: 11905 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 16:54:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 16:54:02 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix whitespace Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11906 Change subject: cosmetic: fix whitespace ...................................................................... cosmetic: fix whitespace Change-Id: Iaa4552844db33fe69da5ed7028dbfa0100c33900 --- M src/common/rsl.c M src/osmo-bts-trx/l1_if.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/11906/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index b4cea2c..9b0de7c 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -281,7 +281,7 @@ return abis_bts_rsl_sendmsg(nmsg); } -/* +/* * common channel releated messages */ diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index b4ca54f..ccc13f4 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -396,7 +396,7 @@ } slottype = transceiver_chan_types[pchan]; - + if (l1h->config.slottype[tn] != slottype || !l1h->config.slottype_valid[tn]) { l1h->config.slottype[tn] = slottype; -- To view, visit https://gerrit.osmocom.org/11906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa4552844db33fe69da5ed7028dbfa0100c33900 Gerrit-Change-Number: 11906 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 17:28:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 23 Nov 2018 17:28:45 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix whitespace In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11906 ) Change subject: cosmetic: fix whitespace ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4552844db33fe69da5ed7028dbfa0100c33900 Gerrit-Change-Number: 11906 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 17:28:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 17:29:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 23 Nov 2018 17:29:18 +0000 Subject: Change in osmo-bts[master]: rsl: Log lchan state during dynts PDCH->TCH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11903 ) Change subject: rsl: Log lchan state during dynts PDCH->TCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee5ac0550afda71fce67b0340749c111b364bb4f Gerrit-Change-Number: 11903 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 17:29:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 17:30:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 23 Nov 2018 17:30:19 +0000 Subject: Change in osmo-bts[master]: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11904 ) Change subject: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11904/1/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/#/c/11904/1/src/common/rsl.c at 2203 PS1, Line 2203: LOGL_NOTICE Unrelated. Maybe move to the previous change? -- To view, visit https://gerrit.osmocom.org/11904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd Gerrit-Change-Number: 11904 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 17:30:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 19:00:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 19:00:43 +0000 Subject: Change in osmo-bts[master]: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11904 ) Change subject: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11904/1/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/#/c/11904/1/src/common/rsl.c at 2203 PS1, Line 2203: LOGL_NOTICE > Unrelated. [?] I think it's related to the patch, in the sense it modifies the same code path and scenario. Since we remove the NACK, we are really not taking this as an error because it is known that actually it is (de)activating the channel anyway, so it's not an error. -- To view, visit https://gerrit.osmocom.org/11904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd Gerrit-Change-Number: 11904 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 19:00:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 19:10:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 23 Nov 2018 19:10:38 +0000 Subject: Change in osmo-bts[master]: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11904 ) Change subject: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK ...................................................................... Patch Set 1: Code-Review+1 Ok, got it :) -- To view, visit https://gerrit.osmocom.org/11904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd Gerrit-Change-Number: 11904 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 23 Nov 2018 19:10:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 20:02:30 2018 From: gerrit-no-reply at lists.osmocom.org (roox) Date: Fri, 23 Nov 2018 20:02:30 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Generate valid JSON output when using the -G parameter Message-ID: roox has uploaded this change for review. ( https://gerrit.osmocom.org/11907 Change subject: ipaccess-config: Generate valid JSON output when using the -G parameter ...................................................................... ipaccess-config: Generate valid JSON output when using the -G parameter JSON names require double quotes. Change-Id: I660fd89c37dfc2543a4bf7699da091458fe08cec --- M src/ipaccess/ipaccess-config.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/11907/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 7c81c5a..ed2a1a4 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -289,7 +289,7 @@ abis_nm_tlv_attr_unit_id(&tp, unit_id, sizeof(unit_id)); - fprintf(stdout, "{ primary_oml_ip: \"%s\", primary_oml_port: %" PRIu16 ", unit_id: \"%s\" }\n", + fprintf(stdout, "{ \"primary_oml_ip\": \"%s\", \"primary_oml_port\": %" PRIu16 ", \"unit_id\": \"%s\" }\n", oml_ip, oml_port, unit_id); return 0; } -- To view, visit https://gerrit.osmocom.org/11907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I660fd89c37dfc2543a4bf7699da091458fe08cec Gerrit-Change-Number: 11907 Gerrit-PatchSet: 1 Gerrit-Owner: roox -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 20:03:52 2018 From: gerrit-no-reply at lists.osmocom.org (roox) Date: Fri, 23 Nov 2018 20:03:52 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix indentation of the usage output Message-ID: roox has uploaded this change for review. ( https://gerrit.osmocom.org/11908 Change subject: ipaccess-config: Fix indentation of the usage output ...................................................................... ipaccess-config: Fix indentation of the usage output Change-Id: I73b41784af4ea073808d6c9b99612b17d1ac7eeb --- M src/ipaccess/ipaccess-config.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/11908/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index ed2a1a4..da19ce2 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -890,12 +890,12 @@ printf("Commands for writing to the BTS:\n"); printf(" -u --unit-id UNIT_ID\t\tSet the Unit ID of the BTS\n"); printf(" -o --oml-ip IP\t\tSet primary OML IP (IP of your BSC)\n"); - printf(" -G --get-attr\t\tGet several attributes from BTS\n"); + printf(" -G --get-attr\t\t\tGet several attributes from BTS\n"); printf(" -i --ip-address IP/MASK\tSet static IP address + netmask of BTS\n"); printf(" -g --ip-gateway IP\t\tSet static IP gateway of BTS\n"); printf(" -r --restart\t\t\tRestart the BTS (after other operations)\n"); printf(" -n --nvram-flags FLAGS/MASK\tSet NVRAM attributes\n"); - printf(" -S --nvattr-set FLAG\tSet one additional NVRAM attribute\n"); + printf(" -S --nvattr-set FLAG\t\tSet one additional NVRAM attribute\n"); printf(" -U --nvattr-unset FLAG\tSet one additional NVRAM attribute\n"); printf(" -l --listen TESTNR\t\tPerform specified test number\n"); printf(" -L --Listen TEST_NAME\t\tPerform specified test\n"); -- To view, visit https://gerrit.osmocom.org/11908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I73b41784af4ea073808d6c9b99612b17d1ac7eeb Gerrit-Change-Number: 11908 Gerrit-PatchSet: 1 Gerrit-Owner: roox -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 20:21:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 20:21:17 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Generate valid JSON output when using the -G parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11907 ) Change subject: ipaccess-config: Generate valid JSON output when using the -G parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I660fd89c37dfc2543a4bf7699da091458fe08cec Gerrit-Change-Number: 11907 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 20:21:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 20:21:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 20:21:19 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Generate valid JSON output when using the -G parameter In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11907 ) Change subject: ipaccess-config: Generate valid JSON output when using the -G parameter ...................................................................... ipaccess-config: Generate valid JSON output when using the -G parameter JSON names require double quotes. Change-Id: I660fd89c37dfc2543a4bf7699da091458fe08cec --- M src/ipaccess/ipaccess-config.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 7c81c5a..ed2a1a4 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -289,7 +289,7 @@ abis_nm_tlv_attr_unit_id(&tp, unit_id, sizeof(unit_id)); - fprintf(stdout, "{ primary_oml_ip: \"%s\", primary_oml_port: %" PRIu16 ", unit_id: \"%s\" }\n", + fprintf(stdout, "{ \"primary_oml_ip\": \"%s\", \"primary_oml_port\": %" PRIu16 ", \"unit_id\": \"%s\" }\n", oml_ip, oml_port, unit_id); return 0; } -- To view, visit https://gerrit.osmocom.org/11907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I660fd89c37dfc2543a4bf7699da091458fe08cec Gerrit-Change-Number: 11907 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 20:21:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 20:21:32 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix indentation of the usage output In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11908 ) Change subject: ipaccess-config: Fix indentation of the usage output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I73b41784af4ea073808d6c9b99612b17d1ac7eeb Gerrit-Change-Number: 11908 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 23 Nov 2018 20:21:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 20:21:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 23 Nov 2018 20:21:35 +0000 Subject: Change in osmo-bsc[master]: ipaccess-config: Fix indentation of the usage output In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11908 ) Change subject: ipaccess-config: Fix indentation of the usage output ...................................................................... ipaccess-config: Fix indentation of the usage output Change-Id: I73b41784af4ea073808d6c9b99612b17d1ac7eeb --- M src/ipaccess/ipaccess-config.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index ed2a1a4..da19ce2 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -890,12 +890,12 @@ printf("Commands for writing to the BTS:\n"); printf(" -u --unit-id UNIT_ID\t\tSet the Unit ID of the BTS\n"); printf(" -o --oml-ip IP\t\tSet primary OML IP (IP of your BSC)\n"); - printf(" -G --get-attr\t\tGet several attributes from BTS\n"); + printf(" -G --get-attr\t\t\tGet several attributes from BTS\n"); printf(" -i --ip-address IP/MASK\tSet static IP address + netmask of BTS\n"); printf(" -g --ip-gateway IP\t\tSet static IP gateway of BTS\n"); printf(" -r --restart\t\t\tRestart the BTS (after other operations)\n"); printf(" -n --nvram-flags FLAGS/MASK\tSet NVRAM attributes\n"); - printf(" -S --nvattr-set FLAG\tSet one additional NVRAM attribute\n"); + printf(" -S --nvattr-set FLAG\t\tSet one additional NVRAM attribute\n"); printf(" -U --nvattr-unset FLAG\tSet one additional NVRAM attribute\n"); printf(" -l --listen TESTNR\t\tPerform specified test number\n"); printf(" -L --Listen TEST_NAME\t\tPerform specified test\n"); -- To view, visit https://gerrit.osmocom.org/11908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I73b41784af4ea073808d6c9b99612b17d1ac7eeb Gerrit-Change-Number: 11908 Gerrit-PatchSet: 1 Gerrit-Owner: roox Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 22:07:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 22:07:14 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11909 Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... osmo_ctrl.py: properly ignore out-of-order traps Sometimes when we set variable we might receive arbitrary number of TRAP messages before we get SET_REPLY. Those could be either separate messages or combined together with SET_REPLY depending on tcp buffering at server side. Let's handle this gracefully by skipping over all TRAP messages. An example command which often triggers this behavior: ./osmo_ctrl.py -s -d 127.0.0.1 -p 4249 bts.0.location (date +%s)",fix2d,1,2,3" Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Related: SYS#4399 --- M scripts/osmo_ctrl.py 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/09/11909/1 diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py index ac20050..5f5f209 100755 --- a/scripts/osmo_ctrl.py +++ b/scripts/osmo_ctrl.py @@ -40,8 +40,17 @@ def do_set_get(sck, var, value = None): (r, c) = Ctrl().cmd(var, value) sck.send(c) - ret = sck.recv(4096) - return (Ctrl().rem_header(ret),) + Ctrl().verify(ret, r, var, value) + tail = sck.recv(4096) + while True: + # handle multiple messages + (head, tail) = Ctrl().split_combined(tail) + (i, k, v) = Ctrl().parse(head) + # ignore all traps + if int(i) != 0: + break; + if len(tail) == 0: + tail = sck.recv(4096) + return (Ctrl().rem_header(head),) + Ctrl().verify(head, r, var, value) def set_var(sck, var, val): (a, _, _) = do_set_get(sck, var, val) -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 22:07:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 22:07:22 +0000 Subject: Change in libosmocore[master]: ctrl: print textual error on IPA parsing failure Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11910 Change subject: ctrl: print textual error on IPA parsing failure ...................................................................... ctrl: print textual error on IPA parsing failure Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db --- M src/ctrl/control_if.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/11910/1 diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index ed18a2f..093fb24 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -360,7 +360,7 @@ * nothing left to do now. */ return 0; } else if (ret < 0) { - LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %d\n", ret); + LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %s\n", strerror(-ret)); return 0; } -- To view, visit https://gerrit.osmocom.org/11910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db Gerrit-Change-Number: 11910 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 22:07:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 22:07:23 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into inline function Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11911 Change subject: IPA: move duplicated error handling into inline function ...................................................................... IPA: move duplicated error handling into inline function The code is re-ordered to put error handling upfront similar to te way we do it in oter places. Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f --- M src/gsm/ipa.c 1 file changed, 32 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/11911/1 diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index d423c26..6ee003d 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -541,6 +541,33 @@ return rc; } +/*! Attempt to recv() message and analyse return value + * \param[out] ret result of recv() will be stored in here. + * \param[in] fd The fd for the socket to read from. + * \param[in] msg Message buffer to read into. + * \param[in] needed Home many bytes we have to read. + * \returns boolean indicating whether message should be discarded. + */ +static inline bool recv_discard_msg(int *ret, int fd, struct msgb *msg, int needed) +{ + *ret = recv(fd, msg->tail, needed, 0); + + if (*ret == 0) /* the socket is properly closed or we've requested to receive 0 bytes */ + return true; + + if (*ret > 0) /* some data was obtained */ + return false; + + if (errno == EAGAIN || errno == EINTR) { + *ret = 0; + return false; + } + + /* errors indicated by -1 return value, let's save the actual error code */ + *ret = -errno; + return true; +} + /*! Read one ipa message from socket fd or store part if still not fully received. * \param[in] fd The fd for the socket to read from. * \param[out] rmsg internally allocated msgb containing a fully received ipa message. @@ -566,6 +593,7 @@ struct ipaccess_head *hh; int len, ret; int needed; + bool discard; if (msg == NULL) { msg = ipa_msg_alloc(0); @@ -579,19 +607,10 @@ if (msg->l2h == NULL) { /* first read our 3-byte header */ needed = sizeof(*hh) - msg->len; - ret = recv(fd, msg->tail, needed, 0); - if (ret == 0) + discard = recv_discard_msg(&ret, fd, msg, needed); + if (discard) goto discard_msg; - if (ret < 0) { - if (errno == EAGAIN || errno == EINTR) - ret = 0; - else { - ret = -errno; - goto discard_msg; - } - } - msgb_put(msg, ret); if (ret < needed) { @@ -629,20 +648,10 @@ needed = len - msgb_l2len(msg); if (needed > 0) { - ret = recv(fd, msg->tail, needed, 0); - - if (ret == 0) + discard = recv_discard_msg(&ret, fd, msg, needed); + if (discard) goto discard_msg; - if (ret < 0) { - if (errno == EAGAIN || errno == EINTR) - ret = 0; - else { - ret = -errno; - goto discard_msg; - } - } - msgb_put(msg, ret); if (ret < needed) { -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 22:07:23 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 22:07:23 +0000 Subject: Change in libosmocore[master]: ctrl: handle ECONNRESET on initial read gracefully Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11912 Change subject: ctrl: handle ECONNRESET on initial read gracefully ...................................................................... ctrl: handle ECONNRESET on initial read gracefully When we're reading CTRL header we might get ECONNRESET when previous message was successfully sent and the peer have already closed connection. This is not really an error (for example script requesting single variable have closed the connection right after reading our answer) so just just discard the message and carry on. Change-Id: I3cbdb3909660d605181d6923031336d296ea4340 --- M src/gsm/ipa.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/11912/1 diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index 6ee003d..82ca304 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -548,7 +548,7 @@ * \param[in] needed Home many bytes we have to read. * \returns boolean indicating whether message should be discarded. */ -static inline bool recv_discard_msg(int *ret, int fd, struct msgb *msg, int needed) +static inline bool recv_discard_msg(int *ret, int fd, struct msgb *msg, int needed, bool initial) { *ret = recv(fd, msg->tail, needed, 0); @@ -563,6 +563,12 @@ return false; } + if (errno == ECONNRESET && initial && needed == 3) { + /* that's initial attempt to read IPA header while connection is already closed */ + *ret = 0; + return true; + } + /* errors indicated by -1 return value, let's save the actual error code */ *ret = -errno; return true; @@ -607,7 +613,7 @@ if (msg->l2h == NULL) { /* first read our 3-byte header */ needed = sizeof(*hh) - msg->len; - discard = recv_discard_msg(&ret, fd, msg, needed); + discard = recv_discard_msg(&ret, fd, msg, needed, true); if (discard) goto discard_msg; @@ -648,7 +654,7 @@ needed = len - msgb_l2len(msg); if (needed > 0) { - discard = recv_discard_msg(&ret, fd, msg, needed); + discard = recv_discard_msg(&ret, fd, msg, needed, false); if (discard) goto discard_msg; -- To view, visit https://gerrit.osmocom.org/11912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3cbdb3909660d605181d6923031336d296ea4340 Gerrit-Change-Number: 11912 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 22:08:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 22:08:38 +0000 Subject: Change in osmo-sgsn[master]: Revert "gbproxy: fix formatting in gbproxy-state command" Message-ID: Hello daniel, Harald Welte, Jenkins Builder, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/11913 to review the following change. Change subject: Revert "gbproxy: fix formatting in gbproxy-state command" ...................................................................... Revert "gbproxy: fix formatting in gbproxy-state command" This reverts commit fffd6cb0d8011442bb69974675f86ad087b7d8db. Change-Id: I1ea17919ec3ed7e26044df8b5f8324717ee9e32c --- M src/gprs/gb_proxy_ctrl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/13/11913/1 diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gprs/gb_proxy_ctrl.c index 694a2f7..032d8d4 100644 --- a/src/gprs/gb_proxy_ctrl.c +++ b/src/gprs/gb_proxy_ctrl.c @@ -64,7 +64,7 @@ struct gprs_ra_id raid; gsm48_parse_ra(&raid, peer->ra); - cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s", + cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", peer->nsei, peer->bvci, raid.mcc, raid.mnc, raid.lac, raid.rac, -- To view, visit https://gerrit.osmocom.org/11913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1ea17919ec3ed7e26044df8b5f8324717ee9e32c Gerrit-Change-Number: 11913 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 22:08:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 22:08:39 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: fix formatting in gbproxy-state command In-Reply-To: References: Message-ID: Max has created a revert of this change. ( https://gerrit.osmocom.org/11894 ) Change subject: gbproxy: fix formatting in gbproxy-state command ...................................................................... -- To view, visit https://gerrit.osmocom.org/11894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: revert Gerrit-Change-Id: I3f32e01dd50a53991c292aeee57a78d81cdc5429 Gerrit-Change-Number: 11894 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 23 22:11:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 22:11:06 +0000 Subject: Change in osmo-sgsn[master]: Revert "gbproxy: fix formatting in gbproxy-state command" In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11913 ) Change subject: Revert "gbproxy: fix formatting in gbproxy-state command" ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ea17919ec3ed7e26044df8b5f8324717ee9e32c Gerrit-Change-Number: 11913 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 23 Nov 2018 22:11:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From laforge at gnumonks.org Fri Nov 23 22:12:10 2018 From: laforge at gnumonks.org (Harald Welte) Date: Fri, 23 Nov 2018 23:12:10 +0100 Subject: cellmgr-ng rotten =?iso-8859-1?B?KFJl?= =?iso-8859-1?Q?=3A_Build_failed_in_Jenkins=3A_master-cellmgr-ng_=BB_a1=3D?= =?iso-8859-1?Q?default=2Ca2=3Ddefault=2Ca3=3Ddefault=2Cosmocom-master-deb?= =?iso-8859-1?Q?ian9?= #54) In-Reply-To: References: <541592031.790.1542885542042.JavaMail.jenkins@jenkins.osmocom.org> <663594879.808.1542971940788.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <20181123221210.GX5011@nataraja> On Fri, Nov 23, 2018 at 01:19:32PM +0100, Pau Espin Pedrol wrote: > I started looking at this failure and found out code in this repository is > really old, with nobody maintain it (13 months since last commits?). ACK. not that I'm aware of. It started as a project to translate circuit-switched A interfaces of a "BSplus" BTS+BSC combination into SCCPlite over IP. Then various other bits and pieces related to MTP and SS7 had been added, towards the direction of a STP. There may be many other features that I'm not aware of [anymore]. It's one of the many powerful but lesser known/understood Osmocom projects that primarily Holger was working on. To my knowledge there are still some production deployments using it as a M3UA <-> IPA/SCCPlite translator, but there are plans to phase that out and use the "new" osmo-stp from libosmo-sigtran.git instead. > Can we disable the build of this project? I think so. We should also add a related "unmaintained" notice to the README file or related documentation in the git repo, as well as on the wiki. -- - Harald Welte http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6) From gerrit-no-reply at lists.osmocom.org Fri Nov 23 22:17:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 23 Nov 2018 22:17:59 +0000 Subject: Change in libosmocore[master]: ctrl: print textual error on IPA parsing failure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11910 ) Change subject: ctrl: print textual error on IPA parsing failure ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db Gerrit-Change-Number: 11910 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 23 Nov 2018 22:17:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Nov 24 00:47:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 24 Nov 2018 00:47:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_tr?= =?UTF-8?Q?x,master,default,osmocom-master-debian9_#1461?= Message-ID: <1033831675.811.1543020435731.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 33.55 KB...] checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... /usr/bin/doxygen checking whether SYS_getrandom is declared... yes checking if gcc supports -fvisibility=hidden... yes checking for clock_gettime... yes checking for localtime_r... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether to enable VTY/CTRL tests... no checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Doxyfile.ctrl config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands configure: WARNING: unrecognized options: --with-systemdsystemunitdir + make -j 8 install echo 0.12.0.125-7ab5 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory ' Making install in include make[2]: Entering directory ' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory ' GEN osmocom/core/bit16gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc64gen.h make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/isdnhdlc.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/core/statistics.h osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_29_118.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/oap_client.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h ' /bin/mkdir -p ' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' GEN crc32gen.c GEN crc64gen.c GEN crc8gen.c GEN crc16gen.c make install-am make[3]: Entering directory ' CC bits.lo CC timer.lo CC msgb.lo CC signal.lo CC bitvec.lo CC select.lo CC timer_clockgettime.lo CC timer_gettimeofday.lo /bin/bash: line 2: 23782 Segmentation fault /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT signal.lo -MD -MP -MF $depbase.Tpo -c -o signal.lo signal.c Makefile:558: recipe for target 'signal.lo' failed make[3]: *** [signal.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory ' Makefile:662: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory ' Makefile:614: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:913: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Nov 24 06:52:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 24 Nov 2018 06:52:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#199?= In-Reply-To: <1642458193.806.1542955922517.JavaMail.jenkins@jenkins.osmocom.org> References: <1642458193.806.1542955922517.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1204396809.823.1543042323296.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.03 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat Nov 24 11:19:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 24 Nov 2018 11:19:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-cellmgr-ng_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#55?= In-Reply-To: <663594879.808.1542971940788.JavaMail.jenkins@jenkins.osmocom.org> References: <663594879.808.1542971940788.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1286919520.825.1543058340697.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 171.81 KB...] config.status: executing libtool commands + PKG_CONFIG_PATH=/build/deps/libosmo-sccp/..//install/lib/pkgconfig + make -j 8 install echo 0.10.0.30-5371 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in mtp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' Making install in sccp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC mtp_pcap.o CC libxua_a-xua_msg.o CC sccp_sap.lo CC sccp_helpers.lo CC sua.lo CC xua_msg.lo CC m3ua.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo CC osmo_ss7.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:1032:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/libosmo-sccp/../install/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/libosmo-sccp/../install/lib' ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libsccp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libmtp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/libosmo-sccp/../install/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/libosmo-sccp/../install/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' Making install in vty make[3]: Entering directory '/build/deps/libosmo-sccp/tests/vty' CC ss7_asp_vty_test.o CCLD ss7_asp_vty_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/vty' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_server.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/libosmo-sccp/../install/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/libosmo-sccp/../install/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/etc/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:326: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' Makefile:396: recipe for target 'install-am' failed make[3]: *** [install-am] Error 2 make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' Makefile:360: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:487: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make: *** [install] Error 2 Makefile:786: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat Nov 24 12:07:52 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 24 Nov 2018 12:07:52 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: use the util.Dir and create one dir per instance In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11598 ) Change subject: ms_driver: use the util.Dir and create one dir per instance ...................................................................... ms_driver: use the util.Dir and create one dir per instance Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/__main__.py M src/osmo_ms_driver/starter.py 3 files changed, 7 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 36da921..36ba713 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -16,7 +16,7 @@ # along with this program. If not, see . from datetime import timedelta -from . import log +from . import log, util from osmo_ms_driver.cdf import cdfs from osmo_ms_driver.event_server import EventServer from osmo_ms_driver.simple_loop import SimpleLoop @@ -85,7 +85,8 @@ self._ev_server.listen(self._loop) options = BinaryOptions("virtphy", "mobile", None) self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, - self._ev_server, self.event_server_sk_tmp_dir, + self._ev_server, + util.Dir(self.event_server_sk_tmp_dir), suite_run=self._suite_run) # TODO: We should pass subscribers down to the test and not get it from diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py index 0e3611b..7e1afa8 100644 --- a/src/osmo_ms_driver/__main__.py +++ b/src/osmo_ms_driver/__main__.py @@ -21,7 +21,7 @@ from .location_update_test import MassUpdateLocationTest from .cdf import cdfs from .starter import BinaryOptions -from osmo_gsm_tester import log +from osmo_gsm_tester import log, util # System modules from datetime import timedelta @@ -64,7 +64,7 @@ loop = SimpleLoop() - tmp_dir = tempfile.mkdtemp(suffix="osmo-ms-driver") + tmp_dir = util.Dir(tempfile.mkdtemp(suffix="osmo-ms-driver")) log.log("Going to store files in ", tmp_dir=tmp_dir) # How long should starting all apps take @@ -73,7 +73,7 @@ time_step=datetime.timedelta(milliseconds=args.launch_interval) # Event server path - event_server_path = os.path.join(tmp_dir, "osmo_ms_driver.unix") + event_server_path = os.path.join(str(tmp_dir), "osmo_ms_driver.unix") # The function that decides when to start something cdf = cdfs[args.cdf_name](time_start, time_step) diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 66027c6..bf7727f 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -31,7 +31,7 @@ self._binary = binary self._env = env self._name_number = name_number - self._tmp_dir = tmp_dir + self._tmp_dir = tmp_dir.new_dir(self.name()) def name_number(self): return self._name_number -- To view, visit https://gerrit.osmocom.org/11598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie0f2fe99f6a6640606eb4e69fb1a2d22eae9b2c8 Gerrit-Change-Number: 11598 Gerrit-PatchSet: 5 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 24 12:42:34 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 24 Nov 2018 12:42:34 +0000 Subject: Change in osmo-gsm-tester[master]: ms_driver: Consult the suite to get the binaries In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11599 ) Change subject: ms_driver: Consult the suite to get the binaries ...................................................................... ms_driver: Consult the suite to get the binaries Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 --- M src/osmo_gsm_tester/ms_driver.py 1 file changed, 29 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 36ba713..634370f 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -74,6 +74,33 @@ self.event_server_sk_tmp_dir = tempfile.mkdtemp('', 'ogteventserversk') return os.path.join(self.event_server_sk_tmp_dir, 'osmo_ms_driver.unix') + def build_binary_options(self): + """Builds an instance of BinaryOptions. + + Populates the BinaryOptions by searching the virtphy and mobile + application within the trial directory. + """ + + # Get the base directory for the virtphy/mobile application + inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) + + # Assume these are dynamically linked and verify there is a lib dir. + lib = inst.child('lib') + if not os.path.isdir(lib): + raise RuntimeError('No lib/ in %r' % inst) + env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + + def check_and_return_binary(name): + """Checks the binary exists and returns the path.""" + binary = inst.child('bin', name) + if not os.path.isfile(name): + raise RuntimeError('Binary missing: %r' % binary) + return binary + + virtphy = check_and_return_binary('virtphy') + mobile = check_and_return_binary('mobile') + return BinaryOptions(virtphy, mobile, env) + def configure(self): """ Configures the subscribers, tests and registration server. Needs to be @@ -83,10 +110,10 @@ self._ev_server = EventServer("ev_server", event_server_path) self._ev_server.listen(self._loop) - options = BinaryOptions("virtphy", "mobile", None) + options = self.build_binary_options() self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf, self._ev_server, - util.Dir(self.event_server_sk_tmp_dir), + util.Dir(self.suite_run.get_test_run_dir()), suite_run=self._suite_run) # TODO: We should pass subscribers down to the test and not get it from -- To view, visit https://gerrit.osmocom.org/11599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 Gerrit-Change-Number: 11599 Gerrit-PatchSet: 4 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 24 12:46:37 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 24 Nov 2018 12:46:37 +0000 Subject: Change in osmo-gsm-tester[master]: suiets: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10687 to look at the new patch set (#11). Change subject: suiets: Add an initial test for the ms_driver ...................................................................... suiets: Add an initial test for the ms_driver Things to make configurable: * IMSI and matching MSISDN ranges (start + count) * Timeouts and number of MS (which should be related) Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 --- A suites/nitb_netreg_mass/register_default_mass.py A suites/nitb_netreg_mass/suite.conf 2 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/87/10687/11 -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 11 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 24 12:46:47 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 24 Nov 2018 12:46:47 +0000 Subject: Change in osmo-gsm-tester[master]: suites: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/10687 to look at the new patch set (#12). Change subject: suites: Add an initial test for the ms_driver ...................................................................... suites: Add an initial test for the ms_driver Things to make configurable: * IMSI and matching MSISDN ranges (start + count) * Timeouts and number of MS (which should be related) Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 --- A suites/nitb_netreg_mass/register_default_mass.py A suites/nitb_netreg_mass/suite.conf 2 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/87/10687/12 -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 12 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 24 14:55:13 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 24 Nov 2018 14:55:13 +0000 Subject: Change in osmo-gsm-tester[master]: suites: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/10687 ) Change subject: suites: Add an initial test for the ms_driver ...................................................................... Patch Set 12: Code-Review+2 Fixed s/suits/suites/ giving myself +2 as I had it before the rebase. -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 12 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 24 Nov 2018 14:55:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Nov 24 15:19:07 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Sat, 24 Nov 2018 15:19:07 +0000 Subject: Change in osmo-gsm-tester[master]: suites: Add an initial test for the ms_driver In-Reply-To: References: Message-ID: Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/10687 ) Change subject: suites: Add an initial test for the ms_driver ...................................................................... suites: Add an initial test for the ms_driver Things to make configurable: * IMSI and matching MSISDN ranges (start + count) * Timeouts and number of MS (which should be related) Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 --- A suites/nitb_netreg_mass/register_default_mass.py A suites/nitb_netreg_mass/suite.conf 2 files changed, 35 insertions(+), 0 deletions(-) Approvals: Holger Freyther: Looks good to me, approved Jenkins Builder: Verified diff --git a/suites/nitb_netreg_mass/register_default_mass.py b/suites/nitb_netreg_mass/register_default_mass.py new file mode 100644 index 0000000..ede2b74 --- /dev/null +++ b/suites/nitb_netreg_mass/register_default_mass.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python3 +""" +Run a network registration with a 'massive' amount of MS +using the ms_driver infrastructure. +""" +from osmo_gsm_tester.testenv import * + +print('use resources...') +nitb = suite.nitb() +bts = suite.bts() +ms_driver = suite.ms_driver() + +print('start nitb and bts...') +nitb.bts_add(bts) +nitb.start() +bts.start() +wait(nitb.bts_is_connected, bts) + +# Configure all MS that the MS driver knows about. +for ms in ms_driver.ms_subscribers(): + nitb.subscriber_add(ms) + +# Run the base test. +ms_driver.run_test() + +# Print stats +ms_driver.print_stats() diff --git a/suites/nitb_netreg_mass/suite.conf b/suites/nitb_netreg_mass/suite.conf new file mode 100644 index 0000000..bfb23cd --- /dev/null +++ b/suites/nitb_netreg_mass/suite.conf @@ -0,0 +1,8 @@ +resources: + ip_address: + - times: 1 + bts: + - times: 1 + +defaults: + timeout: 40s -- To view, visit https://gerrit.osmocom.org/10687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5be2a6b4d3d21bf48625624b9e2cccb33765fe39 Gerrit-Change-Number: 10687 Gerrit-PatchSet: 12 Gerrit-Owner: Holger Freyther Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat Nov 24 23:20:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 24 Nov 2018 23:20:22 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts?= =?UTF-8?Q?_=C2=BB_trx,master,default,osmocom-master-debian9_#1462?= In-Reply-To: <1033831675.811.1543020435731.JavaMail.jenkins@jenkins.osmocom.org> References: <1033831675.811.1543020435731.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <313950635.826.1543101622546.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun Nov 25 06:52:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 25 Nov 2018 06:52:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#200?= In-Reply-To: <1204396809.823.1543042323296.JavaMail.jenkins@jenkins.osmocom.org> References: <1204396809.823.1543042323296.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1827422493.838.1543128722446.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.03 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun Nov 25 11:19:01 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 25 Nov 2018 11:19:01 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-cellmgr-ng_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#56?= In-Reply-To: <1286919520.825.1543058340697.JavaMail.jenkins@jenkins.osmocom.org> References: <1286919520.825.1543058340697.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1993825679.840.1543144741396.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 171.81 KB...] config.status: executing libtool commands + PKG_CONFIG_PATH=/build/deps/libosmo-sccp/..//install/lib/pkgconfig + make -j 8 install echo 0.10.0.30-5371 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in mtp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' Making install in sccp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC mtp_pcap.o CC sccp.o CC libxua_a-xua_msg.o CC sua.lo CC sccp_sap.lo CC m3ua.lo CC xua_msg.lo CC sccp_helpers.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:1032:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/libosmo-sccp/../install/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/libosmo-sccp/../install/lib' ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libsccp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libmtp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/libosmo-sccp/../install/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/libosmo-sccp/../install/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC sccp_test_data.o CC xua_test.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' Making install in vty make[3]: Entering directory '/build/deps/libosmo-sccp/tests/vty' CC ss7_asp_vty_test.o CCLD ss7_asp_vty_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/vty' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_vty.o CC sccp_test_server.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/libosmo-sccp/../install/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/libosmo-sccp/../install/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/etc/osmocom' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:326: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' Makefile:396: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[3]: *** [install-am] Error 2 Makefile:360: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' make[2]: *** [install-recursive] Error 1 make[1]: *** [install-recursive] Error 1 Makefile:487: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' Makefile:786: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun Nov 25 11:31:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 11:31:51 +0000 Subject: Change in osmo-trx[master]: lms: Use LimeSuite.h log level defines instead of hardcoded values In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11901 ) Change subject: lms: Use LimeSuite.h log level defines instead of hardcoded values ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee693da1a0fa1db23deafa8d3845c04171e24799 Gerrit-Change-Number: 11901 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 25 Nov 2018 11:31:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 11:37:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 11:37:44 +0000 Subject: Change in osmo-trx[master]: lms: Apply LMS->OSMO log level conversion In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11902 ) Change subject: lms: Apply LMS->OSMO log level conversion ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a8fbcc7cacebc7038c60175a8ae43b21f713cbb Gerrit-Change-Number: 11902 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 25 Nov 2018 11:37:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 15:36:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 15:36:11 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11914 Change subject: libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} ...................................................................... libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} Passing a message buffer containing the whole encoded message, and a pointer to the RP header (struct gsm411_rp_hdr) is redundant. Change-Id: I0eb5c7c485ab7d109966431bd875fa74e00936d7 --- M src/libmsc/gsm_04_11.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/11914/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 52edcd6..4d43b57 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -700,7 +700,7 @@ } /* Receive a 04.11 RP-ACK message (response to RP-DATA from us) */ -static int gsm411_rx_rp_ack(struct msgb *msg, struct gsm_trans *trans, +static int gsm411_rx_rp_ack(struct gsm_trans *trans, struct gsm411_rp_hdr *rph) { struct gsm_sms *sms = trans->sms.sms; @@ -729,7 +729,7 @@ return 0; } -static int gsm411_rx_rp_error(struct msgb *msg, struct gsm_trans *trans, +static int gsm411_rx_rp_error(struct gsm_trans *trans, struct gsm411_rp_hdr *rph) { struct gsm_network *net = trans->conn->network; @@ -824,11 +824,11 @@ switch (msg_type) { case GSM411_MT_RP_ACK_MO: DEBUGP(DLSMS, "RX SMS RP-ACK (MO)\n"); - rc = gsm411_rx_rp_ack(msg, trans, rp_data); + rc = gsm411_rx_rp_ack(trans, rp_data); break; case GSM411_MT_RP_ERROR_MO: DEBUGP(DLSMS, "RX SMS RP-ERROR (MO)\n"); - rc = gsm411_rx_rp_error(msg, trans, rp_data); + rc = gsm411_rx_rp_error(trans, rp_data); break; default: LOGP(DLSMS, LOGL_NOTICE, "Invalid RP type 0x%02x\n", msg_type); -- To view, visit https://gerrit.osmocom.org/11914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0eb5c7c485ab7d109966431bd875fa74e00936d7 Gerrit-Change-Number: 11914 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 15:36:11 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 15:36:11 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: refactor RP-DATA header validation Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11915 Change subject: libmsc/gsm_04_11.c: refactor RP-DATA header validation ...................................................................... libmsc/gsm_04_11.c: refactor RP-DATA header validation It's much better to have both RP-DATA header parsing and validation code in a single function. There is no need to pass all the header fields (DA, OA, UI) to gsm411_rx_rp_ud() because they are not used there. Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15 --- M src/libmsc/gsm_04_11.c 1 file changed, 18 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/11915/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 4d43b57..14f9f57 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -587,27 +587,10 @@ /* Receive a 04.11 TPDU inside RP-DATA / user data */ static int gsm411_rx_rp_ud(struct msgb *msg, struct gsm_trans *trans, - struct gsm411_rp_hdr *rph, - uint8_t src_len, uint8_t *src, - uint8_t dst_len, uint8_t *dst, - uint8_t tpdu_len, uint8_t *tpdu) + struct gsm411_rp_hdr *rph) { int rc = 0; - if (src_len && src) - LOGP(DLSMS, LOGL_ERROR, "RP-DATA (MO) with SRC ?!?\n"); - - if (!dst_len || !dst || !tpdu_len || !tpdu) { - LOGP(DLSMS, LOGL_ERROR, - "RP-DATA (MO) without DST or TPDU ?!?\n"); - gsm411_send_rp_error(trans, rph->msg_ref, - GSM411_RP_CAUSE_INV_MAND_INF); - return -EIO; - } - msg->l4h = tpdu; - - DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len)); - rc = gsm340_rx_tpdu(trans, msg, rph->msg_ref); if (rc == 0) return gsm411_send_rp_ack(trans, rph->msg_ref); @@ -639,8 +622,23 @@ DEBUGP(DLSMS, "RX_RP-DATA: src_len=%u, dst_len=%u ud_len=%u\n", src_len, dst_len, rpud_len); - return gsm411_rx_rp_ud(msg, trans, rph, src_len, src, dst_len, dst, - rpud_len, rp_ud); + + if (src_len && src) + LOGP(DLSMS, LOGL_ERROR, "RP-DATA (MO) with SRC ?!?\n"); + + if (!dst_len || !dst || !rpud_len || !rp_ud) { + LOGP(DLSMS, LOGL_ERROR, + "RP-DATA (MO) without DST or TPDU ?!?\n"); + gsm411_send_rp_error(trans, rph->msg_ref, + GSM411_RP_CAUSE_INV_MAND_INF); + return -EIO; + } + + msg->l4h = rp_ud; + + DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len)); + + return gsm411_rx_rp_ud(msg, trans, rph); } static struct gsm_sms *sms_report_alloc(struct gsm_sms *sms) -- To view, visit https://gerrit.osmocom.org/11915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15 Gerrit-Change-Number: 11915 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 15:36:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 15:36:12 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: refactor MT SMS message handling Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11916 Change subject: libmsc/gsm_04_11.c: refactor MT SMS message handling ...................................................................... libmsc/gsm_04_11.c: refactor MT SMS message handling According to GSM TS 04.11, the SMC (Short Message Control) state machine is a part of CM-sublayer of L3, that is responsible for connection management (establisment and releasing), and SM-RP (Relay Protocol) message delivery. For some reason, the connection establisment request from SMC (GSM411_MMSMS_EST_REQ) was not handled properly - it was always assumed that connection is already established. This is why the code initiating a MT (Mobile Terminated) SMS transfer had to establish a radio connection with subscriber manually. Let's benefit from having the SMC state machine, and offload connection establishment to it. This change makes the local implementation closer to GSM TS 04.11, and facilitates the further integration of GSUP transport. NOTE: the expected unit test output is changed, because now we always allocate a transaction first, and then establish a connection, not vice versa. Change-Id: I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 --- M include/osmocom/msc/gsm_04_11.h M src/libmsc/gsm_04_11.c M src/libmsc/msc_vty.c M src/libmsc/smpp_openbsc.c M src/libmsc/sms_queue.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 12 files changed, 336 insertions(+), 291 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/11916/1 diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index 0b9639f..a368d46 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -27,6 +27,7 @@ uint8_t *smsc; }; +struct gsm_network; struct msgb; int gsm0411_rcv_sms(struct gsm_subscriber_connection *conn, struct msgb *msg); @@ -37,9 +38,8 @@ const char *sender_msisdn, int dcs, const char *text); -int gsm411_send_sms_subscr(struct vlr_subscr *vsub, - struct gsm_sms *sms); -int gsm411_send_sms(struct gsm_subscriber_connection *conn, +int gsm411_send_sms(struct gsm_network *net, + struct vlr_subscr *vsub, struct gsm_sms *sms); void gsm411_sapi_n_reject(struct gsm_subscriber_connection *conn); diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 14f9f57..d4025c8 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -127,6 +127,86 @@ return msc_tx_dtap(conn, msg); } +/* Paging callback for MT SMS (Paging is triggered by SMC) */ +static int paging_cb_mmsms_est_req(unsigned int hooknum, unsigned int event, + struct msgb *msg, void *_conn, void *_trans) +{ + struct gsm_subscriber_connection *conn = _conn; + struct gsm_trans *trans = _trans; + struct gsm_sms *sms = trans->sms.sms; + int rc = 0; + + DEBUGP(DLSMS, "paging_cb_send_sms(hooknum=%u, event=%u, " + "conn=%p, trans=%p)\n", hooknum, event, conn, trans); + + if (hooknum != GSM_HOOK_RR_PAGING) + return -EINVAL; + + switch (event) { + case GSM_PAGING_SUCCEEDED: + /* Associate transaction with established connection */ + trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + /* FIXME: specify SACCH in case we already have active TCH */ + trans->dlci = 0x03; + /* Confirm successful connection establishment */ + gsm411_smc_recv(&trans->sms.smc_inst, + GSM411_MMSMS_EST_CNF, NULL, 0); + break; + case GSM_PAGING_EXPIRED: + case GSM_PAGING_BUSY: + /* Inform SMC about channel establishment failure */ + gsm411_smc_recv(&trans->sms.smc_inst, + GSM411_MMSMS_REL_IND, NULL, 0); + + /* Notify the SMSqueue and free stored SMS */ + send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, event); + trans->sms.sms = NULL; + sms_free(sms); + + /* Destroy this transaction */ + trans_free(trans); + rc = -ETIMEDOUT; + break; + default: + LOGP(DLSMS, LOGL_ERROR, "Unhandled paging event: %d\n", event); + } + + return rc; +} + +static int gsm411_mmsms_est_req(struct gsm_trans *trans) +{ + struct subscr_request *req; + + /* Subscriber's data shall be associated */ + OSMO_ASSERT(trans->vsub != NULL); + + /* Check if connection is already established */ + if (trans->conn != NULL) { + LOGP(DLSMS, LOGL_DEBUG, "Using an existing connection " + "for %s\n", vlr_subscr_name(trans->vsub)); + return gsm411_smc_recv(&trans->sms.smc_inst, + GSM411_MMSMS_EST_CNF, NULL, 0); + } + + /* Initiate Paging procedure */ + LOGP(DLSMS, LOGL_DEBUG, "Initiating Paging procedure " + "for %s due to MMSMS_EST_REQ\n", vlr_subscr_name(trans->vsub)); + req = subscr_request_conn(trans->vsub, + paging_cb_mmsms_est_req, trans, "MT SMS"); + if (!req) { + LOGP(DLSMS, LOGL_ERROR, "Failed to initiate Paging " + "procedure for %s\n", vlr_subscr_name(trans->vsub)); + /* Inform SMC about channel establishment failure */ + gsm411_smc_recv(&trans->sms.smc_inst, + GSM411_MMSMS_REL_IND, NULL, 0); + trans_free(trans); + return -EIO; + } + + return 0; +} + /* Prefix msg with a 04.08/04.11 CP header */ static int gsm411_cp_sendmsg(struct msgb *msg, struct gsm_trans *trans, uint8_t msg_type) @@ -154,8 +234,7 @@ switch (msg_type) { case GSM411_MMSMS_EST_REQ: - /* recycle msg */ - rc = gsm411_smc_recv(inst, GSM411_MMSMS_EST_CNF, msg, 0); + rc = gsm411_mmsms_est_req(trans); msgb_free(msg); /* upper layer does not free msg */ break; case GSM411_MMSMS_DATA_REQ: @@ -899,6 +978,120 @@ return rc; } +static struct gsm_trans *gsm411_alloc_mt_trans(struct gsm_network *net, + struct vlr_subscr *vsub) +{ + struct gsm_subscriber_connection *conn; + struct gsm_trans *trans; + int tid; + + LOGP(DLSMS, LOGL_INFO, "Going to send a MT SMS\n"); + + /* Generate a new transaction ID */ + tid = trans_assign_trans_id(net, vsub, GSM48_PDISC_SMS, 0); + if (tid == -1) { + LOGP(DLSMS, LOGL_ERROR, "No available transaction IDs\n"); + return NULL; + } + + /* Allocate a new transaction */ + trans = trans_alloc(net, vsub, GSM48_PDISC_SMS, tid, new_callref++); + if (!trans) { + LOGP(DLSMS, LOGL_ERROR, "No memory for trans\n"); + return NULL; + } + + /* Init both SMC and SMR state machines */ + gsm411_smc_init(&trans->sms.smc_inst, 0, 1, + gsm411_mn_recv, gsm411_mm_send); + gsm411_smr_init(&trans->sms.smr_inst, 0, 1, + gsm411_rl_recv, gsm411_mn_send); + + /* Attempt to find an existing connection */ + conn = connection_for_subscr(vsub); + if (conn) { + /* Associate transaction with connection */ + trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + /* Generate unique RP Message Reference */ + trans->sms.sm_rp_mr = conn->next_rp_ref++; + } + + return trans; +} + +/* High-level function to send an SMS to a given subscriber */ +int gsm411_send_sms(struct gsm_network *net, + struct vlr_subscr *vsub, + struct gsm_sms *sms) +{ + uint8_t *data, *rp_ud_len; + struct gsm_trans *trans; + struct msgb *msg; + int rc; + + /* Allocate a new transaction for MT SMS */ + trans = gsm411_alloc_mt_trans(net, vsub); + if (!trans) { + send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, 0); + sms_free(sms); + return -ENOMEM; + } + + /* Allocate a message buffer for to be encoded SMS */ + msg = gsm411_msgb_alloc(); + if (!msg) { + send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, 0); + trans_free(trans); + sms_free(sms); + return -ENOMEM; + } + + /* Hardcode SMSC Originating Address for now */ + data = (uint8_t *)msgb_put(msg, 8); + data[0] = 0x07; /* originator length == 7 */ + data[1] = 0x91; /* type of number: international, ISDN */ + data[2] = 0x44; /* 447785016005 */ + data[3] = 0x77; + data[4] = 0x58; + data[5] = 0x10; + data[6] = 0x06; + data[7] = 0x50; + + /* Hardcoded Destination Address */ + data = (uint8_t *)msgb_put(msg, 1); + data[0] = 0; /* destination length == 0 */ + + /* obtain a pointer for the rp_ud_len, so we can fill it later */ + rp_ud_len = (uint8_t *)msgb_put(msg, 1); + + if (sms->is_report) { + /* generate the 03.40 SMS-STATUS-REPORT TPDU */ + rc = gsm340_gen_sms_status_report_tpdu(msg, sms); + } else { + /* generate the 03.40 SMS-DELIVER TPDU */ + rc = gsm340_gen_sms_deliver_tpdu(msg, sms); + } + if (rc < 0) { + send_signal(S_SMS_UNKNOWN_ERROR, trans, sms, 0); + sms_free(sms); + trans_free(trans); + msgb_free(msg); + return rc; + } + + *rp_ud_len = rc; + + /* Store a pointer to abstract SMS representation */ + trans->sms.sms = sms; + + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVERED]); + db_sms_inc_deliver_attempts(trans->sms.sms); + + return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, + GSM411_MT_RP_DATA_MT, trans->sms.sm_rp_mr, + GSM411_SM_RL_DATA_REQ); +} + /* Entry point for incoming GSM48_PDISC_SMS from abis_rsl.c */ int gsm0411_rcv_sms(struct gsm_subscriber_connection *conn, struct msgb *msg) @@ -985,159 +1178,6 @@ return rc; } -/* Take a SMS in gsm_sms structure and send it through an already - * existing conn. We also assume that the caller ensured this conn already - * has a SAPI3 RLL connection! */ -int gsm411_send_sms(struct gsm_subscriber_connection *conn, struct gsm_sms *sms) -{ - struct msgb *msg = gsm411_msgb_alloc(); - struct gsm_trans *trans; - uint8_t *data, *rp_ud_len; - uint8_t msg_ref = conn->next_rp_ref++; - int transaction_id; - int rc; - - transaction_id = - trans_assign_trans_id(conn->network, conn->vsub, - GSM48_PDISC_SMS, 0); - if (transaction_id == -1) { - LOGP(DLSMS, LOGL_ERROR, "No available transaction ids\n"); - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, 0); - sms_free(sms); - msgb_free(msg); - return -EBUSY; - } - - DEBUGP(DLSMS, "%s()\n", __func__); - - /* FIXME: allocate transaction with message reference */ - trans = trans_alloc(conn->network, conn->vsub, - GSM48_PDISC_SMS, - transaction_id, new_callref++); - if (!trans) { - LOGP(DLSMS, LOGL_ERROR, "No memory for trans\n"); - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, 0); - sms_free(sms); - msgb_free(msg); - /* FIXME: send some error message */ - return -ENOMEM; - } - gsm411_smc_init(&trans->sms.smc_inst, sms->id, 1, - gsm411_mn_recv, gsm411_mm_send); - gsm411_smr_init(&trans->sms.smr_inst, sms->id, 1, - gsm411_rl_recv, gsm411_mn_send); - trans->sms.sms = sms; - - trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_SMS); - trans->dlci = 0x03; - /* FIXME: specify SACCH in case we already have active TCH */ - - /* Hardcode SMSC Originating Address for now */ - data = (uint8_t *)msgb_put(msg, 8); - data[0] = 0x07; /* originator length == 7 */ - data[1] = 0x91; /* type of number: international, ISDN */ - data[2] = 0x44; /* 447785016005 */ - data[3] = 0x77; - data[4] = 0x58; - data[5] = 0x10; - data[6] = 0x06; - data[7] = 0x50; - - /* Hardcoded Destination Address */ - data = (uint8_t *)msgb_put(msg, 1); - data[0] = 0; /* destination length == 0 */ - - /* obtain a pointer for the rp_ud_len, so we can fill it later */ - rp_ud_len = (uint8_t *)msgb_put(msg, 1); - - if (sms->is_report) { - /* generate the 03.40 SMS-STATUS-REPORT TPDU */ - rc = gsm340_gen_sms_status_report_tpdu(msg, sms); - } else { - /* generate the 03.40 SMS-DELIVER TPDU */ - rc = gsm340_gen_sms_deliver_tpdu(msg, sms); - } - if (rc < 0) { - send_signal(S_SMS_UNKNOWN_ERROR, trans, sms, 0); - sms_free(sms); - trans->sms.sms = NULL; - trans_free(trans); - msgb_free(msg); - return rc; - } - - *rp_ud_len = rc; - - DEBUGP(DLSMS, "TX: SMS DELIVER\n"); - - rate_ctr_inc(&conn->network->msc_ctrs->ctr[MSC_CTR_SMS_DELIVERED]); - db_sms_inc_deliver_attempts(trans->sms.sms); - - return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, - GSM411_MT_RP_DATA_MT, msg_ref, GSM411_SM_RL_DATA_REQ); -} - -/* paging callback. Here we get called if paging a subscriber has - * succeeded or failed. */ -static int paging_cb_send_sms(unsigned int hooknum, unsigned int event, - struct msgb *msg, void *_conn, void *_sms) -{ - struct gsm_subscriber_connection *conn = _conn; - struct gsm_sms *sms = _sms; - int rc = 0; - - DEBUGP(DLSMS, "paging_cb_send_sms(hooknum=%u, event=%u, msg=%p," - "conn=%p, sms=%p/id: %llu)\n", hooknum, event, msg, conn, sms, sms->id); - - if (hooknum != GSM_HOOK_RR_PAGING) - return -EINVAL; - - switch (event) { - case GSM_PAGING_SUCCEEDED: - gsm411_send_sms(conn, sms); - break; - case GSM_PAGING_EXPIRED: - case GSM_PAGING_BUSY: - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, event); - sms_free(sms); - rc = -ETIMEDOUT; - break; - default: - LOGP(DLSMS, LOGL_ERROR, "Unhandled paging event: %d\n", event); - } - - return rc; -} - -/* high-level function to send a SMS to a given subscriber. The function - * will take care of paging the subscriber, establishing the RLL SAPI3 - * connection, etc. */ -int gsm411_send_sms_subscr(struct vlr_subscr *vsub, - struct gsm_sms *sms) -{ - struct gsm_subscriber_connection *conn; - void *res; - - /* check if we already have an open conn to the subscriber. - * if yes, send the SMS this way */ - conn = connection_for_subscr(vsub); - if (conn) { - LOGP(DLSMS, LOGL_DEBUG, "Sending SMS via already open connection %p to %s\n", - conn, vlr_subscr_name(vsub)); - return gsm411_send_sms(conn, sms); - } - - /* if not, we have to start paging */ - LOGP(DLSMS, LOGL_DEBUG, "Sending SMS: no connection open, start paging %s\n", - vlr_subscr_name(vsub)); - res = subscr_request_conn(vsub, paging_cb_send_sms, sms, "send SMS"); - if (!res) { - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, GSM_PAGING_BUSY); - sms_free(sms); - } - return 0; -} - void _gsm411_sms_trans_free(struct gsm_trans *trans) { /* cleanup SMS instance */ diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index cdf3184..4f3ac04 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -680,7 +680,7 @@ break; if (sms->receiver) - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(gsmnet, sms->receiver, sms); sms_id = sms->id + 1; } @@ -819,7 +819,7 @@ sms = db_sms_get_unsent_for_subscr(vsub, UINT_MAX); if (sms) - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(gsmnet, sms->receiver, sms); vlr_subscr_put(vsub); diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index c12db5f..051372c 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -268,7 +268,7 @@ LOGP(DLSMS, LOGL_DEBUG, "SMPP SUBMIT-SM: Forwarding in " "real time (Transaction/Forward mode)\n"); sms->smpp.transaction_mode = 1; - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(net, sms->receiver, sms); rc = 1; /* don't send any response yet */ break; } diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 252e529..9907f4f 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -186,7 +186,7 @@ sms_queue_trigger(smsq); } else { pending->resend = 0; - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(smsq->network, sms->receiver, sms); } } } @@ -311,7 +311,7 @@ attempted += 1; smsq->pending += 1; llist_add_tail(&pending->entry, &smsq->pending_sms); - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(smsq->network, sms->receiver, sms); } while (attempted < attempts && rounds < 1000); LOGP(DLSMS, LOGL_DEBUG, "SMSqueue added %d messages in %d rounds\n", attempted, rounds); @@ -349,7 +349,7 @@ smsq->pending += 1; llist_add_tail(&pending->entry, &smsq->pending_sms); - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(smsq->network, sms->receiver, sms); return; no_pending_sms: @@ -398,7 +398,6 @@ { struct gsm_sms *sms; struct gsm_sms_pending *pending; - struct gsm_subscriber_connection *conn; /* * The code used to be very clever and tried to submit @@ -423,15 +422,12 @@ return 0; } - conn = connection_for_subscr(vsub); - if (!conn) - return -1; - /* Now try to deliver any pending SMS to this sub */ sms = db_sms_get_unsent_for_subscr(vsub, UINT_MAX); if (!sms) return -1; - gsm411_send_sms(conn, sms); + + gsm411_send_sms(net, vsub, sms); return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 51f7367..fc701b2 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -275,18 +275,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -299,8 +301,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -311,7 +313,7 @@ - sending GSM Auth Request for MSISDN:46071: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:46071: MSC conn use - compl_l3 == 0 (0x0: ) @@ -356,8 +358,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 5 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -762,18 +762,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response using TMSI, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -786,8 +788,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:50462976){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -798,7 +800,7 @@ - sending GSM Auth Request for MSISDN:46071: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:46071: MSC conn use - compl_l3 == 0 (0x0: ) @@ -843,8 +845,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 5 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -1873,18 +1873,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000003) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -1897,8 +1899,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000010650){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -1909,7 +1911,7 @@ - sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x3 and... - ...rand=efa9c29a9742148d5c9070348716e1bb - ...expecting sres=69d5f9fb -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -1954,8 +1956,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000003) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index cc8659c..9cc6387 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -303,18 +303,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -327,8 +329,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -339,7 +341,7 @@ - sending GSM Auth Request for MSISDN:46071: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:46071: MSC conn use - compl_l3 == 0 (0x0: ) @@ -409,8 +411,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 5 DREF MSISDN:46071: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -843,18 +843,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response using TMSI, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -867,8 +869,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:50462976){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -879,7 +881,7 @@ - sending GSM Auth Request for MSISDN:46071: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:46071: MSC conn use - compl_l3 == 0 (0x0: ) @@ -949,8 +951,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 5 DREF MSISDN:46071: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -2069,18 +2069,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000003) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends *UMTS AKA* Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -2093,8 +2095,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000010650){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -2106,7 +2108,7 @@ - ...rand=54d8f19778056666b41c8c25e52eb60c - ...autn=53f3e5632b3d00008865dd54d49663f2 - ...expecting res=86e848a9e7ad8cd5 -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -2165,8 +2167,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000003) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -2559,18 +2559,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000004) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -2583,8 +2585,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -2595,7 +2597,7 @@ - sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -2665,8 +2667,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000004) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -3059,18 +3059,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000005) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -3083,8 +3085,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -3095,7 +3097,7 @@ - sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -3104,8 +3106,8 @@ auth_request_sent == 1 --- - Fake a situation where Classmark 2 is unknown during proc_arq_fsm -DREF VLR subscr MSISDN:42342 usage increases to: 5 -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 6 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 - MS sends Authen Response, VLR accepts and requests Ciphering - MS sends Authen Response, VLR accepts and requests Ciphering. Normally, we'd know Classmark 3, but this test removed it. Hence a Classmark Request is generated. MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP @@ -3156,8 +3158,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000005) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index d2b7ef3..4874f93 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -471,32 +471,38 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - time passes and no paging result is received - Total time passed: 9.000000 s - the paging timeout has not yet expired paging_stopped == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 vsub->cs.is_paging == 1 - another request is added to the list but does not cause another paging -DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 +DCC (ti 01 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 7 DMM Subscriber MSISDN:46071 already paged. llist_count(&vsub->cs.requests) == 2 -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 6 paging_sent == 0 - the paging timeout expires, the paging as well as the requests are canceled - Total time passed: 11.000000 s DPAG Paging failure for MSISDN:46071 (event=1) DPAG Calling paging cbfn. -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 DPAG Calling paging cbfn. +DREF VLR subscr MSISDN:46071 usage decreases to: 3 DREF VLR subscr MSISDN:46071 usage decreases to: 2 DREF VLR subscr MSISDN:46071 usage decreases to: 1 paging_stopped == 1 @@ -506,12 +512,14 @@ --- - Now that the timeout has expired, another Paging is sent on request DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000003) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 --- @@ -522,10 +530,11 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 DMM IMSI DETACH for MSISDN:46071 DPAG Paging failure for MSISDN:46071 (event=1) DPAG Calling paging cbfn. +DREF VLR subscr MSISDN:46071 usage decreases to: 4 DREF VLR subscr MSISDN:46071 usage decreases to: 3 DREF VLR subscr MSISDN:46071 usage decreases to: 2 DREF VLR subscr MSISDN:46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index fb0582b..e8c2927 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -187,18 +187,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response, we deliver the SMS MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -211,8 +213,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -226,8 +228,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -546,18 +546,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response using TMSI, we deliver the SMS MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -570,8 +572,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -585,8 +587,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 0a964ac..cf90a1c 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1260,12 +1260,14 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - MS replies with Paging Response, we deliver the SMS @@ -1280,8 +1282,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -1295,8 +1297,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -1487,12 +1487,14 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - MS replies with Paging Response, we deliver the SMS @@ -1507,8 +1509,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -1522,8 +1524,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -1734,12 +1734,14 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000003) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - MS replies with Paging Response, we deliver the SMS @@ -1754,8 +1756,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -1769,8 +1771,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000003) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 538a3d9..fdd3b0c 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -288,18 +288,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000001) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -312,8 +314,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=GERAN Auth (no Ciph) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000010650){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -325,7 +327,7 @@ - ...rand=efa9c29a9742148d5c9070348716e1bb - ...autn=f9375e6d41e1000096e7fe4ff1c27e39 - ...expecting res=706f996719ba609c -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -370,8 +372,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000001) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -778,18 +778,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000002) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_UTRAN_IU sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -802,8 +804,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000010650){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -815,7 +817,7 @@ - ...rand=efa9c29a9742148d5c9070348716e1bb - ...autn=f9375e6d41e1000096e7fe4ff1c27e39 - ...expecting res=706f996719ba609c -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -875,8 +877,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000002) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_UTRAN_IU - DTAP --RAN_UTRAN_IU--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 6cf927c..01f5974 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -319,7 +319,7 @@ char *str) { struct gsm_sms *sms = sms_from_text(receiver, sender->msisdn, 0, str); - gsm411_send_sms_subscr(receiver, sms); + gsm411_send_sms(net, receiver, sms); } unsigned char next_rand_byte = 0; -- To view, visit https://gerrit.osmocom.org/11916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 Gerrit-Change-Number: 11916 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 15:36:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 15:36:12 +0000 Subject: Change in osmo-msc[master]: libmsc/transaction: introduce trans_find_by_sm_rp_mr() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11917 Change subject: libmsc/transaction: introduce trans_find_by_sm_rp_mr() ...................................................................... libmsc/transaction: introduce trans_find_by_sm_rp_mr() According to GSM TS 04.11, section 8.2.3, the RP Message Reference is a mandatory field for all messages on the SM-RL (SM Relay Layer), that is used to link an RP-ACK or RP-ERROR message to the associated (preceding) RP-DATA or RP-SMMA message transfer attempt. This change extends the transaction state structure with SM-RP-MR, and introduces a new function for matching transactions within a given connection by this reference. Change-Id: Ice47c37ecef4416e65ecee8931d946c915316791 --- M include/osmocom/msc/transaction.h M src/libmsc/transaction.c 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/11917/1 diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index b7d7971..762eeea 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -76,6 +76,9 @@ struct gsm411_smc_inst smc_inst; struct gsm411_smr_inst smr_inst; + /* SM-RP-MR, Message Reference (see GSM TS 04.11, section 8.2.3) */ + uint8_t sm_rp_mr; + struct gsm_sms *sms; } sms; struct { @@ -99,6 +102,8 @@ uint8_t proto, uint8_t trans_id); struct gsm_trans *trans_find_by_callref(struct gsm_network *net, uint32_t callref); +struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn, + uint8_t sm_rp_mr); struct gsm_trans *trans_alloc(struct gsm_network *net, struct vlr_subscr *vsub, diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index be14420..c5c8bd4 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -73,6 +73,28 @@ return NULL; } +/*! Find a transaction by SM-RP-MR (RP Message Reference) + * \param[in] conn Connection in whihc we want to find transaction + * \param[in] sm_rp_mr RP Message Reference (see GSM TS 04.11, section 8.2.3) + * \returns Matching transaction, if any + */ +struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn, + uint8_t sm_rp_mr) +{ + struct gsm_network *net = conn->network; + struct vlr_subscr *vsub = conn->vsub; + struct gsm_trans *trans; + + llist_for_each_entry(trans, &net->trans_list, entry) { + if (trans->vsub == vsub && + trans->protocol == GSM48_PDISC_SMS && + trans->sms.sm_rp_mr == sm_rp_mr) + return trans; + } + + return NULL; +} + /*! Allocate a new transaction and add it to network list * \param[in] net Netwokr in which we allocate transaction * \param[in] subscr Subscriber for which we allocate transaction -- To view, visit https://gerrit.osmocom.org/11917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice47c37ecef4416e65ecee8931d946c915316791 Gerrit-Change-Number: 11917 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Ivan Kluchnikov -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 15:36:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 15:36:12 +0000 Subject: Change in osmo-msc[master]: libmsc/VTY: introduce kill-switch for routing SMS over GSUP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11918 Change subject: libmsc/VTY: introduce kill-switch for routing SMS over GSUP ...................................................................... libmsc/VTY: introduce kill-switch for routing SMS over GSUP As a rudiment of OsmoNiTB, OsmoMSC is still involved in SMS processing, storage (in SQLite DB), and routing (via SMPP). In real networks this is done by the external entity called SMSC (SMS Centre), while the MSC is doing re-encapsulation of GSM 04.11 SM-TL (Transport Layer) payload (i.e. TPDU) between SM-RL (Relay Layer) and MAP. Since OsmoMSC itself is not a 'Network in The Box' anymore, it makes sense to replicate the 'traditional' behaviour of MSC. The problem is that this behaviour cannot co-exist with the current implementation, so the key idea is to rip out the local SMS storage and routing from OsmoMSC, and (re)implement it in a separate process (OsmoSMSC?). As a temporary solution, this change introduces a 'kill-switch' VTY option that enables routing of SMS messages over GSUP towards ESME (through VLR and HLR), but breaks the local storage and routing. This is why it's disabled by default. As soon as we move the SMS processing and storage away from OsmoMSC, this behaviour would be enabled by default, and the VTY option would be hidden and deprecated. At the moment, this option basically does nothing, and will take an effect in the follow-up changes. Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Related: OS#3587 --- M include/osmocom/msc/gsm_data.h M src/libmsc/msc_vty.c 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/18/11918/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 085248c..3c018b6 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -314,6 +314,14 @@ struct gsm_sms_queue *sms_queue; + /* The "SMS over GSUP" kill-switch that basically breaks internal + * SMS routing (i.e. SQLite DB and SMPP), and enables forwarding + * of short messages over GSUP towards ESME (through VLR and HLR). + * Please see OS#3587 for details. This is a temporary solution, + * so it should be removed as soon as we move the SMS processing + * logic to an external process (OsmoSMSC?). REMOVE ME! */ + bool enable_sms_over_gsup; + /* control interface */ struct ctrl_handle *ctrl; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 4f3ac04..89dcd2e 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -431,6 +431,24 @@ return CMD_SUCCESS; } +/* TODO: to be deprecated as soon as we rip SMS handling out (see OS#3587) */ +DEFUN(cfg_msc_sms_over_gsup, cfg_msc_sms_over_gsup_cmd, + "sms-over-gsup", + "Enable routing of SMS messages over GSUP\n") +{ + gsmnet->enable_sms_over_gsup = true; + return CMD_SUCCESS; +} + +/* TODO: to be deprecated as soon as we rip SMS handling out (see OS#3587) */ +DEFUN(cfg_msc_no_sms_over_gsup, cfg_msc_no_sms_over_gsup_cmd, + "no sms-over-gsup", + NO_STR "Disable routing of SMS messages over GSUP\n") +{ + gsmnet->enable_sms_over_gsup = false; + return CMD_SUCCESS; +} + static int config_write_msc(struct vty *vty) { vty_out(vty, "msc%s", VTY_NEWLINE); @@ -462,6 +480,9 @@ gsmnet->emergency.route_to_msisdn, VTY_NEWLINE); } + if (gsmnet->enable_sms_over_gsup) + vty_out(vty, " sms-over-gsup%s", VTY_NEWLINE); + mgcp_client_config_write(vty, " "); #ifdef BUILD_IU ranap_iu_vty_config_write(vty, " "); @@ -1451,6 +1472,8 @@ install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd); install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd); install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd); + install_element(MSC_NODE, &cfg_msc_sms_over_gsup_cmd); + install_element(MSC_NODE, &cfg_msc_no_sms_over_gsup_cmd); mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); #ifdef BUILD_IU -- To view, visit https://gerrit.osmocom.org/11918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie57685ed2ce1e4c978e775b68fdffe58de44882b Gerrit-Change-Number: 11918 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 15:36:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 15:36:13 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11919 Change subject: libmsc/gsm_04_11.c: forward MO SMS messages over GSUP ...................................................................... libmsc/gsm_04_11.c: forward MO SMS messages over GSUP Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Depends-on: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Related: OS#3587 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/gsm_04_11.h A include/osmocom/msc/gsm_04_11_gsup.h M src/libmsc/Makefile.am M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c A src/libmsc/gsm_04_11_gsup.c 7 files changed, 292 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/19/11919/1 diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index ebc946a..8674b75 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -7,6 +7,7 @@ debug.h \ gsm_04_08.h \ gsm_04_11.h \ + gsm_04_11_gsup.h \ gsm_04_14.h \ gsm_04_80.h \ gsm_09_11.h \ diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index a368d46..3997ab2 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -2,6 +2,7 @@ #define _GSM_04_11_H #include +#include struct vlr_subscr; struct gsm_subscriber_connection; diff --git a/include/osmocom/msc/gsm_04_11_gsup.h b/include/osmocom/msc/gsm_04_11_gsup.h new file mode 100644 index 0000000..82f575d --- /dev/null +++ b/include/osmocom/msc/gsm_04_11_gsup.h @@ -0,0 +1,15 @@ +#pragma once + +#include + +/* Forward declarations */ +struct osmo_gsup_message; +struct vlr_subscr; +struct gsm_trans; +struct msgb; + +int gsm411_gsup_mo_ready_for_sm_req(struct gsm_trans *trans, uint8_t sm_rp_mr); +int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg, + uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len); +int gsm411_gsup_mo_handler(struct vlr_subscr *vsub, + struct osmo_gsup_message *gsup_msg); diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index 90bbbf8..aa95265 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -35,6 +35,7 @@ gsm_04_08.c \ gsm_04_08_cc.c \ gsm_04_11.c \ + gsm_04_11_gsup.c \ gsm_04_14.c \ gsm_04_80.c \ gsm_09_11.c \ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index d5cc212..161585c 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1784,6 +1784,14 @@ DEBUGP(DMSC, "Routed to GSM 09.11 SS/USSD handler\n"); return gsm0911_gsup_handler(vsub, gsup_msg); + /* GSM 04.11 code implementing MO SMS */ + case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR: + case OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT: + case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR: + case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT: + DEBUGP(DMSC, "Routed to GSM 04.11 MO handler\n"); + return gsm411_gsup_mo_handler(vsub, gsup_msg); + default: LOGP(DMM, LOGL_ERROR, "No handler found for %s, dropping message...\n", osmo_gsup_message_type_name(gsup_msg->message_type)); diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index d4025c8..93c2ea7 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -666,10 +666,14 @@ /* Receive a 04.11 TPDU inside RP-DATA / user data */ static int gsm411_rx_rp_ud(struct msgb *msg, struct gsm_trans *trans, - struct gsm411_rp_hdr *rph) + struct gsm411_rp_hdr *rph, + uint8_t *dst, uint8_t dst_len) { int rc = 0; + if (trans->net->enable_sms_over_gsup) + goto sms_over_gsup; + rc = gsm340_rx_tpdu(trans, msg, rph->msg_ref); if (rc == 0) return gsm411_send_rp_ack(trans, rph->msg_ref); @@ -677,6 +681,14 @@ return gsm411_send_rp_error(trans, rph->msg_ref, rc); else return rc; + +sms_over_gsup: + /* RP-ACK or RP-ERROR is triggered as soon as we get the response */ + rc = gsm411_gsup_mo_fwd_sm_req(trans, msg, rph->msg_ref, dst, dst_len); + if (rc) /* GSUP message sending error */ + return gsm411_send_rp_error(trans, rph->msg_ref, rc); + + return 0; } /* Receive a 04.11 RP-DATA message in accordance with Section 7.3.1.2 */ @@ -717,7 +729,7 @@ DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len)); - return gsm411_rx_rp_ud(msg, trans, rph); + return gsm411_rx_rp_ud(msg, trans, rph, dst, dst_len); } static struct gsm_sms *sms_report_alloc(struct gsm_sms *sms) @@ -854,6 +866,9 @@ { int rc; + if (trans->net->enable_sms_over_gsup) + goto sms_over_gsup; + rc = gsm411_send_rp_ack(trans, rph->msg_ref); /* MS tells us that it has memory for more SMS, we need @@ -862,6 +877,14 @@ send_signal(S_SMS_SMMA, trans, NULL, 0); return rc; + +sms_over_gsup: + /* RP-ACK or RP-ERROR is triggered as soon as we get the response */ + rc = gsm411_gsup_mo_ready_for_sm_req(trans, rph->msg_ref); + if (rc) /* GSUP message sending error */ + return gsm411_send_rp_error(trans, rph->msg_ref, rc); + + return 0; } /* receive RL DATA */ diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c new file mode 100644 index 0000000..ee06936 --- /dev/null +++ b/src/libmsc/gsm_04_11_gsup.c @@ -0,0 +1,241 @@ +/* + * (C) 2018 by Vadim Yanitskiy + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +/* Common helper for preparing to be encoded GSUP message */ +static void gsup_msg_init(struct osmo_gsup_message *gsup_msg, + enum osmo_gsup_message_type msg_type, const char *imsi, + uint8_t *sm_rp_mr) +{ + /* Compose a mew GSUP message */ + memset(gsup_msg, 0x00, sizeof(*gsup_msg)); + gsup_msg->message_type = msg_type; + + /* SM-RP-MR (Message Reference) */ + gsup_msg->sm_rp_mr = sm_rp_mr; + + /* Fill in subscriber's IMSI */ + OSMO_STRLCPY_ARRAY(gsup_msg->imsi, imsi); +} + +/* Common helper for encoding and sending GSUP messages towards ESME */ +static int gsup_msg_send(struct gsm_network *net, + struct osmo_gsup_message *gsup_msg) +{ + struct msgb *gsup_msgb; + int rc; + + /* Allocate GSUP message buffer */ + gsup_msgb = osmo_gsup_client_msgb_alloc(); + if (!gsup_msgb) { + LOGP(DLSMS, LOGL_ERROR, "Couldn't allocate GSUP message\n"); + rc = -ENOMEM; + goto error; + } + + /* Encode GSUP message */ + rc = osmo_gsup_encode(gsup_msgb, gsup_msg); + if (rc) { + LOGP(DLSMS, LOGL_ERROR, "Couldn't encode GSUP message\n"); + goto error; + } + + /* Finally send */ + rc = osmo_gsup_client_send(net->vlr->gsup_client, gsup_msgb); + if (rc) { + LOGP(DLSMS, LOGL_ERROR, "Couldn't send GSUP message\n"); + goto error; + } + + return 0; + +error: + if (gsup_msgb) + talloc_free(gsup_msgb); + + return rc; +} + +int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg, + uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len) +{ + uint8_t bcd_buf[GSM48_MI_SIZE] = { 0 }; + struct osmo_gsup_message gsup_msg; + size_t bcd_len; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); + + LOGP(DLSMS, LOGL_DEBUG, "TX GSUP MO-forwardSM-Req\n"); + + /* Assign SM-RP-MR to transaction state */ + trans->sms.sm_rp_mr = sm_rp_mr; + + /* Encode subscriber's MSISDN */ + bcd_len = gsm48_encode_bcd_number(bcd_buf, sizeof(bcd_buf), + 0, trans->vsub->msisdn); + if (bcd_len <= 0 || bcd_len > sizeof(bcd_buf)) { + LOGP(DLSMS, LOGL_ERROR, "Failed to encode subscriber's MSISDN\n"); + return -EINVAL; + } + + /* Initialize a new GSUP message */ + gsup_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST, + trans->vsub->imsi, &sm_rp_mr); + + /* According to 12.2.3, the MSISDN from VLR is inserted here */ + gsup_msg.sm_rp_oa_type = OSMO_GSUP_SMS_SM_RP_ODA_MSISDN; + gsup_msg.sm_rp_oa_len = bcd_len; + gsup_msg.sm_rp_oa = bcd_buf; + + /* SM-RP-DA should (already) contain SMSC address */ + gsup_msg.sm_rp_da_type = OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR; + gsup_msg.sm_rp_da_len = sm_rp_da_len; + gsup_msg.sm_rp_da = sm_rp_da; + + /* SM-RP-UI (TPDU) is pointed by msgb->l4h */ + gsup_msg.sm_rp_ui_len = msgb_l4len(msg); + gsup_msg.sm_rp_ui = (uint8_t *) msgb_sms(msg); + + return gsup_msg_send(trans->net, &gsup_msg); +} + +int gsm411_gsup_mo_ready_for_sm_req(struct gsm_trans *trans, uint8_t sm_rp_mr) +{ + struct osmo_gsup_message gsup_msg; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); + + LOGP(DLSMS, LOGL_DEBUG, "TX GSUP READY-FOR-SM Req\n"); + + /* Assign SM-RP-MR to transaction state */ + trans->sms.sm_rp_mr = sm_rp_mr; + + /* Initialize a new GSUP message */ + gsup_msg_init(&gsup_msg, OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST, + trans->vsub->imsi, &sm_rp_mr); + + /* Indicate SMMA as the Alert Reason */ + gsup_msg.sm_al_reas = OSMO_GSUP_SMS_SM_AL_REAS_MEM_AVAIL; + + return gsup_msg_send(trans->net, &gsup_msg); +} + +/* Triggers either RP-ACK or RP-ERROR on response from ESME */ +int gsm411_gsup_mo_handler(struct vlr_subscr *vsub, + struct osmo_gsup_message *gsup_msg) +{ + struct gsm_subscriber_connection *conn; + struct vlr_instance *vlr; + struct gsm_network *net; + struct gsm_trans *trans; + const char *msg_name; + bool msg_is_err; + + /* Obtain required pointers */ + vlr = vsub->vlr; + net = (struct gsm_network *) vlr->user_ctx; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, vsub); + + /* Determine the message type and name */ + msg_is_err = OSMO_GSUP_IS_MSGT_ERROR(gsup_msg->message_type); + switch (gsup_msg->message_type) { + case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR: + case OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT: + msg_name = "MO-forwardSM"; + break; + case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR: + case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT: + msg_name = "MO-ReadyForSM"; + break; + default: + /* Shall not happen */ + OSMO_ASSERT(0); + } + + LOGP(DLSMS, LOGL_DEBUG, "RX %s-%s\n", msg_name, + msg_is_err ? "Err" : "Res"); + + /* Make sure that 'SMS over GSUP' is expected */ + if (!net->enable_sms_over_gsup) { + /* TODO: notify sender about that? */ + LOGP(DLSMS, LOGL_NOTICE, "Unexpected MO SMS over GSUP, " + "ignoring message...\n"); + return -EIO; + } + + /* Verify GSUP message */ + if (!gsup_msg->sm_rp_mr) + goto msg_error; + if (msg_is_err && !gsup_msg->sm_rp_cause) + goto msg_error; + + /* Attempt to find a DTAP-connection */ + conn = connection_for_subscr(vsub); + if (!conn) { + /* FIXME: should we establish it then? */ + LOGP(DLSMS, LOGL_NOTICE, "No connection found for %s, " + "ignoring %s-%s message...\n", vlr_subscr_name(vsub), + msg_name, msg_is_err ? "Err" : "Res"); + return -EIO; /* TODO: notify sender about that? */ + } + + /* Attempt to find DTAP-transaction */ + trans = trans_find_by_sm_rp_mr(conn, *(gsup_msg->sm_rp_mr)); + if (!trans) { + LOGP(DLSMS, LOGL_NOTICE, "No transaction found for %s, " + "ignoring %s-%s message...\n", vlr_subscr_name(vsub), + msg_name, msg_is_err ? "Err" : "Res"); + return -EIO; /* TODO: notify sender about that? */ + } + + /* Send either RP-ERROR, or RP-ACK */ + if (msg_is_err) { + /* TODO: handle optional SM-RP-UI payload (requires API change) */ + gsm411_send_rp_error(trans, *(gsup_msg->sm_rp_mr), + *(gsup_msg->sm_rp_cause)); + } else { + gsm411_send_rp_ack(trans, *(gsup_msg->sm_rp_mr)); + } + + return 0; + +msg_error: + /* TODO: notify sender about that? */ + LOGP(DLSMS, LOGL_NOTICE, "RX malformed %s-%s\n", + msg_name, msg_is_err ? "Err" : "Res"); + return -EINVAL; +} -- To view, visit https://gerrit.osmocom.org/11919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 Gerrit-Change-Number: 11919 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 15:36:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 15:36:13 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11920 Change subject: libmsc/gsm_04_11.c: accept MT SMS messages over GSUP ...................................................................... libmsc/gsm_04_11.c: accept MT SMS messages over GSUP Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Depends-on: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3 Related: OS#3587 --- M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_11_gsup.h M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c 5 files changed, 177 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/11920/1 diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index 3997ab2..4310115 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -42,6 +42,10 @@ int gsm411_send_sms(struct gsm_network *net, struct vlr_subscr *vsub, struct gsm_sms *sms); +int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub, + size_t sm_rp_oa_len, const uint8_t *sm_rp_oa, + size_t sm_rp_ud_len, const uint8_t *sm_rp_ud); + void gsm411_sapi_n_reject(struct gsm_subscriber_connection *conn); int gsm411_send_rp_ack(struct gsm_trans *trans, uint8_t msg_ref); diff --git a/include/osmocom/msc/gsm_04_11_gsup.h b/include/osmocom/msc/gsm_04_11_gsup.h index 82f575d..9c6f2fb 100644 --- a/include/osmocom/msc/gsm_04_11_gsup.h +++ b/include/osmocom/msc/gsm_04_11_gsup.h @@ -13,3 +13,9 @@ uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len); int gsm411_gsup_mo_handler(struct vlr_subscr *vsub, struct osmo_gsup_message *gsup_msg); + +int gsm411_gsup_mt_fwd_sm_res(struct gsm_trans *trans, uint8_t sm_rp_mr); +int gsm411_gsup_mt_fwd_sm_err(struct gsm_trans *trans, + uint8_t sm_rp_mr, uint8_t cause); +int gsm411_gsup_mt_handler(struct vlr_subscr *vsub, + struct osmo_gsup_message *gsup_msg); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 161585c..87e4cb1 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1792,6 +1792,11 @@ DEBUGP(DMSC, "Routed to GSM 04.11 MO handler\n"); return gsm411_gsup_mo_handler(vsub, gsup_msg); + /* GSM 04.11 code implementing MT SMS */ + case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST: + DEBUGP(DMSC, "Routed to GSM 04.11 MT handler\n"); + return gsm411_gsup_mt_handler(vsub, gsup_msg); + default: LOGP(DMM, LOGL_ERROR, "No handler found for %s, dropping message...\n", osmo_gsup_message_type_name(gsup_msg->message_type)); diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 93c2ea7..efaf2ae 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -159,9 +159,11 @@ GSM411_MMSMS_REL_IND, NULL, 0); /* Notify the SMSqueue and free stored SMS */ - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, event); - trans->sms.sms = NULL; - sms_free(sms); + if (sms != NULL) { /* gsm411_send_rp_data() doesn't set trans->sms.sms */ + send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, event); + trans->sms.sms = NULL; + sms_free(sms); + } /* Destroy this transaction */ trans_free(trans); @@ -798,6 +800,9 @@ * successfully received a SMS. We can now safely mark it as * transmitted */ + if (trans->net->enable_sms_over_gsup) + goto sms_over_gsup; + if (!sms) { LOGP(DLSMS, LOGL_ERROR, "RX RP-ACK but no sms in transaction?!?\n"); return gsm411_send_rp_error(trans, rph->msg_ref, @@ -816,6 +821,10 @@ trans->sms.sms = NULL; return 0; + +sms_over_gsup: + /* Forward towards ESME via GSUP */ + return gsm411_gsup_mt_fwd_sm_res(trans, rph->msg_ref); } static int gsm411_rx_rp_error(struct gsm_trans *trans, @@ -834,6 +843,9 @@ vlr_subscr_name(trans->conn->vsub), cause_len, cause, get_value_string(gsm411_rp_cause_strs, cause)); + if (trans->net->enable_sms_over_gsup) + goto sms_over_gsup; + if (!sms) { LOGP(DLSMS, LOGL_ERROR, "RX RP-ERR, but no sms in transaction?!?\n"); @@ -859,6 +871,10 @@ trans->sms.sms = NULL; return 0; + +sms_over_gsup: + /* Forward towards ESME via GSUP */ + return gsm411_gsup_mt_fwd_sm_err(trans, rph->msg_ref, cause); } static int gsm411_rx_rp_smma(struct msgb *msg, struct gsm_trans *trans, @@ -1115,6 +1131,54 @@ GSM411_SM_RL_DATA_REQ); } +/* Low-level function to send raw RP-DATA to a given subscriber */ +int gsm411_send_rp_data(struct gsm_network *net, struct vlr_subscr *vsub, + size_t sm_rp_oa_len, const uint8_t *sm_rp_oa, + size_t sm_rp_ud_len, const uint8_t *sm_rp_ud) +{ + struct gsm_trans *trans; + struct msgb *msg; + uint8_t *ptr; + + /* Allocate a new transaction for MT SMS */ + trans = gsm411_alloc_mt_trans(net, vsub); + if (!trans) + return -ENOMEM; + + /* Allocate a message buffer for to be encoded SMS */ + msg = gsm411_msgb_alloc(); + if (!msg) { + trans_free(trans); + return -ENOMEM; + } + + /* Encode RP-DA length */ + ptr = (uint8_t *) msgb_put(msg, 1); + ptr[0] = sm_rp_oa_len; + + /* Encode RP-OA (SMSC address) */ + ptr = (uint8_t *) msgb_put(msg, sm_rp_oa_len); + memcpy(ptr, sm_rp_oa, sm_rp_oa_len); + + /* Encode RP-DA (shall be empty, len=0) */ + ptr = (uint8_t *) msgb_put(msg, 1); + ptr[0] = 0x00; + + /* Encode RP-UD length */ + ptr = (uint8_t *) msgb_put(msg, 1); + ptr[0] = sm_rp_ud_len; + + /* Encode RP-UD itself (SM TPDU) */ + ptr = (uint8_t *) msgb_put(msg, sm_rp_ud_len); + memcpy(ptr, sm_rp_ud, sm_rp_ud_len); + + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVERED]); + + return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, + GSM411_MT_RP_DATA_MT, trans->sms.sm_rp_mr, + GSM411_SM_RL_DATA_REQ); +} + /* Entry point for incoming GSM48_PDISC_SMS from abis_rsl.c */ int gsm0411_rcv_sms(struct gsm_subscriber_connection *conn, struct msgb *msg) diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index ee06936..d94c384 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -239,3 +239,98 @@ msg_name, msg_is_err ? "Err" : "Res"); return -EINVAL; } + +int gsm411_gsup_mt_fwd_sm_res(struct gsm_trans *trans, uint8_t sm_rp_mr) +{ + struct osmo_gsup_message gsup_msg; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); + + LOGP(DLSMS, LOGL_DEBUG, "TX MT-forwardSM-Res\n"); + + /* Initialize a new GSUP message */ + gsup_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT, + trans->vsub->imsi, &sm_rp_mr); + + return gsup_msg_send(trans->net, &gsup_msg); +} + +int gsm411_gsup_mt_fwd_sm_err(struct gsm_trans *trans, + uint8_t sm_rp_mr, uint8_t cause) +{ + struct osmo_gsup_message gsup_msg; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub); + + LOGP(DLSMS, LOGL_DEBUG, "TX MT-forwardSM-Err\n"); + + /* Initialize a new GSUP message */ + gsup_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, + trans->vsub->imsi, &sm_rp_mr); + + /* SM-RP-Cause value */ + gsup_msg.sm_rp_cause = &cause; + + /* TODO: include optional SM-RP-UI field if present */ + return gsup_msg_send(trans->net, &gsup_msg); +} + +/* Handles MT SMS (and triggers Paging Request if required) */ +int gsm411_gsup_mt_handler(struct vlr_subscr *vsub, + struct osmo_gsup_message *gsup_msg) +{ + struct vlr_instance *vlr; + struct gsm_network *net; + int rc; + + /* Obtain required pointers */ + vlr = vsub->vlr; + net = (struct gsm_network *) vlr->user_ctx; + + /* Associate logging messages with this subscriber */ + log_set_context(LOG_CTX_VLR_SUBSCR, vsub); + + LOGP(DLSMS, LOGL_DEBUG, "RX MT-forwardSM-Req\n"); + + /* Make sure that 'SMS over GSUP' is expected */ + if (!net->enable_sms_over_gsup) { + LOGP(DLSMS, LOGL_NOTICE, "Unexpected MT SMS over GSUP, " + "ignoring message...\n"); + /* TODO: notify sender about that? */ + return -EIO; + } + + /* Verify GSUP message */ + if (!gsup_msg->sm_rp_mr) + goto msg_error; + if (!gsup_msg->sm_rp_da_type) + goto msg_error; + if (!gsup_msg->sm_rp_oa_type) + goto msg_error; + if (!gsup_msg->sm_rp_ui) + goto msg_error; + + /** + * FIXME: SM-RP-MR is not known yet + * TODO: SM-RP-DA is out of our interest + * TODO: SM-RP-OA should contain the SMSC address + */ + rc = gsm411_send_rp_data(net, vsub, + gsup_msg->sm_rp_oa_len, gsup_msg->sm_rp_oa, + gsup_msg->sm_rp_ui_len, gsup_msg->sm_rp_ui); + if (rc) { + LOGP(DLSMS, LOGL_NOTICE, "Failed to send MT SMS, " + "ignoring MT-forwardSM-Req message...\n"); + /* TODO: notify sender about that? */ + return rc; + } + + return 0; + +msg_error: + /* TODO: notify sender about that? */ + LOGP(DLSMS, LOGL_NOTICE, "RX malformed MT-forwardSM-Req\n"); + return -EINVAL; +} -- To view, visit https://gerrit.osmocom.org/11920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I57357982ca0e51f6722c24a4aa1d0fb3e6caef88 Gerrit-Change-Number: 11920 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 18:27:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 25 Nov 2018 18:27:19 +0000 Subject: Change in openbsc[master]: Remove ipaccess utils Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11921 Change subject: Remove ipaccess utils ...................................................................... Remove ipaccess utils There's increasing gap in functionality between ipaccess utils from this repo and from osmo-bsc due to ongoing development in new repository. To avoid potential user confusion let's drop them similar to the way SGSN was removed earlier. Change-Id: I9c04f9b469e60802461a2a6e421d3ba27e6dafa1 --- M debian/control D debian/osmocom-ipaccess-utils.install M debian/rules M openbsc/README M openbsc/configure.ac M openbsc/src/Makefile.am D openbsc/src/ipaccess/Makefile.am D openbsc/src/ipaccess/abisip-find.c D openbsc/src/ipaccess/ipaccess-config.c D openbsc/src/ipaccess/ipaccess-firmware.c D openbsc/src/ipaccess/ipaccess-proxy.c D openbsc/src/ipaccess/network_listen.c 12 files changed, 0 insertions(+), 2,935 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/21/11921/1 diff --git a/debian/control b/debian/control index 0e9bb0c..a841acf 100644 --- a/debian/control +++ b/debian/control @@ -42,15 +42,6 @@ components bundled together. When using osmocom-nitb, there is no need for a Mobile Switching Center (MSC) which is needed when using osmocom-bsc-sccplite. -Package: osmocom-ipaccess-utils -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Command line utilities for ip.access nanoBTS - This package contains utilities that are specific for nanoBTS when being used - together with OpenBSC. It contains mainly three tools: ipaccess-find, - ipaccess-config and ipaccess-proxy. - Package: osmocom-bs11-utils Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/osmocom-ipaccess-utils.install b/debian/osmocom-ipaccess-utils.install deleted file mode 100644 index de13c18..0000000 --- a/debian/osmocom-ipaccess-utils.install +++ /dev/null @@ -1,3 +0,0 @@ -/usr/bin/ipaccess-config -/usr/bin/abisip-find -/usr/bin/ipaccess-proxy diff --git a/debian/rules b/debian/rules index dc609f9..0ea9b23 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,6 @@ override_dh_strip: dh_strip -posmocom-bsc-sccplite --dbg-package=osmocom-bsc-sccplite-dbg dh_strip -posmocom-nitb --dbg-package=osmocom-nitb-dbg - dh_strip -posmocom-ipaccess-utils --dbg-package=osmocom-ipaccess-utils-dbg dh_strip -posmocom-bs11-utils --dbg-package=osmocom-bs11-utils-dbg dh_strip -posmocom-bsc-nat --dbg-package=osmocom-bsc-nat-dbg diff --git a/openbsc/README b/openbsc/README index d01b2cf..bffdd81 100644 --- a/openbsc/README +++ b/openbsc/README @@ -14,7 +14,6 @@ * Osmo-GbProxy - a Proxy to aggregate many Gb links as one Gb link to the SGSN * OsmoBSCNAT - a gateway aggregating many A links as one A link to the MSC * OsmoGTPHUB - a hub aggregating many GTP links (between SGSN and GGSN) - * ipaccess-utils - some tools to discover + configure ip.access nanoBTS * bs11_config - a tool to configure the Siemens BS-11 microBTS Various interfaces towards the BTS are supported, among which are: diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 75dd5d3..64285e0 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -259,7 +259,6 @@ src/osmo-bsc/Makefile src/osmo-bsc_nat/Makefile src/osmo-bsc_mgcp/Makefile - src/ipaccess/Makefile src/utils/Makefile tests/Makefile tests/atlocal diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am index e579ea0..86d6f8f 100644 --- a/openbsc/src/Makefile.am +++ b/openbsc/src/Makefile.am @@ -42,7 +42,6 @@ osmo-nitb \ osmo-bsc_mgcp \ utils \ - ipaccess \ $(NULL) # Conditional Programs diff --git a/openbsc/src/ipaccess/Makefile.am b/openbsc/src/ipaccess/Makefile.am deleted file mode 100644 index 4dfe247..0000000 --- a/openbsc/src/ipaccess/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - -I$(top_builddir) \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -OSMO_LIBS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(NULL) - -bin_PROGRAMS = \ - abisip-find \ - ipaccess-config \ - ipaccess-proxy \ - $(NULL) - -abisip_find_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(OSMO_LIBS) \ - $(NULL) - -abisip_find_SOURCES = \ - abisip-find.c \ - $(NULL) - -ipaccess_config_SOURCES = \ - ipaccess-config.c \ - ipaccess-firmware.c \ - network_listen.c \ - $(NULL) - -# FIXME: resolve the bogus dependencies patched around here: -ipaccess_config_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(OSMO_LIBS) \ - $(NULL) - -ipaccess_proxy_SOURCES = \ - ipaccess-proxy.c \ - $(NULL) - -ipaccess_proxy_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(OSMO_LIBS) \ - $(NULL) diff --git a/openbsc/src/ipaccess/abisip-find.c b/openbsc/src/ipaccess/abisip-find.c deleted file mode 100644 index 21d9f22..0000000 --- a/openbsc/src/ipaccess/abisip-find.c +++ /dev/null @@ -1,216 +0,0 @@ -/* ip.access nanoBTS configuration tool */ - -/* (C) 2009-2010 by Harald Welte - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include - - -#include -#include -#include -#include -#include - -static int udp_sock(const char *ifname) -{ - int fd, rc, bc = 1; - struct sockaddr_in sa; - - fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (fd < 0) - return fd; - - if (ifname) { -#ifdef __FreeBSD__ - rc = setsockopt(fd, SOL_SOCKET, IP_RECVIF, ifname, - strlen(ifname)); -#else - rc = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifname, - strlen(ifname)); -#endif - if (rc < 0) - goto err; - } - - memset(&sa, 0, sizeof(sa)); - sa.sin_family = AF_INET; - sa.sin_port = htons(3006); - sa.sin_addr.s_addr = INADDR_ANY; - - rc = bind(fd, (struct sockaddr *)&sa, sizeof(sa)); - if (rc < 0) - goto err; - - rc = setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &bc, sizeof(bc)); - if (rc < 0) - goto err; - -#if 0 - /* we cannot bind, since the response packets don't come from - * the broadcast address */ - sa.sin_family = AF_INET; - sa.sin_port = htons(3006); - inet_aton("255.255.255.255", &sa.sin_addr); - - rc = connect(fd, (struct sockaddr *)&sa, sizeof(sa)); - if (rc < 0) - goto err; -#endif - return fd; - -err: - close(fd); - return rc; -} - -const unsigned char find_pkt[] = { 0x00, 0x0b+8, IPAC_PROTO_IPACCESS, 0x00, - IPAC_MSGT_ID_GET, - 0x01, IPAC_IDTAG_MACADDR, - 0x01, IPAC_IDTAG_IPADDR, - 0x01, IPAC_IDTAG_UNIT, - 0x01, IPAC_IDTAG_LOCATION1, - 0x01, IPAC_IDTAG_LOCATION2, - 0x01, IPAC_IDTAG_EQUIPVERS, - 0x01, IPAC_IDTAG_SWVERSION, - 0x01, IPAC_IDTAG_UNITNAME, - 0x01, IPAC_IDTAG_SERNR, - }; - - -static int bcast_find(int fd) -{ - struct sockaddr_in sa; - - sa.sin_family = AF_INET; - sa.sin_port = htons(3006); - inet_aton("255.255.255.255", &sa.sin_addr); - - return sendto(fd, find_pkt, sizeof(find_pkt), 0, (struct sockaddr *) &sa, sizeof(sa)); -} - -static int parse_response(unsigned char *buf, int len) -{ - uint8_t t_len; - uint8_t t_tag; - uint8_t *cur = buf; - - while (cur < buf + len) { - t_len = *cur++; - t_tag = *cur++; - - printf("%s='%s' ", ipa_ccm_idtag_name(t_tag), cur); - - cur += t_len; - } - printf("\n"); - return 0; -} - -static int read_response(int fd) -{ - unsigned char buf[255]; - struct sockaddr_in sa; - int len; - socklen_t sa_len = sizeof(sa); - - len = recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *)&sa, &sa_len); - if (len < 0) - return len; - - /* 2 bytes length, 1 byte protocol */ - if (buf[2] != IPAC_PROTO_IPACCESS) - return 0; - - if (buf[4] != IPAC_MSGT_ID_RESP) - return 0; - - return parse_response(buf+6, len-6); -} - -static int bfd_cb(struct osmo_fd *bfd, unsigned int flags) -{ - if (flags & BSC_FD_READ) - return read_response(bfd->fd); - if (flags & BSC_FD_WRITE) { - bfd->when &= ~BSC_FD_WRITE; - return bcast_find(bfd->fd); - } - return 0; -} - -static struct osmo_timer_list timer; - -static void timer_cb(void *_data) -{ - struct osmo_fd *bfd = _data; - - bfd->when |= BSC_FD_WRITE; - - osmo_timer_schedule(&timer, 5, 0); -} - -int main(int argc, char **argv) -{ - struct osmo_fd bfd; - char *ifname = NULL; - int rc; - - printf("abisip-find (C) 2009 by Harald Welte\n"); - printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); - - if (argc < 2) { - fprintf(stdout, "you might need to specify the outgoing\n" - " network interface, e.g. ``%s eth0''\n", argv[0]); - } else { - ifname = argv[1]; - } - - bfd.cb = bfd_cb; - bfd.when = BSC_FD_READ | BSC_FD_WRITE; - bfd.fd = udp_sock(ifname); - if (bfd.fd < 0) { - perror("Cannot create local socket for broadcast udp"); - exit(1); - } - - rc = osmo_fd_register(&bfd); - if (rc < 0) { - fprintf(stderr, "Cannot register FD\n"); - exit(1); - } - - osmo_timer_setup(&timer, timer_cb, &bfd); - osmo_timer_schedule(&timer, 5, 0); - - printf("Trying to find ip.access BTS by broadcast UDP...\n"); - - while (1) { - rc = osmo_select_main(0); - if (rc < 0) - exit(3); - } - - exit(0); -} - diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c deleted file mode 100644 index 6822c06..0000000 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ /dev/null @@ -1,1019 +0,0 @@ -/* ip.access nanoBTS configuration tool */ - -/* (C) 2009-2010 by Harald Welte - * (C) 2009-2011 by Holger Hans Peter Freyther - * (C) 2009-2010 by On-Waves - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct gsm_network *bsc_gsmnet; - -static int net_listen_testnr; -static int restart; -static char *prim_oml_ip; -static char *bts_ip_addr, *bts_ip_mask, *bts_ip_gw; -static char *unit_id; -static uint16_t nv_flags; -static uint16_t nv_mask; -static char *software = NULL; -static int sw_load_state = 0; -static int oml_state = 0; -static int dump_files = 0; -static char *firmware_analysis = NULL; -static int found_trx = 0; -static int loop_tests = 0; - -static void *tall_ctx_config = NULL; -static struct abis_nm_sw_desc *sw_load1 = NULL; -static struct abis_nm_sw_desc *sw_load2 = NULL; - -/* -static uint8_t prim_oml_attr[] = { 0x95, 0x00, 7, 0x88, 192, 168, 100, 11, 0x00, 0x00 }; -static uint8_t unit_id_attr[] = { 0x91, 0x00, 9, '2', '3', '4', '2', '/' , '0', '/', '0', 0x00 }; -*/ - -extern int ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what); -extern struct e1inp_line_ops ipaccess_e1inp_line_ops; - -/* Actively connect to a BTS. Currently used by ipaccess-config.c */ -static int ipaccess_connect(struct e1inp_line *line, struct sockaddr_in *sa) -{ - struct e1inp_ts *e1i_ts = &line->ts[0]; - struct osmo_fd *bfd = &e1i_ts->driver.ipaccess.fd; - int ret, on = 1; - - bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; - bfd->data = line; - bfd->priv_nr = E1INP_SIGN_OML; - - if (bfd->fd < 0) { - LOGP(DLINP, LOGL_ERROR, "could not create TCP socket.\n"); - return -EIO; - } - - ret = setsockopt(bfd->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "could not set socket option\n"); - close(bfd->fd); - return -EIO; - } - - ret = connect(bfd->fd, (struct sockaddr *) sa, sizeof(*sa)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "could not connect socket\n"); - close(bfd->fd); - return ret; - } - - ret = osmo_fd_register(bfd); - if (ret < 0) { - close(bfd->fd); - return ret; - } - return ret; - //return e1inp_line_register(line); -} - -/* configure pseudo E1 line in ip.access style and connect to BTS */ -static int ia_config_connect(struct gsm_bts *bts, struct sockaddr_in *sin) -{ - struct e1inp_line *line; - struct e1inp_ts *sign_ts, *rsl_ts; - struct e1inp_sign_link *oml_link, *rsl_link; - - line = talloc_zero(tall_bsc_ctx, struct e1inp_line); - if (!line) - return -ENOMEM; - - line->driver = e1inp_driver_find("ipa"); - if (!line->driver) { - fprintf(stderr, "cannot `ipa' driver, giving up.\n"); - return -EINVAL; - } - line->ops = &ipaccess_e1inp_line_ops; - - /* create E1 timeslots for signalling and TRAU frames */ - e1inp_ts_config_sign(&line->ts[1-1], line); - e1inp_ts_config_sign(&line->ts[2-1], line); - - /* create signalling links for TS1 */ - sign_ts = &line->ts[1-1]; - rsl_ts = &line->ts[2-1]; - oml_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OML, - bts->c0, 0xff, 0); - rsl_link = e1inp_sign_link_create(rsl_ts, E1INP_SIGN_RSL, - bts->c0, 0, 0); - - /* create back-links from bts/trx */ - bts->oml_link = oml_link; - bts->c0->rsl_link = rsl_link; - - /* default port at BTS for incoming connections is 3006 */ - if (sin->sin_port == 0) - sin->sin_port = htons(3006); - - return ipaccess_connect(line, sin); -} - -/* - * Callback function for NACK on the OML NM - * - * Currently we send the config requests but don't check the - * result. The nanoBTS will send us a NACK when we did something the - * BTS didn't like. - */ -static int ipacc_msg_nack(uint8_t mt) -{ - fprintf(stderr, "Failure to set attribute. This seems fatal\n"); - exit(-1); - return 0; -} - -static void check_restart_or_exit(struct gsm_bts_trx *trx) -{ - if (restart) { - abis_nm_ipaccess_restart(trx); - } else { - exit(0); - } -} - -static int ipacc_msg_ack(uint8_t mt, struct gsm_bts_trx *trx) -{ - if (sw_load_state == 1) { - fprintf(stderr, "The new software is activaed.\n"); - check_restart_or_exit(trx); - } else if (oml_state == 1) { - fprintf(stderr, "Set the NV Attributes.\n"); - check_restart_or_exit(trx); - } - - return 0; -} - -static const uint8_t phys_conf_min[] = { 0x02 }; - -static uint16_t build_physconf(uint8_t *physconf_buf, const struct rxlev_stats *st) -{ - uint16_t *whitelist = (uint16_t *) (physconf_buf + 4); - int num_arfcn; - unsigned int arfcnlist_size; - - /* Create whitelist from rxlevels */ - physconf_buf[0] = phys_conf_min[0]; - physconf_buf[1] = NM_IPAC_EIE_ARFCN_WHITE; - num_arfcn = ipac_rxlevstat2whitelist(whitelist, st, 0, 100); - arfcnlist_size = num_arfcn * 2; - *((uint16_t *) (physconf_buf+2)) = htons(arfcnlist_size); - DEBUGP(DNM, "physconf_buf (%s)\n", osmo_hexdump(physconf_buf, arfcnlist_size+4)); - return arfcnlist_size+4; -} - -static int nwl_sig_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) -{ - struct gsm_bts_trx *trx; - uint8_t physconf_buf[2*NUM_ARFCNS+16]; - uint16_t physconf_len; - - switch (signal) { - case S_IPAC_NWL_COMPLETE: - trx = signal_data; - DEBUGP(DNM, "received S_IPAC_NWL_COMPLETE signal\n"); - switch (trx->ipaccess.test_nr) { - case NM_IPACC_TESTNO_CHAN_USAGE: - /* Dump RxLev results */ - //rxlev_stat_dump(&trx->ipaccess.rxlev_stat); - /* Create whitelist from results */ - physconf_len = build_physconf(physconf_buf, - &trx->ipaccess.rxlev_stat); - /* Start next test abbout BCCH channel usage */ - ipac_nwl_test_start(trx, NM_IPACC_TESTNO_BCCH_CHAN_USAGE, - physconf_buf, physconf_len); - break; - case NM_IPACC_TESTNO_BCCH_CHAN_USAGE: - /* Dump BCCH RxLev results */ - //rxlev_stat_dump(&trx->ipaccess.rxlev_stat); - /* Create whitelist from results */ - physconf_len = build_physconf(physconf_buf, - &trx->ipaccess.rxlev_stat); - /* Start next test about BCCH info */ - ipac_nwl_test_start(trx, NM_IPACC_TESTNO_BCCH_INFO, - physconf_buf, physconf_len); - break; - case NM_IPACC_TESTNO_BCCH_INFO: - /* re-start full process with CHAN_USAGE */ - if (loop_tests) { - DEBUGP(DNM, "starting next test cycle\n"); - ipac_nwl_test_start(trx, net_listen_testnr, phys_conf_min, - sizeof(phys_conf_min)); - } else { - exit(0); - } - break; - } - break; - } - return 0; -} - -static int nm_state_event(int evt, uint8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, - struct abis_om_obj_inst *obj_inst); - -static int nm_sig_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) -{ - struct ipacc_ack_signal_data *ipacc_data; - struct nm_statechg_signal_data *nsd; - - switch (signal) { - case S_NM_IPACC_NACK: - ipacc_data = signal_data; - return ipacc_msg_nack(ipacc_data->msg_type); - case S_NM_IPACC_ACK: - ipacc_data = signal_data; - return ipacc_msg_ack(ipacc_data->msg_type, ipacc_data->trx); - case S_NM_IPACC_RESTART_ACK: - printf("The BTS has acked the restart. Exiting.\n"); - exit(0); - break; - case S_NM_IPACC_RESTART_NACK: - printf("The BTS has nacked the restart. Exiting.\n"); - exit(0); - break; - case S_NM_STATECHG_OPER: - case S_NM_STATECHG_ADM: - nsd = signal_data; - nm_state_event(signal, nsd->obj_class, nsd->obj, nsd->old_state, - nsd->new_state, nsd->obj_inst); - break; - default: - break; - } - - return 0; -} - -/* callback function passed to the ABIS OML code */ -static int percent; -static int percent_old; -static int swload_cbfn(unsigned int hook, unsigned int event, struct msgb *_msg, - void *data, void *param) -{ - struct msgb *msg; - struct gsm_bts_trx *trx; - - if (hook != GSM_HOOK_NM_SWLOAD) - return 0; - - trx = (struct gsm_bts_trx *) data; - - switch (event) { - case NM_MT_LOAD_INIT_ACK: - fprintf(stdout, "Software Load Initiate ACK\n"); - break; - case NM_MT_LOAD_INIT_NACK: - fprintf(stderr, "ERROR: Software Load Initiate NACK\n"); - exit(5); - break; - case NM_MT_LOAD_END_ACK: - fprintf(stderr, "LOAD END ACK..."); - /* now make it the default */ - sw_load_state = 1; - - msg = msgb_alloc(1024, "sw: nvattr"); - msg->l2h = msgb_put(msg, 3); - msg->l3h = &msg->l2h[3]; - - /* activate software */ - if (sw_load1) - abis_nm_put_sw_desc(msg, sw_load1, true); - - if (sw_load2) - abis_nm_put_sw_desc(msg, sw_load2, true); - - /* fill in the data */ - msg->l2h[0] = NM_ATT_IPACC_CUR_SW_CFG; - msg->l2h[1] = msgb_l3len(msg) >> 8; - msg->l2h[2] = msgb_l3len(msg) & 0xff; - printf("Foo l2h: %p l3h: %p... length l2: %u l3: %u\n", msg->l2h, msg->l3h, msgb_l2len(msg), msgb_l3len(msg)); - abis_nm_ipaccess_set_nvattr(trx, msg->l2h, msgb_l2len(msg)); - msgb_free(msg); - break; - case NM_MT_LOAD_END_NACK: - fprintf(stderr, "ERROR: Software Load End NACK\n"); - exit(3); - break; - case NM_MT_ACTIVATE_SW_NACK: - fprintf(stderr, "ERROR: Activate Software NACK\n"); - exit(4); - break; - case NM_MT_ACTIVATE_SW_ACK: - break; - case NM_MT_LOAD_SEG_ACK: - percent = abis_nm_software_load_status(trx->bts); - if (percent > percent_old) - printf("Software Download Progress: %d%%\n", percent); - percent_old = percent; - break; - case NM_MT_LOAD_ABORT: - fprintf(stderr, "ERROR: Load aborted by the BTS.\n"); - exit(6); - break; - } - return 0; -} - -static void nv_put_ip_if_cfg(struct msgb *nmsg, uint32_t ip, uint32_t mask) -{ - msgb_put_u8(nmsg, NM_ATT_IPACC_IP_IF_CFG); - - msgb_put_u32(nmsg, ip); - msgb_put_u32(nmsg, mask); -} - -static void nv_put_gw_cfg(struct msgb *nmsg, uint32_t addr, uint32_t mask, uint32_t gw) -{ - msgb_put_u8(nmsg, NM_ATT_IPACC_IP_GW_CFG); - msgb_put_u32(nmsg, addr); - msgb_put_u32(nmsg, mask); - msgb_put_u32(nmsg, gw); -} - -static void nv_put_unit_id(struct msgb *nmsg, const char *unit_id) -{ - msgb_tl16v_put(nmsg, NM_ATT_IPACC_UNIT_ID, strlen(unit_id)+1, - (const uint8_t *)unit_id); -} - -static void nv_put_prim_oml(struct msgb *nmsg, uint32_t ip, uint16_t port) -{ - int len; - - /* 0x88 + IP + port */ - len = 1 + sizeof(ip) + sizeof(port); - - msgb_put_u8(nmsg, NM_ATT_IPACC_PRIM_OML_CFG_LIST); - msgb_put_u16(nmsg, len); - - msgb_put_u8(nmsg, 0x88); - - /* IP address */ - msgb_put_u32(nmsg, ip); - - /* port number */ - msgb_put_u16(nmsg, port); -} - -static void nv_put_flags(struct msgb *nmsg, uint16_t nv_flags, uint16_t nv_mask) -{ - msgb_put_u8(nmsg, NM_ATT_IPACC_NV_FLAGS); - msgb_put_u16(nmsg, sizeof(nv_flags) + sizeof(nv_mask)); - msgb_put_u8(nmsg, nv_flags & 0xff); - msgb_put_u8(nmsg, nv_mask & 0xff); - msgb_put_u8(nmsg, nv_flags >> 8); - msgb_put_u8(nmsg, nv_mask >> 8); -} - -/* human-readable test names for the ip.access tests */ -static const struct value_string ipa_test_strs[] = { - { 64, "ccch-usage" }, - { 65, "bcch-usage" }, - { 66, "freq-sync" }, - { 67, "rtp-usage" }, - { 68, "rtp-perf" }, - { 69, "gprs-ccch" }, - { 70, "pccch-usage" }, - { 71, "gprs-usage" }, - { 72, "esta-mf" }, - { 73, "uplink-mf" }, - { 74, "dolink-mf" }, - { 75, "tbf-details" }, - { 76, "tbf-usage" }, - { 77, "llc-data" }, - { 78, "pdch-usage" }, - { 79, "power-control" }, - { 80, "link-adaption" }, - { 81, "tch-usage" }, - { 82, "amr-mf" }, - { 83, "rtp-multiplex-perf" }, - { 84, "rtp-multiplex-usage" }, - { 85, "srtp-multiplex-usage" }, - { 86, "abis-traffic" }, - { 89, "gprs-multiplex-perf" }, - { 90, "gprs-multiplex-usage" }, - { 0, NULL }, -}; - -/* human-readable names for the ip.access nanoBTS NVRAM Flags */ -static const struct value_string ipa_nvflag_strs[] = { - { 0x0001, "static-ip" }, - { 0x0002, "static-gw" }, - { 0x0004, "no-dhcp-vsi" }, - { 0x0008, "dhcp-enabled" }, - { 0x0040, "led-disabled" }, - { 0x0100, "secondary-oml-enabled" }, - { 0x0200, "diag-enabled" }, - { 0x0400, "cli-enabled" }, - { 0x0800, "http-enabled" }, - { 0x1000, "post-enabled" }, - { 0x2000, "snmp-enabled" }, - { 0, NULL } -}; - -/* set the flags in flags/mask according to a string-identified flag and 'enable' */ -static int ipa_nvflag_set(uint16_t *flags, uint16_t *mask, const char *name, int en) -{ - int rc; - rc = get_string_value(ipa_nvflag_strs, name); - if (rc < 0) - return rc; - - *mask |= rc; - if (en) - *flags |= rc; - else - *flags &= ~rc; - - return 0; -} - -static void bootstrap_om(struct gsm_bts_trx *trx) -{ - struct msgb *nmsg = msgb_alloc(1024, "nested msgb"); - int need_to_set_attr = 0; - int len; - - printf("OML link established using TRX %d\n", trx->nr); - - if (unit_id) { - len = strlen(unit_id); - if (len > nmsg->data_len-10) - goto out_err; - printf("setting Unit ID to '%s'\n", unit_id); - nv_put_unit_id(nmsg, unit_id); - need_to_set_attr = 1; - } - if (prim_oml_ip) { - struct in_addr ia; - - if (!inet_aton(prim_oml_ip, &ia)) { - fprintf(stderr, "invalid IP address: %s\n", - prim_oml_ip); - goto out_err; - } - - printf("setting primary OML link IP to '%s'\n", inet_ntoa(ia)); - nv_put_prim_oml(nmsg, ntohl(ia.s_addr), 0); - need_to_set_attr = 1; - } - if (nv_mask) { - printf("setting NV Flags/Mask to 0x%04x/0x%04x\n", - nv_flags, nv_mask); - nv_put_flags(nmsg, nv_flags, nv_mask); - need_to_set_attr = 1; - } - if (bts_ip_addr && bts_ip_mask) { - struct in_addr ia_addr, ia_mask; - - if (!inet_aton(bts_ip_addr, &ia_addr)) { - fprintf(stderr, "invalid IP address: %s\n", - bts_ip_addr); - goto out_err; - } - - if (!inet_aton(bts_ip_mask, &ia_mask)) { - fprintf(stderr, "invalid IP address: %s\n", - bts_ip_mask); - goto out_err; - } - - printf("setting static IP Address/Mask\n"); - nv_put_ip_if_cfg(nmsg, ntohl(ia_addr.s_addr), ntohl(ia_mask.s_addr)); - need_to_set_attr = 1; - } - if (bts_ip_gw) { - struct in_addr ia_gw; - - if (!inet_aton(bts_ip_gw, &ia_gw)) { - fprintf(stderr, "invalid IP address: %s\n", - bts_ip_gw); - goto out_err; - } - - printf("setting static IP Gateway\n"); - /* we only set the default gateway with zero addr/mask */ - nv_put_gw_cfg(nmsg, 0, 0, ntohl(ia_gw.s_addr)); - need_to_set_attr = 1; - } - - if (need_to_set_attr) { - abis_nm_ipaccess_set_nvattr(trx, nmsg->head, nmsg->len); - oml_state = 1; - } - - if (restart && !prim_oml_ip && !software) { - printf("restarting BTS\n"); - abis_nm_ipaccess_restart(trx); - } - -out_err: - msgb_free(nmsg); -} - -static int nm_state_event(int evt, uint8_t obj_class, void *obj, - struct gsm_nm_state *old_state, struct gsm_nm_state *new_state, - struct abis_om_obj_inst *obj_inst) -{ - if (obj_class == NM_OC_BASEB_TRANSC) { - if (!found_trx && obj_inst->trx_nr != 0xff) { - struct gsm_bts_trx *trx = container_of(obj, struct gsm_bts_trx, bb_transc); - bootstrap_om(trx); - found_trx = 1; - } - } else if (evt == S_NM_STATECHG_OPER && - obj_class == NM_OC_RADIO_CARRIER && - new_state->availability == 3) { - struct gsm_bts_trx *trx = obj; - - if (net_listen_testnr) - ipac_nwl_test_start(trx, net_listen_testnr, - phys_conf_min, sizeof(phys_conf_min)); - else if (software) { - int rc; - printf("Attempting software upload with '%s'\n", software); - rc = abis_nm_software_load(trx->bts, trx->nr, software, 19, 0, swload_cbfn, trx); - if (rc < 0) { - fprintf(stderr, "Failed to start software load\n"); - exit(-3); - } - } - } - return 0; -} - -static struct abis_nm_sw_desc *create_swload(struct sdp_header *header) -{ - struct abis_nm_sw_desc *load; - - load = talloc_zero(tall_ctx_config, struct abis_nm_sw_desc); - - osmo_strlcpy((char *)load->file_id, header->firmware_info.sw_part, - sizeof(load->file_id)); - load->file_id_len = strlen((char*)load->file_id) + 1; - - osmo_strlcpy((char *)load->file_version, header->firmware_info.version, - sizeof(load->file_version)); - load->file_version_len = strlen((char*)load->file_version) + 1; - - return load; -} - -static int find_sw_load_params(const char *filename) -{ - struct stat stat; - struct sdp_header *header; - struct llist_head *entry; - int fd; - void *tall_firm_ctx = 0; - - entry = talloc_zero(tall_firm_ctx, struct llist_head); - INIT_LLIST_HEAD(entry); - - fd = open(filename, O_RDONLY); - if (!fd) { - perror("nada"); - return -1; - } - - /* verify the file */ - if (fstat(fd, &stat) == -1) { - perror("Can not stat the file"); - close(fd); - return -1; - } - - ipaccess_analyze_file(fd, stat.st_size, 0, entry); - if (close(fd) != 0) { - perror("Close failed.\n"); - return -1; - } - - /* try to find what we are looking for */ - llist_for_each_entry(header, entry, entry) { - if (ntohs(header->firmware_info.more_more_magic) == 0x1000) { - sw_load1 = create_swload(header); - } else if (ntohs(header->firmware_info.more_more_magic) == 0x2001) { - sw_load2 = create_swload(header); - } - } - - if (!sw_load1 || !sw_load2) { - fprintf(stderr, "Did not find data.\n"); - talloc_free(tall_firm_ctx); - return -1; - } - - talloc_free(tall_firm_ctx); - return 0; -} - -static void dump_entry(struct sdp_header_item *sub_entry, int part, int fd) -{ - int out_fd; - int copied; - char filename[4096]; - off_t target; - - if (!dump_files) - return; - - if (sub_entry->header_entry.something1 == 0) - return; - - snprintf(filename, sizeof(filename), "part.%d", part++); - out_fd = open(filename, O_WRONLY | O_CREAT, 0660); - if (out_fd < 0) { - perror("Can not dump firmware"); - return; - } - - target = sub_entry->absolute_offset + ntohl(sub_entry->header_entry.start) + 4; - if (lseek(fd, target, SEEK_SET) != target) { - perror("seek failed"); - close(out_fd); - return; - } - - for (copied = 0; copied < ntohl(sub_entry->header_entry.length); ++copied) { - char c; - if (read(fd, &c, sizeof(c)) != sizeof(c)) { - perror("copy failed"); - break; - } - - if (write(out_fd, &c, sizeof(c)) != sizeof(c)) { - perror("write failed"); - break; - } - } - - close(out_fd); -} - -static void analyze_firmware(const char *filename) -{ - struct stat stat; - struct sdp_header *header; - struct sdp_header_item *sub_entry; - struct llist_head *entry; - int fd; - void *tall_firm_ctx = 0; - int part = 0; - - entry = talloc_zero(tall_firm_ctx, struct llist_head); - INIT_LLIST_HEAD(entry); - - printf("Opening possible firmware '%s'\n", filename); - fd = open(filename, O_RDONLY); - if (!fd) { - perror("nada"); - return; - } - - /* verify the file */ - if (fstat(fd, &stat) == -1) { - perror("Can not stat the file"); - close(fd); - return; - } - - ipaccess_analyze_file(fd, stat.st_size, 0, entry); - - llist_for_each_entry(header, entry, entry) { - printf("Printing header information:\n"); - printf("more_more_magic: 0x%x\n", ntohs(header->firmware_info.more_more_magic)); - printf("header_length: %u\n", ntohl(header->firmware_info.header_length)); - printf("file_length: %u\n", ntohl(header->firmware_info.file_length)); - printf("sw_part: %.20s\n", header->firmware_info.sw_part); - printf("text1: %.64s\n", header->firmware_info.text1); - printf("time: %.12s\n", header->firmware_info.time); - printf("date: %.14s\n", header->firmware_info.date); - printf("text2: %.10s\n", header->firmware_info.text2); - printf("version: %.20s\n", header->firmware_info.version); - printf("subitems...\n"); - - llist_for_each_entry(sub_entry, &header->header_list, entry) { - printf("\tsomething1: %u\n", sub_entry->header_entry.something1); - printf("\ttext1: %.64s\n", sub_entry->header_entry.text1); - printf("\ttime: %.12s\n", sub_entry->header_entry.time); - printf("\tdate: %.14s\n", sub_entry->header_entry.date); - printf("\ttext2: %.10s\n", sub_entry->header_entry.text2); - printf("\tversion: %.20s\n", sub_entry->header_entry.version); - printf("\tlength: %u\n", ntohl(sub_entry->header_entry.length)); - printf("\taddr1: 0x%x\n", ntohl(sub_entry->header_entry.addr1)); - printf("\taddr2: 0x%x\n", ntohl(sub_entry->header_entry.addr2)); - printf("\tstart: 0x%x\n", ntohl(sub_entry->header_entry.start)); - printf("\tabs. offset: 0x%lx\n", sub_entry->absolute_offset); - printf("\n\n"); - - dump_entry(sub_entry, part++, fd); - } - printf("\n\n"); - } - - if (close(fd) != 0) { - perror("Close failed.\n"); - return; - } - - talloc_free(tall_firm_ctx); -} - -static void print_usage(void) -{ - printf("Usage: ipaccess-config IP_OF_BTS\n"); -} - -static void print_help(void) -{ -#if 0 - printf("Commands for reading from the BTS:\n"); - printf(" -D --dump\t\t\tDump the BTS configuration\n"); - printf("\n"); -#endif - printf("Commands for writing to the BTS:\n"); - printf(" -u --unit-id UNIT_ID\t\tSet the Unit ID of the BTS\n"); - printf(" -o --oml-ip IP\t\tSet primary OML IP (IP of your BSC)\n"); - printf(" -i --ip-address IP/MASK\tSet static IP address + netmask of BTS\n"); - printf(" -g --ip-gateway IP\t\tSet static IP gateway of BTS\n"); - printf(" -r --restart\t\t\tRestart the BTS (after other operations)\n"); - printf(" -n --nvram-flags FLAGS/MASK\tSet NVRAM attributes\n"); - printf(" -S --nvattr-set FLAG\tSet one additional NVRAM attribute\n"); - printf(" -U --nvattr-unset FLAG\tSet one additional NVRAM attribute\n"); - printf(" -l --listen TESTNR\t\tPerform specified test number\n"); - printf(" -L --Listen TEST_NAME\t\tPerform specified test\n"); - printf(" -s --stream-id ID\t\tSet the IPA Stream Identifier for OML\n"); - printf(" -d --software FIRMWARE\tDownload firmware into BTS\n"); - printf("\n"); - printf("Miscellaneous commands:\n"); - printf(" -h --help\t\t\tthis text\n"); - printf(" -H --HELP\t\t\tPrint parameter details.\n"); - printf(" -f --firmware FIRMWARE\tProvide firmware information\n"); - printf(" -w --write-firmware\t\tThis will dump the firmware parts to the filesystem. Use with -f.\n"); - printf(" -p --loop\t\t\tLoop the tests executed with the --listen command.\n"); -} - -static void print_value_string(const struct value_string *val, int size) -{ - int i; - - for (i = 0; i < size - 1; ++i) { - char sep = val[i + 1].str == NULL ? '.' : ','; - printf("%s%c ", val[i].str, sep); - } - printf("\n"); -} - -static void print_options(void) -{ - - printf("Options for NVRAM (-S,-U):\n "); - print_value_string(&ipa_nvflag_strs[0], ARRAY_SIZE(ipa_nvflag_strs)); - - printf("Options for Tests (-L):\n "); - print_value_string(&ipa_test_strs[0], ARRAY_SIZE(ipa_test_strs)); -} - -extern void bts_model_nanobts_init(); - -int main(int argc, char **argv) -{ - struct gsm_bts *bts; - struct sockaddr_in sin; - int rc, option_index = 0, stream_id = 0xff; - - tall_ctx_config = talloc_named_const(NULL, 0, "ipaccess-config"); - msgb_talloc_ctx_init(tall_ctx_config, 0); - - osmo_init_logging(&log_info); - log_parse_category_mask(osmo_stderr_target, "DNM,0"); - bts_model_nanobts_init(); - - printf("ipaccess-config (C) 2009-2010 by Harald Welte and others\n"); - printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); - - while (1) { - int c; - unsigned long ul; - char *slash; - static struct option long_options[] = { - { "unit-id", 1, 0, 'u' }, - { "oml-ip", 1, 0, 'o' }, - { "ip-address", 1, 0, 'i' }, - { "ip-gateway", 1, 0, 'g' }, - { "restart", 0, 0, 'r' }, - { "nvram-flags", 1, 0, 'n' }, - { "nvattr-set", 1, 0, 'S' }, - { "nvattr-unset", 1, 0, 'U' }, - { "help", 0, 0, 'h' }, - { "HELP", 0, 0, 'H' }, - { "listen", 1, 0, 'l' }, - { "Listen", 1, 0, 'L' }, - { "stream-id", 1, 0, 's' }, - { "software", 1, 0, 'd' }, - { "firmware", 1, 0, 'f' }, - { "write-firmware", 0, 0, 'w' }, - { "disable-color", 0, 0, 'c'}, - { "loop", 0, 0, 'p' }, - { 0, 0, 0, 0 }, - }; - - c = getopt_long(argc, argv, "u:o:i:g:rn:S:U:l:L:hs:d:f:wcpH", long_options, - &option_index); - - if (c == -1) - break; - - switch (c) { - case 'u': - unit_id = optarg; - break; - case 'o': - prim_oml_ip = optarg; - break; - case 'i': - slash = strchr(optarg, '/'); - if (!slash) - exit(2); - bts_ip_addr = optarg; - *slash = 0; - bts_ip_mask = slash+1; - break; - case 'g': - bts_ip_gw = optarg; - break; - case 'r': - restart = 1; - break; - case 'n': - slash = strchr(optarg, '/'); - if (!slash) - exit(2); - ul = strtoul(optarg, NULL, 16); - nv_flags = ul & 0xffff; - ul = strtoul(slash+1, NULL, 16); - nv_mask = ul & 0xffff; - break; - case 'S': - if (ipa_nvflag_set(&nv_flags, &nv_mask, optarg, 1) < 0) - exit(2); - break; - case 'U': - if (ipa_nvflag_set(&nv_flags, &nv_mask, optarg, 0) < 0) - exit(2); - break; - case 'l': - net_listen_testnr = atoi(optarg); - break; - case 'L': - net_listen_testnr = get_string_value(ipa_test_strs, - optarg); - if (net_listen_testnr < 0) { - fprintf(stderr, - "The test '%s' is not known. Use -H to" - " see available tests.\n", optarg); - exit(2); - } - break; - case 's': - stream_id = atoi(optarg); - break; - case 'd': - software = strdup(optarg); - if (find_sw_load_params(optarg) != 0) - exit(0); - break; - case 'f': - firmware_analysis = optarg; - break; - case 'w': - dump_files = 1; - break; - case 'c': - log_set_use_color(osmo_stderr_target, 0); - break; - case 'p': - loop_tests = 1; - break; - case 'h': - print_usage(); - print_help(); - exit(0); - case 'H': - print_options(); - exit(0); - } - }; - - if (firmware_analysis) - analyze_firmware(firmware_analysis); - - if (optind >= argc) { - /* only warn if we have not done anything else */ - if (!firmware_analysis) - fprintf(stderr, "you have to specify the IP address of the BTS. Use --help for more information\n"); - exit(2); - } - libosmo_abis_init(tall_ctx_config); - - bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1, NULL); - if (!bsc_gsmnet) - exit(1); - - bts = gsm_bts_alloc_register(bsc_gsmnet, GSM_BTS_TYPE_NANOBTS, - HARDCODED_BSIC); - /* ip.access supports up to 4 chained TRX */ - gsm_bts_trx_alloc(bts); - gsm_bts_trx_alloc(bts); - gsm_bts_trx_alloc(bts); - bts->oml_tei = stream_id; - - osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); - osmo_signal_register_handler(SS_IPAC_NWL, nwl_sig_cb, NULL); - - ipac_nwl_init(); - - printf("Trying to connect to ip.access BTS ...\n"); - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - inet_aton(argv[optind], &sin.sin_addr); - rc = ia_config_connect(bts, &sin); - if (rc < 0) { - perror("Error connecting to the BTS"); - exit(1); - } - - bts->oml_link->ts->sign.delay = 10; - bts->c0->rsl_link->ts->sign.delay = 10; - while (1) { - rc = osmo_select_main(0); - if (rc < 0) - exit(3); - } - - exit(0); -} - diff --git a/openbsc/src/ipaccess/ipaccess-firmware.c b/openbsc/src/ipaccess/ipaccess-firmware.c deleted file mode 100644 index 5f55bb5..0000000 --- a/openbsc/src/ipaccess/ipaccess-firmware.c +++ /dev/null @@ -1,135 +0,0 @@ -/* Routines for parsing an ipacces SDP firmware file */ - -/* (C) 2009 by Holger Hans Peter Freyther - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include - -#include -#include -#include -#include - -#define PART_LENGTH 138 - -osmo_static_assert(sizeof(struct sdp_header_entry) == 138, right_entry); -osmo_static_assert(sizeof(struct sdp_firmware) == 158, _right_header_length); - -/* more magic, the second "int" in the header */ -static char more_magic[] = { 0x10, 0x02 }; - -int ipaccess_analyze_file(int fd, const unsigned int st_size, const unsigned int base_offset, struct llist_head *list) -{ - struct sdp_firmware *firmware_header = 0; - struct sdp_header *header; - char buf[4096]; - int rc, i; - uint16_t table_size; - uint16_t table_offset; - off_t table_start; - - - rc = read(fd, buf, sizeof(*firmware_header)); - if (rc < 0) { - perror("Can not read header start."); - return -1; - } - - firmware_header = (struct sdp_firmware *) &buf[0]; - if (strncmp(firmware_header->magic, " SDP", 4) != 0) { - fprintf(stderr, "Wrong magic.\n"); - return -1; - } - - if (memcmp(firmware_header->more_magic, more_magic, 2) != 0) { - fprintf(stderr, "Wrong more magic. Got: 0x%x 0x%x vs. 0x%x 0x%x\n", - firmware_header->more_magic[0] & 0xff, firmware_header->more_magic[1] & 0xff, - more_magic[0], more_magic[1]); - return -1; - } - - - if (ntohl(firmware_header->file_length) != st_size) { - fprintf(stderr, "The filesize and the header do not match.\n"); - return -1; - } - - /* add the firmware */ - header = talloc_zero(list, struct sdp_header); - header->firmware_info = *firmware_header; - INIT_LLIST_HEAD(&header->header_list); - llist_add(&header->entry, list); - - table_offset = ntohs(firmware_header->table_offset); - table_start = lseek(fd, table_offset, SEEK_CUR); - if (table_start == -1) { - fprintf(stderr, "Failed to seek to the rel position: 0x%x\n", table_offset); - return -1; - } - - if (read(fd, &table_size, sizeof(table_size)) != sizeof(table_size)) { - fprintf(stderr, "The table size could not be read.\n"); - return -1; - } - - table_size = ntohs(table_size); - - if (table_size % PART_LENGTH != 0) { - fprintf(stderr, "The part length seems to be wrong: 0x%x\n", table_size); - return -1; - } - - /* look into each firmware now */ - for (i = 0; i < table_size / PART_LENGTH; ++i) { - struct sdp_header_entry entry; - struct sdp_header_item *header_entry; - unsigned int offset = table_start + 2; - offset += i * 138; - - if (lseek(fd, offset, SEEK_SET) != offset) { - fprintf(stderr, "Can not seek to the offset: %u.\n", offset); - return -1; - } - - rc = read(fd, &entry, sizeof(entry)); - if (rc != sizeof(entry)) { - fprintf(stderr, "Can not read the header entry.\n"); - return -1; - } - - header_entry = talloc_zero(header, struct sdp_header_item); - header_entry->header_entry = entry; - header_entry->absolute_offset = base_offset; - llist_add(&header_entry->entry, &header->header_list); - - /* now we need to find the SDP file... */ - offset = ntohl(entry.start) + 4 + base_offset; - if (lseek(fd, offset, SEEK_SET) != offset) { - perror("can't seek to sdp"); - return -1; - } - - - ipaccess_analyze_file(fd, ntohl(entry.length), offset, list); - } - - return 0; -} - diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c deleted file mode 100644 index d367442..0000000 --- a/openbsc/src/ipaccess/ipaccess-proxy.c +++ /dev/null @@ -1,1226 +0,0 @@ -/* OpenBSC Abis/IP proxy ip.access nanoBTS */ - -/* (C) 2009 by Harald Welte - * (C) 2010 by On-Waves - * (C) 2010 by Holger Hans Peter Freyther - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define _GNU_SOURCE -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* one instance of an ip.access protocol proxy */ -struct ipa_proxy { - /* socket where we listen for incoming OML from BTS */ - struct osmo_fd oml_listen_fd; - /* socket where we listen for incoming RSL from BTS */ - struct osmo_fd rsl_listen_fd; - /* list of BTS's (struct ipa_bts_conn */ - struct llist_head bts_list; - /* the BSC reconnect timer */ - struct osmo_timer_list reconn_timer; - /* global GPRS NS data */ - struct in_addr gprs_addr; - struct in_addr listen_addr; -}; - -/* global pointer to the proxy structure */ -static struct ipa_proxy *ipp; - -struct ipa_proxy_conn { - struct osmo_fd fd; - struct llist_head tx_queue; - struct ipa_bts_conn *bts_conn; -}; -#define MAX_TRX 4 - -/* represents a particular BTS in our proxy */ -struct ipa_bts_conn { - /* list of BTS's (ipa_proxy->bts_list) */ - struct llist_head list; - /* back pointer to the proxy which we belong to */ - struct ipa_proxy *ipp; - /* the unit ID as determined by CCM */ - struct { - uint16_t site_id; - uint16_t bts_id; - } unit_id; - - /* incoming connections from BTS */ - struct ipa_proxy_conn *oml_conn; - struct ipa_proxy_conn *rsl_conn[MAX_TRX]; - - /* outgoing connections to BSC */ - struct ipa_proxy_conn *bsc_oml_conn; - struct ipa_proxy_conn *bsc_rsl_conn[MAX_TRX]; - - /* UDP sockets for BTS and BSC injection */ - struct osmo_fd udp_bts_fd; - struct osmo_fd udp_bsc_fd; - - /* NS data */ - struct in_addr bts_addr; - struct osmo_fd gprs_ns_fd; - int gprs_local_port; - uint16_t gprs_orig_port; - uint32_t gprs_orig_ip; - - char *id_tags[256]; - uint8_t *id_resp; - unsigned int id_resp_len; -}; - -enum ipp_fd_type { - OML_FROM_BTS = 1, - RSL_FROM_BTS = 2, - OML_TO_BSC = 3, - RSL_TO_BSC = 4, - UDP_TO_BTS = 5, - UDP_TO_BSC = 6, -}; - -/* some of the code against we link from OpenBSC needs this */ -void *tall_bsc_ctx; - -static char *listen_ipaddr; -static char *bsc_ipaddr; -static char *gprs_ns_ipaddr; - -static int gprs_ns_cb(struct osmo_fd *bfd, unsigned int what); - -#define PROXY_ALLOC_SIZE 1200 - -static struct ipa_bts_conn *find_bts_by_unitid(struct ipa_proxy *ipp, - uint16_t site_id, - uint16_t bts_id) -{ - struct ipa_bts_conn *ipbc; - - llist_for_each_entry(ipbc, &ipp->bts_list, list) { - if (ipbc->unit_id.site_id == site_id && - ipbc->unit_id.bts_id == bts_id) - return ipbc; - } - - return NULL; -} - -struct ipa_proxy_conn *alloc_conn(void) -{ - struct ipa_proxy_conn *ipc; - - ipc = talloc_zero(tall_bsc_ctx, struct ipa_proxy_conn); - if (!ipc) - return NULL; - - INIT_LLIST_HEAD(&ipc->tx_queue); - - return ipc; -} - -static int store_idtags(struct ipa_bts_conn *ipbc, struct tlv_parsed *tlvp) -{ - unsigned int i, len; - - for (i = 0; i <= 0xff; i++) { - if (!TLVP_PRESENT(tlvp, i)) - continue; - - len = TLVP_LEN(tlvp, i); -#if 0 - if (!ipbc->id_tags[i]) - ipbc->id_tags[i] = talloc_size(tall_bsc_ctx, len); - else -#endif - ipbc->id_tags[i] = talloc_realloc_size(ipbc, - ipbc->id_tags[i], len); - if (!ipbc->id_tags[i]) - return -ENOMEM; - - memset(ipbc->id_tags[i], 0, len); - //memcpy(ipbc->id_tags[i], TLVP_VAL(tlvp, i), len); - } - return 0; -} - - -static struct ipa_proxy_conn *connect_bsc(struct sockaddr_in *sa, int priv_nr, void *data); - -#define logp_ipbc_uid(ss, lvl, ipbc, trx_id) _logp_ipbc_uid(ss, lvl, __FILE__, __LINE__, ipbc, trx_id) - -static void _logp_ipbc_uid(unsigned int ss, unsigned int lvl, char *file, int line, - struct ipa_bts_conn *ipbc, uint8_t trx_id) -{ - if (ipbc) - logp2(ss, lvl, file, line, 0, "(%u/%u/%u) ", ipbc->unit_id.site_id, - ipbc->unit_id.bts_id, trx_id); - else - logp2(ss, lvl, file, line, 0, "unknown "); -} - -static int handle_udp_read(struct osmo_fd *bfd) -{ - struct ipa_bts_conn *ipbc = bfd->data; - struct ipa_proxy_conn *other_conn = NULL; - struct msgb *msg = msgb_alloc(PROXY_ALLOC_SIZE, "Abis/IP UDP"); - struct ipaccess_head *hh; - int ret; - - /* with UDP sockets, we cannot read partial packets but have to read - * all of it in one go */ - hh = (struct ipaccess_head *) msg->data; - ret = recv(bfd->fd, msg->data, msg->data_len, 0); - if (ret < 0) { - if (errno != EAGAIN) - LOGP(DLINP, LOGL_ERROR, "recv error %s\n", strerror(errno)); - msgb_free(msg); - return ret; - } - if (ret == 0) { - DEBUGP(DLINP, "UDP peer disappeared, dead socket\n"); - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; - msgb_free(msg); - return -EIO; - } - if (ret < sizeof(*hh)) { - DEBUGP(DLINP, "could not even read header!?!\n"); - msgb_free(msg); - return -EIO; - } - msgb_put(msg, ret); - msg->l2h = msg->data + sizeof(*hh); - DEBUGP(DLMI, "UDP RX: %s\n", osmo_hexdump(msg->data, msg->len)); - - if (hh->len != msg->len - sizeof(*hh)) { - DEBUGP(DLINP, "length (%u/%u) disagrees with header(%u)\n", - msg->len, msg->len - 3, hh->len); - msgb_free(msg); - return -EIO; - } - - switch (bfd->priv_nr & 0xff) { - case UDP_TO_BTS: - /* injection towards BTS */ - switch (hh->proto) { - case IPAC_PROTO_RSL: - /* FIXME: what to do about TRX > 0 */ - other_conn = ipbc->rsl_conn[0]; - break; - default: - DEBUGP(DLINP, "Unknown protocol 0x%02x, sending to " - "OML FD\n", hh->proto); - /* fall through */ - case IPAC_PROTO_IPACCESS: - case IPAC_PROTO_OML: - other_conn = ipbc->oml_conn; - break; - } - break; - case UDP_TO_BSC: - /* injection towards BSC */ - switch (hh->proto) { - case IPAC_PROTO_RSL: - /* FIXME: what to do about TRX > 0 */ - other_conn = ipbc->bsc_rsl_conn[0]; - break; - default: - DEBUGP(DLINP, "Unknown protocol 0x%02x, sending to " - "OML FD\n", hh->proto); - /* fall through */ - case IPAC_PROTO_IPACCESS: - case IPAC_PROTO_OML: - other_conn = ipbc->bsc_oml_conn; - break; - } - break; - default: - DEBUGP(DLINP, "Unknown filedescriptor priv_nr=%04x\n", bfd->priv_nr); - break; - } - - if (other_conn) { - /* enqueue the message for TX on the respective FD */ - msgb_enqueue(&other_conn->tx_queue, msg); - other_conn->fd.when |= BSC_FD_WRITE; - } else - msgb_free(msg); - - return 0; -} - -static int handle_udp_write(struct osmo_fd *bfd) -{ - /* not implemented yet */ - bfd->when &= ~BSC_FD_WRITE; - - return -EIO; -} - -/* callback from select.c in case one of the fd's can be read/written */ -static int udp_fd_cb(struct osmo_fd *bfd, unsigned int what) -{ - int rc = 0; - - if (what & BSC_FD_READ) - rc = handle_udp_read(bfd); - if (what & BSC_FD_WRITE) - rc = handle_udp_write(bfd); - - return rc; -} - - -static int ipbc_alloc_connect(struct ipa_proxy_conn *ipc, struct osmo_fd *bfd, - uint16_t site_id, uint16_t bts_id, - uint16_t trx_id, struct tlv_parsed *tlvp, - struct msgb *msg) -{ - struct ipa_bts_conn *ipbc; - uint16_t udp_port; - int ret = 0; - struct sockaddr_in sin; - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - inet_aton(bsc_ipaddr, &sin.sin_addr); - - DEBUGP(DLINP, "(%u/%u/%u) New BTS connection: ", - site_id, bts_id, trx_id); - - /* OML needs to be established before RSL */ - if ((bfd->priv_nr & 0xff) != OML_FROM_BTS) { - DEBUGPC(DLINP, "Not a OML connection ?!?\n"); - return -EIO; - } - - /* allocate new BTS connection data structure */ - ipbc = talloc_zero(tall_bsc_ctx, struct ipa_bts_conn); - if (!ipbc) { - ret = -ENOMEM; - goto err_out; - } - - DEBUGPC(DLINP, "Created BTS Conn data structure\n"); - ipbc->ipp = ipp; - ipbc->unit_id.site_id = site_id; - ipbc->unit_id.bts_id = bts_id; - ipbc->oml_conn = ipc; - ipc->bts_conn = ipbc; - - /* store the content of the ID TAGS for later reference */ - store_idtags(ipbc, tlvp); - ipbc->id_resp_len = msg->len; - ipbc->id_resp = talloc_size(tall_bsc_ctx, ipbc->id_resp_len); - memcpy(ipbc->id_resp, msg->data, ipbc->id_resp_len); - - /* Create OML TCP connection towards BSC */ - sin.sin_port = htons(IPA_TCP_PORT_OML); - ipbc->bsc_oml_conn = connect_bsc(&sin, OML_TO_BSC, ipbc); - if (!ipbc->bsc_oml_conn) { - ret = -EIO; - goto err_bsc_conn; - } - - DEBUGP(DLINP, "(%u/%u/%u) OML Connected to BSC\n", - site_id, bts_id, trx_id); - - /* Create UDP socket for BTS packet injection */ - udp_port = 10000 + (site_id % 1000)*100 + (bts_id % 100); - ret = make_sock(&ipbc->udp_bts_fd, IPPROTO_UDP, INADDR_ANY, udp_port, - UDP_TO_BTS, udp_fd_cb, ipbc); - if (ret < 0) - goto err_udp_bts; - DEBUGP(DLINP, "(%u/%u/%u) Created UDP socket for injection " - "towards BTS at port %u\n", site_id, bts_id, trx_id, udp_port); - - /* Create UDP socket for BSC packet injection */ - udp_port = 20000 + (site_id % 1000)*100 + (bts_id % 100); - ret = make_sock(&ipbc->udp_bsc_fd, IPPROTO_UDP, INADDR_ANY, udp_port, - UDP_TO_BSC, udp_fd_cb, ipbc); - if (ret < 0) - goto err_udp_bsc; - DEBUGP(DLINP, "(%u/%u/%u) Created UDP socket for injection " - "towards BSC at port %u\n", site_id, bts_id, trx_id, udp_port); - - - /* GPRS NS related code */ - if (gprs_ns_ipaddr) { - struct sockaddr_in sock; - socklen_t len = sizeof(sock); - struct in_addr addr; - uint32_t ip; - - inet_aton(listen_ipaddr, &addr); - ip = ntohl(addr.s_addr); /* make_sock() needs host byte order */ - ret = make_sock(&ipbc->gprs_ns_fd, IPPROTO_UDP, ip, 0, 0, - gprs_ns_cb, ipbc); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Creating the GPRS socket failed.\n"); - goto err_udp_bsc; - } - - ret = getsockname(ipbc->gprs_ns_fd.fd, (struct sockaddr* ) &sock, &len); - ipbc->gprs_local_port = ntohs(sock.sin_port); - LOGP(DLINP, LOGL_NOTICE, - "Created GPRS NS Socket. Listening on: %s:%d\n", - inet_ntoa(sock.sin_addr), ipbc->gprs_local_port); - - ret = getpeername(bfd->fd, (struct sockaddr* ) &sock, &len); - ipbc->bts_addr = sock.sin_addr; - } - - llist_add(&ipbc->list, &ipp->bts_list); - - return 0; - -err_udp_bsc: - osmo_fd_unregister(&ipbc->udp_bts_fd); -err_udp_bts: - osmo_fd_unregister(&ipbc->bsc_oml_conn->fd); - close(ipbc->bsc_oml_conn->fd.fd); - talloc_free(ipbc->bsc_oml_conn); - ipbc->bsc_oml_conn = NULL; -err_bsc_conn: - talloc_free(ipbc->id_resp); - talloc_free(ipbc); -#if 0 - osmo_fd_unregister(bfd); - close(bfd->fd); - talloc_free(bfd); -#endif -err_out: - return ret; -} - -static int ipaccess_rcvmsg(struct ipa_proxy_conn *ipc, struct msgb *msg, - struct osmo_fd *bfd) -{ - struct tlv_parsed tlvp; - uint8_t msg_type = *(msg->l2h); - struct ipaccess_unit unit_data; - struct ipa_bts_conn *ipbc; - int ret = 0; - - switch (msg_type) { - case IPAC_MSGT_PING: - ret = ipa_ccm_send_pong(bfd->fd); - break; - case IPAC_MSGT_PONG: - DEBUGP(DLMI, "PONG!\n"); - break; - case IPAC_MSGT_ID_RESP: - DEBUGP(DLMI, "ID_RESP "); - /* parse tags, search for Unit ID */ - ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2, - msgb_l2len(msg)-2); - DEBUGP(DLMI, "\n"); - - if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { - LOGP(DLINP, LOGL_ERROR, "No Unit ID in ID RESPONSE !?!\n"); - return -EIO; - } - - /* lookup BTS, create sign_link, ... */ - memset(&unit_data, 0, sizeof(unit_data)); - ipa_parse_unitid((char *)TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT), - &unit_data); - ipbc = find_bts_by_unitid(ipp, unit_data.site_id, unit_data.bts_id); - if (!ipbc) { - /* We have not found an ipbc (per-bts proxy instance) - * for this BTS yet. The first connection of a new BTS must - * be a OML connection. We allocate the associated data structures, - * and try to connect to the remote end */ - - return ipbc_alloc_connect(ipc, bfd, unit_data.site_id, - unit_data.bts_id, - unit_data.trx_id, &tlvp, msg); - /* if this fails, the caller will clean up bfd */ - } else { - struct sockaddr_in sin; - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - inet_aton(bsc_ipaddr, &sin.sin_addr); - - DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", - unit_data.site_id, unit_data.bts_id, unit_data.trx_id); - - if ((bfd->priv_nr & 0xff) != RSL_FROM_BTS) { - LOGP(DLINP, LOGL_ERROR, "Second OML connection from " - "same BTS ?!?\n"); - return 0; - } - - if (unit_data.trx_id >= MAX_TRX) { - LOGP(DLINP, LOGL_ERROR, "We don't support more " - "than %u TRX\n", MAX_TRX); - return -EINVAL; - } - - ipc->bts_conn = ipbc; - /* store TRX number in higher 8 bit of the bfd private number */ - bfd->priv_nr |= unit_data.trx_id << 8; - ipbc->rsl_conn[unit_data.trx_id] = ipc; - - /* Create RSL TCP connection towards BSC */ - sin.sin_port = htons(IPA_TCP_PORT_RSL); - ipbc->bsc_rsl_conn[unit_data.trx_id] = - connect_bsc(&sin, RSL_TO_BSC | (unit_data.trx_id << 8), ipbc); - if (!ipbc->bsc_oml_conn) - return -EIO; - DEBUGP(DLINP, "(%u/%u/%u) Connected RSL to BSC\n", - unit_data.site_id, unit_data.bts_id, unit_data.trx_id); - } - break; - case IPAC_MSGT_ID_GET: - DEBUGP(DLMI, "ID_GET\n"); - if ((bfd->priv_nr & 0xff) != OML_TO_BSC && - (bfd->priv_nr & 0xff) != RSL_TO_BSC) { - DEBUGP(DLINP, "IDentity REQuest from BTS ?!?\n"); - return -EIO; - } - ipbc = ipc->bts_conn; - if (!ipbc) { - DEBUGP(DLINP, "ID_GET from BSC before we have ID_RESP from BTS\n"); - return -EIO; - } - ret = write(bfd->fd, ipbc->id_resp, ipbc->id_resp_len); - if (ret != ipbc->id_resp_len) { - LOGP(DLINP, LOGL_ERROR, "Partial write: %d of %d\n", - ret, ipbc->id_resp_len); - return -EIO; - } - ret = 0; - break; - case IPAC_MSGT_ID_ACK: - DEBUGP(DLMI, "ID_ACK? -> ACK!\n"); - ret = ipa_ccm_send_id_ack(bfd->fd); - break; - default: - LOGP(DLMI, LOGL_ERROR, "Unhandled IPA type; %d\n", msg_type); - return 1; - break; - } - return ret; -} - -struct msgb *ipaccess_proxy_read_msg(struct osmo_fd *bfd, int *error) -{ - struct msgb *msg = msgb_alloc(PROXY_ALLOC_SIZE, "Abis/IP"); - struct ipaccess_head *hh; - int len, ret = 0; - - if (!msg) { - *error = -ENOMEM; - return NULL; - } - - /* first read our 3-byte header */ - hh = (struct ipaccess_head *) msg->data; - ret = recv(bfd->fd, msg->data, 3, 0); - if (ret < 0) { - if (errno != EAGAIN) - LOGP(DLINP, LOGL_ERROR, "recv error: %s\n", strerror(errno)); - msgb_free(msg); - *error = ret; - return NULL; - } else if (ret == 0) { - msgb_free(msg); - *error = ret; - return NULL; - } - - msgb_put(msg, ret); - - /* then read te length as specified in header */ - msg->l2h = msg->data + sizeof(*hh); - len = ntohs(hh->len); - ret = recv(bfd->fd, msg->l2h, len, 0); - if (ret < len) { - LOGP(DLINP, LOGL_ERROR, "short read!\n"); - msgb_free(msg); - *error = -EIO; - return NULL; - } - msgb_put(msg, ret); - - return msg; -} - -static struct ipa_proxy_conn *ipc_by_priv_nr(struct ipa_bts_conn *ipbc, - unsigned int priv_nr) -{ - struct ipa_proxy_conn *bsc_conn; - unsigned int trx_id = priv_nr >> 8; - - switch (priv_nr & 0xff) { - case OML_FROM_BTS: /* incoming OML data from BTS, forward to BSC OML */ - bsc_conn = ipbc->bsc_oml_conn; - break; - case RSL_FROM_BTS: /* incoming RSL data from BTS, forward to BSC RSL */ - bsc_conn = ipbc->bsc_rsl_conn[trx_id]; - break; - case OML_TO_BSC: /* incoming OML data from BSC, forward to BTS OML */ - bsc_conn = ipbc->oml_conn; - break; - case RSL_TO_BSC: /* incoming RSL data from BSC, forward to BTS RSL */ - bsc_conn = ipbc->rsl_conn[trx_id]; - break; - default: - bsc_conn = NULL; - break; - } - return bsc_conn; -} - -static void reconn_tmr_cb(void *data) -{ - struct ipa_proxy *ipp = data; - struct ipa_bts_conn *ipbc; - struct sockaddr_in sin; - int i; - - DEBUGP(DLINP, "Running reconnect timer\n"); - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - inet_aton(bsc_ipaddr, &sin.sin_addr); - - llist_for_each_entry(ipbc, &ipp->bts_list, list) { - /* if OML to BSC is dead, try to restore it */ - if (ipbc->oml_conn && !ipbc->bsc_oml_conn) { - sin.sin_port = htons(IPA_TCP_PORT_OML); - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, 0); - LOGPC(DLINP, LOGL_NOTICE, "OML Trying to reconnect\n"); - ipbc->bsc_oml_conn = connect_bsc(&sin, OML_TO_BSC, ipbc); - if (!ipbc->bsc_oml_conn) - goto reschedule; - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, 0); - LOGPC(DLINP, LOGL_NOTICE, "OML Reconnected\n"); - } - /* if we (still) don't have a OML connection, skip RSL */ - if (!ipbc->oml_conn || !ipbc->bsc_oml_conn) - continue; - - for (i = 0; i < ARRAY_SIZE(ipbc->rsl_conn); i++) { - unsigned int priv_nr; - /* don't establish RSL links which we don't have */ - if (!ipbc->rsl_conn[i]) - continue; - if (ipbc->bsc_rsl_conn[i]) - continue; - priv_nr = ipbc->rsl_conn[i]->fd.priv_nr; - priv_nr &= ~0xff; - priv_nr |= RSL_TO_BSC; - sin.sin_port = htons(IPA_TCP_PORT_RSL); - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, priv_nr >> 8); - LOGPC(DLINP, LOGL_NOTICE, "RSL Trying to reconnect\n"); - ipbc->bsc_rsl_conn[i] = connect_bsc(&sin, priv_nr, ipbc); - if (!ipbc->bsc_rsl_conn[i]) - goto reschedule; - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, priv_nr >> 8); - LOGPC(DLINP, LOGL_NOTICE, "RSL Reconnected\n"); - } - } - return; - -reschedule: - osmo_timer_schedule(&ipp->reconn_timer, 5, 0); -} - -static void handle_dead_socket(struct osmo_fd *bfd) -{ - struct ipa_proxy_conn *ipc = bfd->data; /* local conn */ - struct ipa_proxy_conn *bsc_conn; /* remote conn */ - struct ipa_bts_conn *ipbc = ipc->bts_conn; - unsigned int trx_id = bfd->priv_nr >> 8; - struct msgb *msg, *msg2; - - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; - - /* FIXME: clear tx_queue, remove all references, etc. */ - llist_for_each_entry_safe(msg, msg2, &ipc->tx_queue, list) - msgb_free(msg); - - switch (bfd->priv_nr & 0xff) { - case OML_FROM_BTS: /* incoming OML data from BTS, forward to BSC OML */ - /* The BTS started a connection with us but we got no - * IPAC_MSGT_ID_RESP message yet, in that scenario we did not - * allocate the ipa_bts_conn structure. */ - if (ipbc == NULL) - break; - ipbc->oml_conn = NULL; - bsc_conn = ipbc->bsc_oml_conn; - /* close the connection to the BSC */ - osmo_fd_unregister(&bsc_conn->fd); - close(bsc_conn->fd.fd); - llist_for_each_entry_safe(msg, msg2, &bsc_conn->tx_queue, list) - msgb_free(msg); - talloc_free(bsc_conn); - ipbc->bsc_oml_conn = NULL; - /* FIXME: do we need to delete the entire ipbc ? */ - break; - case RSL_FROM_BTS: /* incoming RSL data from BTS, forward to BSC RSL */ - ipbc->rsl_conn[trx_id] = NULL; - bsc_conn = ipbc->bsc_rsl_conn[trx_id]; - /* close the connection to the BSC */ - osmo_fd_unregister(&bsc_conn->fd); - close(bsc_conn->fd.fd); - llist_for_each_entry_safe(msg, msg2, &bsc_conn->tx_queue, list) - msgb_free(msg); - talloc_free(bsc_conn); - ipbc->bsc_rsl_conn[trx_id] = NULL; - break; - case OML_TO_BSC: /* incoming OML data from BSC, forward to BTS OML */ - ipbc->bsc_oml_conn = NULL; - bsc_conn = ipbc->oml_conn; - /* start reconnect timer */ - osmo_timer_schedule(&ipp->reconn_timer, 5, 0); - break; - case RSL_TO_BSC: /* incoming RSL data from BSC, forward to BTS RSL */ - ipbc->bsc_rsl_conn[trx_id] = NULL; - bsc_conn = ipbc->rsl_conn[trx_id]; - /* start reconnect timer */ - osmo_timer_schedule(&ipp->reconn_timer, 5, 0); - break; - default: - bsc_conn = NULL; - break; - } - - talloc_free(ipc); -} - -static void patch_gprs_msg(struct ipa_bts_conn *ipbc, int priv_nr, struct msgb *msg) -{ - uint8_t *nsvci; - - if ((priv_nr & 0xff) != OML_FROM_BTS && (priv_nr & 0xff) != OML_TO_BSC) - return; - - if (msgb_l2len(msg) != 39) - return; - - /* - * Check if this is a IPA Set Attribute or IPA Set Attribute ACK - * and if the FOM Class is GPRS NSVC0 and then we will patch it. - * - * The patch assumes the message looks like the one from the trace - * but we only match messages with a specific size anyway... So - * this hack should work just fine. - */ - - if (msg->l2h[0] == 0x10 && msg->l2h[1] == 0x80 && - msg->l2h[2] == 0x00 && msg->l2h[3] == 0x15 && - msg->l2h[18] == 0xf5 && msg->l2h[19] == 0xf2) { - nsvci = &msg->l2h[23]; - ipbc->gprs_orig_port = *(uint16_t *)(nsvci+8); - ipbc->gprs_orig_ip = *(uint32_t *)(nsvci+10); - *(uint16_t *)(nsvci+8) = htons(ipbc->gprs_local_port); - *(uint32_t *)(nsvci+10) = ipbc->ipp->listen_addr.s_addr; - } else if (msg->l2h[0] == 0x10 && msg->l2h[1] == 0x80 && - msg->l2h[2] == 0x00 && msg->l2h[3] == 0x15 && - msg->l2h[18] == 0xf6 && msg->l2h[19] == 0xf2) { - nsvci = &msg->l2h[23]; - *(uint16_t *)(nsvci+8) = ipbc->gprs_orig_port; - *(uint32_t *)(nsvci+10) = ipbc->gprs_orig_ip; - } -} - -static int handle_tcp_read(struct osmo_fd *bfd) -{ - struct ipa_proxy_conn *ipc = bfd->data; - struct ipa_bts_conn *ipbc = ipc->bts_conn; - struct ipa_proxy_conn *bsc_conn; - struct msgb *msg; - struct ipaccess_head *hh; - int ret = 0; - char *btsbsc; - - if ((bfd->priv_nr & 0xff) <= 2) - btsbsc = "BTS"; - else - btsbsc = "BSC"; - - msg = ipaccess_proxy_read_msg(bfd, &ret); - if (!msg) { - if (ret == 0) { - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, bfd->priv_nr >> 8); - LOGPC(DLINP, LOGL_NOTICE, "%s disappeared, " - "dead socket\n", btsbsc); - handle_dead_socket(bfd); - } - return ret; - } - - msgb_put(msg, ret); - logp_ipbc_uid(DLMI, LOGL_DEBUG, ipbc, bfd->priv_nr >> 8); - DEBUGPC(DLMI, "RX<-%s: %s\n", btsbsc, osmo_hexdump(msg->data, msg->len)); - - hh = (struct ipaccess_head *) msg->data; - if (hh->proto == IPAC_PROTO_IPACCESS) { - ret = ipaccess_rcvmsg(ipc, msg, bfd); - if (ret < 0) { - osmo_fd_unregister(bfd); - close(bfd->fd); - bfd->fd = -1; - talloc_free(bfd); - msgb_free(msg); - return ret; - } else if (ret == 0) { - /* we do not forward parts of the CCM protocol - * through the proxy but rather terminate it ourselves. */ - msgb_free(msg); - return ret; - } - } - - if (!ipbc) { - LOGP(DLINP, LOGL_ERROR, - "received %s packet but no ipc->bts_conn?!?\n", btsbsc); - msgb_free(msg); - return -EIO; - } - - bsc_conn = ipc_by_priv_nr(ipbc, bfd->priv_nr); - if (bsc_conn) { - if (gprs_ns_ipaddr) - patch_gprs_msg(ipbc, bfd->priv_nr, msg); - /* enqueue packet towards BSC */ - msgb_enqueue(&bsc_conn->tx_queue, msg); - /* mark respective filedescriptor as 'we want to write' */ - bsc_conn->fd.when |= BSC_FD_WRITE; - } else { - logp_ipbc_uid(DLINP, LOGL_INFO, ipbc, bfd->priv_nr >> 8); - LOGPC(DLINP, LOGL_INFO, "Dropping packet from %s, " - "since remote connection is dead\n", btsbsc); - msgb_free(msg); - } - - return ret; -} - -/* a TCP socket is ready to be written to */ -static int handle_tcp_write(struct osmo_fd *bfd) -{ - struct ipa_proxy_conn *ipc = bfd->data; - struct ipa_bts_conn *ipbc = ipc->bts_conn; - struct llist_head *lh; - struct msgb *msg; - char *btsbsc; - int ret; - - if ((bfd->priv_nr & 0xff) <= 2) - btsbsc = "BTS"; - else - btsbsc = "BSC"; - - - /* get the next msg for this timeslot */ - if (llist_empty(&ipc->tx_queue)) { - bfd->when &= ~BSC_FD_WRITE; - return 0; - } - lh = ipc->tx_queue.next; - llist_del(lh); - msg = llist_entry(lh, struct msgb, list); - - logp_ipbc_uid(DLMI, LOGL_DEBUG, ipbc, bfd->priv_nr >> 8); - DEBUGPC(DLMI, "TX %04x: %s\n", bfd->priv_nr, - osmo_hexdump(msg->data, msg->len)); - - ret = send(bfd->fd, msg->data, msg->len, 0); - msgb_free(msg); - - if (ret == 0) { - logp_ipbc_uid(DLINP, LOGL_NOTICE, ipbc, bfd->priv_nr >> 8); - LOGP(DLINP, LOGL_NOTICE, "%s disappeared, dead socket\n", btsbsc); - handle_dead_socket(bfd); - } - - return ret; -} - -/* callback from select.c in case one of the fd's can be read/written */ -static int proxy_ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what) -{ - int rc = 0; - - if (what & BSC_FD_READ) { - rc = handle_tcp_read(bfd); - if (rc < 0) - return rc; - } - if (what & BSC_FD_WRITE) - rc = handle_tcp_write(bfd); - - return rc; -} - -/* callback of the listening filedescriptor */ -static int listen_fd_cb(struct osmo_fd *listen_bfd, unsigned int what) -{ - int ret; - struct ipa_proxy_conn *ipc; - struct osmo_fd *bfd; - struct sockaddr_in sa; - socklen_t sa_len = sizeof(sa); - - if (!(what & BSC_FD_READ)) - return 0; - - ret = accept(listen_bfd->fd, (struct sockaddr *) &sa, &sa_len); - if (ret < 0) { - perror("accept"); - return ret; - } - DEBUGP(DLINP, "accept()ed new %s link from %s\n", - (listen_bfd->priv_nr & 0xff) == OML_FROM_BTS ? "OML" : "RSL", - inet_ntoa(sa.sin_addr)); - - ipc = alloc_conn(); - if (!ipc) { - close(ret); - return -ENOMEM; - } - - bfd = &ipc->fd; - bfd->fd = ret; - bfd->data = ipc; - bfd->priv_nr = listen_bfd->priv_nr; - bfd->cb = proxy_ipaccess_fd_cb; - bfd->when = BSC_FD_READ; - ret = osmo_fd_register(bfd); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); - close(bfd->fd); - talloc_free(ipc); - return ret; - } - - /* Request ID. FIXME: request LOCATION, HW/SW VErsion, Unit Name, Serno */ - ret = ipa_ccm_send_id_req(bfd->fd); - - return 0; -} - -static void send_ns(int fd, const char *buf, int size, struct in_addr ip, int port) -{ - int ret; - struct sockaddr_in addr; - socklen_t len = sizeof(addr); - memset(&addr, 0, sizeof(addr)); - - addr.sin_family = AF_INET; - addr.sin_port = htons(port); - addr.sin_addr = ip; - - ret = sendto(fd, buf, size, 0, (struct sockaddr *) &addr, len); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Failed to forward GPRS message.\n"); - } -} - -static int gprs_ns_cb(struct osmo_fd *bfd, unsigned int what) -{ - struct ipa_bts_conn *bts; - char buf[4096]; - int ret; - struct sockaddr_in sock; - socklen_t len = sizeof(sock); - - /* 1. get the data... */ - ret = recvfrom(bfd->fd, buf, sizeof(buf), 0, (struct sockaddr *) &sock, &len); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Failed to recv GPRS NS msg: %s.\n", strerror(errno)); - return -1; - } - - bts = bfd->data; - - /* 2. figure out where to send it to */ - if (memcmp(&sock.sin_addr, &ipp->gprs_addr, sizeof(sock.sin_addr)) == 0) { - LOGP(DLINP, LOGL_DEBUG, "GPRS NS msg from network.\n"); - send_ns(bfd->fd, buf, ret, bts->bts_addr, 23000); - } else if (memcmp(&sock.sin_addr, &bts->bts_addr, sizeof(sock.sin_addr)) == 0) { - LOGP(DLINP, LOGL_DEBUG, "GPRS NS msg from BTS.\n"); - send_ns(bfd->fd, buf, ret, ipp->gprs_addr, 23000); - } else { - LOGP(DLINP, LOGL_ERROR, "Unknown GPRS source: %s\n", inet_ntoa(sock.sin_addr)); - } - - return 0; -} - -/* Actively connect to a BSC. */ -static struct ipa_proxy_conn *connect_bsc(struct sockaddr_in *sa, int priv_nr, void *data) -{ - struct ipa_proxy_conn *ipc; - struct osmo_fd *bfd; - int ret, on = 1; - - ipc = alloc_conn(); - if (!ipc) - return NULL; - - ipc->bts_conn = data; - - bfd = &ipc->fd; - bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; - bfd->data = ipc; - bfd->priv_nr = priv_nr; - - if (bfd->fd < 0) { - LOGP(DLINP, LOGL_ERROR, "Could not create socket: %s\n", - strerror(errno)); - talloc_free(ipc); - return NULL; - } - - ret = setsockopt(bfd->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Could not set socket option\n"); - close(bfd->fd); - talloc_free(ipc); - return NULL; - } - - ret = connect(bfd->fd, (struct sockaddr *) sa, sizeof(*sa)); - if (ret < 0) { - LOGP(DLINP, LOGL_ERROR, "Could not connect socket: %s\n", - inet_ntoa(sa->sin_addr)); - close(bfd->fd); - talloc_free(ipc); - return NULL; - } - - /* pre-fill tx_queue with identity request */ - ret = osmo_fd_register(bfd); - if (ret < 0) { - close(bfd->fd); - talloc_free(ipc); - return NULL; - } - - return ipc; -} - -static int ipaccess_proxy_setup(void) -{ - int ret; - - ipp = talloc_zero(tall_bsc_ctx, struct ipa_proxy); - if (!ipp) - return -ENOMEM; - INIT_LLIST_HEAD(&ipp->bts_list); - osmo_timer_setup(&ipp->reconn_timer, reconn_tmr_cb, ipp); - - /* Listen for OML connections */ - ret = make_sock(&ipp->oml_listen_fd, IPPROTO_TCP, INADDR_ANY, - IPA_TCP_PORT_OML, OML_FROM_BTS, listen_fd_cb, NULL); - if (ret < 0) - return ret; - - /* Listen for RSL connections */ - ret = make_sock(&ipp->rsl_listen_fd, IPPROTO_TCP, INADDR_ANY, - IPA_TCP_PORT_RSL, RSL_FROM_BTS, listen_fd_cb, NULL); - - if (ret < 0) - return ret; - - /* Connect the GPRS NS Socket */ - if (gprs_ns_ipaddr) { - inet_aton(gprs_ns_ipaddr, &ipp->gprs_addr); - inet_aton(listen_ipaddr, &ipp->listen_addr); - } - - return ret; -} - -static void signal_handler(int signal) -{ - fprintf(stdout, "signal %u received\n", signal); - - switch (signal) { - case SIGABRT: - /* in case of abort, we want to obtain a talloc report - * and then return to the caller, who will abort the process */ - case SIGUSR1: - talloc_report_full(tall_bsc_ctx, stderr); - break; - default: - break; - } -} - -static void print_help(void) -{ - printf(" ipaccess-proxy is a proxy BTS.\n"); - printf(" -h --help. This help text.\n"); - printf(" -l --listen IP. The ip to listen to.\n"); - printf(" -b --bsc IP. The BSC IP address.\n"); - printf(" -g --gprs IP. Take GPRS NS from that IP.\n"); - printf("\n"); - printf(" -s --disable-color. Disable the color inside the logging message.\n"); - printf(" -e --log-level number. Set the global loglevel.\n"); - printf(" -T --timestamp. Prefix every log message with a timestamp.\n"); - printf(" -V --version. Print the version of OpenBSC.\n"); -} - -static void print_usage(void) -{ - printf("Usage: ipaccess-proxy [options]\n"); -} - -enum { - IPA_PROXY_OPT_LISTEN_NONE = 0, - IPA_PROXY_OPT_LISTEN_IP = (1 << 0), - IPA_PROXY_OPT_BSC_IP = (1 << 1), -}; - -static void handle_options(int argc, char** argv) -{ - int options_mask = 0; - - /* disable explicit missing arguments error output from getopt_long */ - opterr = 0; - - while (1) { - int option_index = 0, c; - static struct option long_options[] = { - {"help", 0, 0, 'h'}, - {"disable-color", 0, 0, 's'}, - {"timestamp", 0, 0, 'T'}, - {"log-level", 1, 0, 'e'}, - {"listen", 1, 0, 'l'}, - {"bsc", 1, 0, 'b'}, - {0, 0, 0, 0} - }; - - c = getopt_long(argc, argv, "hsTe:l:b:g:", - long_options, &option_index); - if (c == -1) - break; - - switch (c) { - case 'h': - print_usage(); - print_help(); - exit(0); - case 'l': - listen_ipaddr = optarg; - options_mask |= IPA_PROXY_OPT_LISTEN_IP; - break; - case 'b': - bsc_ipaddr = optarg; - options_mask |= IPA_PROXY_OPT_BSC_IP; - break; - case 'g': - gprs_ns_ipaddr = optarg; - break; - case 's': - log_set_use_color(osmo_stderr_target, 0); - break; - case 'T': - log_set_print_timestamp(osmo_stderr_target, 1); - break; - case 'e': - log_set_log_level(osmo_stderr_target, atoi(optarg)); - break; - case '?': - if (optopt) { - printf("ERROR: missing mandatory argument " - "for `%s' option\n", argv[optind-1]); - } else { - printf("ERROR: unknown option `%s'\n", - argv[optind-1]); - } - print_usage(); - print_help(); - exit(EXIT_FAILURE); - break; - default: - /* ignore */ - break; - } - } - if ((options_mask & (IPA_PROXY_OPT_LISTEN_IP | IPA_PROXY_OPT_BSC_IP)) - != (IPA_PROXY_OPT_LISTEN_IP | IPA_PROXY_OPT_BSC_IP)) { - printf("ERROR: You have to specify `--listen' and `--bsc' " - "options at least.\n"); - print_usage(); - print_help(); - exit(EXIT_FAILURE); - } -} - -int main(int argc, char **argv) -{ - int rc; - - tall_bsc_ctx = talloc_named_const(NULL, 1, "ipaccess-proxy"); - msgb_talloc_ctx_init(tall_bsc_ctx, 0); - - osmo_init_logging(&log_info); - log_parse_category_mask(osmo_stderr_target, "DLINP:DLMI"); - - handle_options(argc, argv); - - rc = ipaccess_proxy_setup(); - if (rc < 0) - exit(1); - - signal(SIGUSR1, &signal_handler); - signal(SIGABRT, &signal_handler); - osmo_init_ignore_signals(); - - while (1) { - osmo_select_main(0); - } -} diff --git a/openbsc/src/ipaccess/network_listen.c b/openbsc/src/ipaccess/network_listen.c deleted file mode 100644 index 43d82a9..0000000 --- a/openbsc/src/ipaccess/network_listen.c +++ /dev/null @@ -1,257 +0,0 @@ -/* ip.access nanoBTS network listen mode */ - -/* (C) 2009-2010 by Harald Welte - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#define WHITELIST_MAX_SIZE ((NUM_ARFCNS*2)+2+1) - -int ipac_rxlevstat2whitelist(uint16_t *buf, const struct rxlev_stats *st, uint8_t min_rxlev, - uint16_t max_num_arfcns) -{ - int i; - unsigned int num_arfcn = 0; - - for (i = NUM_RXLEVS-1; i >= min_rxlev; i--) { - int16_t arfcn = -1; - - while ((arfcn = rxlev_stat_get_next(st, i, arfcn)) >= 0) { - *buf++ = htons(arfcn); - num_arfcn++; - - } - - if (num_arfcn > max_num_arfcns) - break; - } - - return num_arfcn; -} - -enum ipac_test_state { - IPAC_TEST_S_IDLE, - IPAC_TEST_S_RQD, - IPAC_TEST_S_EXEC, - IPAC_TEST_S_PARTIAL, -}; - -int ipac_nwl_test_start(struct gsm_bts_trx *trx, uint8_t testnr, - const uint8_t *phys_conf, unsigned int phys_conf_len) -{ - struct msgb *msg; - - if (trx->ipaccess.test_state != IPAC_TEST_S_IDLE) { - fprintf(stderr, "Cannot start test in state %u\n", trx->ipaccess.test_state); - return -EINVAL; - } - - switch (testnr) { - case NM_IPACC_TESTNO_CHAN_USAGE: - case NM_IPACC_TESTNO_BCCH_CHAN_USAGE: - rxlev_stat_reset(&trx->ipaccess.rxlev_stat); - break; - } - - msg = msgb_alloc_headroom(phys_conf_len+256, 128, "OML"); - - if (phys_conf && phys_conf_len) { - uint8_t *payload; - /* first put the phys conf header */ - msgb_tv16_put(msg, NM_ATT_PHYS_CONF, phys_conf_len); - payload = msgb_put(msg, phys_conf_len); - memcpy(payload, phys_conf, phys_conf_len); - } - - abis_nm_perform_test(trx->bts, NM_OC_RADIO_CARRIER, 0, trx->nr, 0xff, - testnr, 1, msg); - trx->ipaccess.test_nr = testnr; - - /* FIXME: start safety timer until when test is supposed to complete */ - - return 0; -} - -static uint16_t last_arfcn; -static struct gsm_sysinfo_freq nwl_si_freq[1024]; -#define FREQ_TYPE_NCELL_2 0x04 /* sub channel of SI 2 */ -#define FREQ_TYPE_NCELL_2bis 0x08 /* sub channel of SI 2bis */ -#define FREQ_TYPE_NCELL_2ter 0x10 /* sub channel of SI 2ter */ - -struct ipacc_ferr_elem { - int16_t freq_err; - uint8_t freq_qual; - uint8_t arfcn; -} __attribute__((packed)); - -struct ipacc_cusage_elem { - uint16_t arfcn:10, - rxlev:6; -} __attribute__ ((packed)); - -static int test_rep(void *_msg) -{ - struct msgb *msg = _msg; - struct abis_om_fom_hdr *foh = msgb_l3(msg); - uint16_t test_rep_len, ferr_list_len; - struct ipacc_ferr_elem *ife; - struct ipac_bcch_info binfo; - struct e1inp_sign_link *sign_link = (struct e1inp_sign_link *)msg->dst; - int i, rc; - - DEBUGP(DNM, "TEST REPORT: "); - - if (foh->data[0] != NM_ATT_TEST_NO || - foh->data[2] != NM_ATT_TEST_REPORT) - return -EINVAL; - - DEBUGPC(DNM, "test_no=0x%02x ", foh->data[1]); - /* data[2] == NM_ATT_TEST_REPORT */ - /* data[3..4]: test_rep_len */ - memcpy(&test_rep_len, &foh->data[3], sizeof(uint16_t)); - test_rep_len = ntohs(test_rep_len); - /* data[5]: ip.access test result */ - DEBUGPC(DNM, "tst_res=%s\n", ipacc_testres_name(foh->data[5])); - - /* data[6]: ip.access nested IE. 3 == freq_err_list */ - switch (foh->data[6]) { - case NM_IPAC_EIE_FREQ_ERR_LIST: - /* data[7..8]: length of ferr_list */ - memcpy(&ferr_list_len, &foh->data[7], sizeof(uint16_t)); - ferr_list_len = ntohs(ferr_list_len); - - /* data[9...]: frequency error list elements */ - for (i = 0; i < ferr_list_len; i+= sizeof(*ife)) { - ife = (struct ipacc_ferr_elem *) (foh->data + 9 + i); - DEBUGP(DNM, "==> ARFCN %4u, Frequency Error %6hd\n", - ife->arfcn, ntohs(ife->freq_err)); - } - break; - case NM_IPAC_EIE_CHAN_USE_LIST: - /* data[7..8]: length of ferr_list */ - memcpy(&ferr_list_len, &foh->data[7], sizeof(uint16_t)); - ferr_list_len = ntohs(ferr_list_len); - - /* data[9...]: channel usage list elements */ - for (i = 0; i < ferr_list_len; i+= 2) { - uint16_t *cu_ptr = (uint16_t *)(foh->data + 9 + i); - uint16_t cu = ntohs(*cu_ptr); - uint16_t arfcn = cu & 0x3ff; - uint8_t rxlev = cu >> 10; - DEBUGP(DNM, "==> ARFCN %4u, RxLev %2u\n", arfcn, rxlev); - rxlev_stat_input(&sign_link->trx->ipaccess.rxlev_stat, - arfcn, rxlev); - } - break; - case NM_IPAC_EIE_BCCH_INFO_TYPE: - break; - case NM_IPAC_EIE_BCCH_INFO: - rc = ipac_parse_bcch_info(&binfo, foh->data+6); - if (rc < 0) { - DEBUGP(DNM, "BCCH Info parsing failed\n"); - break; - } - DEBUGP(DNM, "==> ARFCN %u, RxLev %2u, RxQual %2u: %s, LAC %d CI %d BSIC %u\n", - binfo.arfcn, binfo.rx_lev, binfo.rx_qual, - osmo_plmn_name(&binfo.cgi.lai.plmn), - binfo.cgi.lai.lac, binfo.cgi.cell_identity, binfo.bsic); - - if (binfo.arfcn != last_arfcn) { - /* report is on a new arfcn, need to clear channel list */ - memset(nwl_si_freq, 0, sizeof(nwl_si_freq)); - last_arfcn = binfo.arfcn; - } - if (binfo.info_type & IPAC_BINF_NEIGH_BA_SI2) { - DEBUGP(DNM, "BA SI2: %s\n", osmo_hexdump(binfo.ba_list_si2, sizeof(binfo.ba_list_si2))); - gsm48_decode_freq_list(nwl_si_freq, binfo.ba_list_si2, sizeof(binfo.ba_list_si2), - 0x8c, FREQ_TYPE_NCELL_2); - } - if (binfo.info_type & IPAC_BINF_NEIGH_BA_SI2bis) { - DEBUGP(DNM, "BA SI2bis: %s\n", osmo_hexdump(binfo.ba_list_si2bis, sizeof(binfo.ba_list_si2bis))); - gsm48_decode_freq_list(nwl_si_freq, binfo.ba_list_si2bis, sizeof(binfo.ba_list_si2bis), - 0x8e, FREQ_TYPE_NCELL_2bis); - } - if (binfo.info_type & IPAC_BINF_NEIGH_BA_SI2ter) { - DEBUGP(DNM, "BA SI2ter: %s\n", osmo_hexdump(binfo.ba_list_si2ter, sizeof(binfo.ba_list_si2ter))); - gsm48_decode_freq_list(nwl_si_freq, binfo.ba_list_si2ter, sizeof(binfo.ba_list_si2ter), - 0x8e, FREQ_TYPE_NCELL_2ter); - } - for (i = 0; i < ARRAY_SIZE(nwl_si_freq); i++) { - if (nwl_si_freq[i].mask) - DEBUGP(DNM, "Neighbor Cell on ARFCN %u\n", i); - } - break; - default: - break; - } - - switch (foh->data[5]) { - case NM_IPACC_TESTRES_SUCCESS: - case NM_IPACC_TESTRES_STOPPED: - case NM_IPACC_TESTRES_TIMEOUT: - case NM_IPACC_TESTRES_NO_CHANS: - sign_link->trx->ipaccess.test_state = IPAC_TEST_S_IDLE; - /* Send signal to notify higher layers of test completion */ - DEBUGP(DNM, "dispatching S_IPAC_NWL_COMPLETE signal\n"); - osmo_signal_dispatch(SS_IPAC_NWL, S_IPAC_NWL_COMPLETE, - sign_link->trx); - break; - case NM_IPACC_TESTRES_PARTIAL: - sign_link->trx->ipaccess.test_state = IPAC_TEST_S_PARTIAL; - break; - } - - return 0; -} - -static int nwl_sig_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) -{ - switch (signal) { - case S_NM_TEST_REP: - return test_rep(signal_data); - default: - break; - } - - return 0; -} - -void ipac_nwl_init(void) -{ - osmo_signal_register_handler(SS_NM, nwl_sig_cb, NULL); -} -- To view, visit https://gerrit.osmocom.org/11921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9c04f9b469e60802461a2a6e421d3ba27e6dafa1 Gerrit-Change-Number: 11921 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 18:50:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 25 Nov 2018 18:50:01 +0000 Subject: Change in openbsc[master]: Remove ipaccess utils In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11921 ) Change subject: Remove ipaccess utils ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c04f9b469e60802461a2a6e421d3ba27e6dafa1 Gerrit-Change-Number: 11921 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 18:50:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 18:50:15 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 25 Nov 2018 18:50:15 +0000 Subject: Change in osmo-sysmon[master]: Add OpenVPN status helper example from corresponding ticket In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11885 ) Change subject: Add OpenVPN status helper example from corresponding ticket ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I912d943cdc7024e3ddd92e0a122ac2dd4fbf0a18 Gerrit-Change-Number: 11885 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Sun, 25 Nov 2018 18:50:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 20:04:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 20:04:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11922 Change subject: BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions ...................................................................... BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions This would allow to expect a MT SMS message using f_mt_sms_expect() and send an RP-ACK using f_mt_sms_send_rp_ack() separately in the follow-up changes for SMS over GSUP. Change-Id: I4730634a9f3352b6f8553ee2fd1d43044f41241e --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/11922/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 96f522c..d5fde89 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -873,17 +873,13 @@ f_mo_sms_wait_rp_ack(spars); } -/* receive MT-SMS delivered from the MSC/SMSC over an already existing DTAP connection */ -function f_mt_sms(inout SmsParameters spars) +/* Wait for MT SMS on an already existing DTAP connection */ +function f_mt_sms_expect(inout SmsParameters spars) runs on BSC_ConnHdlr { - var template (value) TPDU_RP_DATA_MS_SGSN tp_mo; - var template (value) RPDU_MS_SGSN rp_mo; var template (value) PDU_ML3_MS_NW l3_mo; - var template TPDU_RP_DATA_SGSN_MS tp_mt; var template RPDU_SGSN_MS rp_mt; var template PDU_ML3_NW_MS l3_mt; - var PDU_DTAP_MT dtap_mt; var default d := activate(as_other_sms()); @@ -893,6 +889,7 @@ rp_mt := tr_RP_DATA_MT(?, ?, omit, tp_mt); l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt)); BSSAP.receive(tr_PDU_DTAP_MT(l3_mt, spars.dlci)) -> value dtap_mt; + /* Extract relevant identifiers */ spars.tid := bit2int(dtap_mt.dtap.tiOrSkip.transactionId.tio); spars.rp.msg_ref := dtap_mt.dtap.msgs.sms.cP_DATA.cP_User_Data.cP_RPDU.rP_DATA_SGSN_MS.rP_MessageReference; @@ -901,6 +898,19 @@ l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_ACK_MO); BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); + deactivate(d); + setverdict(pass); +} + +/* Send RP-ACK for MT-SMS over an already existing DTAP connection */ +function f_mt_sms_send_rp_ack(inout SmsParameters spars) +runs on BSC_ConnHdlr { + var template (value) RPDU_MS_SGSN rp_mo; + var template (value) PDU_ML3_MS_NW l3_mo; + var template PDU_ML3_NW_MS l3_mt; + + var default d := activate(as_other_sms()); + /* send RP-ACK for RP-DATA */ rp_mo := ts_RP_ACK_MO(spars.rp.msg_ref); l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_DATA_MO(rp_mo)); @@ -914,6 +924,13 @@ setverdict(pass); } +/* Wait for a MT-SMS and send RP-ACK over an already existing + * (and authenticated, ...) DTAP connection */ +function f_mt_sms(inout SmsParameters spars) +runs on BSC_ConnHdlr { + f_mt_sms_expect(spars); + f_mt_sms_send_rp_ack(spars); +} -- To view, visit https://gerrit.osmocom.org/11922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4730634a9f3352b6f8553ee2fd1d43044f41241e Gerrit-Change-Number: 11922 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 20:04:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 20:04:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_ConnectionHandler.ttcn: introduce f_mt_sms_send_rp_error() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11923 Change subject: BSC_ConnectionHandler.ttcn: introduce f_mt_sms_send_rp_error() ...................................................................... BSC_ConnectionHandler.ttcn: introduce f_mt_sms_send_rp_error() Change-Id: I3d67a451335e1c1e1b18237fdda82260c0c969fb --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/11923/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index d5fde89..4ea8091 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -924,6 +924,28 @@ setverdict(pass); } +/* Send RP-ERROR for MT-SMS over an already existing DTAP connection */ +function f_mt_sms_send_rp_error(inout SmsParameters spars, uint7_t cause) +runs on BSC_ConnHdlr { + var template (value) RPDU_MS_SGSN rp_mo; + var template (value) PDU_ML3_MS_NW l3_mo; + var template PDU_ML3_NW_MS l3_mt; + + var default d := activate(as_other_sms()); + + /* send RP-ACK for RP-DATA */ + rp_mo := ts_RP_ERROR_MO(spars.rp.msg_ref, cause); + l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_DATA_MO(rp_mo)); + BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true)); + + /* expect CP-ACK for CP-DATA(RP-ERROR) just sent */ + l3_mt := tr_ML3_MT_SMS(spars.tid, c_TIF_ORIG, tr_CP_ACK_MT); + BSSAP.receive(tr_PDU_DTAP_MT(l3_mt, spars.dlci)); + + deactivate(d); + setverdict(pass); +} + /* Wait for a MT-SMS and send RP-ACK over an already existing * (and authenticated, ...) DTAP connection */ function f_mt_sms(inout SmsParameters spars) -- To view, visit https://gerrit.osmocom.org/11923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3d67a451335e1c1e1b18237fdda82260c0c969fb Gerrit-Change-Number: 11923 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 20:04:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 20:04:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11924 Change subject: MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP ...................................................................... MSC_Tests.ttcn: introduce TC_gsup_mt_sms_{ack|err} for MT SMS over GSUP Change-Id: I63a25c8366cce0852df6b628365151661a22a25f --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 147 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/11924/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e2df249..124e915 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2135,6 +2135,149 @@ vc_conn.done; } +/* Helper for sending MT SMS over GSUP */ +private function f_gsup_forwardSM_req(SmsParameters spars) +runs on BSC_ConnHdlr { + GSUP.send(ts_GSUP_MT_FORWARD_SM_REQ( + imsi := g_pars.imsi, + /* NOTE: MSC should assign RP-MR itself */ + sm_rp_mr := 'FF'O, + /* FIXME: extract SM-RP-DA from spars.rp.dest */ + /* TODO: fix encoding of ts_GSUP_SM_RP_DA_IMSI */ + sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(g_pars.msisdn)), + sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(g_pars.msisdn)), + /* FIXME: define coding rules for SmsParametersTp, and use 'decmatch spars.tp' */ + sm_rp_ui := '00068021436500008111328130858200'O + )); +} + +/* Test successful MT-SMS (RP-ACK) over GSUP */ +private function f_tc_gsup_mt_sms_ack(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + } else { + f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + } + + var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + /* NOTE: MSC should assign RP-MR itself */ + sm_rp_mr := ? + ); + + /* Submit a MT SMS on GSUP */ + f_gsup_forwardSM_req(spars); + + /* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */ + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + f_establish_fully(EST_TYPE_PAG_RESP); + + /* Wait for MT SMS on DTAP */ + f_mt_sms_expect(spars); + + /* Send RP-ACK and expect MT-forwardSM-Res on GSUP */ + f_mt_sms_send_rp_ack(spars); + alt { + [] GSUP.receive(mt_forwardSM_res) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + f_expect_clear(); +} +testcase TC_gsup_mt_sms_ack() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(90); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_sms_ack), pars); + vc_conn.done; +} + +/* Test rejected MT-SMS (RP-ERROR) over GSUP */ +private function f_tc_gsup_mt_sms_err(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + var OCT1 sm_rp_cause := '78'O; /* dummy RP-Cause value */ + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(); + + /* Register an 'expect' for given IMSI (+TMSI) */ + if (isvalue(g_pars.tmsi)) { + f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi); + } else { + f_bssmap_register_imsi(g_pars.imsi, 'FFFFFFFF'O); + } + + var template GSUP_PDU mt_forwardSM_err := tr_GSUP_MT_FORWARD_SM_ERR( + imsi := g_pars.imsi, + /* NOTE: MSC should assign RP-MR itself */ + sm_rp_mr := ?, + sm_rp_cause := sm_rp_cause + ); + + /* Submit a MT SMS on GSUP */ + f_gsup_forwardSM_req(spars); + + /* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */ + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + f_establish_fully(EST_TYPE_PAG_RESP); + + /* Wait for MT SMS on DTAP */ + f_mt_sms_expect(spars); + + /* Send RP-ERROR and expect MT-forwardSM-Err on GSUP */ + f_mt_sms_send_rp_error(spars, oct2int(sm_rp_cause)); + alt { + [] GSUP.receive(mt_forwardSM_err) { + log("RX MT-forwardSM-Err (RP-ERROR)"); + setverdict(pass); + mtc.stop; + } + [] GSUP.receive { + log("RX unexpected GSUP message"); + setverdict(fail); + mtc.stop; + } + } + + f_expect_clear(); +} +testcase TC_gsup_mt_sms_err() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(91); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_sms_err), pars); + vc_conn.done; +} + /* convert GSM L3 TON to SMPP_TON enum */ function f_sm_ton_from_gsm(BIT3 ton) return SMPP_TON { select (ton) { @@ -2892,6 +3035,8 @@ execute( TC_gsup_mo_sms() ); execute( TC_gsup_mo_smma() ); + execute( TC_gsup_mt_sms_ack() ); + execute( TC_gsup_mt_sms_err() ); execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 17ffa76..ef83a04 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -65,6 +65,8 @@ + + -- To view, visit https://gerrit.osmocom.org/11924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I63a25c8366cce0852df6b628365151661a22a25f Gerrit-Change-Number: 11924 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 21:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 25 Nov 2018 21:46:26 +0000 Subject: Change in osmo-mgw[master]: fix osmo-mgw -s; fixes osmo-mgw.service using -s Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11925 Change subject: fix osmo-mgw -s; fixes osmo-mgw.service using -s ...................................................................... fix osmo-mgw -s; fixes osmo-mgw.service using -s Even though osmo-mgw advertises the -s option, the getopt configuration lacks -s and that option does not work. Thus the osmo-mgw.service file that uses -s was unable to start. Add 's' to the getopt configuration, fix -s and hence also fix the .service file. Change-Id: I6f298aef73eb3486d04706910e9fdbaaebaf2481 --- M src/osmo-mgw/mgw_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/25/11925/1 diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index de094c1..583d0fb 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -104,7 +104,7 @@ {0, 0, 0, 0}, }; - c = getopt_long(argc, argv, "hc:VD", long_options, &option_index); + c = getopt_long(argc, argv, "hc:sVD", long_options, &option_index); if (c == -1) break; -- To view, visit https://gerrit.osmocom.org/11925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6f298aef73eb3486d04706910e9fdbaaebaf2481 Gerrit-Change-Number: 11925 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 21:50:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 21:50:48 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into inline function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11911 ) Change subject: IPA: move duplicated error handling into inline function ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11911/1/src/gsm/ipa.c File src/gsm/ipa.c: https://gerrit.osmocom.org/#/c/11911/1/src/gsm/ipa.c at 545 PS1, Line 545: * \param[out] ret result of recv() will be stored in here. What about errno? not mentioned here. https://gerrit.osmocom.org/#/c/11911/1/src/gsm/ipa.c at 551 PS1, Line 551: static inline bool recv_discard_msg(int *ret, int fd, struct msgb *msg, int needed) IMHO it makes more sense to return ret and have a bool *discard as out param, but fine anyway. BTW, no need to use inline here, let the compiler decide. -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 21:50:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:22:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 22:22:17 +0000 Subject: Change in osmo-sgsn[master]: Revert "gbproxy: fix formatting in gbproxy-state command" In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11913 ) Change subject: Revert "gbproxy: fix formatting in gbproxy-state command" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ea17919ec3ed7e26044df8b5f8324717ee9e32c Gerrit-Change-Number: 11913 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Sun, 25 Nov 2018 22:22:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:24:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 22:24:00 +0000 Subject: Change in libosmocore[master]: ctrl: print textual error on IPA parsing failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11910 ) Change subject: ctrl: print textual error on IPA parsing failure ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11910/1/src/ctrl/control_if.c File src/ctrl/control_if.c: https://gerrit.osmocom.org/#/c/11910/1/src/ctrl/control_if.c at 363 PS1, Line 363: LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %s\n", strerror(-ret)); Better keep the errno too: "(%d): %s\n", errno, strerror(-ret)). -- To view, visit https://gerrit.osmocom.org/11910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db Gerrit-Change-Number: 11910 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 22:24:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:24:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 22:24:31 +0000 Subject: Change in libosmocore[master]: ctrl: print textual error on IPA parsing failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11910 ) Change subject: ctrl: print textual error on IPA parsing failure ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db Gerrit-Change-Number: 11910 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 22:24:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:26:02 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Sun, 25 Nov 2018 22:26:02 +0000 Subject: Change in osmo-sgsn[master]: Revert "gbproxy: fix formatting in gbproxy-state command" In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11913 ) Change subject: Revert "gbproxy: fix formatting in gbproxy-state command" ...................................................................... Revert "gbproxy: fix formatting in gbproxy-state command" In case of multiple bts peers we use '\n' as individual entries separator. This reverts commit fffd6cb0d8011442bb69974675f86ad087b7d8db. Change-Id: I1ea17919ec3ed7e26044df8b5f8324717ee9e32c --- M src/gprs/gb_proxy_ctrl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gprs/gb_proxy_ctrl.c index 829d6f6..4b7c2f4 100644 --- a/src/gprs/gb_proxy_ctrl.c +++ b/src/gprs/gb_proxy_ctrl.c @@ -64,7 +64,7 @@ struct gprs_ra_id raid; gsm48_parse_ra(&raid, peer->ra); - cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s", + cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", peer->nsei, peer->bvci, raid.mcc, raid.mnc, raid.lac, raid.rac, -- To view, visit https://gerrit.osmocom.org/11913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1ea17919ec3ed7e26044df8b5f8324717ee9e32c Gerrit-Change-Number: 11913 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:40:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 22:40:47 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11909 ) Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11909/1/scripts/osmo_ctrl.py File scripts/osmo_ctrl.py: https://gerrit.osmocom.org/#/c/11909/1/scripts/osmo_ctrl.py at 43 PS1, Line 43: tail = sck.recv(4096) what about setting tail = [] here, and then moving following snippet at the start of while loop: if len(tail) == 0: sck.recv() https://gerrit.osmocom.org/#/c/11909/1/scripts/osmo_ctrl.py at 49 PS1, Line 49: if int(i) != 0: what does this mean? Does 0 mean TRAP? can we have some variable enumerating those please? https://gerrit.osmocom.org/#/c/11909/1/scripts/osmo_ctrl.py at 51 PS1, Line 51: if len(tail) == 0: These 2 line scan then be dropped. -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 22:40:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:43:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 22:43:00 +0000 Subject: Change in openbsc[master]: Remove ipaccess utils In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11921 ) Change subject: Remove ipaccess utils ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c04f9b469e60802461a2a6e421d3ba27e6dafa1 Gerrit-Change-Number: 11921 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 22:43:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:46:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 22:46:28 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11914 ) Change subject: libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11914/1/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11914/1/src/libmsc/gsm_04_11.c at 703 PS1, Line 703: static int gsm411_rx_rp_ack(struct gsm_trans *trans, so msg parma was not being used at all? strange compiler didn't warn/error about it. -- To view, visit https://gerrit.osmocom.org/11914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0eb5c7c485ab7d109966431bd875fa74e00936d7 Gerrit-Change-Number: 11914 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 22:46:28 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:48:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 22:48:17 +0000 Subject: Change in osmo-sysmon[master]: Add OpenVPN status helper example from corresponding ticket In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11885 ) Change subject: Add OpenVPN status helper example from corresponding ticket ...................................................................... Patch Set 2: Code-Review+1 Since this script is from Harald, let's wait for his +2. -- To view, visit https://gerrit.osmocom.org/11885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I912d943cdc7024e3ddd92e0a122ac2dd4fbf0a18 Gerrit-Change-Number: 11885 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 22:48:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 22:49:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 22:49:23 +0000 Subject: Change in osmo-mgw[master]: fix osmo-mgw -s; fixes osmo-mgw.service using -s In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11925 ) Change subject: fix osmo-mgw -s; fixes osmo-mgw.service using -s ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f298aef73eb3486d04706910e9fdbaaebaf2481 Gerrit-Change-Number: 11925 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 22:49:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 23:09:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 25 Nov 2018 23:09:51 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: refactor RP-DATA header validation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11915 ) Change subject: libmsc/gsm_04_11.c: refactor RP-DATA header validation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15 Gerrit-Change-Number: 11915 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sun, 25 Nov 2018 23:09:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Nov 25 23:49:17 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 25 Nov 2018 23:49:17 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11914 ) Change subject: libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11914/1/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/11914/1/src/libmsc/gsm_04_11.c at 703 PS1, Line 703: static int gsm411_rx_rp_ack(struct gsm_trans *trans, > so msg parma was not being used at all? strange compiler didn't warn/error about it. Yeah, for some reason GCC doesn't even complain :/ -- To view, visit https://gerrit.osmocom.org/11914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0eb5c7c485ab7d109966431bd875fa74e00936d7 Gerrit-Change-Number: 11914 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sun, 25 Nov 2018 23:49:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 26 06:52:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 26 Nov 2018 06:52:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#201?= In-Reply-To: <1827422493.838.1543128722446.JavaMail.jenkins@jenkins.osmocom.org> References: <1827422493.838.1543128722446.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1947113928.851.1543215123700.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.03 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 26 08:57:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 26 Nov 2018 08:57:54 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11728 to look at the new patch set (#4). Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... gsm0808: add message generator for BSSMAP HANDOVER PERFORMED We currently have no generator function that can generate BSSMAP HANDOVER PERFORMED messages. Lets add function for this. Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/11728/4 -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 09:01:19 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 26 Nov 2018 09:01:19 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11734 to look at the new patch set (#4). Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... handover_fsm: send HANDOVER PERFORMED msg on internal ho When an internal handover is done the specification demands to inform the MSC about the event. - Add sending of BSSMAP HANDOVER PERFORMED msg. Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Depends: libosmocore I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M src/osmo-bsc/handover_fsm.c M tests/handover/handover_test.c 2 files changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/11734/4 -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 09:31:43 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 09:31:43 +0000 Subject: Change in libosmocore[master]: ctrl: print textual error on IPA parsing failure In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11910 ) Change subject: ctrl: print textual error on IPA parsing failure ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db Gerrit-Change-Number: 11910 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 09:31:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 09:45:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 09:45:59 +0000 Subject: Change in libosmocore[master]: ctrl: use #define for TRAP id Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11926 Change subject: ctrl: use #define for TRAP id ...................................................................... ctrl: use #define for TRAP id We always use id = 0 when sending TRAP messages. Let's make this more obvious by introducing appropriate define. Change-Id: I33d7d4c6a1885a75a85d6f2f017430e0860b4126 --- M include/osmocom/ctrl/control_cmd.h M src/ctrl/control_if.c 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/11926/1 diff --git a/include/osmocom/ctrl/control_cmd.h b/include/osmocom/ctrl/control_cmd.h index 93055c7..276a7de 100644 --- a/include/osmocom/ctrl/control_cmd.h +++ b/include/osmocom/ctrl/control_cmd.h @@ -12,6 +12,7 @@ #define CTRL_CMD_ERROR -1 #define CTRL_CMD_HANDLED 0 #define CTRL_CMD_REPLY 1 +#define CTRL_CMD_TRAP_ID "0" struct ctrl_handle; diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index ed18a2f..5ff4fd6 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -156,7 +156,7 @@ if (!cmd) return -ENOMEM; - cmd->id = "0"; /* It's a TRAP! */ + cmd->id = CTRL_CMD_TRAP_ID; /* It's a TRAP! */ cmd->variable = (char *) name; cmd->reply = value; r = ctrl_cmd_send_to_all(ctrl, cmd); -- To view, visit https://gerrit.osmocom.org/11926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I33d7d4c6a1885a75a85d6f2f017430e0860b4126 Gerrit-Change-Number: 11926 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 09:47:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 09:47:04 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11911 ) Change subject: IPA: move duplicated error handling into function ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 09:47:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 09:52:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 09:52:54 +0000 Subject: Change in osmo-gsm-manuals[master]: ctrl: clarify use of id = 0 Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11927 Change subject: ctrl: clarify use of id = 0 ...................................................................... ctrl: clarify use of id = 0 Change-Id: Ic00de5023e7a1ec6426a0178778d35b13c337271 --- M common/chapters/control_if.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/27/11927/1 diff --git a/common/chapters/control_if.adoc b/common/chapters/control_if.adoc index ea55cd7..cd639c7 100644 --- a/common/chapters/control_if.adoc +++ b/common/chapters/control_if.adoc @@ -55,7 +55,7 @@ :: A numeric identifier, uniquely identifying this particular - operation. `0` is not allowed. It will be echoed back in any + operation. Value `0` is not allowed unless it's a TRAP message. It will be echoed back in any response to a particular request. :: The name of the variable / field affected by the GET / SET / -- To view, visit https://gerrit.osmocom.org/11927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic00de5023e7a1ec6426a0178778d35b13c337271 Gerrit-Change-Number: 11927 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 09:58:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 09:58:11 +0000 Subject: Change in libosmocore[master]: ctrl: use #define for TRAP id In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11926 ) Change subject: ctrl: use #define for TRAP id ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11926/1/src/ctrl/control_if.c File src/ctrl/control_if.c: https://gerrit.osmocom.org/#/c/11926/1/src/ctrl/control_if.c at 159 PS1, Line 159: cmd->id = CTRL_CMD_TRAP_ID; /* It's a TRAP! */ Why do we use ID=0? why not incrementing it so one can infer order of traps? -- To view, visit https://gerrit.osmocom.org/11926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I33d7d4c6a1885a75a85d6f2f017430e0860b4126 Gerrit-Change-Number: 11926 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 09:58:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 09:59:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 09:59:29 +0000 Subject: Change in osmo-gsm-manuals[master]: ctrl: clarify use of id = 0 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11927 ) Change subject: ctrl: clarify use of id = 0 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11927/1/common/chapters/control_if.adoc File common/chapters/control_if.adoc: https://gerrit.osmocom.org/#/c/11927/1/common/chapters/control_if.adoc at 58 PS1, Line 58: operation. Value `0` is not allowed unless it's a TRAP message. It will be echoed back in any Same here. Why do we send value 0 for trap? why not using incrementing number? -- To view, visit https://gerrit.osmocom.org/11927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic00de5023e7a1ec6426a0178778d35b13c337271 Gerrit-Change-Number: 11927 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-CC: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 09:59:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:38:58 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 10:38:58 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Fix abort during APN patch In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11889 ) Change subject: gbproxy: Fix abort during APN patch ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11889/1/src/gprs/gb_proxy.c File src/gprs/gb_proxy.c: https://gerrit.osmocom.org/#/c/11889/1/src/gprs/gb_proxy.c at 365 PS1, Line 365: msgb_bvci(msg), link_info->sgsn_nsei); Do we need to use msg here or could we use msg_bvci(stored_msg)? https://gerrit.osmocom.org/#/c/11889/1/src/gprs/gb_proxy.c at 371 PS1, Line 371: msgb_nsei(msg), Same here, should we use link_info->sgsn_nsei just to be clear? -- To view, visit https://gerrit.osmocom.org/11889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c Gerrit-Change-Number: 11889 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 10:38:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:41:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 10:41:04 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Fix abort during APN patch In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11889 ) Change subject: gbproxy: Fix abort during APN patch ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11889/1/src/gprs/gb_proxy.c File src/gprs/gb_proxy.c: https://gerrit.osmocom.org/#/c/11889/1/src/gprs/gb_proxy.c at 371 PS1, Line 371: msgb_nsei(msg), > Same here, should we use link_info->sgsn_nsei just to be clear? Those are fixed in follow-up patches, check them :) -- To view, visit https://gerrit.osmocom.org/11889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c Gerrit-Change-Number: 11889 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 10:41:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:43:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 10:43:53 +0000 Subject: Change in libosmocore[master]: ctrl: print textual error on IPA parsing failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11910 ) Change subject: ctrl: print textual error on IPA parsing failure ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db Gerrit-Change-Number: 11910 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 10:43:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:46:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 10:46:35 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11911 ) Change subject: IPA: move duplicated error handling into function ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11911/3/src/gsm/ipa.c File src/gsm/ipa.c: https://gerrit.osmocom.org/#/c/11911/3/src/gsm/ipa.c at 545 PS3, Line 545: * \param[out] ret result of recv() will be stored in here. You are still not mentioning here that ret also contains errno if ret >0. Othwerise it would be range [-1,N] (result of recv). -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 10:46:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:47:31 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 10:47:31 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Fix abort during APN patch In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11889 ) Change subject: gbproxy: Fix abort during APN patch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c Gerrit-Change-Number: 11889 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 10:47:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:47:35 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 10:47:35 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Fix abort during APN patch In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11889 ) Change subject: gbproxy: Fix abort during APN patch ...................................................................... gbproxy: Fix abort during APN patch gbproxy process was aborted with following message during APN patching: <000e> gb_proxy_patch.c:129 Patching ACT_PDP_REQ to SGSN: Replacing APN 'foo' -> 'bar' msgb(0x5555558797d0): Sub area is not fully contained in the msg data During osmo-sgsn 107fb59e84b12bbf6bdfdd4fc241dbcda7332706 old copy of gprs_msgb_resize_area was replaced by more modern libosmocore version called msgb_resize_area. They are mostly identical but the later has some extra verification asserts. One of this asserts was triggering the process abort, but the bug has always been there as far as I could see in git history. The assert triggers because the bssgp buffer and parse_ctx point to "stored_msg", while the data buffer comes from a different msbg "msg", which is clearly wrong behavior. In the modified line, "msg" (the one which provided the imsi now already stored in link_info through gbproxy_update_link_state_ul()->gbproxy_assign_imsi()) is really not needed anymore, and we want to patch the stored msg going to be forwarded. Related: SYS#4397 Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c --- M src/gprs/gb_proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, but someone else must approve daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index fe6a6c6..85c3c47 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -348,7 +348,7 @@ gprs_gb_parse_bssgp(msgb_bssgph(stored_msg), msgb_bssgp_len(stored_msg), &tmp_parse_ctx); - gbproxy_patch_bssgp(msg, msgb_bssgph(stored_msg), + gbproxy_patch_bssgp(stored_msg, msgb_bssgph(stored_msg), msgb_bssgp_len(stored_msg), peer, link_info, &len_change, &tmp_parse_ctx); -- To view, visit https://gerrit.osmocom.org/11889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7226fc5bcfbf58c349431d0a39cdb904fefd9e9c Gerrit-Change-Number: 11889 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:49:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 10:49:15 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: Remove unneeded parse_ctx param In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11890 ) Change subject: gbproxy: Remove unneeded parse_ctx param ...................................................................... gbproxy: Remove unneeded parse_ctx param The only use inside the function is only to log information which should actually be provided by tmp_parse_ctx of each stored msg. Change-Id: Ic186b92fa9bd0a2b853a0cf525c6f6feb9493897 --- M src/gprs/gb_proxy.c 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 85c3c47..faf4a8b 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -324,8 +324,7 @@ static int gbproxy_flush_stored_messages(struct gbproxy_peer *peer, struct msgb *msg, time_t now, - struct gbproxy_link_info* link_info, - struct gprs_gb_parse_context *parse_ctx) + struct gbproxy_link_info* link_info) { int rc; struct msgb *stored_msg; @@ -369,8 +368,8 @@ "NSEI=%d(BSS) failed to send stored message " "(%s)\n", msgb_nsei(msg), - parse_ctx->llc_msg_name ? - parse_ctx->llc_msg_name : "BSSGP"); + tmp_parse_ctx.llc_msg_name ? + tmp_parse_ctx.llc_msg_name : "BSSGP"); msgb_free(stored_msg); } @@ -479,8 +478,7 @@ /* The IMSI is now available. If flushing the messages fails, * then link_info has been deleted and we should return * immediately. */ - if (gbproxy_flush_stored_messages(peer, msg, now, link_info, - parse_ctx) < 0) + if (gbproxy_flush_stored_messages(peer, msg, now, link_info) < 0) return 0; gbproxy_reset_imsi_acquisition(link_info); -- To view, visit https://gerrit.osmocom.org/11890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic186b92fa9bd0a2b853a0cf525c6f6feb9493897 Gerrit-Change-Number: 11890 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:49:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 10:49:16 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Move comment to func description In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11891 ) Change subject: gbproxy: flush_stored_messages: Move comment to func description ...................................................................... gbproxy: flush_stored_messages: Move comment to func description Change-Id: I14a90d1957a2cbd8fd53002b035fe481ab3abbbf --- M src/gprs/gb_proxy.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index faf4a8b..d43b034 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -321,6 +321,8 @@ link_info->vu_gen_tx_bss = GBPROXY_INIT_VU_GEN_TX; } +/* Got identity response with IMSI, assuming the request had + * been generated by the gbproxy */ static int gbproxy_flush_stored_messages(struct gbproxy_peer *peer, struct msgb *msg, time_t now, @@ -328,8 +330,6 @@ { int rc; struct msgb *stored_msg; - /* Got identity response with IMSI, assuming the request had - * been generated by the gbproxy */ LOGP(DLLC, LOGL_DEBUG, "NSEI=%d(BSS) IMSI acquisition succeeded, " -- To view, visit https://gerrit.osmocom.org/11891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I14a90d1957a2cbd8fd53002b035fe481ab3abbbf Gerrit-Change-Number: 11891 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:49:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 10:49:18 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Log and route using stored_msg info In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11892 ) Change subject: gbproxy: flush_stored_messages: Log and route using stored_msg info ...................................................................... gbproxy: flush_stored_messages: Log and route using stored_msg info It makes no sense to print every stored_msg with BVCI from msg, same for routing. This will allow getting rid of "msg" completelly in next commit. Change-Id: I95eafbf41012be3e02c68fc996773dd02b174fe6 --- M src/gprs/gb_proxy.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index d43b034..331ebc8 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -361,13 +361,13 @@ } rc = gbprox_relay2sgsn(peer->cfg, stored_msg, - msgb_bvci(msg), link_info->sgsn_nsei); + msgb_bvci(stored_msg), link_info->sgsn_nsei); if (rc < 0) LOGP(DLLC, LOGL_ERROR, "NSEI=%d(BSS) failed to send stored message " "(%s)\n", - msgb_nsei(msg), + tmp_parse_ctx.peer_nsei, tmp_parse_ctx.llc_msg_name ? tmp_parse_ctx.llc_msg_name : "BSSGP"); msgb_free(stored_msg); -- To view, visit https://gerrit.osmocom.org/11892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I95eafbf41012be3e02c68fc996773dd02b174fe6 Gerrit-Change-Number: 11892 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 10:49:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 10:49:18 +0000 Subject: Change in osmo-sgsn[master]: gbproxy: flush_stored_messages: Get rid of msg param In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11893 ) Change subject: gbproxy: flush_stored_messages: Get rid of msg param ...................................................................... gbproxy: flush_stored_messages: Get rid of msg param Log line actually makes more sense out of the function where IMSI acq is resolved. We can then get rid of msg param which may cause confusion and add complexitiy to code for no good reason. Change-Id: I6716a260e12a3cf36af0501ce611c6c1e608f537 --- M src/gprs/gb_proxy.c 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c index 331ebc8..0b5758a 100644 --- a/src/gprs/gb_proxy.c +++ b/src/gprs/gb_proxy.c @@ -324,18 +324,12 @@ /* Got identity response with IMSI, assuming the request had * been generated by the gbproxy */ static int gbproxy_flush_stored_messages(struct gbproxy_peer *peer, - struct msgb *msg, time_t now, struct gbproxy_link_info* link_info) { int rc; struct msgb *stored_msg; - LOGP(DLLC, LOGL_DEBUG, - "NSEI=%d(BSS) IMSI acquisition succeeded, " - "flushing stored messages\n", - msgb_nsei(msg)); - /* Patch and flush stored messages towards the SGSN */ while ((stored_msg = msgb_dequeue_count(&link_info->stored_msgs, &link_info->stored_msgs_len))) { @@ -475,10 +469,14 @@ gsm48_hdr_pdisc(parse_ctx->g48_hdr) == GSM48_PDISC_MM_GPRS && gsm48_hdr_msg_type(parse_ctx->g48_hdr) == GSM48_MT_GMM_ID_RESP; + LOGP(DLLC, LOGL_DEBUG, + "NSEI=%d(BSS) IMSI acquisition succeeded, " + "flushing stored messages\n", + msgb_nsei(msg)); /* The IMSI is now available. If flushing the messages fails, * then link_info has been deleted and we should return * immediately. */ - if (gbproxy_flush_stored_messages(peer, msg, now, link_info) < 0) + if (gbproxy_flush_stored_messages(peer, now, link_info) < 0) return 0; gbproxy_reset_imsi_acquisition(link_info); -- To view, visit https://gerrit.osmocom.org/11893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6716a260e12a3cf36af0501ce611c6c1e608f537 Gerrit-Change-Number: 11893 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon Nov 26 11:19:00 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 26 Nov 2018 11:19:00 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-cellmgr-ng_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#57?= In-Reply-To: <1993825679.840.1543144741396.JavaMail.jenkins@jenkins.osmocom.org> References: <1993825679.840.1543144741396.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1143565675.853.1543231140480.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 172.05 KB...] config.status: executing libtool commands + PKG_CONFIG_PATH=/build/deps/libosmo-sccp/..//install/lib/pkgconfig + make -j 8 install echo 0.10.0.30-5371 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in mtp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' Making install in sccp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC sccp.o CC mtp_pcap.o CC libxua_a-xua_msg.o CC sua.lo CC sccp_sap.lo CC xua_msg.lo CC sccp_helpers.lo CC m3ua.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:1032:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/libosmo-sccp/../install/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/libosmo-sccp/../install/lib' ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libsccp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libmtp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/libosmo-sccp/../install/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/libosmo-sccp/../install/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' Making install in vty make[3]: Entering directory '/build/deps/libosmo-sccp/tests/vty' CC ss7_asp_vty_test.o CCLD ss7_asp_vty_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/vty' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_server.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/libosmo-sccp/../install/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/libosmo-sccp/../install/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied Makefile:326: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: *** [install-systemdsystemunitDATA] Error 1 make[3]: *** [install-am] Error 2 Makefile:396: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[2]: *** [install-recursive] Error 1 Makefile:360: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' Makefile:487: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 Makefile:786: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:19:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:19:36 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: introduce constant for TRAP id Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11928 Change subject: ctrl: introduce constant for TRAP id ...................................................................... ctrl: introduce constant for TRAP id Use it for TRAP message parsing and generation. Change-Id: I0381eb60d10e7278b966464add79772a9f7c8118 --- M osmopy/osmo_ipa.py 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/28/11928/1 diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index 246101d..41865c1 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -43,6 +43,7 @@ CTRL_REP = 'REPLY' CTRL_ERR = 'ERR' CTRL_TRAP = 'TRAP' + CTRL_TRAP_ID = 0 def _l(self, d, p): """ @@ -250,7 +251,7 @@ if s == self.CTRL_GET + '_' + self.CTRL_REP: return i, v, None (s, i, var, val) = data.split(' ', 3) - if s == self.CTRL_TRAP and i != '0': + if s == self.CTRL_TRAP and int(i) != self.CTRL_TRAP_ID: return i, None, None return i, var, val @@ -267,7 +268,7 @@ """ Make TRAP message with given (vak, val) pair """ - return self.add_header("%s 0 %s %s" % (self.CTRL_TRAP, var, val)) + return self.add_header("%s %d %s %s" % (self.CTRL_TRAP, self.CTRL_TRAP_ID, var, val)) def cmd(self, var, val=None): """ -- To view, visit https://gerrit.osmocom.org/11928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0381eb60d10e7278b966464add79772a9f7c8118 Gerrit-Change-Number: 11928 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:19:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:19:37 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add optional TRAP-skipping parameter to split_combined() Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11929 Change subject: ctrl: add optional TRAP-skipping parameter to split_combined() ...................................................................... ctrl: add optional TRAP-skipping parameter to split_combined() This allows to easy skip TRAP messages when we do not want to process them (for example when waiting for REPLY to a single command). Update documentation accordingly. Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 --- M osmopy/osmo_ipa.py 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/29/11929/1 diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index 41865c1..822e166 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -2,7 +2,7 @@ # -*- mode: python-mode; py-indent-tabs-mode: nil -*- """ /* - * Copyright (C) 2016 sysmocom s.f.m.c. GmbH + * Copyright (C) 2016-2018 sysmocom s.f.m.c. GmbH * * All Rights Reserved * @@ -28,7 +28,7 @@ """ Stateless IPA protocol multiplexer: add/remove/parse (extended) header """ - version = "0.0.6" + version = "0.0.7" TCP_PORT_OML = 3002 TCP_PORT_RSL = 3003 # OpenBSC extensions: OSMO, MGCP_OLD @@ -106,18 +106,25 @@ Strip IPA protocol header correctly removing extension if present Returns data length, IPA protocol, extension (or None if not defined for a give protocol) and the data without header """ - if not len(data): + if data == None or not len(data): return None, None, None, None (dlen, proto) = struct.unpack('>HB', data[:3]) if self.PROTO['OSMO'] == proto or self.PROTO['CCM'] == proto: # there's extension which we have to unpack return struct.unpack('>HBB', data[:4]) + (data[4:], ) # length, protocol, extension, data return dlen, proto, None, data[3:] # length, protocol, _, data - def split_combined(self, data): + def split_combined(self, data, ignore_traps = False): """ - Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where rest contains remaining messages, first is the single IPA message + Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where rest contains + remaining messages, first is the single IPA message with. Neither have headers stripped. + If ignore_traps parameter is set, than TRAP messages will be discarded. """ - (length, _, _, _) = self.del_header(data) + if data == None or len(data) == 0: + return None, None + (length, _, _, d) = self.del_header(data) + if length and ignore_traps: + if d[:(length + 3)].decode('utf-8').startswith(self.CTRL_TRAP): + return self.split_combined(data[(length + 3):], ignore_traps) return data[:(length + 3)], data[(length + 3):] def tag_serial(self, data): -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:19:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:19:37 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: cosmetic cleanup Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11930 Change subject: ctrl: cosmetic cleanup ...................................................................... ctrl: cosmetic cleanup * remove unused function * move internal function call outside of main Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da --- M scripts/osmo_ctrl.py 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/30/11930/1 diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py index 771611d..2ed334d 100755 --- a/scripts/osmo_ctrl.py +++ b/scripts/osmo_ctrl.py @@ -52,13 +52,10 @@ return (Ctrl().rem_header(head),) + Ctrl().verify(head, r, var, value) def set_var(sck, var, val): + _leftovers(sock, socket.MSG_DONTWAIT) (a, _, _) = do_set_get(sck, var, val) return a -def get_var(sck, var): - (_, _, v) = do_set_get(sck, var) - return v - def _leftovers(sck, fl): """ Read outstanding data if any according to flags @@ -110,7 +107,6 @@ if options.cmd_set: if len(args) < 2: parser.error("Set requires var and value arguments") - _leftovers(sock, socket.MSG_DONTWAIT) print("Got message:", set_var(sock, args[0], ' '.join(args[1:]))) if options.cmd_get: -- To view, visit https://gerrit.osmocom.org/11930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da Gerrit-Change-Number: 11930 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:20:18 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:20:18 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11909 ) Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 11:20:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:20:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:20:59 +0000 Subject: Change in libosmocore[master]: ctrl: print textual error on IPA parsing failure In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11910 ) Change subject: ctrl: print textual error on IPA parsing failure ...................................................................... ctrl: print textual error on IPA parsing failure Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db --- M src/ctrl/control_if.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index ed18a2f..1121d07 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -360,7 +360,7 @@ * nothing left to do now. */ return 0; } else if (ret < 0) { - LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %d\n", ret); + LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %d (%s)\n", ret, strerror(-ret)); return 0; } -- To view, visit https://gerrit.osmocom.org/11910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db Gerrit-Change-Number: 11910 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:27:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:27:25 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11911 ) Change subject: IPA: move duplicated error handling into function ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11911/3/src/gsm/ipa.c File src/gsm/ipa.c: https://gerrit.osmocom.org/#/c/11911/3/src/gsm/ipa.c at 545 PS3, Line 545: * \param[out] ret result of recv() will be stored in here. > You are still not mentioning here that ret also contains errno if ret >0 Because it doesn't: if ret > 0 than it does not contain errno - see the code. -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 11:27:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:27:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:27:52 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into function In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11911 to look at the new patch set (#4). Change subject: IPA: move duplicated error handling into function ...................................................................... IPA: move duplicated error handling into function The code is re-ordered to put error handling upfront similar to te way we do it in oter places. Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f --- M src/gsm/ipa.c 1 file changed, 32 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/11911/4 -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:35:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:35:27 +0000 Subject: Change in osmo-gsm-manuals[master]: ctrl: clarify use of id = 0 In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11927 ) Change subject: ctrl: clarify use of id = 0 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11927/1/common/chapters/control_if.adoc File common/chapters/control_if.adoc: https://gerrit.osmocom.org/#/c/11927/1/common/chapters/control_if.adoc at 58 PS1, Line 58: operation. Value `0` is not allowed unless it's a TRAP message. It will be echoed back in any > Same here. [?] I have not invented the protocol, so I have no idea. I'm just documenting existing behavior. -- To view, visit https://gerrit.osmocom.org/11927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic00de5023e7a1ec6426a0178778d35b13c337271 Gerrit-Change-Number: 11927 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 11:35:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 11:37:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 11:37:14 +0000 Subject: Change in libosmocore[master]: ctrl: use #define for TRAP id In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11926 ) Change subject: ctrl: use #define for TRAP id ...................................................................... Patch Set 1: (1 comment) I think such questions better be addressed to ML where they could reach wider audience. https://gerrit.osmocom.org/#/c/11926/1/src/ctrl/control_if.c File src/ctrl/control_if.c: https://gerrit.osmocom.org/#/c/11926/1/src/ctrl/control_if.c at 159 PS1, Line 159: cmd->id = CTRL_CMD_TRAP_ID; /* It's a TRAP! */ > Why do we use ID=0? why not incrementing it so one can infer order of traps? I don't know what was the reasoning behind this decision. And changing the protocol semantics is certainly outside of the scope of this patch. -- To view, visit https://gerrit.osmocom.org/11926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I33d7d4c6a1885a75a85d6f2f017430e0860b4126 Gerrit-Change-Number: 11926 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 11:37:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 12:02:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 26 Nov 2018 12:02:37 +0000 Subject: Change in osmo-gsm-manuals[master]: ctrl: clarify use of id = 0 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11927 ) Change subject: ctrl: clarify use of id = 0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic00de5023e7a1ec6426a0178778d35b13c337271 Gerrit-Change-Number: 11927 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 12:02:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 12:14:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 12:14:56 +0000 Subject: Change in libosmocore[master]: IPA: move duplicated error handling into function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11911 ) Change subject: IPA: move duplicated error handling into function ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11911/3/src/gsm/ipa.c File src/gsm/ipa.c: https://gerrit.osmocom.org/#/c/11911/3/src/gsm/ipa.c at 545 PS3, Line 545: * \param[out] ret result of recv() will be stored in here. > > You are still not mentioning here that ret also contains errno if ret >0 [?] Of course I meant if ret < 0 ;) -- To view, visit https://gerrit.osmocom.org/11911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0147bffaf04b0baf97e5cca22948bd0e116668f Gerrit-Change-Number: 11911 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 12:14:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:04:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 13:04:25 +0000 Subject: Change in libosmocore[master]: ctrl: handle ECONNRESET on initial read gracefully In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11912 ) Change subject: ctrl: handle ECONNRESET on initial read gracefully ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cbdb3909660d605181d6923031336d296ea4340 Gerrit-Change-Number: 11912 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 13:04:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:09:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 13:09:43 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix whitespace In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11906 to look at the new patch set (#2). Change subject: cosmetic: fix whitespace ...................................................................... cosmetic: fix whitespace Change-Id: Iaa4552844db33fe69da5ed7028dbfa0100c33900 --- M include/osmo-bts/rsl.h M src/common/rsl.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-trx/l1_if.c 4 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/11906/2 -- To view, visit https://gerrit.osmocom.org/11906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iaa4552844db33fe69da5ed7028dbfa0100c33900 Gerrit-Change-Number: 11906 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:09:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 13:09:44 +0000 Subject: Change in osmo-bts[master]: bts_model: Allow TS connect to be processed asynchronously Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11931 Change subject: bts_model: Allow TS connect to be processed asynchronously ...................................................................... bts_model: Allow TS connect to be processed asynchronously This commit doesn't change internal logic of any model, only the API to be able to return result of connect TS asyncrhonously since some models (like osmo-bts-trx) require some time to process the result. This way PDCH ACT/DEACT (N)ACK can be sent once the result of this long process is known. For instance, nowadays in osmo-bts-trx we PDCH (DE)ACT ACK before getting the result from SETSLOT on the TRX iface. With this new API, bts_model_ts_connect doesn't return any value synchronously. Instead, it is expected to always end up calling cb_ts_connected with the return code from the TS activation process. 0 is considered a successs, while any other value is considered an error. Change-Id: Ie073a4397dd2f1a691968d12b15b8b42f1e1b0cf --- M include/osmo-bts/bts_model.h M include/osmo-bts/rsl.h M src/common/rsl.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/main.c M tests/handover/handover_test.c M tests/meas/meas_test.c M tests/stubs.c 13 files changed, 63 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/11931/1 diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h index f1f6830..be0480c 100644 --- a/include/osmo-bts/bts_model.h +++ b/include/osmo-bts/bts_model.h @@ -60,6 +60,6 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst); int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts); -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan); +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan); #endif diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 731f6c0..0361841 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -40,7 +40,7 @@ int rsl_tx_delete_ind(struct gsm_bts *bts, const uint8_t *ia, uint8_t ia_len); void cb_ts_disconnected(struct gsm_bts_trx_ts *ts); -void cb_ts_connected(struct gsm_bts_trx_ts *ts); +void cb_ts_connected(struct gsm_bts_trx_ts *ts, int rc); void ipacc_dyn_pdch_complete(struct gsm_bts_trx_ts *ts, int rc); #endif // _RSL_H */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 9b0de7c..507e8aa 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2157,7 +2157,7 @@ * 1. call bts_model_ts_disconnect() to disconnect TCH/F; * 2. cb_ts_disconnected() is called when done; * 3. call bts_model_ts_connect() to connect as PDTCH; - * 4. cb_ts_connected() is called when done; + * 4. cb_ts_connected(rc) is called when done; * 5. instruct the PCU to enable PDTCH; * 6. the PCU will call back with an activation request; * 7. l1sap_info_act_cnf() will call ipacc_dyn_pdch_complete() when SAPI @@ -2171,7 +2171,7 @@ * deactivations are done; * 4. cb_ts_disconnected() is called when done; * 5. call bts_model_ts_connect() to connect as TCH/F; - * 6. cb_ts_connected() is called when done; + * 6. cb_ts_connected(rc) is called when done; * 7. directly call ipacc_dyn_pdch_complete(), since no further action required * for TCH/F; * 8. send a PDCH DEACT ACK. @@ -2276,7 +2276,8 @@ if (rc) goto error_nack; - rc = bts_model_ts_connect(ts, as_pchan); + bts_model_ts_connect(ts, as_pchan); + return; error_nack: /* Error? then NACK right now. */ @@ -2322,9 +2323,14 @@ } } -static void ipacc_dyn_pdch_ts_connected(struct gsm_bts_trx_ts *ts) +static void ipacc_dyn_pdch_ts_connected(struct gsm_bts_trx_ts *ts, int rc) { - int rc; + if (rc) { + LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT IPA operation failed (%d) in bts model\n", + gsm_lchan_name(ts->lchan), rc); + ipacc_dyn_pdch_complete(ts, rc); + return; + } if (ts->flags & TS_F_PDCH_DEACT_PENDING) { if (ts->lchan[0].type != GSM_LCHAN_TCH_F) @@ -2373,12 +2379,18 @@ } } -static void osmo_dyn_ts_connected(struct gsm_bts_trx_ts *ts) +static void osmo_dyn_ts_connected(struct gsm_bts_trx_ts *ts, int rc) { - int rc; struct msgb *msg = ts->dyn.pending_chan_activ; ts->dyn.pending_chan_activ = NULL; + if (rc) { + LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT OSMO operation failed (%d) in bts model\n", + gsm_lchan_name(ts->lchan), rc); + ipacc_dyn_pdch_complete(ts, rc); + return; + } + if (!msg) { LOGP(DRSL, LOGL_ERROR, "%s TS re-connected, but no chan activ msg pending\n", @@ -2395,15 +2407,15 @@ msgb_free(msg); } -void cb_ts_connected(struct gsm_bts_trx_ts *ts) +void cb_ts_connected(struct gsm_bts_trx_ts *ts, int rc) { OSMO_ASSERT(ts); switch (ts->pchan) { case GSM_PCHAN_TCH_F_PDCH: - return ipacc_dyn_pdch_ts_connected(ts); + return ipacc_dyn_pdch_ts_connected(ts, rc); case GSM_PCHAN_TCH_F_TCH_H_PDCH: - return osmo_dyn_ts_connected(ts); + return osmo_dyn_ts_connected(ts, rc); default: return; } diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c index da6c60e..f084f1b 100644 --- a/src/osmo-bts-litecell15/oml.c +++ b/src/osmo-bts-litecell15/oml.c @@ -1925,13 +1925,17 @@ ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " : "", ts->flags & TS_F_PDCH_DEACT_PENDING ? "DEACT_PENDING " : ""); - cb_ts_connected(ts); + cb_ts_connected(ts, 0); return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + int rc; + + rc = ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + if (rc) + cb_ts_connected(ts, rc); } diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index f76de92..6cf7e1d 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -2070,15 +2070,19 @@ ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " : "", ts->flags & TS_F_PDCH_DEACT_PENDING ? "DEACT_PENDING " : ""); - cb_ts_connected(ts); + cb_ts_connected(ts, 0); msgb_free(l1_msg); return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + int rc; + + rc = ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + if (rc) + cb_ts_connected(ts, rc); } diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 2ab9fcd..d44f721 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1605,7 +1605,7 @@ msgb_free(resp); - cb_ts_connected(ts); + cb_ts_connected(ts, 0); return 0; } @@ -1805,9 +1805,10 @@ return l1if_req_compl(fl1h, msg, ts_disconnect_cb, NULL); } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { + int rc; if (as_pchan == GSM_PCHAN_TCH_F_PDCH || as_pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { LOGP(DL1C, LOGL_ERROR, @@ -1815,8 +1816,10 @@ " expected a specific pchan instead\n", gsm_ts_and_pchan_name(ts), gsm_pchan_name(as_pchan)); exit(1); - return -EINVAL; + return; } - return ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + rc = ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + if (rc) + cb_ts_connected(ts, rc); } diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index fa1aaf4..c011401 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -211,9 +211,9 @@ return -ENOTSUP; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return -ENOTSUP; + return; } int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap) diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index ce85a8b..ea7527d 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1947,13 +1947,17 @@ ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " : "", ts->flags & TS_F_PDCH_DEACT_PENDING ? "DEACT_PENDING " : ""); - cb_ts_connected(ts); + cb_ts_connected(ts, 0); return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + int rc; + + rc = ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + if (rc) + cb_ts_connected(ts, rc); } diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index ccc13f4..da1b554 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -764,7 +764,7 @@ return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { int rc; @@ -773,12 +773,10 @@ rc = trx_set_ts_as_pchan(ts, as_pchan); if (rc) - return rc; + cb_ts_connected(ts, rc); LOGP(DL1C, LOGL_NOTICE, "%s bts_model_ts_connect(as_pchan=%s) success," " calling cb_ts_connected()\n", gsm_ts_name(ts), gsm_pchan_name(as_pchan)); - - cb_ts_connected(ts); - return 0; + cb_ts_connected(ts, 0); } diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index 88041fd..aa1c608 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -133,10 +133,9 @@ return -ENOTSUP; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); - return -ENOTSUP; } int main(int argc, char **argv) diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 407ed95..a805554 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -278,6 +278,6 @@ void trx_get_hlayer1(void) {} int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) { return 0; } int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { return 0; } +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { return; } int bts_model_lchan_deactivate(struct gsm_lchan *lchan) { return 0; } int bts_model_lchan_deactivate_sacch(struct gsm_lchan *lchan) { return 0; } diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index f580374..b2bf80e 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -659,9 +659,9 @@ return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return 0; + return; } int bts_model_lchan_deactivate(struct gsm_lchan *lchan) diff --git a/tests/stubs.c b/tests/stubs.c index d6f4d3d..7c64034 100644 --- a/tests/stubs.c +++ b/tests/stubs.c @@ -54,6 +54,6 @@ int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) -{ return 0; } +{ return; } -- To view, visit https://gerrit.osmocom.org/11931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie073a4397dd2f1a691968d12b15b8b42f1e1b0cf Gerrit-Change-Number: 11931 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:09:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 13:09:44 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11932 Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT Before this patch, PDCH DEACT was (n)acked to the BSC without taking into account if TRX succeeded or failed to set the TS: 20181123044720655 DRLL <0002> rsl.c:2523 (bts=0,trx=0,ts=0,ss=0) Rx RLL DATA_REQ Abis -> LAPDm 20181123044720700 DRSL <0000> rsl.c:2805 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) ss=0 Rx RSL IPAC_PDCH_DEACT 20181123044720700 DRSL <0000> rsl.c:2205 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still active 20181123044720700 DRSL <0000> rsl.c:2131 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT NACK (cause = 0x0f) 20181123044720700 DPCU <0009> pcu_sock.c:124 Sending info 20181123044720700 DPCU <0009> pcu_sock.c:139 BTS is up 20181123044720700 DPCU <0009> pcu_sock.c:232 trx=0 ts=7: available (tsc=7 arfcn=868) 20181123044720703 DPCU <0009> pcu_sock.c:608 Deactivate request received: TRX=0 TX=6 20181123044720703 DL1C <0006> l1sap.c:1519 deactivating channel chan_nr=TCH/F on TS6 trx=0 20181123044720703 DTRX <000b> trx_if.c:242 Enqueuing TRX control command 'CMD NOHANDOVER 6 0' 20181123044720703 DL1C <0006> l1sap.c:648 deactivate confirm chan_nr=TCH/F on TS6 trx=0 20181123044720703 DRSL <0000> rsl.c:714 (bts=0,trx=0,ts=6,ss=0) not sending REL ACK 20181123044720703 DRSL <0000> rsl.c:2264 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: channel disconnected, will reconnect as TCH 20181123044720703 DL1C <0006> scheduler.c:593 Configuring multiframe with TCH/F+SACCH trx=0 ts=6 20181123044720703 DTRX <000b> trx_if.c:242 Enqueuing TRX control command 'CMD SETSLOT 6 1' 20181123044720703 DL1C <0006> l1_if.c:780 (bts=0,trx=0,ts=6) bts_model_ts_connect(as_pchan=TCH/F) success, calling cb_ts_connected() 20181123044720703 DRSL <0000> rsl.c:2339 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: timeslot connected as TCH/F 20181123044720703 DRSL <0000> rsl.c:2440 (bts=0,trx=0,ts=6,ss=0) TCH/F_PDCH switched to TCH/F mode (ts->flags == 0) 20181123044720703 DRSL <0000> rsl.c:2103 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT ACK 20181123044720704 DTRX <000b> trx_if.c:492 Response message: 'RSP NOHANDOVER 0 6' 20181123044720705 DTRX <000b> trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 3 files changed, 91 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/11932/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index da1b554..6af25a6 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -58,6 +58,16 @@ [GSM_PCHAN_UNKNOWN] = 0, }; +static enum gsm_phys_chan_config transceiver_chan_type_2_pchan(uint8_t type) +{ + int i; + for (i = 0; i < _GSM_PCHAN_MAX; i++) { + if (transceiver_chan_types[i] == type) + return (enum gsm_phys_chan_config) i; + } + return GSM_PCHAN_UNKNOWN; +} + struct trx_l1h *trx_l1h_alloc(void *tall_ctx, struct phy_instance *pinst) { struct trx_l1h *l1h; @@ -140,6 +150,36 @@ LID_SACCH, 0); } +static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc) +{ + struct phy_instance *pinst = l1h->phy_inst; + struct gsm_bts_trx *trx = pinst->trx; + struct gsm_bts_trx_ts *ts; + enum gsm_phys_chan_config pchan; + + + if (tn >= TRX_NR_TS) { + LOGP(DL1C, LOGL_ERROR, "transceiver (%s) SETSLOT invalid param TN\n", + phy_instance_name(pinst)); + return; + } + + if (type > 13) { + LOGP(DL1C, LOGL_ERROR, "transceiver (%s) SETSLOT invalid param TS_TYPE\n", + phy_instance_name(pinst)); + return; + } + + pchan = transceiver_chan_type_2_pchan(type); + + ts = &trx->ts[tn]; + LOGP(DL1C, LOGL_DEBUG, "%s l1if_setslot_cb(as_pchan=%s)," + " calling cb_ts_connected(rc=%d)\n", + gsm_ts_name(ts), gsm_pchan_name(pchan), rc); + cb_ts_connected(ts, rc); +} + + /* * transceiver provisioning */ @@ -196,7 +236,7 @@ if (l1h->config.slottype_valid[tn] && !l1h->config.slottype_sent[tn]) { trx_if_cmd_setslot(l1h, tn, - l1h->config.slottype[tn]); + l1h->config.slottype[tn], l1if_setslot_cb); l1h->config.slottype_sent[tn] = 1; } } @@ -775,8 +815,5 @@ if (rc) cb_ts_connected(ts, rc); - LOGP(DL1C, LOGL_NOTICE, "%s bts_model_ts_connect(as_pchan=%s) success," - " calling cb_ts_connected()\n", - gsm_ts_name(ts), gsm_pchan_name(as_pchan)); - cb_ts_connected(ts, 0); + /* cb_ts_connected will be called in l1if_setslot_cb once we receive RSP SETSLOT */ } diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index abe6846..7c9f432 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -196,7 +196,7 @@ * The new ocommand will be added to the end of the control command * queue. */ -static int trx_ctrl_cmd(struct trx_l1h *l1h, int critical, const char *cmd, +static int trx_ctrl_cmd(struct trx_l1h *l1h, int critical, void *cb, const char *cmd, const char *fmt, ...) { struct trx_ctrl_msg *tcm; @@ -231,6 +231,7 @@ tcm->params_len = 0; } tcm->critical = critical; + tcm->cb = cb; /* Avoid adding consecutive duplicate messages, eg: two consecutive POWEROFF */ if(pending) @@ -255,7 +256,7 @@ { struct phy_instance *pinst = l1h->phy_inst; if (pinst->num == 0) - return trx_ctrl_cmd(l1h, 1, "POWEROFF", ""); + return trx_ctrl_cmd(l1h, 1, NULL, "POWEROFF", ""); else return 0; } @@ -265,7 +266,7 @@ { struct phy_instance *pinst = l1h->phy_inst; if (pinst->num == 0) - return trx_ctrl_cmd(l1h, 1, "POWERON", ""); + return trx_ctrl_cmd(l1h, 1, NULL, "POWERON", ""); else return 0; } @@ -277,7 +278,7 @@ if (pinst->phy_link->u.osmotrx.use_legacy_setbsic) return 0; - return trx_ctrl_cmd(l1h, 1, "SETTSC", "%d", tsc); + return trx_ctrl_cmd(l1h, 1, NULL, "SETTSC", "%d", tsc); } /*! Send "SETBSIC" command to TRX */ @@ -287,37 +288,37 @@ if (!pinst->phy_link->u.osmotrx.use_legacy_setbsic) return 0; - return trx_ctrl_cmd(l1h, 1, "SETBSIC", "%d", bsic); + return trx_ctrl_cmd(l1h, 1, NULL, "SETBSIC", "%d", bsic); } /*! Send "SETRXGAIN" command to TRX */ int trx_if_cmd_setrxgain(struct trx_l1h *l1h, int db) { - return trx_ctrl_cmd(l1h, 0, "SETRXGAIN", "%d", db); + return trx_ctrl_cmd(l1h, 0, NULL, "SETRXGAIN", "%d", db); } /*! Send "SETPOWER" command to TRX */ int trx_if_cmd_setpower(struct trx_l1h *l1h, int db) { - return trx_ctrl_cmd(l1h, 0, "SETPOWER", "%d", db); + return trx_ctrl_cmd(l1h, 0, NULL, "SETPOWER", "%d", db); } /*! Send "SETMAXDLY" command to TRX, i.e. maximum delay for RACH bursts */ int trx_if_cmd_setmaxdly(struct trx_l1h *l1h, int dly) { - return trx_ctrl_cmd(l1h, 0, "SETMAXDLY", "%d", dly); + return trx_ctrl_cmd(l1h, 0, NULL, "SETMAXDLY", "%d", dly); } /*! Send "SETMAXDLYNB" command to TRX, i.e. maximum delay for normal bursts */ int trx_if_cmd_setmaxdlynb(struct trx_l1h *l1h, int dly) { - return trx_ctrl_cmd(l1h, 0, "SETMAXDLYNB", "%d", dly); + return trx_ctrl_cmd(l1h, 0, NULL, "SETMAXDLYNB", "%d", dly); } /*! Send "SETSLOT" command to TRX: Configure Channel Combination for TS */ -int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type) +int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb) { - return trx_ctrl_cmd(l1h, 1, "SETSLOT", "%d %d", tn, type); + return trx_ctrl_cmd(l1h, 1, cb, "SETSLOT", "%d %d", tn, type); } /*! Send "RXTUNE" command to TRX: Tune Receiver to given ARFCN */ @@ -336,7 +337,7 @@ return -ENOTSUP; } - return trx_ctrl_cmd(l1h, 1, "RXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd(l1h, 1, NULL, "RXTUNE", "%d", freq10 * 100); } /*! Send "TXTUNE" command to TRX: Tune Transmitter to given ARFCN */ @@ -355,25 +356,26 @@ return -ENOTSUP; } - return trx_ctrl_cmd(l1h, 1, "TXTUNE", "%d", freq10 * 100); + return trx_ctrl_cmd(l1h, 1, NULL, "TXTUNE", "%d", freq10 * 100); } /*! Send "HANDOVER" command to TRX: Enable handover RACH Detection on timeslot/sub-slot */ int trx_if_cmd_handover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss) { - return trx_ctrl_cmd(l1h, 1, "HANDOVER", "%d %d", tn, ss); + return trx_ctrl_cmd(l1h, 1, NULL, "HANDOVER", "%d %d", tn, ss); } /*! Send "NOHANDOVER" command to TRX: Disable handover RACH Detection on timeslot/sub-slot */ int trx_if_cmd_nohandover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss) { - return trx_ctrl_cmd(l1h, 1, "NOHANDOVER", "%d %d", tn, ss); + return trx_ctrl_cmd(l1h, 1, NULL, "NOHANDOVER", "%d %d", tn, ss); } struct trx_ctrl_rsp { char cmd[50]; char params[100]; int status; + void *cb; }; static int parse_rsp(const char *buf_in, size_t len_in, struct trx_ctrl_rsp *rsp) @@ -437,6 +439,30 @@ return true; } +static int trx_ctrl_rx_rsp_setslot(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp) +{ + trx_if_cmd_setslot_cb *cb = (trx_if_cmd_setslot_cb*) rsp->cb; + struct phy_instance *pinst = l1h->phy_inst; + unsigned int tn, ts_type; + + if (rsp->status) + LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT failed with status %d\n", + phy_instance_name(pinst), rsp->status); + + /* Since message was already validated against CMD we sent, we know format + * of params is: " " */ + if (sscanf(rsp->params, "%u %u", &tn, &ts_type) < 2) { + LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT unable to parse params\n", + phy_instance_name(pinst)); + return -EINVAL; + } + + if (cb) + cb(l1h, tn, ts_type, rsp->status); + + return rsp->status == 0 ? 0 : -EINVAL; +} + /* -EINVAL: unrecoverable error, exit BTS * N > 0: try sending originating command again after N seconds * 0: Done with response, get originating command out from send queue @@ -459,6 +485,8 @@ phy_link_state_set(pinst->phy_link, PHY_LINK_SHUTDOWN); return 5; } + } else if (strcmp(rsp->cmd, "SETSLOT") == 0) { + return trx_ctrl_rx_rsp_setslot(l1h, rsp); } if (rsp->status) { @@ -526,6 +554,8 @@ goto rsp_error; } + rsp.cb = tcm->cb; + /* check for response code */ rc = trx_ctrl_rx_rsp(l1h, &rsp, tcm->critical); if (rc == -EINVAL) diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index 206f5e5..cdfbd41 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -12,8 +12,11 @@ int cmd_len; int params_len; int critical; + void *cb; }; +typedef void trx_if_cmd_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc); + void trx_if_init(struct trx_l1h *l1h); int trx_if_cmd_poweroff(struct trx_l1h *l1h); int trx_if_cmd_poweron(struct trx_l1h *l1h); @@ -23,7 +26,7 @@ int trx_if_cmd_setpower(struct trx_l1h *l1h, int db); int trx_if_cmd_setmaxdly(struct trx_l1h *l1h, int dly); int trx_if_cmd_setmaxdlynb(struct trx_l1h *l1h, int dly); -int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type); +int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb); int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn); int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn); int trx_if_cmd_handover(struct trx_l1h *l1h, uint8_t tn, uint8_t ss); -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:21:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 13:21:10 +0000 Subject: Change in libosmocore[master]: ctrl: handle ECONNRESET on initial read gracefully In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11912 ) Change subject: ctrl: handle ECONNRESET on initial read gracefully ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11912/4/src/gsm/ipa.c File src/gsm/ipa.c: https://gerrit.osmocom.org/#/c/11912/4/src/gsm/ipa.c at 566 PS4, Line 566: if (errno == ECONNRESET && msg->l2h == NULL) { I still really don't understand why do we want to return 0 in this case and not ECONNRESET. What's wrong wit it? if we receive ECCONNRESET it means we sent some data and the peer host answered with a RST because no socket is bound there, so there's no use in keeping the connection alive. It's an error and conn should be cleared. I don't understand what you mean in your commit with "carry on". In any case, I still think there's no sense in having this code here instead of having it where only makes sense, that is under the if condition in line 613 -- To view, visit https://gerrit.osmocom.org/11912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cbdb3909660d605181d6923031336d296ea4340 Gerrit-Change-Number: 11912 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 13:21:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:21:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 13:21:19 +0000 Subject: Change in libosmocore[master]: ctrl: handle ECONNRESET on initial read gracefully In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11912 ) Change subject: ctrl: handle ECONNRESET on initial read gracefully ...................................................................... Patch Set 4: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/11912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cbdb3909660d605181d6923031336d296ea4340 Gerrit-Change-Number: 11912 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 13:21:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:30:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 13:30:41 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log traps via debu facility Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11933 Change subject: ctrl2cgi: log traps via debu facility ...................................................................... ctrl2cgi: log traps via debu facility Change-Id: I21ff593be420a374a00073953c9254a013c43164 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/33/11933/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 1b5e952..bdbd5c5 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -103,6 +103,7 @@ """ Parse CTRL TRAP and dispatch to appropriate handler after normalization """ + self.factory.log.debug('TRAP %s' % v) (l, r) = v.split() loc = l.split('.') t_type = loc[-1] -- To view, visit https://gerrit.osmocom.org/11933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I21ff593be420a374a00073953c9254a013c43164 Gerrit-Change-Number: 11933 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:31:02 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 13:31:02 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log traps via debug facility In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11933 to look at the new patch set (#2). Change subject: ctrl2cgi: log traps via debug facility ...................................................................... ctrl2cgi: log traps via debug facility Change-Id: I21ff593be420a374a00073953c9254a013c43164 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/33/11933/2 -- To view, visit https://gerrit.osmocom.org/11933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I21ff593be420a374a00073953c9254a013c43164 Gerrit-Change-Number: 11933 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:33:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 13:33:23 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log traps via debug facility In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11933 ) Change subject: ctrl2cgi: log traps via debug facility ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I21ff593be420a374a00073953c9254a013c43164 Gerrit-Change-Number: 11933 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 13:33:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:38:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 13:38:14 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore arguments to lambda function Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11934 Change subject: ctrl2cgi: explicitly ignore arguments to lambda function ...................................................................... ctrl2cgi: explicitly ignore arguments to lambda function Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 --- M scripts/ctrl2cgi.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/34/11934/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index bdbd5c5..fadb183 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -108,7 +108,7 @@ loc = l.split('.') t_type = loc[-1] p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type) + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda _: "Unhandled %s trap" % t_type) method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix def ctrl_SET_REPLY(self, data, _, v): -- To view, visit https://gerrit.osmocom.org/11934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 Gerrit-Change-Number: 11934 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:42:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 13:42:36 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore arguments to lambda function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11934 ) Change subject: ctrl2cgi: explicitly ignore arguments to lambda function ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 Gerrit-Change-Number: 11934 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 13:42:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:42:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 13:42:45 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore arguments to lambda function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11934 ) Change subject: ctrl2cgi: explicitly ignore arguments to lambda function ...................................................................... Patch Set 2: See updated version. -- To view, visit https://gerrit.osmocom.org/11934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 Gerrit-Change-Number: 11934 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 13:42:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 13:44:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 13:44:29 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore arguments to lambda function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11934 ) Change subject: ctrl2cgi: explicitly ignore arguments to lambda function ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11934/2/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11934/2/scripts/ctrl2cgi.py at 111 PS2, Line 111: method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) lol no idea if that works, I guess you looked it up somehwere. -- To view, visit https://gerrit.osmocom.org/11934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 Gerrit-Change-Number: 11934 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 13:44:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:06:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 14:06:39 +0000 Subject: Change in libosmocore[master]: ctrl: print textual error on IPA parsing failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11910 ) Change subject: ctrl: print textual error on IPA parsing failure ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I49bb613b416d549f554fd9d23cd37b63954324db Gerrit-Change-Number: 11910 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 14:06:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:09:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 14:09:04 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 14:09:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:09:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 14:09:25 +0000 Subject: Change in osmo-bts[master]: rsl: Log lchan state during dynts PDCH->TCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11903 ) Change subject: rsl: Log lchan state during dynts PDCH->TCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee5ac0550afda71fce67b0340749c111b364bb4f Gerrit-Change-Number: 11903 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 14:09:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:11:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 14:11:28 +0000 Subject: Change in osmo-bts[master]: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11904 ) Change subject: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd Gerrit-Change-Number: 11904 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 14:11:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:17:07 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 14:17:07 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log traps via debug facility In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11933 ) Change subject: ctrl2cgi: log traps via debug facility ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I21ff593be420a374a00073953c9254a013c43164 Gerrit-Change-Number: 11933 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 14:17:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:17:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 26 Nov 2018 14:17:32 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c at 199 PS1, Line 199: trx_ctrl_cmd I would rather introduce a new symbol, e.g. trx_ctrl_cmd_cb(). https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c at 259 PS1, Line 259: NULL ... so this would allow to avoid passing NULL everywhere. -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 14:17:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:18:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 14:18:49 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore arguments to lambda function In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11934 ) Change subject: ctrl2cgi: explicitly ignore arguments to lambda function ...................................................................... Patch Set 2: (1 comment) python tends to defer errors to the very last moment so usually just looking up is not enough :) https://gerrit.osmocom.org/#/c/11934/2/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11934/2/scripts/ctrl2cgi.py at 111 PS2, Line 111: method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) > lol no idea if that works, I guess you looked it up somehwere. I've tested it :) -- To view, visit https://gerrit.osmocom.org/11934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 Gerrit-Change-Number: 11934 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 14:18:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:23:01 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 14:23:01 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore arguments to lambda function In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11934 ) Change subject: ctrl2cgi: explicitly ignore arguments to lambda function ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11934/2/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11934/2/scripts/ctrl2cgi.py at 111 PS2, Line 111: method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) > lol no idea if that works, I guess you looked it up somehwere. I guess this is just using a var named '_' to pack all arguments into a tuple similar to def foo(*bar) -- To view, visit https://gerrit.osmocom.org/11934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 Gerrit-Change-Number: 11934 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 14:23:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:27:43 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 26 Nov 2018 14:27:43 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 1: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/11932/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11932/1//COMMIT_MSG at 12 PS1, Line 12: 20181123044720655 cosmetic: I think timestamps are useless here. https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/l1_if.c File src/osmo-bts-trx/l1_if.c: https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/l1_if.c at 162 PS1, Line 162: TN "... param (tn=%u)\n" would be a bit more informative. https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/l1_if.c at 167 PS1, Line 167: 13 where does this number come from? https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/l1_if.c at 168 PS1, Line 168: TS_TYPE same here: "... param (ts_type=%u)\n" https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.h File src/osmo-bts-trx/trx_if.h: https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.h at 15 PS1, Line 15: void Why void? Why not 'trx_if_cmd_setslot_cb *cb'? -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 14:27:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:35:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 14:35:41 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: remove unused function Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11935 Change subject: ctrl2cgi: remove unused function ...................................................................... ctrl2cgi: remove unused function Change-Id: I1bff680b301b06e3b178d59bdcb86c4773ad9296 --- M scripts/ctrl2cgi.py 1 file changed, 0 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/35/11935/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 1b5e952..b51867a 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -46,20 +46,6 @@ # keys from OpenBSC openbsc/src/libbsc/bsc_vty.c fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # CGI server treats it as boolean but expects int -def patch_cgi_resp(r): - str = r.decode('utf-8') - lines = str.splitlines() - i = 0 - #search for empty line, marks start of body - for l in lines: - i += 1 - if l == '': - break - print('i="%r"' % i) - json_lines = lines[i:] - json_str = '\n'.join(json_lines) - return json.loads(json_str) - @defer.inlineCallbacks def handle_reply(f, log, resp): """ -- To view, visit https://gerrit.osmocom.org/11935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1bff680b301b06e3b178d59bdcb86c4773ad9296 Gerrit-Change-Number: 11935 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:55:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 14:55:21 +0000 Subject: Change in osmo-bts[master]: rsl: Log lchan state during dynts PDCH->TCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11903 ) Change subject: rsl: Log lchan state during dynts PDCH->TCH ...................................................................... rsl: Log lchan state during dynts PDCH->TCH Change-Id: Iee5ac0550afda71fce67b0340749c111b364bb4f --- M src/common/rsl.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index b221754..d4bd2f0 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2201,8 +2201,9 @@ if (lchan->state != LCHAN_S_NONE) { LOGP(DRSL, LOGL_ERROR, - "%s Request to PDCH %s, but lchan is still active\n", - gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT"); + "%s Request to PDCH %s, but lchan is still in state %s\n", + gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT", + gsm_lchans_name(lchan->state)); rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC); } -- To view, visit https://gerrit.osmocom.org/11903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iee5ac0550afda71fce67b0340749c111b364bb4f Gerrit-Change-Number: 11903 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:55:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 14:55:22 +0000 Subject: Change in osmo-bts[master]: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11904 ) Change subject: rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK ...................................................................... rsl: Avoid sending ipa PDCH DEACT NACK followed by ACK It was spotted during osmo-gsm-tester test dynts:trx-sysmocell5000+mod-bts0-dynts67-ipa+cfg-codec-fr-any that osmo-bts-trx was answering to PDCH DEACT from BSC first with a NACK followed immediatelly after by an ACK. That happens after the test does a GPRS pdp ctx act successfuly and then deactivates the ctx and the 2 MS try to place a call between them (and thus channels need to be moved to TCH/F). Most probably the if condition where the lines for this commit are modified need to be fine-grained. Patch before this one should help to understand the steates/situation in this scenario, and then a follow-up patch can be created to improve the logic. Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd --- M src/common/rsl.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index d4bd2f0..b4cea2c 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2200,11 +2200,10 @@ } if (lchan->state != LCHAN_S_NONE) { - LOGP(DRSL, LOGL_ERROR, + LOGP(DRSL, LOGL_NOTICE, "%s Request to PDCH %s, but lchan is still in state %s\n", gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT", gsm_lchans_name(lchan->state)); - rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC); } ts->flags |= pdch_act? TS_F_PDCH_ACT_PENDING -- To view, visit https://gerrit.osmocom.org/11904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I91c65da6b6b7094f32187d3b083153a87c3219fd Gerrit-Change-Number: 11904 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:56:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 14:56:08 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log traps via debug facility In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11933 ) Change subject: ctrl2cgi: log traps via debug facility ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I21ff593be420a374a00073953c9254a013c43164 Gerrit-Change-Number: 11933 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 14:56:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:56:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 14:56:25 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore arguments to lambda function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11934 ) Change subject: ctrl2cgi: explicitly ignore arguments to lambda function ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 Gerrit-Change-Number: 11934 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 14:56:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 14:58:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 14:58:38 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: remove unused function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11935 ) Change subject: ctrl2cgi: remove unused function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1bff680b301b06e3b178d59bdcb86c4773ad9296 Gerrit-Change-Number: 11935 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 14:58:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:03:04 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 15:03:04 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: log traps via debug facility In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11933 ) Change subject: ctrl2cgi: log traps via debug facility ...................................................................... ctrl2cgi: log traps via debug facility Change-Id: I21ff593be420a374a00073953c9254a013c43164 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 1b5e952..bdbd5c5 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -103,6 +103,7 @@ """ Parse CTRL TRAP and dispatch to appropriate handler after normalization """ + self.factory.log.debug('TRAP %s' % v) (l, r) = v.split() loc = l.split('.') t_type = loc[-1] -- To view, visit https://gerrit.osmocom.org/11933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I21ff593be420a374a00073953c9254a013c43164 Gerrit-Change-Number: 11933 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:03:06 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 15:03:06 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: explicitly ignore arguments to lambda function In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11934 ) Change subject: ctrl2cgi: explicitly ignore arguments to lambda function ...................................................................... ctrl2cgi: explicitly ignore arguments to lambda function Make sure that we don't fail regardless of number of arguments given. Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 --- M scripts/ctrl2cgi.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index bdbd5c5..471cf23 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -108,7 +108,7 @@ loc = l.split('.') t_type = loc[-1] p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type) + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix def ctrl_SET_REPLY(self, data, _, v): -- To view, visit https://gerrit.osmocom.org/11934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I44035323b70f04eb8f5dc12123cb708f53eba188 Gerrit-Change-Number: 11934 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:04:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 15:04:35 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: remove unused function In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11935 ) Change subject: ctrl2cgi: remove unused function ...................................................................... ctrl2cgi: remove unused function Change-Id: I1bff680b301b06e3b178d59bdcb86c4773ad9296 --- M scripts/ctrl2cgi.py 1 file changed, 0 insertions(+), 14 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 471cf23..ed4522c 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -46,20 +46,6 @@ # keys from OpenBSC openbsc/src/libbsc/bsc_vty.c fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # CGI server treats it as boolean but expects int -def patch_cgi_resp(r): - str = r.decode('utf-8') - lines = str.splitlines() - i = 0 - #search for empty line, marks start of body - for l in lines: - i += 1 - if l == '': - break - print('i="%r"' % i) - json_lines = lines[i:] - json_str = '\n'.join(json_lines) - return json.loads(json_str) - @defer.inlineCallbacks def handle_reply(f, log, resp): """ -- To view, visit https://gerrit.osmocom.org/11935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1bff680b301b06e3b178d59bdcb86c4773ad9296 Gerrit-Change-Number: 11935 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:07:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 15:07:53 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.h File src/osmo-bts-trx/trx_if.h: https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.h at 15 PS1, Line 15: void > Why void? Why not 'trx_if_cmd_setslot_cb *cb'? Because it's a generic cb pointer, which can be used by kind of message later on. As I'm extending this kind of RSP checks, I foresee that I'll need more callbacks in the future for similar stuff than added in this commit. It's far more extensible (yet without adding complexity) having a callback set per message instead of global one or per type or whatever. https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c at 199 PS1, Line 199: trx_ctrl_cmd > I would rather introduce a new symbol, e.g. trx_ctrl_cmd_cb(). that makes no sense since here the cb is per message and the trx_ctrl_msg is created inside the function and not returned, so here is fine. https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c at 259 PS1, Line 259: NULL > ... so this would allow to avoid passing NULL everywhere. I foresee expanding cb use in the future, so it makes sense to keep it like this. -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 15:07:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:08:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 15:08:49 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11932/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11932/1//COMMIT_MSG at 12 PS1, Line 12: 20181123044720655 > cosmetic: I think timestamps are useless here. I actually like having TS related data when looking at logs, to understand timings of events (see if they are probably related or not, how timers affect, etc.) -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 15:08:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:13:28 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 15:13:28 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix whitespace In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11906 ) Change subject: cosmetic: fix whitespace ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa4552844db33fe69da5ed7028dbfa0100c33900 Gerrit-Change-Number: 11906 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 15:13:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:15:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 15:15:05 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11932 to look at the new patch set (#2). Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT Before this patch, PDCH DEACT was (n)acked to the BSC without taking into account if TRX succeeded or failed to set the TS: 20181123044720655 DRLL <0002> rsl.c:2523 (bts=0,trx=0,ts=0,ss=0) Rx RLL DATA_REQ Abis -> LAPDm 20181123044720700 DRSL <0000> rsl.c:2805 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) ss=0 Rx RSL IPAC_PDCH_DEACT 20181123044720700 DRSL <0000> rsl.c:2205 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still active 20181123044720700 DRSL <0000> rsl.c:2131 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT NACK (cause = 0x0f) 20181123044720700 DPCU <0009> pcu_sock.c:124 Sending info 20181123044720700 DPCU <0009> pcu_sock.c:139 BTS is up 20181123044720700 DPCU <0009> pcu_sock.c:232 trx=0 ts=7: available (tsc=7 arfcn=868) 20181123044720703 DPCU <0009> pcu_sock.c:608 Deactivate request received: TRX=0 TX=6 20181123044720703 DL1C <0006> l1sap.c:1519 deactivating channel chan_nr=TCH/F on TS6 trx=0 20181123044720703 DTRX <000b> trx_if.c:242 Enqueuing TRX control command 'CMD NOHANDOVER 6 0' 20181123044720703 DL1C <0006> l1sap.c:648 deactivate confirm chan_nr=TCH/F on TS6 trx=0 20181123044720703 DRSL <0000> rsl.c:714 (bts=0,trx=0,ts=6,ss=0) not sending REL ACK 20181123044720703 DRSL <0000> rsl.c:2264 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: channel disconnected, will reconnect as TCH 20181123044720703 DL1C <0006> scheduler.c:593 Configuring multiframe with TCH/F+SACCH trx=0 ts=6 20181123044720703 DTRX <000b> trx_if.c:242 Enqueuing TRX control command 'CMD SETSLOT 6 1' 20181123044720703 DL1C <0006> l1_if.c:780 (bts=0,trx=0,ts=6) bts_model_ts_connect(as_pchan=TCH/F) success, calling cb_ts_connected() 20181123044720703 DRSL <0000> rsl.c:2339 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: timeslot connected as TCH/F 20181123044720703 DRSL <0000> rsl.c:2440 (bts=0,trx=0,ts=6,ss=0) TCH/F_PDCH switched to TCH/F mode (ts->flags == 0) 20181123044720703 DRSL <0000> rsl.c:2103 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT ACK 20181123044720704 DTRX <000b> trx_if.c:492 Response message: 'RSP NOHANDOVER 0 6' 20181123044720705 DTRX <000b> trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 3 files changed, 92 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/11932/2 -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:17:04 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 15:17:04 +0000 Subject: Change in libosmocore[master]: ctrl: use #define for TRAP id In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11926 ) Change subject: ctrl: use #define for TRAP id ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11926/1/src/ctrl/control_if.c File src/ctrl/control_if.c: https://gerrit.osmocom.org/#/c/11926/1/src/ctrl/control_if.c at 159 PS1, Line 159: cmd->id = CTRL_CMD_TRAP_ID; /* It's a TRAP! */ > I don't know what was the reasoning behind this decision. [?] Probably because we use the ID to match a request to a reply and didn't want traps to interfere there. It is of course entirely possible to just ignore traps in general when matching, just saying I think this was the idea. -- To view, visit https://gerrit.osmocom.org/11926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I33d7d4c6a1885a75a85d6f2f017430e0860b4126 Gerrit-Change-Number: 11926 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 15:17:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:24:02 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 15:24:02 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: cosmetic cleanup In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11930 ) Change subject: ctrl: cosmetic cleanup ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11930/1/scripts/osmo_ctrl.py File scripts/osmo_ctrl.py: https://gerrit.osmocom.org/#/c/11930/1/scripts/osmo_ctrl.py at 55 PS1, Line 55: _leftovers(sock, socket.MSG_DONTWAIT) sock != sck Why did this pass jenkins builder? https://gerrit.osmocom.org/#/c/11930/1/scripts/osmo_ctrl.py at 115 PS1, Line 115: _leftovers(sock, socket.MSG_DONTWAIT) Now you call it here and in set_var. We could just call it from do_set_get since that is called by set_var as well -- To view, visit https://gerrit.osmocom.org/11930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da Gerrit-Change-Number: 11930 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 15:24:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:43:32 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 15:43:32 +0000 Subject: Change in osmo-trx[master]: lms: Apply LMS->OSMO log level conversion In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11902 ) Change subject: lms: Apply LMS->OSMO log level conversion ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a8fbcc7cacebc7038c60175a8ae43b21f713cbb Gerrit-Change-Number: 11902 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 15:43:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:44:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 15:44:59 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11936 Change subject: Move common Trap-related code into separate file ...................................................................... Move common Trap-related code into separate file The ctrl2cgi.py is heavily based upon soap.py - let's move all the shared code into separate file to make further modifications easier. Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Related: SYS#4399 --- M scripts/ctrl2cgi.py M scripts/soap.py A scripts/trap_helper.py 3 files changed, 120 insertions(+), 192 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/36/11936/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index ed4522c..e847336 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -29,6 +29,7 @@ from osmopy.osmo_ipa import Ctrl from treq import post, collect from functools import partial +from trap_helper import Trap, reloader, debug_init from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers import hashlib @@ -38,13 +39,6 @@ # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') -# keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values CGI-specific -oper = { 'inoperational' : 0, 'operational' : 1 } -admin = { 'locked' : 0, 'unlocked' : 1 } -policy = { 'off' : 0, 'on' : 1, 'grace' : 2, 'unknown' : 3 } - -# keys from OpenBSC openbsc/src/libbsc/bsc_vty.c -fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # CGI server treats it as boolean but expects int @defer.inlineCallbacks def handle_reply(f, log, resp): @@ -81,65 +75,6 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res -class Trap(CTRL): - """ - TRAP handler (agnostic to factory's client object) - """ - def ctrl_TRAP(self, data, op_id, v): - """ - Parse CTRL TRAP and dispatch to appropriate handler after normalization - """ - self.factory.log.debug('TRAP %s' % v) - (l, r) = v.split() - loc = l.split('.') - t_type = loc[-1] - p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) - method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix - - def ctrl_SET_REPLY(self, data, _, v): - """ - Debug log for replies to our commands - """ - self.factory.log.debug('SET REPLY %s' % v) - - def ctrl_ERROR(self, data, op_id, v): - """ - We want to know if smth went wrong - """ - self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) - - def connectionMade(self): - """ - Logging wrapper, calling super() is necessary not to break reconnection logic - """ - self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) - super(CTRL, self).connectionMade() - - @defer.inlineCallbacks - def handle_locationstate(self, net, bsc, bts, trx, data): - """ - Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers - """ - (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',') - tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data)) - params = {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix.get(fx, 0), 'time_stamp': tstamp, 'oper_status': oper.get(opr, 2), 'admin_status': admin.get(adm, 2), 'policy_status': policy.get(pol, 3) } - params['h'] = gen_hash(params, self.factory.secret_key) - d = post(self.factory.location, None, params=params) - d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors - # Ensure that we run only limited number of requests in parallel: - yield self.factory.semaphore.acquire() - yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit - self.factory.semaphore.release() - - def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): - """ - Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled - """ - self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) - class TrapFactory(IPAFactory): """ @@ -165,21 +100,12 @@ self.log.setLevel(level) self.log.debug("Using IPA %s, CGI server: %s" % (Ctrl.version, self.location)) - -def reloader(path, script, log, dbg1, dbg2, signum, _): - """ - Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation - """ - log.info("Received Signal %d - restarting..." % signum) - if signum == signal.SIGUSR1 and dbg1 not in sys.argv and dbg2 not in sys.argv: - sys.argv.append(dbg1) # enforce debug - if signum == signal.SIGUSR2 and (dbg1 in sys.argv or dbg2 in sys.argv): # disable debug - if dbg1 in sys.argv: - sys.argv.remove(dbg1) - if dbg2 in sys.argv: - sys.argv.remove(dbg2) - os.execl(path, script, *sys.argv[1:]) - + def prepare_params(bsc, lon, lat, fix, tstamp, oper, admin, policy): + params = {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix, 'time_stamp': tstamp, 'oper_status': oper, 'admin_status': admin, 'policy_status': policy } + params['h'] = gen_hash(params, self.factory.secret_key) + d = post(self.factory.location, None, params=params) + d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) + return d if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given GCI service and Osmocom CTRL protocol.') @@ -187,27 +113,14 @@ p.add_argument('-a', '--addr-ctrl', default='localhost', help="Adress to use for CTRL interface, defaults to localhost") p.add_argument('-p', '--port-ctrl', type=int, default=4250, help="Port to use for CTRL interface, defaults to 4250") p.add_argument('-n', '--num-max-conn', type=int, default=5, help="Max number of concurrent HTTP requests to CGI server") - p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") + p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Location URL of the CGI server") p.add_argument('-s', '--secret-key', help="Secret key used to generate verification token") p.add_argument('-c', '--config-file', help="Path Config file. Cmd line args override values in config file") args = p.parse_args() - log = logging.getLogger('CTRL2CGI') - if args.debug: - log.setLevel(logging.DEBUG) - else: - log.setLevel(logging.INFO) - log.addHandler(logging.handlers.SysLogHandler('/dev/log')) - if args.output: - log.addHandler(logging.StreamHandler(sys.stdout)) - - reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with add_argument() call above - signal.signal(signal.SIGHUP, reboot) - signal.signal(signal.SIGQUIT, reboot) - signal.signal(signal.SIGUSR1, reboot) # restart and enabled debug output - signal.signal(signal.SIGUSR2, reboot) # restart and disable debug output + log = debug_init('CTRL2CGI', args.debug, args.output) location_cfgfile = None secret_key_cfgfile = None diff --git a/scripts/soap.py b/scripts/soap.py index dc06e1e..3478f94 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -30,20 +30,13 @@ from treq import post, collect from suds.client import Client from functools import partial +from trap_helper import Trap, reloader, debug_init from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') -# keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values SOAP-specific -oper = { 'inoperational' : 0, 'operational' : 1 } -admin = { 'locked' : 0, 'unlocked' : 1 } -policy = { 'off' : 0, 'on' : 1, 'grace' : 2, 'unknown' : 3 } - -# keys from OpenBSC openbsc/src/libbsc/bsc_vty.c -fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # SOAP server treats it as boolean but expects int - def handle_reply(p, f, log, r): """ @@ -58,64 +51,6 @@ f(m) -class Trap(CTRL): - """ - TRAP handler (agnostic to factory's client object) - """ - def ctrl_TRAP(self, data, op_id, v): - """ - Parse CTRL TRAP and dispatch to appropriate handler after normalization - """ - (l, r) = v.split() - loc = l.split('.') - t_type = loc[-1] - p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type) - method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix - - def ctrl_SET_REPLY(self, data, _, v): - """ - Debug log for replies to our commands - """ - self.factory.log.debug('SET REPLY %s' % v) - - def ctrl_ERROR(self, data, op_id, v): - """ - We want to know if smth went wrong - """ - self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) - - def connectionMade(self): - """ - Logging wrapper, calling super() is necessary not to break reconnection logic - """ - self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) - super(CTRL, self).connectionMade() - - @defer.inlineCallbacks - def handle_locationstate(self, net, bsc, bts, trx, data): - """ - Handle location-state TRAP: parse trap content, build SOAP context and use treq's routines to post it while setting up async handlers - """ - (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',') - tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data)) - ctx = self.factory.client.registerSiteLocation(bsc, float(lon), float(lat), fix.get(fx, 0), tstamp, oper.get(opr, 2), admin.get(adm, 2), policy.get(pol, 3)) - d = post(self.factory.location, ctx.envelope) - d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s" % (e, bsc)), bsc) # handle HTTP errors - # Ensure that we run only limited number of requests in parallel: - yield self.factory.semaphore.acquire() - yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit - self.factory.semaphore.release() - - def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): - """ - Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled - """ - self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) - - class TrapFactory(IPAFactory): """ Store SOAP client object so TRAP handler can use it for requests @@ -140,21 +75,12 @@ self.log.setLevel(level) self.log.debug("Using IPA %s, SUDS client: %s" % (Ctrl.version, soap)) - -def reloader(path, script, log, dbg1, dbg2, signum, _): - """ - Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation - """ - log.info("Received Signal %d - restarting..." % signum) - if signum == signal.SIGUSR1 and dbg1 not in sys.argv and dbg2 not in sys.argv: - sys.argv.append(dbg1) # enforce debug - if signum == signal.SIGUSR2 and (dbg1 in sys.argv or dbg2 in sys.argv): # disable debug - if dbg1 in sys.argv: - sys.argv.remove(dbg1) - if dbg2 in sys.argv: - sys.argv.remove(dbg2) - os.execl(path, script, *sys.argv[1:]) - + def prepare_params(bsc, lon, lat, fix, tstamp, oper, admin, policy): + ctx = self.factory.client.registerSiteLocation(bsc, float(lon), float(lat), fix, tstamp, oper, admin, policy) + d = post(self.factory.location, ctx.envelope) + # treq's collect helper is handy to get all reply content at once using closure on ctx: + d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) + return d if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given SOAP service and Osmocom CTRL protocol.') @@ -163,25 +89,12 @@ p.add_argument('-c', '--ctrl', default='localhost', help="Adress to use for CTRL interface, defaults to localhost") p.add_argument('-w', '--wsdl', required=True, help="WSDL URL for SOAP") p.add_argument('-n', '--num', type=int, default=5, help="Max number of concurrent HTTP requests to SOAP server") - p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") + p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Override location found in WSDL file (don't use unless you know what you're doing)") args = p.parse_args() - log = logging.getLogger('CTRL2SOAP') - if args.debug: - log.setLevel(logging.DEBUG) - else: - log.setLevel(logging.INFO) - log.addHandler(logging.handlers.SysLogHandler('/dev/log')) - if args.output: - log.addHandler(logging.StreamHandler(sys.stdout)) - - reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with add_argument() call above - signal.signal(signal.SIGHUP, reboot) - signal.signal(signal.SIGQUIT, reboot) - signal.signal(signal.SIGUSR1, reboot) # restart and enabled debug output - signal.signal(signal.SIGUSR2, reboot) # restart and disable debug output + log = debug_init('CTRL2SOAP', args.debug, args.output) log.info("SOAP proxy %s starting with PID %d ..." % (__version__, os.getpid())) reactor.connectTCP(args.ctrl, args.port, TrapFactory(args.ctrl, args.port, Trap, defer.DeferredSemaphore(args.num), log, args.wsdl, args.location)) diff --git a/scripts/trap_helper.py b/scripts/trap_helper.py new file mode 100644 index 0000000..646a55d --- /dev/null +++ b/scripts/trap_helper.py @@ -0,0 +1,102 @@ +import sys, os, signal, logging, logging.handlers +from functools import partial +from osmopy.twisted_ipa import CTRL +from twisted.internet import defer + +# keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values SOAP-specific +oper = { 'inoperational' : 0, 'operational' : 1 } +admin = { 'locked' : 0, 'unlocked' : 1 } +policy = { 'off' : 0, 'on' : 1, 'grace' : 2, 'unknown' : 3 } + +# keys from OpenBSC openbsc/src/libbsc/bsc_vty.c +fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # SOAP server treats it as boolean but expects int + +class Trap(CTRL): + """ + TRAP handler (agnostic to factory's client object) + """ + def ctrl_TRAP(self, data, op_id, v): + """ + Parse CTRL TRAP and dispatch to appropriate handler after normalization + """ + (l, r) = v.split() + loc = l.split('.') + t_type = loc[-1] + p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type) + method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix + + def ctrl_SET_REPLY(self, data, _, v): + """ + Debug log for replies to our commands + """ + self.factory.log.debug('SET REPLY %s' % v) + + def ctrl_ERROR(self, data, op_id, v): + """ + We want to know if smth went wrong + """ + self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) + + def connectionMade(self): + """ + Logging wrapper, calling super() is necessary not to break reconnection logic + """ + self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) + super(CTRL, self).connectionMade() + + @defer.inlineCallbacks + def handle_locationstate(self, net, bsc, bts, trx, data): + """ + Handle location-state TRAP: parse trap content, prepare parameters and use treq's routines to post it while setting up async handlers + """ + (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',') + tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() + self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data)) + + d = self.factory.prepare_params(bsc, lon, lat, fix.get(fx, 0), tstamp, oper.get(opr, 2), admin.get(adm, 2), policy.get(pol, 3)) + + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors + # Ensure that we run only limited number of requests in parallel: + yield self.factory.semaphore.acquire() + yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit + self.factory.semaphore.release() + + def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): + """ + Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled + """ + self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) + + +def reloader(path, script, log, dbg1, dbg2, signum, _): + """ + Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation + """ + log.info("Received Signal %d - restarting..." % signum) + if signum == signal.SIGUSR1 and dbg1 not in sys.argv and dbg2 not in sys.argv: + sys.argv.append(dbg1) # enforce debug + if signum == signal.SIGUSR2 and (dbg1 in sys.argv or dbg2 in sys.argv): # disable debug + if dbg1 in sys.argv: + sys.argv.remove(dbg1) + if dbg2 in sys.argv: + sys.argv.remove(dbg2) + os.execl(path, script, *sys.argv[1:]) + +def debug_init(name, is_debug, output): + log = logging.getLogger(name) + if is_debug: + log.setLevel(logging.DEBUG) + else: + log.setLevel(logging.INFO) + log.addHandler(logging.handlers.SysLogHandler('/dev/log')) + if output: + log.addHandler(logging.StreamHandler(sys.stdout)) + + reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with caller's add_argument() + signal.signal(signal.SIGHUP, reboot) + signal.signal(signal.SIGQUIT, reboot) + signal.signal(signal.SIGUSR1, reboot) # restart and enabled debug output + signal.signal(signal.SIGUSR2, reboot) # restart and disable debug output + + return log -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 15:56:21 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Mon, 26 Nov 2018 15:56:21 +0000 Subject: Change in openbsc[master]: bsc-nat: Enable octet-aligned when ensuring mode set In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/6598 ) Change subject: bsc-nat: Enable octet-aligned when ensuring mode set ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Looks good to me, can you change the RFC in the commit msg? https://gerrit.osmocom.org/#/c/6598/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/6598/2//COMMIT_MSG at 9 PS2, Line 9: From RFC 4857: It's RFC 4867 -- To view, visit https://gerrit.osmocom.org/6598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4db7f6d18f650f36f3186965096771f748de5fd Gerrit-Change-Number: 6598 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 15:56:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:02:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 16:02:59 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: introduce constant for TRAP id In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11928 ) Change subject: ctrl: introduce constant for TRAP id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0381eb60d10e7278b966464add79772a9f7c8118 Gerrit-Change-Number: 11928 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 16:02:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:03:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 16:03:49 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: introduce constant for TRAP id In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11928 ) Change subject: ctrl: introduce constant for TRAP id ...................................................................... ctrl: introduce constant for TRAP id Use it for TRAP message parsing and generation. Change-Id: I0381eb60d10e7278b966464add79772a9f7c8118 --- M osmopy/osmo_ipa.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index 246101d..41865c1 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -43,6 +43,7 @@ CTRL_REP = 'REPLY' CTRL_ERR = 'ERR' CTRL_TRAP = 'TRAP' + CTRL_TRAP_ID = 0 def _l(self, d, p): """ @@ -250,7 +251,7 @@ if s == self.CTRL_GET + '_' + self.CTRL_REP: return i, v, None (s, i, var, val) = data.split(' ', 3) - if s == self.CTRL_TRAP and i != '0': + if s == self.CTRL_TRAP and int(i) != self.CTRL_TRAP_ID: return i, None, None return i, var, val @@ -267,7 +268,7 @@ """ Make TRAP message with given (vak, val) pair """ - return self.add_header("%s 0 %s %s" % (self.CTRL_TRAP, var, val)) + return self.add_header("%s %d %s %s" % (self.CTRL_TRAP, self.CTRL_TRAP_ID, var, val)) def cmd(self, var, val=None): """ -- To view, visit https://gerrit.osmocom.org/11928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0381eb60d10e7278b966464add79772a9f7c8118 Gerrit-Change-Number: 11928 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:09:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 16:09:31 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add optional TRAP-skipping parameter to split_combined() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add optional TRAP-skipping parameter to split_combined() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11929/1/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11929/1/osmopy/osmo_ipa.py at 119 PS1, Line 119: remaining messages, first is the single IPA message with. Neither have headers stripped. This line makes no sense: "with. Neither headers stripped" ? https://gerrit.osmocom.org/#/c/11929/1/osmopy/osmo_ipa.py at 124 PS1, Line 124: (length, _, _, d) = self.del_header(data) calling var "payload" instead of "d" would make it more easy to understand. -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 16:09:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:11:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 16:11:33 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add optional TRAP-skipping parameter to split_combined() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add optional TRAP-skipping parameter to split_combined() ...................................................................... Patch Set 1: In my opinion this is not the best approach (adding a new bool to the existing function) it makes the function so complex. Looks to me it'd be far easier to add another function which calls split_combined() in a loop checking if head starts with something different than TRAP. -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 16:11:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:12:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 16:12:44 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11909 ) Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... Patch Set 2: Code-Review+1 See my comment in previous commit. -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 16:12:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:34:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 26 Nov 2018 16:34:21 +0000 Subject: Change in osmo-mgw[master]: fix osmo-mgw -s; fixes osmo-mgw.service using -s In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11925 ) Change subject: fix osmo-mgw -s; fixes osmo-mgw.service using -s ...................................................................... fix osmo-mgw -s; fixes osmo-mgw.service using -s Even though osmo-mgw advertises the -s option, the getopt configuration lacks -s and that option does not work. Thus the osmo-mgw.service file that uses -s was unable to start. Add 's' to the getopt configuration, fix -s and hence also fix the .service file. Change-Id: I6f298aef73eb3486d04706910e9fdbaaebaf2481 --- M src/osmo-mgw/mgw_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index de094c1..583d0fb 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -104,7 +104,7 @@ {0, 0, 0, 0}, }; - c = getopt_long(argc, argv, "hc:VD", long_options, &option_index); + c = getopt_long(argc, argv, "hc:sVD", long_options, &option_index); if (c == -1) break; -- To view, visit https://gerrit.osmocom.org/11925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6f298aef73eb3486d04706910e9fdbaaebaf2481 Gerrit-Change-Number: 11925 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:34:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 16:34:22 +0000 Subject: Change in osmo-bts[master]: bts-trx: early return on POWERON success In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11905 ) Change subject: bts-trx: early return on POWERON success ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ddee46374ab329c47dc68e720e236f13d393f66 Gerrit-Change-Number: 11905 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 26 Nov 2018 16:34:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:34:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 16:34:43 +0000 Subject: Change in osmo-bts[master]: bts-trx: early return on POWERON success In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11905 ) Change subject: bts-trx: early return on POWERON success ...................................................................... bts-trx: early return on POWERON success Later on it's expected to add more rsp parsing, so let's return here and not depend on generic return further down. Change-Id: I8ddee46374ab329c47dc68e720e236f13d393f66 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index b048170..abe6846 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -450,6 +450,7 @@ if (rsp->status == 0) { if (pinst->phy_link->state != PHY_LINK_CONNECTED) phy_link_state_set(pinst->phy_link, PHY_LINK_CONNECTED); + return 0; } else { LOGP(DTRX, LOGL_NOTICE, "transceiver (%s) rejected POWERON command (%d), re-trying in a few seconds\n", -- To view, visit https://gerrit.osmocom.org/11905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8ddee46374ab329c47dc68e720e236f13d393f66 Gerrit-Change-Number: 11905 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:34:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 16:34:43 +0000 Subject: Change in osmo-bts[master]: cosmetic: fix whitespace In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11906 ) Change subject: cosmetic: fix whitespace ...................................................................... cosmetic: fix whitespace Change-Id: Iaa4552844db33fe69da5ed7028dbfa0100c33900 --- M include/osmo-bts/rsl.h M src/common/rsl.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-trx/l1_if.c 4 files changed, 3 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 06d58a2..731f6c0 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -44,4 +44,3 @@ void ipacc_dyn_pdch_complete(struct gsm_bts_trx_ts *ts, int rc); #endif // _RSL_H */ - diff --git a/src/common/rsl.c b/src/common/rsl.c index b4cea2c..9b0de7c 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -281,7 +281,7 @@ return abis_bts_rsl_sendmsg(nmsg); } -/* +/* * common channel releated messages */ diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 7f4c0cd..2ab9fcd 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -508,7 +508,7 @@ /* TODO: This state machine should be shared accross BTS models? */ switch (lchan->ciph_state) { - case LCHAN_CIPH_RX_REQ: + case LCHAN_CIPH_RX_REQ: lchan->ciph_state = LCHAN_CIPH_RX_CONF; break; case LCHAN_CIPH_RX_CONF_TX_REQ: diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index b4ca54f..ccc13f4 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -396,7 +396,7 @@ } slottype = transceiver_chan_types[pchan]; - + if (l1h->config.slottype[tn] != slottype || !l1h->config.slottype_valid[tn]) { l1h->config.slottype[tn] = slottype; -- To view, visit https://gerrit.osmocom.org/11906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa4552844db33fe69da5ed7028dbfa0100c33900 Gerrit-Change-Number: 11906 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:35:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 16:35:44 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11936 ) Change subject: Move common Trap-related code into separate file ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Mon, 26 Nov 2018 16:35:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:36:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 26 Nov 2018 16:36:51 +0000 Subject: Change in osmo-gsm-manuals[master]: ctrl: clarify use of id = 0 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11927 ) Change subject: ctrl: clarify use of id = 0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic00de5023e7a1ec6426a0178778d35b13c337271 Gerrit-Change-Number: 11927 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 16:36:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:44:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 16:44:51 +0000 Subject: Change in osmo-gsm-manuals[master]: ctrl: clarify use of id = 0 In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11927 ) Change subject: ctrl: clarify use of id = 0 ...................................................................... ctrl: clarify use of id = 0 Change-Id: Ic00de5023e7a1ec6426a0178778d35b13c337271 --- M common/chapters/control_if.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/common/chapters/control_if.adoc b/common/chapters/control_if.adoc index ea55cd7..cd639c7 100644 --- a/common/chapters/control_if.adoc +++ b/common/chapters/control_if.adoc @@ -55,7 +55,7 @@ :: A numeric identifier, uniquely identifying this particular - operation. `0` is not allowed. It will be echoed back in any + operation. Value `0` is not allowed unless it's a TRAP message. It will be echoed back in any response to a particular request. :: The name of the variable / field affected by the GET / SET / -- To view, visit https://gerrit.osmocom.org/11927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic00de5023e7a1ec6426a0178778d35b13c337271 Gerrit-Change-Number: 11927 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: osmith Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 16:54:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 16:54:58 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11936 ) Change subject: Move common Trap-related code into separate file ...................................................................... Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11936/2/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11936/2/scripts/ctrl2cgi.py at 32 PS2, Line 32: from trap_helper import Trap, reloader, debug_init Next time better break each of them into a separate patch please, otherwise there are too many changes. https://gerrit.osmocom.org/#/c/11936/2/scripts/trap_helper.py File scripts/trap_helper.py: https://gerrit.osmocom.org/#/c/11936/2/scripts/trap_helper.py at 2 PS2, Line 2: from functools import partial Did you think about how is this file going to be installed? I bet it's not installed nor packaged in debian by default. Can you confirm? And if it's installed, is it installed in a correct place so that it can be imported by other python files? -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 16:54:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:04:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:04:36 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ipa: add extended checks Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11937 Change subject: osmo_ipa: add extended checks ...................................................................... osmo_ipa: add extended checks Make sure we properly handle None objects. Change-Id: If5ddc04b8a5dc26e56e5f5bbec7f28cf0af4a97b --- M osmopy/osmo_ipa.py 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/37/11937/1 diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index 41865c1..462c4ec 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -106,8 +106,9 @@ Strip IPA protocol header correctly removing extension if present Returns data length, IPA protocol, extension (or None if not defined for a give protocol) and the data without header """ - if not len(data): + if data == None or len(data) == 0: return None, None, None, None + (dlen, proto) = struct.unpack('>HB', data[:3]) if self.PROTO['OSMO'] == proto or self.PROTO['CCM'] == proto: # there's extension which we have to unpack return struct.unpack('>HBB', data[:4]) + (data[4:], ) # length, protocol, extension, data @@ -117,6 +118,9 @@ """ Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where rest contains remaining messages, first is the single IPA message """ + if data == None or len(data) == 0: + return None, None + (length, _, _, _) = self.del_header(data) return data[:(length + 3)], data[(length + 3):] -- To view, visit https://gerrit.osmocom.org/11937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If5ddc04b8a5dc26e56e5f5bbec7f28cf0af4a97b Gerrit-Change-Number: 11937 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:04:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:04:37 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ipa: update split_combined docs Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11938 Change subject: osmo_ipa: update split_combined docs ...................................................................... osmo_ipa: update split_combined docs Change-Id: I1cc6dc314fa0f147ab64ad29d9b892c3637a51c7 --- M osmopy/osmo_ipa.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/38/11938/1 diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index 462c4ec..b0dcaa6 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -116,7 +116,8 @@ def split_combined(self, data): """ - Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where rest contains remaining messages, first is the single IPA message + Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where 'rest' contains + remaining messages and 'first' is the single IPA message with. No headers are stripped in 'first' or 'rest'. """ if data == None or len(data) == 0: return None, None -- To view, visit https://gerrit.osmocom.org/11938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1cc6dc314fa0f147ab64ad29d9b892c3637a51c7 Gerrit-Change-Number: 11938 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:05:01 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:05:01 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: cosmetic cleanup In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11930 ) Change subject: ctrl: cosmetic cleanup ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da Gerrit-Change-Number: 11930 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:05:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:05:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:05:04 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11909 ) Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:05:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:05:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:05:06 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:05:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:10:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 18:10:16 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ipa: update split_combined docs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11938 ) Change subject: osmo_ipa: update split_combined docs ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11938/1/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11938/1/osmopy/osmo_ipa.py at 120 PS1, Line 120: remaining messages and 'first' is the single IPA message with. No headers are stripped in 'first' or 'rest'. This line makes no sense to me: "with. blabla" -- To view, visit https://gerrit.osmocom.org/11938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1cc6dc314fa0f147ab64ad29d9b892c3637a51c7 Gerrit-Change-Number: 11938 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 18:10:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:10:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 18:10:18 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ipa: add extended checks In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11937 ) Change subject: osmo_ipa: add extended checks ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11937/1/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11937/1/osmopy/osmo_ipa.py at 111 PS1, Line 111: Is this adding whitespace or cleaning it? -- To view, visit https://gerrit.osmocom.org/11937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5ddc04b8a5dc26e56e5f5bbec7f28cf0af4a97b Gerrit-Change-Number: 11937 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 18:10:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:14:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 18:14:58 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 121 PS2, Line 121: if data == None or len(data) == 0: That's not needed anymore thanks to your other commits previous to this one. https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 126 PS2, Line 126: if (int(length) != 0): What if you have an empty IPA header followed by the packet you want? you are loosing it here by returning None at the end of the function. Instead you should go the recursive self.skip_traps(tail) path if int(length)==0. https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 128 PS2, Line 128: return self.skip_traps(tail) Ah I see you need the code I commented above as a base case. IMHO it be easier to do it in a loop, no need to go recursive way here, but fine. -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:14:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:18:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 18:18:55 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11909 ) Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11909/3/scripts/osmo_ctrl.py File scripts/osmo_ctrl.py: https://gerrit.osmocom.org/#/c/11909/3/scripts/osmo_ctrl.py at 44 PS3, Line 44: while True: I'd prefer having 1 less sck.recv call to care about. This code can be simplified now: while True: ret = sck.recv(4096) ret = Ctrl().skip_traps(ret) if ret: (i, k, v) = Ctrl().parse(ret) break -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:18:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:24:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:24:33 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11936 ) Change subject: Move common Trap-related code into separate file ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:24:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:26:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:26:05 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ipa: add extended checks In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11937 ) Change subject: osmo_ipa: add extended checks ...................................................................... osmo_ipa: add extended checks Make sure we properly handle None objects. Change-Id: If5ddc04b8a5dc26e56e5f5bbec7f28cf0af4a97b --- M osmopy/osmo_ipa.py 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index 41865c1..462c4ec 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -106,8 +106,9 @@ Strip IPA protocol header correctly removing extension if present Returns data length, IPA protocol, extension (or None if not defined for a give protocol) and the data without header """ - if not len(data): + if data == None or len(data) == 0: return None, None, None, None + (dlen, proto) = struct.unpack('>HB', data[:3]) if self.PROTO['OSMO'] == proto or self.PROTO['CCM'] == proto: # there's extension which we have to unpack return struct.unpack('>HBB', data[:4]) + (data[4:], ) # length, protocol, extension, data @@ -117,6 +118,9 @@ """ Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where rest contains remaining messages, first is the single IPA message """ + if data == None or len(data) == 0: + return None, None + (length, _, _, _) = self.del_header(data) return data[:(length + 3)], data[(length + 3):] -- To view, visit https://gerrit.osmocom.org/11937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If5ddc04b8a5dc26e56e5f5bbec7f28cf0af4a97b Gerrit-Change-Number: 11937 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:33:24 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 18:33:24 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11936 ) Change subject: Move common Trap-related code into separate file ...................................................................... Patch Set 3: > > is it installed in a correct place so that it can be imported by > other python files? > > Yes and no: our python2 libs .deb contains it although it's python3 > only. But we have exactly the same problem with all other py3 > scripts so it should not make much difference. Ok that's fine there. Did you try actually the script can be imported if installed in /usr/bin (it's where it's installed right?). I'd say that's not in PYTHON_LIBRARY_PATH or whatever is called, so it may not be found. -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:33:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:35:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 26 Nov 2018 18:35:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#3) to the change originally created by dexter. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... MSC_Test: Test what happens when Paging for SMS is unanswered Trigger sending of an SMS, but ignore any paging requests from the MSC, make sure that the MSC is not paging infinitly Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Related: OS#3704 --- M msc/MSC_Tests.ttcn 1 file changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11897/3 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:35:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 26 Nov 2018 18:35:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests.ttcn: introduce TC_chan_deact_silence Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11939 Change subject: BSC_Tests.ttcn: introduce TC_chan_deact_silence ...................................................................... BSC_Tests.ttcn: introduce TC_chan_deact_silence The idea of this test case is to verify channel deactivation procedure due to no response to Immediate Assignment. Change-Id: I00b0838c9f919303aef72280248b0d1317f42b3b Related: OS#3709 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/11939/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a155fef..53e4396 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -524,6 +524,39 @@ } } +/* Test channel deactivation due to silence from MS */ +testcase TC_chan_deact_silence() runs on test_CT { + var RslChannelNr chan_nr; + + f_init(1); + + /* Request for a dedicated channel */ + chan_nr := f_chreq_act_ack('23'O); + + /* Wait some time until the channel is released */ + f_sleep(2.0); + + /* Expect CHANnel RELease */ + alt { + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, + tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) { + log("Received CHANnel RELease"); + setverdict(pass); + } + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, + tr_RSL_IMM_ASSIGN(?))) { + /* See OS#3709, OsmoBSC should not send Immediate + * Assignment Reject since a dedicated channel was + * already allocated, and Immediate Assignment was + * already sent. */ + setverdict(fail, "Unexpected Immediate Assignment!"); + } + [] IPA_RSL[0].receive { + setverdict(fail, "Unexpected RSL message!"); + } + } +} + /*********************************************************************** * Assignment Testing ***********************************************************************/ @@ -3372,6 +3405,7 @@ execute( TC_chan_act_ack_est_ind_refused() ); execute( TC_chan_act_nack() ); execute( TC_chan_exhaustion() ); + execute( TC_chan_deact_silence() ); execute( TC_chan_rel_rll_rel_ind() ); execute( TC_chan_rel_conn_fail() ); execute( TC_chan_rel_hard_clear() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index d558e72..fd26922 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -10,6 +10,7 @@ + -- To view, visit https://gerrit.osmocom.org/11939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I00b0838c9f919303aef72280248b0d1317f42b3b Gerrit-Change-Number: 11939 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:35:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:35:37 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 121 PS2, Line 121: if data == None or len(data) == 0: > That's not needed anymore thanks to your other commits previous to this one. I'd rather have it as explicit check in here as well: makes reasoning about the function easier. https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 126 PS2, Line 126: if (int(length) != 0): > What if you have an empty IPA header How does that look like? Do you have some test case in mind? https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 128 PS2, Line 128: return self.skip_traps(tail) > you need the code I commented above as a base case I don't get that. Could you rephrase it - what exactly you want to see and why? -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:35:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:38:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:38:45 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11909 to look at the new patch set (#4). Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... osmo_ctrl.py: properly ignore out-of-order traps Sometimes when we set variable we might receive arbitrary number of TRAP messages before we get SET_REPLY. Those could be either separate messages or combined together with SET_REPLY depending on tcp buffering at server side. Let's handle this gracefully by skipping over all TRAP messages. An example command which often triggers this behavior: ./osmo_ctrl.py -s -d 127.0.0.1 -p 4249 bts.0.location (date +%s)",fix2d,1,2,3" Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Related: SYS#4399 --- M scripts/osmo_ctrl.py 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/09/11909/4 -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:38:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 18:38:59 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 126 PS2, Line 126: if (int(length) != 0): > > What if you have an empty IPA header [?] Sorry I meant an empty IPA payload. So an IPA header with payload=0, which I guess is actually valid. https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 128 PS2, Line 128: return self.skip_traps(tail) > > you need the code I commented above as a base case [?] Line 121. It is the base case of your recursion so it's actually needed :) -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:38:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:39:41 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 26 Nov 2018 18:39:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 3: Oh, I am so sorry. I have been manually testing this change in my local branch, and just pushed an outdated version together with a new change. I'll restore the previous version. -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 18:39:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:40:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 26 Nov 2018 18:40:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#4) to the change originally created by dexter. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... MSC_Test: Test what happens when Paging for SMS is unanswered Trigger sending of an SMS, but ignore any paging requests from the MSC, make sure that the MSC is not paging infinitly Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Depends: osmo-msc I88a51568b43a1414e72ce74d7ba2e9406cf07f9f Related: OS#3704 --- M msc/MSC_Tests.ttcn 1 file changed, 69 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/11897/4 -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:50:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:50:27 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 2: (1 comment) Having said that, I'd very much welcome your patch which would add this (and couple of more) test cases with odd invalid input to make this more robust. https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 126 PS2, Line 126: if (int(length) != 0): > Sorry I meant an empty IPA payload. [?] That's only possible if you specifically craft such message using some non-osmocom tool. Which certainly is possible but there're dozens of places where we don't check for that. Making this tolerant to malicious input would be nice but is definitely outside of the scope for this patch. In case of osmocom routines length = len(payload) + 1 and payload is always non-empty string of at least 6 bytes. -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:50:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:51:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:51:25 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ipa: update split_combined docs In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11938 ) Change subject: osmo_ipa: update split_combined docs ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1cc6dc314fa0f147ab64ad29d9b892c3637a51c7 Gerrit-Change-Number: 11938 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 26 Nov 2018 18:51:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:51:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Mon, 26 Nov 2018 18:51:45 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ipa: update split_combined docs In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11938 ) Change subject: osmo_ipa: update split_combined docs ...................................................................... osmo_ipa: update split_combined docs Change-Id: I1cc6dc314fa0f147ab64ad29d9b892c3637a51c7 --- M osmopy/osmo_ipa.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index 462c4ec..c371023 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -116,7 +116,8 @@ def split_combined(self, data): """ - Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where rest contains remaining messages, first is the single IPA message + Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where 'rest' contains + remaining messages and 'first' is the single IPA message. No headers are stripped in 'first' or 'rest'. """ if data == None or len(data) == 0: return None, None -- To view, visit https://gerrit.osmocom.org/11938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1cc6dc314fa0f147ab64ad29d9b892c3637a51c7 Gerrit-Change-Number: 11938 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 18:56:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 26 Nov 2018 18:56:19 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 126 PS2, Line 126: if (int(length) != 0): > That's only possible if you specifically craft such message using some non-osmocom tool. [?] BTW, the () and the int() doesn't seem to be needed here (length is used as an integer in line 127). And regarding this check, I'm not asking you to refactor a big code, it's simply a matter of doing: if length == 0 or payload[:(length + 3)].decode('utf-8').startswith(self.CTRL_TRAP): return self.skip_traps(tail) -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Mon, 26 Nov 2018 18:56:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 26 21:09:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 26 Nov 2018 21:09:34 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c at 199 PS1, Line 199: trx_ctrl_cmd > that makes no sense since here the cb is per message and the trx_ctrl_msg is created inside the func [?] Another approach: this symbol becomes trx_ctrl_cmd_cb(), and trx_ctrl_cmd() becomes a wrapper that calls trx_ctrl_cmd_cb() with NULL. How about that? :) https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c at 259 PS1, Line 259: NULL > I foresee expanding cb use in the future, so it makes sense to keep it like this. Ok, but I am still unsure this makes sense for all commands. -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 26 Nov 2018 21:09:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon Nov 26 23:19:40 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 26 Nov 2018 23:19:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5bfc7f983d158_11f6436688128361@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: syswrite: No space left on device (worker was obs-arm-5:6) -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon Nov 26 23:29:06 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 26 Nov 2018 23:29:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5bfc81d3687c0_11f64366881288a7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: 500 rename /var/cache/obs/worker/cache/content.new /var/cache/obs/worker/cache/content: No such file or directory (worker was obs-arm-5:19) gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Nov 27 00:32:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 00:32:54 +0000 Subject: Change in osmo-bsc[master]: send Immediate Assignment Reject only before Immediate Assignment Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11940 Change subject: send Immediate Assignment Reject only before Immediate Assignment ...................................................................... send Immediate Assignment Reject only before Immediate Assignment Set flag lchan->activate.immediate_assignment_sent to true when sending, and omit a reject after that. lchan->activate gets completely zeroed in lchan_reset(), which sets that flag back to false whenever an lchan becomes inactive. Related: OS#3709 Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/11940/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index ba52c99..c67edd0 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -501,6 +501,7 @@ struct { enum lchan_activate_mode activ_for; bool activ_ack; /*< true as soon as RSL Chan Activ Ack is received */ + bool immediate_assignment_sent; /*< true as soon as an Immediate Assignment was sent */ /*! This flag ensures that when an lchan activation has succeeded, and we have already * sent ACKs like Immediate Assignment or BSSMAP Assignment Complete, and if other errors * occur later, e.g. during release, that we don't send a NACK out of context. */ diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 71b40c1..5e99239 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -97,9 +97,17 @@ switch (activ_for) { case FOR_MS_CHANNEL_REQUEST: - LOG_LCHAN(lchan, LOGL_NOTICE, "Tx Immediate Assignment Reject (%s)\n", - lchan->last_error ? : "unknown error"); - rsl_tx_imm_ass_rej(lchan->ts->trx->bts, lchan->rqd_ref); + if (lchan->activate.immediate_assignment_sent) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation failed, after Immediate Assignment message was sent (%s)\n", + lchan->last_error ? : "unknown error"); + /* Likely the MS never showed up. Just tear down the lchan. */ + } else { + /* Failure before Immediate Assignment message, send a reject. */ + LOG_LCHAN(lchan, LOGL_NOTICE, "Tx Immediate Assignment Reject (%s)\n", + lchan->last_error ? : "unknown error"); + rsl_tx_imm_ass_rej(lchan->ts->trx->bts, lchan->rqd_ref); + } break; case FOR_ASSIGNMENT: @@ -713,6 +721,7 @@ return; } LOG_LCHAN(lchan, LOGL_DEBUG, "Tx RR Immediate Assignment\n"); + lchan->activate.immediate_assignment_sent = true; break; case FOR_ASSIGNMENT: -- To view, visit https://gerrit.osmocom.org/11940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca Gerrit-Change-Number: 11940 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 00:35:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 00:35:17 +0000 Subject: Change in osmo-bsc[master]: send Immediate Assignment Reject only before Immediate Assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11940 ) Change subject: send Immediate Assignment Reject only before Immediate Assignment ...................................................................... send Immediate Assignment Reject only before Immediate Assignment Set flag lchan->activate.immediate_assignment_sent to true when sending, and omit a reject after that. lchan->activate gets completely zeroed in lchan_reset(), which sets that flag back to false whenever an lchan becomes inactive. Related: OS#3709 Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/11940/2 -- To view, visit https://gerrit.osmocom.org/11940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca Gerrit-Change-Number: 11940 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 00:48:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 00:48:06 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 4: Code-Review+1 (3 comments) Another pass, but would also be ok with me to merge as-is. https://gerrit.osmocom.org/#/c/11728/4/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/11728/4/include/osmocom/gsm/gsm0808.h at 174 PS4, Line 174: struct gsm0808_cell_id cell; (in osmo-bsc it is usually called "cell_id") https://gerrit.osmocom.org/#/c/11728/4/include/osmocom/gsm/gsm0808.h at 186 PS4, Line 186: struct gsm0808_speech_codec speech_codec_chosen; in above structs we have a 'bool more_items' to allow backwards compatible extensions to this struct. Are there items in this message we so far ignore? If yes such a bool might help someone in the future... https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c at 926 PS4, Line 926: /* Sspeech Version (chosen) 3.2.2.51 */ Chosen: Parseltounge (scnr, I mean the "Ss" typo) -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 00:48:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 00:49:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 00:49:39 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c at 913 PS4, Line 913: msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); did you guys figure out what "?2:1" code Pau meant in the earlier comment? -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 00:49:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 01:03:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 01:03:18 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11734 ) Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... Patch Set 4: Code-Review-1 (7 comments) I found a few more things, some less important than others... https://gerrit.osmocom.org/#/c/11734/4/src/osmo-bsc/handover_fsm.c File src/osmo-bsc/handover_fsm.c: https://gerrit.osmocom.org/#/c/11734/4/src/osmo-bsc/handover_fsm.c at 678 PS4, Line 678: struct gsm0808_handover_performed ho_perf_params; could just write '= {};' instead of the memset below https://gerrit.osmocom.org/#/c/11734/4/src/osmo-bsc/handover_fsm.c at 680 PS4, Line 680: struct gsm0808_speech_codec sc; maybe also = {} here? https://gerrit.osmocom.org/#/c/11734/4/src/osmo-bsc/handover_fsm.c at 689 PS4, Line 689: if (!cell) no error message or anything? Please do some LOG_HO(conn, LOGL_ERROR, "...") https://gerrit.osmocom.org/#/c/11734/4/src/osmo-bsc/handover_fsm.c at 692 PS4, Line 692: ho_perf_params.cell.id_discr = CELL_IDENT_WHOLE_GLOBAL; Please use the proper union member, here id.global. I prefer this notation: ho_perf_params.cell = (struct gsm0808_cell_id){ .id_discr = CELL_IDENT_WHOLE_GLOBAL, .id.global = *cell, } because then you're always sure all unset items become zero. (Also, I think a new version of cgi_for_msc() version should return a struct gsm0808_cell_id directly, again a note to self to fix it.) https://gerrit.osmocom.org/#/c/11734/4/src/osmo-bsc/handover_fsm.c at 696 PS4, Line 696: if (!ho_perf_params.chosen_channel) LOG_HO(..,ERROR https://gerrit.osmocom.org/#/c/11734/4/src/osmo-bsc/handover_fsm.c at 719 PS4, Line 719: msg = gsm0808_create_handover_performed(&ho_perf_params); check msg for NULL and log error? https://gerrit.osmocom.org/#/c/11734/4/src/osmo-bsc/handover_fsm.c at 720 PS4, Line 720: gscon_sigtran_send(conn, msg); check rc and log error? -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 01:03:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 01:13:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 01:13:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Test: Test what happens when Paging for SMS is unanswered In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11897 ) Change subject: MSC_Test: Test what happens when Paging for SMS is unanswered ...................................................................... Patch Set 4: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/11897/4/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11897/4/msc/MSC_Tests.ttcn at 1984 PS4, Line 1984: /* Expect the MSC to page exactly 10 times before giving up */ so ... if you're not sending an SMS above, how do you expect paging to happen? https://gerrit.osmocom.org/#/c/11897/4/msc/MSC_Tests.ttcn at 1986 PS4, Line 1986: [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) if above LU ended up negotiating a TMSI, I actually expect Paging by TMSI? https://gerrit.osmocom.org/#/c/11897/4/msc/MSC_Tests.ttcn at 2028 PS4, Line 2028: f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS"); ah. then drop the FIXME above? -- To view, visit https://gerrit.osmocom.org/11897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id645729551672026c6a96bb849ecd04f20cd0c56 Gerrit-Change-Number: 11897 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 01:13:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 01:33:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 01:33:55 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 4: Code-Review+1 (2 comments) hmm, if stsp also agrees, maybe I should insist on my hunch that a generic T1234 dynamic setting will not make sense anyway. But I don't want to block this more than necessary. Arguing for my earlier points... just a +1 from me for now because I think they are valid points. https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3916 PS3, Line 3916: "T-number, optionally preceded by 't' or 'T'.") > I didn't completely get what you mean here regarding docs, but anyway that sounds confusing to me wh [?] Point 1 is, we often have #defines to re-use the exact same string again, because only one doc string survives in the online docs. DEFUN("foo one", "Foo to set one\n" "One arg") DEFUN("foo two", "Foo to set two\n" "Two") > list foo one foo two > foo? Foo to set one > foo ? one One arg two Two So in that case, you want a FOO_STR that is always the same. But when there is a 'no' before that, that's not an issue. This example shows that, and also illustrates the other point: #define FOO_STR "Set a foo value\n" DEFUN("foo one", FOO_STR "One arg") DEFUN("no foo", NO_STR FOO_STR) > list foo one no foo > foo? Set a foo value > no? Negate a command or set its defaults > no ? foo Set a foo value > no foo? Set a foo value "no foo" now says that it sets a value. For me it makes more sense to describe what "no foo" would actually do: DEFUN("no foo", NO_STR "Disable foo") > no? Negate a command or set its defaults > no ? foo Disable foo > no foo? Disable foo So > no timer-dynamic? Calculate T3113 dynamically based on channel config and load that's "WTF" to me. https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3927 PS3, Line 3927: return CMD_WARNING; > Sure, but anyway nowadays doesn't make sense, to let's better tell the user probably he's doing some [?] (still think it makes sense to say "has no dynamic" when the user tries to set a dynamic value; if you really need to say something here, maybe rather "T%d already is non-dynamic"?) -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 27 Nov 2018 01:33:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 01:41:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 01:41:25 +0000 Subject: Change in osmo-dev[master]: Add expect script: 'vty' for easy access to all vtys In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11811 ) Change subject: Add expect script: 'vty' for easy access to all vtys ...................................................................... Patch Set 2: Code-Review+1 nice. I wouldn't mind at all to add it here, but it probably prefers to take on the invitation to live in libosmocore instead? agree that the commit log explanation should instead go either to a comment on top, or to some README file next to it. I think libosmocore/contrib/ is a better place than doc/examples/ (which usually is for .cfg files in other reposes) -- To view, visit https://gerrit.osmocom.org/11811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec Gerrit-Change-Number: 11811 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 27 Nov 2018 01:41:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 27 06:52:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 27 Nov 2018 06:52:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#202?= In-Reply-To: <1947113928.851.1543215123700.JavaMail.jenkins@jenkins.osmocom.org> References: <1947113928.851.1543215123700.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2056529441.866.1543301522860.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.35 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:37:54 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 27 Nov 2018 07:37:54 +0000 Subject: Change in openbsc[master]: bsc-nat: Enable octet-aligned when ensuring mode set In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/6598 ) Change subject: bsc-nat: Enable octet-aligned when ensuring mode set ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/6598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4db7f6d18f650f36f3186965096771f748de5fd Gerrit-Change-Number: 6598 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 07:37:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:40:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:40:00 +0000 Subject: Change in osmo-bsc[master]: send Immediate Assignment Reject only before Immediate Assignment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11940 ) Change subject: send Immediate Assignment Reject only before Immediate Assignment ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca Gerrit-Change-Number: 11940 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 27 Nov 2018 07:40:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:40:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:40:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests.ttcn: introduce TC_chan_deact_silence In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11939 ) Change subject: BSC_Tests.ttcn: introduce TC_chan_deact_silence ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I00b0838c9f919303aef72280248b0d1317f42b3b Gerrit-Change-Number: 11939 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 27 Nov 2018 07:40:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:40:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:40:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests.ttcn: introduce TC_chan_deact_silence In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11939 ) Change subject: BSC_Tests.ttcn: introduce TC_chan_deact_silence ...................................................................... BSC_Tests.ttcn: introduce TC_chan_deact_silence The idea of this test case is to verify channel deactivation procedure due to no response to Immediate Assignment. Change-Id: I00b0838c9f919303aef72280248b0d1317f42b3b Related: OS#3709 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml 2 files changed, 35 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a155fef..53e4396 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -524,6 +524,39 @@ } } +/* Test channel deactivation due to silence from MS */ +testcase TC_chan_deact_silence() runs on test_CT { + var RslChannelNr chan_nr; + + f_init(1); + + /* Request for a dedicated channel */ + chan_nr := f_chreq_act_ack('23'O); + + /* Wait some time until the channel is released */ + f_sleep(2.0); + + /* Expect CHANnel RELease */ + alt { + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, + tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) { + log("Received CHANnel RELease"); + setverdict(pass); + } + [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, + tr_RSL_IMM_ASSIGN(?))) { + /* See OS#3709, OsmoBSC should not send Immediate + * Assignment Reject since a dedicated channel was + * already allocated, and Immediate Assignment was + * already sent. */ + setverdict(fail, "Unexpected Immediate Assignment!"); + } + [] IPA_RSL[0].receive { + setverdict(fail, "Unexpected RSL message!"); + } + } +} + /*********************************************************************** * Assignment Testing ***********************************************************************/ @@ -3372,6 +3405,7 @@ execute( TC_chan_act_ack_est_ind_refused() ); execute( TC_chan_act_nack() ); execute( TC_chan_exhaustion() ); + execute( TC_chan_deact_silence() ); execute( TC_chan_rel_rll_rel_ind() ); execute( TC_chan_rel_conn_fail() ); execute( TC_chan_rel_hard_clear() ); diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index d558e72..fd26922 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -10,6 +10,7 @@ + -- To view, visit https://gerrit.osmocom.org/11939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I00b0838c9f919303aef72280248b0d1317f42b3b Gerrit-Change-Number: 11939 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:40:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:40:29 +0000 Subject: Change in osmo-bsc[master]: send Immediate Assignment Reject only before Immediate Assignment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11940 ) Change subject: send Immediate Assignment Reject only before Immediate Assignment ...................................................................... send Immediate Assignment Reject only before Immediate Assignment Set flag lchan->activate.immediate_assignment_sent to true when sending, and omit a reject after that. lchan->activate gets completely zeroed in lchan_reset(), which sets that flag back to false whenever an lchan becomes inactive. Related: OS#3709 Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/lchan_fsm.c 2 files changed, 13 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index ba52c99..15158cd 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -501,6 +501,7 @@ struct { enum lchan_activate_mode activ_for; bool activ_ack; /*< true as soon as RSL Chan Activ Ack is received */ + bool immediate_assignment_sent; /*! This flag ensures that when an lchan activation has succeeded, and we have already * sent ACKs like Immediate Assignment or BSSMAP Assignment Complete, and if other errors * occur later, e.g. during release, that we don't send a NACK out of context. */ diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 71b40c1..5e99239 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -97,9 +97,17 @@ switch (activ_for) { case FOR_MS_CHANNEL_REQUEST: - LOG_LCHAN(lchan, LOGL_NOTICE, "Tx Immediate Assignment Reject (%s)\n", - lchan->last_error ? : "unknown error"); - rsl_tx_imm_ass_rej(lchan->ts->trx->bts, lchan->rqd_ref); + if (lchan->activate.immediate_assignment_sent) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation failed, after Immediate Assignment message was sent (%s)\n", + lchan->last_error ? : "unknown error"); + /* Likely the MS never showed up. Just tear down the lchan. */ + } else { + /* Failure before Immediate Assignment message, send a reject. */ + LOG_LCHAN(lchan, LOGL_NOTICE, "Tx Immediate Assignment Reject (%s)\n", + lchan->last_error ? : "unknown error"); + rsl_tx_imm_ass_rej(lchan->ts->trx->bts, lchan->rqd_ref); + } break; case FOR_ASSIGNMENT: @@ -713,6 +721,7 @@ return; } LOG_LCHAN(lchan, LOGL_DEBUG, "Tx RR Immediate Assignment\n"); + lchan->activate.immediate_assignment_sent = true; break; case FOR_ASSIGNMENT: -- To view, visit https://gerrit.osmocom.org/11940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca Gerrit-Change-Number: 11940 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:42:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:42:21 +0000 Subject: Change in osmo-bts[master]: bts_model: Allow TS connect to be processed asynchronously In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11931 ) Change subject: bts_model: Allow TS connect to be processed asynchronously ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie073a4397dd2f1a691968d12b15b8b42f1e1b0cf Gerrit-Change-Number: 11931 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 27 Nov 2018 07:42:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:43:21 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 27 Nov 2018 07:43:21 +0000 Subject: Change in openbsc[master]: bsc-nat: Enable octet-aligned when ensuring mode set In-Reply-To: References: Message-ID: daniel has uploaded a new patch set (#3) to the change originally created by Pau Espin Pedrol. ( https://gerrit.osmocom.org/6598 ) Change subject: bsc-nat: Enable octet-aligned when ensuring mode set ...................................................................... bsc-nat: Enable octet-aligned when ensuring mode set >From RFC 4867: octet-align: Permissible values are 0 and 1. If 1, octet-aligned operation SHALL be used. If 0 or if not present, bandwidth-efficient operation is employed. Change-Id: Ic4db7f6d18f650f36f3186965096771f748de5fd --- M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c M openbsc/tests/bsc-nat/bsc_data.c 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/98/6598/3 -- To view, visit https://gerrit.osmocom.org/6598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic4db7f6d18f650f36f3186965096771f748de5fd Gerrit-Change-Number: 6598 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:44:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:44:29 +0000 Subject: Change in osmo-trx[master]: lms: Apply LMS->OSMO log level conversion In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11902 ) Change subject: lms: Apply LMS->OSMO log level conversion ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a8fbcc7cacebc7038c60175a8ae43b21f713cbb Gerrit-Change-Number: 11902 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 07:44:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:44:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:44:38 +0000 Subject: Change in osmo-trx[master]: lms: Use LimeSuite.h log level defines instead of hardcoded values In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11901 ) Change subject: lms: Use LimeSuite.h log level defines instead of hardcoded values ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee693da1a0fa1db23deafa8d3845c04171e24799 Gerrit-Change-Number: 11901 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 07:44:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:44:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:44:40 +0000 Subject: Change in osmo-trx[master]: lms: Use LimeSuite.h log level defines instead of hardcoded values In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11901 ) Change subject: lms: Use LimeSuite.h log level defines instead of hardcoded values ...................................................................... lms: Use LimeSuite.h log level defines instead of hardcoded values Change-Id: Iee693da1a0fa1db23deafa8d3845c04171e24799 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 32c3d15..318df17 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -62,10 +62,10 @@ /* map lime specific log levels */ static const int lvl_map[5] = { [0] = LOGL_FATAL, - [1] = LOGL_ERROR, - [2] = LOGL_NOTICE, - [3] = LOGL_INFO, - [4] = LOGL_DEBUG, + [LMS_LOG_ERROR] = LOGL_ERROR, + [LMS_LOG_WARNING] = LOGL_NOTICE, + [LMS_LOG_INFO] = LOGL_INFO, + [LMS_LOG_DEBUG] = LOGL_DEBUG, }; /* protect against future higher log level values (lower importance) */ if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map)) -- To view, visit https://gerrit.osmocom.org/11901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iee693da1a0fa1db23deafa8d3845c04171e24799 Gerrit-Change-Number: 11901 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:44:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:44:41 +0000 Subject: Change in osmo-trx[master]: lms: Apply LMS->OSMO log level conversion In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11902 ) Change subject: lms: Apply LMS->OSMO log level conversion ...................................................................... lms: Apply LMS->OSMO log level conversion Change-Id: I3a8fbcc7cacebc7038c60175a8ae43b21f713cbb --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 318df17..0a6c4a2 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -71,7 +71,7 @@ if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map)) lvl = ARRAY_SIZE(lvl_map)-1; - LOGLV(DLMS, lvl) << msg; + LOGLV(DLMS, lvl_map[lvl]) << msg; } static void thread_enable_cancel(bool cancel) -- To view, visit https://gerrit.osmocom.org/11902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3a8fbcc7cacebc7038c60175a8ae43b21f713cbb Gerrit-Change-Number: 11902 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:45:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:45:05 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 07:45:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:45:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:45:07 +0000 Subject: Change in docker-playground[master]: Add ttcn3-bscnat-test docker image In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11657 ) Change subject: Add ttcn3-bscnat-test docker image ...................................................................... Add ttcn3-bscnat-test docker image Run the bscnat ttcn3 tests in docker. This uses the osmo-nitb-master image since osmo-bsc_nat is built there as well. Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 --- A ttcn3-bscnat-test/BSCNAT_Tests.cfg A ttcn3-bscnat-test/Dockerfile A ttcn3-bscnat-test/Makefile A ttcn3-bscnat-test/bscs.config A ttcn3-bscnat-test/jenkins.sh A ttcn3-bscnat-test/osmo-bsc-nat.cfg 6 files changed, 191 insertions(+), 0 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved daniel: Verified diff --git a/ttcn3-bscnat-test/BSCNAT_Tests.cfg b/ttcn3-bscnat-test/BSCNAT_Tests.cfg new file mode 100644 index 0000000..e45061d --- /dev/null +++ b/ttcn3-bscnat-test/BSCNAT_Tests.cfg @@ -0,0 +1,30 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/bsc-nat/BSCNAT_Tests.default" + +[LOGGING] +*.JUnitLogger.testsuite_name := "BSCNAT_Tests" + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +mp_bsc_port := 49999; +mp_bsc_ip := "172.18.11.203"; +mp_msc_port := 5100; +mp_msc_ip := "172.18.11.203"; +mp_nat_port := 5000; +mp_nat_ip := "172.18.11.20"; + +#mp_ipa_mgcp_uses_osmo_ext := true; + +mp_mgcp_uses_udp := true; +mp_callagent_ip := "172.18.11.203"; +mp_callagent_udp_port := 2727; +mp_mgw_ip := "172.18.11.20"; +mp_mgw_udp_port := 2427; + +[MAIN_CONTROLLER] + +[EXECUTE] +BSCNAT_Tests.control +#BSCNAT_Tests.TC_recv_dump diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile new file mode 100644 index 0000000..b19413e --- /dev/null +++ b/ttcn3-bscnat-test/Dockerfile @@ -0,0 +1,33 @@ +ARG USER +FROM $USER/debian-stretch-titan + +RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git + +RUN cd osmo-ttcn3-hacks && \ + git checkout -f -B master origin/master && \ + make deps + +RUN git config --global user.email docker at dock.er && \ + git config --global user.name "Dock Er" + +ARG OSMO_TTCN3_BRANCH="master" + +ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit +RUN cd osmo-ttcn3-hacks && \ + git fetch && \ + git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ + make bsc-nat + +VOLUME /data + +RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + +COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg + +CMD cd /data && \ + /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc-nat/BSCNAT_Tests; \ + exit_code=$?; \ + /osmo-ttcn3-hacks/log_merge.sh BSCNAT_Tests --rm; \ + exit $exit_code diff --git a/ttcn3-bscnat-test/Makefile b/ttcn3-bscnat-test/Makefile new file mode 100644 index 0000000..0895788 --- /dev/null +++ b/ttcn3-bscnat-test/Makefile @@ -0,0 +1,2 @@ + +include ../make/Makefile diff --git a/ttcn3-bscnat-test/bscs.config b/ttcn3-bscnat-test/bscs.config new file mode 100644 index 0000000..6afa09b --- /dev/null +++ b/ttcn3-bscnat-test/bscs.config @@ -0,0 +1,19 @@ +nat + bsc 0 + token BSC0 + location_area_code 1 + description bsc + max-endpoints 32 + paging forbidden 0 + bsc 1 + token BSC1 + location_area_code 2 + description bsc + max-endpoints 32 + paging forbidden 0 + bsc 2 + token BSC2 + location_area_code 3 + description bsc + max-endpoints 32 + paging forbidden 0 diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh new file mode 100755 index 0000000..0287097 --- /dev/null +++ b/ttcn3-bscnat-test/jenkins.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "debian-jessie-build" \ + "osmo-nitb-$IMAGE_SUFFIX" \ + "debian-stretch-titan" \ + "ttcn3-bscnat-test" + + +mkdir $VOL_BASE_DIR/bscnat-tester +cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/ + +mkdir $VOL_BASE_DIR/bscnat +cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/ +cp bscs.config $VOL_BASE_DIR/bscnat/ + +network_create 172.18.11.0/24 + +echo Starting container with BSCNAT +docker run --rm \ + --network $NET_NAME --ip 172.18.11.20 \ + -v $VOL_BASE_DIR/bscnat:/data \ + --name ${BUILD_TAG}-bscnat -d \ + $REPO_USER/osmo-nitb-$IMAGE_SUFFIX /usr/local/bin/osmo-bsc_nat -c /data/osmo-bsc-nat.cfg + +echo Starting container with BSCNAT testsuite +docker run --rm \ + --network $NET_NAME --ip 172.18.11.203 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/bscnat-tester:/data \ + --name ${BUILD_TAG}-ttcn3-bscnat-test \ + $REPO_USER/ttcn3-bscnat-test + +echo Stopping containers +docker container kill ${BUILD_TAG}-bscnat + +network_remove +collect_logs diff --git a/ttcn3-bscnat-test/osmo-bsc-nat.cfg b/ttcn3-bscnat-test/osmo-bsc-nat.cfg new file mode 100644 index 0000000..4f02366 --- /dev/null +++ b/ttcn3-bscnat-test/osmo-bsc-nat.cfg @@ -0,0 +1,67 @@ +! +! OsmoBSCNAT (0.12.0.266-2daa9) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging timestamp 1 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level mncc notice + logging level pag notice + logging level meas notice + logging level sccp debug + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level db notice + logging level ref notice + logging level gprs debug + logging level ns info + logging level bssgp debug + logging level llc debug + logging level sndcp debug + logging level nat notice + logging level ctrl notice + logging level smpp debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice +! +line vty + no login +! +mgcp + bind ip 172.18.11.20 + bind port 2427 + rtp bts-base 4000 + rtp net-base 16000 + rtp ip-dscp 0 + no rtcp-omit + sdp audio-payload number 126 + sdp audio-payload name AMR/8000 + loop 0 + number endpoints 1 + call-agent ip 172.18.11.203 + rtp transcoder-base 0 + transcoder-remote-base 4000 +nat + msc ip 172.18.11.203 + msc port 5100 + token foo + timeout auth 2 + timeout ping 20 + timeout pong 5 + ip-dscp 0 + bscs-config-file bscs.config + access-list msceven imsi-allow ^[0-9]*[24680]$ + access-list mscodd imsi-allow ^[0-9]*[13579]$ -- To view, visit https://gerrit.osmocom.org/11657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibeebb0325d3d1976225666eb28db0741df2e66f0 Gerrit-Change-Number: 11657 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:45:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:45:54 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: refactor RP-DATA header validation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11915 ) Change subject: libmsc/gsm_04_11.c: refactor RP-DATA header validation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15 Gerrit-Change-Number: 11915 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 07:45:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:46:13 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 27 Nov 2018 07:46:13 +0000 Subject: Change in openbsc[master]: bsc-nat: Enable octet-aligned when ensuring mode set In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/6598 ) Change subject: bsc-nat: Enable octet-aligned when ensuring mode set ...................................................................... Patch Set 4: Code-Review+2 I changed the RFC no in the commit message and rebased the patch -- To view, visit https://gerrit.osmocom.org/6598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4db7f6d18f650f36f3186965096771f748de5fd Gerrit-Change-Number: 6598 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 07:46:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 27 07:47:11 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 27 Nov 2018 07:47:11 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-trx_=C2=BB_--with-s?= =?UTF-8?Q?se,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#694?= Message-ID: <649972987.868.1543304831430.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Pau Espin Pedrol] lms: Use LimeSuite.h log level defines instead of hardcoded values [Pau Espin Pedrol] lms: Apply LMS->OSMO log level conversion ------------------------------------------ [...truncated 101.56 KB...] Freeing entry tree Determining which enums are documented Computing member relations... Building full member lists recursively... Adding members to member groups. Computing member references... Inheriting documentation... Generating disk names... Adding source references... Adding xrefitems... Sorting member lists... Computing dependencies between directories... Generating citations page... Counting data structures... Resolving user defined references... Finding anchors and sections in the documentation... Transferring function references... Combining using relations... Adding members to index pages... Generating style sheet... Generating search indices... Generating example documentation... Generating file sources... Generating file documentation... Generating page documentation... Generating group documentation... Generating class documentation... Generating namespace index... Generating graph info page... Generating directory documentation... Generating index page... Generating page index... Generating module index... Generating namespace index... Generating namespace member index... Generating annotated compound index... Generating alphabetical compound index... Generating hierarchical class index... Generating graphical class hierarchy... Generating member index... Generating file index... Generating file member index... Generating example index... finalizing index lists... writing tag file... Running dot... Running dot for graph 1/1 lookup cache used 0/65536 hits=0 misses=0 finished... make[5]: Entering directory ' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_guide.html /usr/bin/install -c -m 644 ../README ' cp -r html make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in firmware make[2]: Entering directory ' Making install in include make[3]: Entering directory ' PYTHONPATH=../../usrp/firmware/include ./generate_regs.py ./fpga_regs_common.h fpga_regs_common.v PYTHONPATH=../../usrp/firmware/include ./generate_regs.py ./fpga_regs_standard.h fpga_regs_standard.v make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp_i2c_addr.h usrp_spi_defs.h fpga_regs_common.h fpga_regs_standard.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 usrp.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libusrp + export PKG_CONFIG_PATH=: + export LD_LIBRARY_PATH= + set +x =============================== osmo-trx =============================== + cd + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'config'. libtoolize: copying file 'config/libtool.m4' libtoolize: copying file 'config/ltoptions.m4' libtoolize: copying file 'config/ltsugar.m4' libtoolize: copying file 'config/ltversion.m4' libtoolize: copying file 'config/lt~obsolete.m4' configure.ac:44: installing './compile' configure.ac:31: installing './config.guess' configure.ac:31: installing './config.sub' configure.ac:35: installing './install-sh' configure.ac:35: installing './missing' CommonLibs/Makefile.am: installing './depcomp' Makefile.am: installing './INSTALL' + ./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms --with-sse checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking target system type... x86_64-pc-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking for style of include used by make... GNU checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking dependency style of gcc... gcc3 checking dependency style of gcc... gcc3 checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking whether gcc understands -c and -o together... (cached) yes checking dependency style of gcc... (cached) gcc3 checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking whether g++ supports C++11 features by default... yes checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for rm... /bin/rm checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... dlltool checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for ANSI C header files... (cached) yes checking byteswap.h usability... yes checking byteswap.h presence... yes checking for byteswap.h... yes checking for an ANSI C-conforming const... yes checking for inline... inline checking for size_t... yes checking whether time.h and sys/time.h may both be included... yes checking whether byte ordering is bigendian... no checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOCTRL... yes checking for USRP... yes checking for LMS... no configure: error: Package requirements (LimeSuite) were not met: Package LimeSuite was not found in the pkg-config search path. Perhaps you should add the directory containing `LimeSuite.pc' to the PKG_CONFIG_PATH environment variable Package 'LimeSuite', required by 'world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables LMS_CFLAGS and LMS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:49:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:49:20 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11914 ) Change subject: libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} ...................................................................... libmsc/gsm_04_11.c: don't pass msgb to gsm411_rx_rp_{ack|error} Passing a message buffer containing the whole encoded message, and a pointer to the RP header (struct gsm411_rp_hdr) is redundant. Change-Id: I0eb5c7c485ab7d109966431bd875fa74e00936d7 --- M src/libmsc/gsm_04_11.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 52edcd6..4d43b57 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -700,7 +700,7 @@ } /* Receive a 04.11 RP-ACK message (response to RP-DATA from us) */ -static int gsm411_rx_rp_ack(struct msgb *msg, struct gsm_trans *trans, +static int gsm411_rx_rp_ack(struct gsm_trans *trans, struct gsm411_rp_hdr *rph) { struct gsm_sms *sms = trans->sms.sms; @@ -729,7 +729,7 @@ return 0; } -static int gsm411_rx_rp_error(struct msgb *msg, struct gsm_trans *trans, +static int gsm411_rx_rp_error(struct gsm_trans *trans, struct gsm411_rp_hdr *rph) { struct gsm_network *net = trans->conn->network; @@ -824,11 +824,11 @@ switch (msg_type) { case GSM411_MT_RP_ACK_MO: DEBUGP(DLSMS, "RX SMS RP-ACK (MO)\n"); - rc = gsm411_rx_rp_ack(msg, trans, rp_data); + rc = gsm411_rx_rp_ack(trans, rp_data); break; case GSM411_MT_RP_ERROR_MO: DEBUGP(DLSMS, "RX SMS RP-ERROR (MO)\n"); - rc = gsm411_rx_rp_error(msg, trans, rp_data); + rc = gsm411_rx_rp_error(trans, rp_data); break; default: LOGP(DLSMS, LOGL_NOTICE, "Invalid RP type 0x%02x\n", msg_type); -- To view, visit https://gerrit.osmocom.org/11914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0eb5c7c485ab7d109966431bd875fa74e00936d7 Gerrit-Change-Number: 11914 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:49:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 27 Nov 2018 07:49:21 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: refactor RP-DATA header validation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11915 ) Change subject: libmsc/gsm_04_11.c: refactor RP-DATA header validation ...................................................................... libmsc/gsm_04_11.c: refactor RP-DATA header validation It's much better to have both RP-DATA header parsing and validation code in a single function. There is no need to pass all the header fields (DA, OA, UI) to gsm411_rx_rp_ud() because they are not used there. Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15 --- M src/libmsc/gsm_04_11.c 1 file changed, 18 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 4d43b57..14f9f57 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -587,27 +587,10 @@ /* Receive a 04.11 TPDU inside RP-DATA / user data */ static int gsm411_rx_rp_ud(struct msgb *msg, struct gsm_trans *trans, - struct gsm411_rp_hdr *rph, - uint8_t src_len, uint8_t *src, - uint8_t dst_len, uint8_t *dst, - uint8_t tpdu_len, uint8_t *tpdu) + struct gsm411_rp_hdr *rph) { int rc = 0; - if (src_len && src) - LOGP(DLSMS, LOGL_ERROR, "RP-DATA (MO) with SRC ?!?\n"); - - if (!dst_len || !dst || !tpdu_len || !tpdu) { - LOGP(DLSMS, LOGL_ERROR, - "RP-DATA (MO) without DST or TPDU ?!?\n"); - gsm411_send_rp_error(trans, rph->msg_ref, - GSM411_RP_CAUSE_INV_MAND_INF); - return -EIO; - } - msg->l4h = tpdu; - - DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len)); - rc = gsm340_rx_tpdu(trans, msg, rph->msg_ref); if (rc == 0) return gsm411_send_rp_ack(trans, rph->msg_ref); @@ -639,8 +622,23 @@ DEBUGP(DLSMS, "RX_RP-DATA: src_len=%u, dst_len=%u ud_len=%u\n", src_len, dst_len, rpud_len); - return gsm411_rx_rp_ud(msg, trans, rph, src_len, src, dst_len, dst, - rpud_len, rp_ud); + + if (src_len && src) + LOGP(DLSMS, LOGL_ERROR, "RP-DATA (MO) with SRC ?!?\n"); + + if (!dst_len || !dst || !rpud_len || !rp_ud) { + LOGP(DLSMS, LOGL_ERROR, + "RP-DATA (MO) without DST or TPDU ?!?\n"); + gsm411_send_rp_error(trans, rph->msg_ref, + GSM411_RP_CAUSE_INV_MAND_INF); + return -EIO; + } + + msg->l4h = rp_ud; + + DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len)); + + return gsm411_rx_rp_ud(msg, trans, rph); } static struct gsm_sms *sms_report_alloc(struct gsm_sms *sms) -- To view, visit https://gerrit.osmocom.org/11915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaf295949148e2a613c5403d1f7a926fcd6849c15 Gerrit-Change-Number: 11915 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 07:50:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 07:50:08 +0000 Subject: Change in osmo-bsc[master]: send Immediate Assignment Reject only before Immediate Assignment In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11940 ) Change subject: send Immediate Assignment Reject only before Immediate Assignment ...................................................................... Patch Set 2: (2 comments) Oh, it has been already merged :/ https://gerrit.osmocom.org/#/c/11940/2/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/#/c/11940/2/src/osmo-bsc/lchan_fsm.c at 101 PS2, Line 101: LOGL_ERROR As I pointed out in OS#3709, let's use LOGL_NOTICE. https://gerrit.osmocom.org/#/c/11940/2/src/osmo-bsc/lchan_fsm.c at 102 PS2, Line 102: lchan activation failed As was also pointed out in OS#3709, at this point the activation was successful. We could debug something like: LOG_LCHAN(lchan, LOGL_NOTICE, "No response to Immediate Assignment, tearing down the lchan\n"); or not to print anything at all. -- To view, visit https://gerrit.osmocom.org/11940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca Gerrit-Change-Number: 11940 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 07:50:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 08:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 08:15:04 +0000 Subject: Change in osmo-msc[master]: libmsc/transaction.c: cosmetic: fix typo Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11941 Change subject: libmsc/transaction.c: cosmetic: fix typo ...................................................................... libmsc/transaction.c: cosmetic: fix typo Change-Id: I6d72b856e40ba81ee2f1e60693055705b5993b09 --- M src/libmsc/transaction.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/11941/1 diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index be14420..680d7f3 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -35,7 +35,7 @@ void _gsm911_nc_ss_trans_free(struct gsm_trans *trans); /*! Find a transaction in connection for given protocol + transaction ID - * \param[in] conn Connection in whihc we want to find transaction + * \param[in] conn Connection in which we want to find transaction * \param[in] proto Protocol of transaction * \param[in] trans_id Transaction ID of transaction * \returns Matching transaction, if any -- To view, visit https://gerrit.osmocom.org/11941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6d72b856e40ba81ee2f1e60693055705b5993b09 Gerrit-Change-Number: 11941 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 09:25:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 09:25:05 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11069 ) Change subject: GSUP/SMS: introduce MO-/MT-FORWARD-SM messages ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71 Gerrit-Change-Number: 11069 Gerrit-PatchSet: 9 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 09:25:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 09:25:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 09:25:10 +0000 Subject: Change in libosmocore[master]: GSUP/SMS: introduce READY-FOR-SM message In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11751 ) Change subject: GSUP/SMS: introduce READY-FOR-SM message ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 Gerrit-Change-Number: 11751 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 27 Nov 2018 09:25:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 09:28:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 09:28:27 +0000 Subject: Change in osmo-msc[master]: libmsc/transaction: introduce trans_find_by_sm_rp_mr() In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11917 ) Change subject: libmsc/transaction: introduce trans_find_by_sm_rp_mr() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice47c37ecef4416e65ecee8931d946c915316791 Gerrit-Change-Number: 11917 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 09:28:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 27 09:43:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 27 Nov 2018 09:43:26 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-trx_=C2=BB_--wi?= =?UTF-8?Q?th-sse,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#695?= In-Reply-To: <649972987.868.1543304831430.JavaMail.jenkins@jenkins.osmocom.org> References: <649972987.868.1543304831430.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1801699866.869.1543311806109.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue Nov 27 09:57:06 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Tue, 27 Nov 2018 09:57:06 +0000 Subject: Change in osmo-dev[master]: Add expect script: 'vty' for easy access to all vtys In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/11811 ) Change subject: Add expect script: 'vty' for easy access to all vtys ...................................................................... Patch Set 2: Thanks all for the reviews. I've been thinking more about this and I think I can do better. Integrate byobu or tmux maybe, to bring up different configs. If one wanted to work on data, you might want to see bts/pcu/sgsn/ggsn in a 4-way split tmux. If your BTS is remote, you might want to use ssh to gain your vty there. Whereas in another scenario you might prefer a screen with msc/hlr with appropriate logging. I don't think I would try to make this so super configurable, but rather, as you say. Make it clear how to edit and personalise ones own "vty" I will submit the next version to libosmocore. (Apologies for recent absence.. somewhat overwhelmed attending to a data centre moving house.) -- To view, visit https://gerrit.osmocom.org/11811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I64ec5f2a8e04f3a8ea9cd0910ba9614fcd37ecec Gerrit-Change-Number: 11811 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 27 Nov 2018 09:57:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 10:10:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 10:10:40 +0000 Subject: Change in osmo-bts[master]: bts_model: Allow TS connect to be processed asynchronously In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11931 ) Change subject: bts_model: Allow TS connect to be processed asynchronously ...................................................................... bts_model: Allow TS connect to be processed asynchronously This commit doesn't change internal logic of any model, only the API to be able to return result of connect TS asyncrhonously since some models (like osmo-bts-trx) require some time to process the result. This way PDCH ACT/DEACT (N)ACK can be sent once the result of this long process is known. For instance, nowadays in osmo-bts-trx we PDCH (DE)ACT ACK before getting the result from SETSLOT on the TRX iface. With this new API, bts_model_ts_connect doesn't return any value synchronously. Instead, it is expected to always end up calling cb_ts_connected with the return code from the TS activation process. 0 is considered a successs, while any other value is considered an error. Change-Id: Ie073a4397dd2f1a691968d12b15b8b42f1e1b0cf --- M include/osmo-bts/bts_model.h M include/osmo-bts/rsl.h M src/common/rsl.c M src/osmo-bts-litecell15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/main.c M tests/handover/handover_test.c M tests/meas/meas_test.c M tests/stubs.c 13 files changed, 63 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h index f1f6830..be0480c 100644 --- a/include/osmo-bts/bts_model.h +++ b/include/osmo-bts/bts_model.h @@ -60,6 +60,6 @@ void bts_model_phy_instance_set_defaults(struct phy_instance *pinst); int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts); -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan); +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan); #endif diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 731f6c0..0361841 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -40,7 +40,7 @@ int rsl_tx_delete_ind(struct gsm_bts *bts, const uint8_t *ia, uint8_t ia_len); void cb_ts_disconnected(struct gsm_bts_trx_ts *ts); -void cb_ts_connected(struct gsm_bts_trx_ts *ts); +void cb_ts_connected(struct gsm_bts_trx_ts *ts, int rc); void ipacc_dyn_pdch_complete(struct gsm_bts_trx_ts *ts, int rc); #endif // _RSL_H */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 9b0de7c..507e8aa 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2157,7 +2157,7 @@ * 1. call bts_model_ts_disconnect() to disconnect TCH/F; * 2. cb_ts_disconnected() is called when done; * 3. call bts_model_ts_connect() to connect as PDTCH; - * 4. cb_ts_connected() is called when done; + * 4. cb_ts_connected(rc) is called when done; * 5. instruct the PCU to enable PDTCH; * 6. the PCU will call back with an activation request; * 7. l1sap_info_act_cnf() will call ipacc_dyn_pdch_complete() when SAPI @@ -2171,7 +2171,7 @@ * deactivations are done; * 4. cb_ts_disconnected() is called when done; * 5. call bts_model_ts_connect() to connect as TCH/F; - * 6. cb_ts_connected() is called when done; + * 6. cb_ts_connected(rc) is called when done; * 7. directly call ipacc_dyn_pdch_complete(), since no further action required * for TCH/F; * 8. send a PDCH DEACT ACK. @@ -2276,7 +2276,8 @@ if (rc) goto error_nack; - rc = bts_model_ts_connect(ts, as_pchan); + bts_model_ts_connect(ts, as_pchan); + return; error_nack: /* Error? then NACK right now. */ @@ -2322,9 +2323,14 @@ } } -static void ipacc_dyn_pdch_ts_connected(struct gsm_bts_trx_ts *ts) +static void ipacc_dyn_pdch_ts_connected(struct gsm_bts_trx_ts *ts, int rc) { - int rc; + if (rc) { + LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT IPA operation failed (%d) in bts model\n", + gsm_lchan_name(ts->lchan), rc); + ipacc_dyn_pdch_complete(ts, rc); + return; + } if (ts->flags & TS_F_PDCH_DEACT_PENDING) { if (ts->lchan[0].type != GSM_LCHAN_TCH_F) @@ -2373,12 +2379,18 @@ } } -static void osmo_dyn_ts_connected(struct gsm_bts_trx_ts *ts) +static void osmo_dyn_ts_connected(struct gsm_bts_trx_ts *ts, int rc) { - int rc; struct msgb *msg = ts->dyn.pending_chan_activ; ts->dyn.pending_chan_activ = NULL; + if (rc) { + LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT OSMO operation failed (%d) in bts model\n", + gsm_lchan_name(ts->lchan), rc); + ipacc_dyn_pdch_complete(ts, rc); + return; + } + if (!msg) { LOGP(DRSL, LOGL_ERROR, "%s TS re-connected, but no chan activ msg pending\n", @@ -2395,15 +2407,15 @@ msgb_free(msg); } -void cb_ts_connected(struct gsm_bts_trx_ts *ts) +void cb_ts_connected(struct gsm_bts_trx_ts *ts, int rc) { OSMO_ASSERT(ts); switch (ts->pchan) { case GSM_PCHAN_TCH_F_PDCH: - return ipacc_dyn_pdch_ts_connected(ts); + return ipacc_dyn_pdch_ts_connected(ts, rc); case GSM_PCHAN_TCH_F_TCH_H_PDCH: - return osmo_dyn_ts_connected(ts); + return osmo_dyn_ts_connected(ts, rc); default: return; } diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c index da6c60e..f084f1b 100644 --- a/src/osmo-bts-litecell15/oml.c +++ b/src/osmo-bts-litecell15/oml.c @@ -1925,13 +1925,17 @@ ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " : "", ts->flags & TS_F_PDCH_DEACT_PENDING ? "DEACT_PENDING " : ""); - cb_ts_connected(ts); + cb_ts_connected(ts, 0); return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + int rc; + + rc = ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + if (rc) + cb_ts_connected(ts, rc); } diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index f76de92..6cf7e1d 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -2070,15 +2070,19 @@ ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " : "", ts->flags & TS_F_PDCH_DEACT_PENDING ? "DEACT_PENDING " : ""); - cb_ts_connected(ts); + cb_ts_connected(ts, 0); msgb_free(l1_msg); return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + int rc; + + rc = ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + if (rc) + cb_ts_connected(ts, rc); } diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 2ab9fcd..d44f721 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1605,7 +1605,7 @@ msgb_free(resp); - cb_ts_connected(ts); + cb_ts_connected(ts, 0); return 0; } @@ -1805,9 +1805,10 @@ return l1if_req_compl(fl1h, msg, ts_disconnect_cb, NULL); } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { + int rc; if (as_pchan == GSM_PCHAN_TCH_F_PDCH || as_pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { LOGP(DL1C, LOGL_ERROR, @@ -1815,8 +1816,10 @@ " expected a specific pchan instead\n", gsm_ts_and_pchan_name(ts), gsm_pchan_name(as_pchan)); exit(1); - return -EINVAL; + return; } - return ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + rc = ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + if (rc) + cb_ts_connected(ts, rc); } diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index fa1aaf4..c011401 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -211,9 +211,9 @@ return -ENOTSUP; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return -ENOTSUP; + return; } int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap) diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index ce85a8b..ea7527d 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1947,13 +1947,17 @@ ts->flags & TS_F_PDCH_ACT_PENDING ? "ACT_PENDING " : "", ts->flags & TS_F_PDCH_DEACT_PENDING ? "DEACT_PENDING " : ""); - cb_ts_connected(ts); + cb_ts_connected(ts, 0); return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + int rc; + + rc = ts_connect_as(ts, as_pchan, ts_connect_cb, NULL); + if (rc) + cb_ts_connected(ts, rc); } diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index ccc13f4..da1b554 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -764,7 +764,7 @@ return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { int rc; @@ -773,12 +773,10 @@ rc = trx_set_ts_as_pchan(ts, as_pchan); if (rc) - return rc; + cb_ts_connected(ts, rc); LOGP(DL1C, LOGL_NOTICE, "%s bts_model_ts_connect(as_pchan=%s) success," " calling cb_ts_connected()\n", gsm_ts_name(ts), gsm_pchan_name(as_pchan)); - - cb_ts_connected(ts); - return 0; + cb_ts_connected(ts, 0); } diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index 88041fd..aa1c608 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -133,10 +133,9 @@ return -ENOTSUP; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__); - return -ENOTSUP; } int main(int argc, char **argv) diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 407ed95..a805554 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -278,6 +278,6 @@ void trx_get_hlayer1(void) {} int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) { return 0; } int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { return 0; } +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { return; } int bts_model_lchan_deactivate(struct gsm_lchan *lchan) { return 0; } int bts_model_lchan_deactivate_sacch(struct gsm_lchan *lchan) { return 0; } diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index f580374..b2bf80e 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -659,9 +659,9 @@ return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { - return 0; + return; } int bts_model_lchan_deactivate(struct gsm_lchan *lchan) diff --git a/tests/stubs.c b/tests/stubs.c index d6f4d3d..7c64034 100644 --- a/tests/stubs.c +++ b/tests/stubs.c @@ -54,6 +54,6 @@ int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts) { return 0; } -int bts_model_ts_connect(struct gsm_bts_trx_ts *ts, +void bts_model_ts_connect(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) -{ return 0; } +{ return; } -- To view, visit https://gerrit.osmocom.org/11931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie073a4397dd2f1a691968d12b15b8b42f1e1b0cf Gerrit-Change-Number: 11931 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 10:30:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 10:30:57 +0000 Subject: Change in openbsc[master]: bsc-nat: Enable octet-aligned when ensuring mode set In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/6598 ) Change subject: bsc-nat: Enable octet-aligned when ensuring mode set ...................................................................... bsc-nat: Enable octet-aligned when ensuring mode set >From RFC 4867: octet-align: Permissible values are 0 and 1. If 1, octet-aligned operation SHALL be used. If 0 or if not present, bandwidth-efficient operation is employed. Change-Id: Ic4db7f6d18f650f36f3186965096771f748de5fd --- M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c M openbsc/tests/bsc-nat/bsc_data.c 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 9fc8ba3..311ab94 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -939,7 +939,7 @@ * safely append another line. */ if (ensure_mode_set && !found_fmtp && payload != -1) { - snprintf(buf, sizeof(buf) - 1, "a=fmtp:%d mode-set=2%s", + snprintf(buf, sizeof(buf) - 1, "a=fmtp:%d mode-set=2 octet-align=1%s", payload, cr ? "\r\n" : "\n"); buf[sizeof(buf) - 1] = '\0'; output->l3h = msgb_put(output, strlen(buf)); diff --git a/openbsc/tests/bsc-nat/bsc_data.c b/openbsc/tests/bsc-nat/bsc_data.c index 3a9f1da..71d5391 100644 --- a/openbsc/tests/bsc-nat/bsc_data.c +++ b/openbsc/tests/bsc-nat/bsc_data.c @@ -158,19 +158,19 @@ /* patch the ip and port */ static const char crcx_resp[] = "200 23265295\r\nI: 1\r\n\r\nv=0\r\nc=IN IP4 172.16.18.2\r\nm=audio 4002 RTP/AVP 98 3\r\na=rtpmap:98 AMR/8000\r\n"; -static const char crcx_resp_patched[] = "200 23265295\r\nI: 1\r\n\r\nv=0\r\nc=IN IP4 10.0.0.1\r\nm=audio 999 RTP/AVP 98 3\r\na=rtpmap:98 AMR/8000\r\na=fmtp:98 mode-set=2\r\n"; +static const char crcx_resp_patched[] = "200 23265295\r\nI: 1\r\n\r\nv=0\r\nc=IN IP4 10.0.0.1\r\nm=audio 999 RTP/AVP 98 3\r\na=rtpmap:98 AMR/8000\r\na=fmtp:98 mode-set=2 octet-align=1\r\n"; /* patch the ip and port */ -static const char mdcx[] = "MDCX 23330829 8 at mgw MGCP 1.0\r\nC: 394b0439fb\r\nI: 1\r\nL: p:20, a:AMR, nt:IN\r\nM: recvonly\r\n\r\nv=0\r\no=- 1049380491 0 IN IP4 172.16.18.2\r\ns=-\r\nc=IN IP4 172.16.18.2\r\nt=0 0\r\nm=audio 4410 RTP/AVP 126\r\na=rtpmap:126 AMR/8000/1\r\na=fmtp:126 mode-set=2;start-mode=0\r\na=ptime:20\r\na=recvonly\r\nm=image 4412 udptl t38\r\na=T38FaxVersion:0\r\na=T38MaxBitRate:14400\r\n"; -static const char mdcx_patched[] = "MDCX 23330829 1e at mgw MGCP 1.0\r\nC: 394b0439fb\r\nI: 1\r\nL: p:20, a:AMR, nt:IN\r\nM: recvonly\r\n\r\nv=0\r\no=- 1049380491 0 IN IP4 172.16.18.2\r\ns=-\r\nc=IN IP4 10.0.0.23\r\nt=0 0\r\nm=audio 6666 RTP/AVP 126\r\na=rtpmap:126 AMR/8000/1\r\na=fmtp:126 mode-set=2;start-mode=0\r\na=ptime:20\r\na=recvonly\r\nm=image 4412 udptl t38\r\na=T38FaxVersion:0\r\na=T38MaxBitRate:14400\r\n"; +static const char mdcx[] = "MDCX 23330829 8 at mgw MGCP 1.0\r\nC: 394b0439fb\r\nI: 1\r\nL: p:20, a:AMR, nt:IN\r\nM: recvonly\r\n\r\nv=0\r\no=- 1049380491 0 IN IP4 172.16.18.2\r\ns=-\r\nc=IN IP4 172.16.18.2\r\nt=0 0\r\nm=audio 4410 RTP/AVP 126\r\na=rtpmap:126 AMR/8000/1\r\na=fmtp:126 mode-set=2 octet-align=1;start-mode=0\r\na=ptime:20\r\na=recvonly\r\nm=image 4412 udptl t38\r\na=T38FaxVersion:0\r\na=T38MaxBitRate:14400\r\n"; +static const char mdcx_patched[] = "MDCX 23330829 1e at mgw MGCP 1.0\r\nC: 394b0439fb\r\nI: 1\r\nL: p:20, a:AMR, nt:IN\r\nM: recvonly\r\n\r\nv=0\r\no=- 1049380491 0 IN IP4 172.16.18.2\r\ns=-\r\nc=IN IP4 10.0.0.23\r\nt=0 0\r\nm=audio 6666 RTP/AVP 126\r\na=rtpmap:126 AMR/8000/1\r\na=fmtp:126 mode-set=2 octet-align=1;start-mode=0\r\na=ptime:20\r\na=recvonly\r\nm=image 4412 udptl t38\r\na=T38FaxVersion:0\r\na=T38MaxBitRate:14400\r\n"; static const char mdcx_resp[] = "200 23330829\r\n\r\nv=0\r\nc=IN IP4 172.16.18.2\r\nm=audio 4002 RTP/AVP 98\r\na=rtpmap:98 AMR/8000\r\n"; -static const char mdcx_resp_patched[] = "200 23330829\r\n\r\nv=0\r\nc=IN IP4 10.0.0.23\r\nm=audio 5555 RTP/AVP 98\r\na=rtpmap:98 AMR/8000\r\na=fmtp:98 mode-set=2\r\n"; +static const char mdcx_resp_patched[] = "200 23330829\r\n\r\nv=0\r\nc=IN IP4 10.0.0.23\r\nm=audio 5555 RTP/AVP 98\r\na=rtpmap:98 AMR/8000\r\na=fmtp:98 mode-set=2 octet-align=1\r\n"; /* different line ending */ static const char mdcx_resp2[] = "200 33330829\n\nv=0\nc=IN IP4 172.16.18.2\nm=audio 4002 RTP/AVP 98\na=rtpmap:98 AMR/8000\n"; -static const char mdcx_resp_patched2[] = "200 33330829\n\nv=0\nc=IN IP4 10.0.0.23\nm=audio 5555 RTP/AVP 98\na=rtpmap:98 AMR/8000\na=fmtp:98 mode-set=2\n"; +static const char mdcx_resp_patched2[] = "200 33330829\n\nv=0\nc=IN IP4 10.0.0.23\nm=audio 5555 RTP/AVP 98\na=rtpmap:98 AMR/8000\na=fmtp:98 mode-set=2 octet-align=1\n"; static const char mdcx_resp_patched2_noamr[] = "200 33330829\n\nv=0\nc=IN IP4 10.0.0.23\nm=audio 5555 RTP/AVP 98\na=rtpmap:98 AMR/8000\n"; struct mgcp_patch_test { -- To view, visit https://gerrit.osmocom.org/6598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic4db7f6d18f650f36f3186965096771f748de5fd Gerrit-Change-Number: 6598 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 10:39:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 10:39:57 +0000 Subject: Change in libsmpp34[master]: fix use of partly initialized struct in tcp test In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11854 ) Change subject: fix use of partly initialized struct in tcp test ...................................................................... fix use of partly initialized struct in tcp test Properly initialize sockaddr 'name' used by tcp test, and remove a redundant re-declaration of this variable in a nested scope. Change-Id: Id6e488308a72be96cca6aa661f088d2c3c67a6a3 Related: CID#188848 --- M test_apps/tcp.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved diff --git a/test_apps/tcp.c b/test_apps/tcp.c index 4e24fa5..4cf681d 100644 --- a/test_apps/tcp.c +++ b/test_apps/tcp.c @@ -69,7 +69,7 @@ /* bind to a local addr */ if (strlen(local_src) != 0) { - struct sockaddr_in name; + memset(&name, 0, sizeof(name)); name.sin_family = AF_INET; name.sin_port = htons(local_port); name.sin_addr.s_addr = inet_addr(local_src); @@ -91,6 +91,7 @@ }; memcpy(&addr.s_addr, _host.h_addr_list[0], sizeof(struct in_addr)); + memset(&name, 0, sizeof(name)); name.sin_family = AF_INET; name.sin_port = htons( port ); name.sin_addr = addr; -- To view, visit https://gerrit.osmocom.org/11854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id6e488308a72be96cca6aa661f088d2c3c67a6a3 Gerrit-Change-Number: 11854 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 10:48:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 10:48:28 +0000 Subject: Change in osmo-bsc[master]: follow-up: logging tweak for Immediate Assignment Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/11942 Change subject: follow-up: logging tweak for Immediate Assignment ...................................................................... follow-up: logging tweak for Immediate Assignment follow-up to I9ad094d272254d7aee9b0a676201d4ed8cd727ca because it was merged before fixeria's code review could be incorporated. Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/11942/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5e99239..dc466da 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -97,17 +97,14 @@ switch (activ_for) { case FOR_MS_CHANNEL_REQUEST: - if (lchan->activate.immediate_assignment_sent) { - LOG_LCHAN(lchan, LOGL_ERROR, - "lchan activation failed, after Immediate Assignment message was sent (%s)\n", - lchan->last_error ? : "unknown error"); - /* Likely the MS never showed up. Just tear down the lchan. */ - } else { + if (!lchan->activate.immediate_assignment_sent) { /* Failure before Immediate Assignment message, send a reject. */ LOG_LCHAN(lchan, LOGL_NOTICE, "Tx Immediate Assignment Reject (%s)\n", lchan->last_error ? : "unknown error"); rsl_tx_imm_ass_rej(lchan->ts->trx->bts, lchan->rqd_ref); } + /* Otherwise, likely the MS never showed up after the Assignment, and the failure cause + * (Timeout?) was already logged elsewhere. Just tear down the lchan. */ break; case FOR_ASSIGNMENT: -- To view, visit https://gerrit.osmocom.org/11942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 Gerrit-Change-Number: 11942 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 10:48:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 10:48:52 +0000 Subject: Change in osmo-bsc[master]: send Immediate Assignment Reject only before Immediate Assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11940 ) Change subject: send Immediate Assignment Reject only before Immediate Assignment ...................................................................... Patch Set 2: (1 comment) see https://gerrit.osmocom.org/11942 https://gerrit.osmocom.org/#/c/11940/2/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/#/c/11940/2/src/osmo-bsc/lchan_fsm.c at 102 PS2, Line 102: lchan activation failed > As was also pointed out in OS#3709, at this point the [?] since the timeout was already logged, indeed drop this logging -- To view, visit https://gerrit.osmocom.org/11940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ad094d272254d7aee9b0a676201d4ed8cd727ca Gerrit-Change-Number: 11940 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 10:48:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 10:51:02 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 10:51:02 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11936 ) Change subject: Move common Trap-related code into separate file ...................................................................... Patch Set 3: > Did you try actually the script can be imported if installed in /usr/bin I've just installed the .deb and it works fine on my machine. The script is in /usr/bin (as it was before), the osmopy is in dist-packages (as it was before). And the "import osmopy" works the same as before. I don't see why it would break - we already import other stuff from osmopy so if it were failing, it would have failed before this change as well. -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 10:51:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 10:52:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 10:52:22 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11936 ) Change subject: Move common Trap-related code into separate file ...................................................................... Patch Set 3: We might want to bump the .deb version to match the python one - not sure if we should do it now or later. -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 10:52:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 10:55:23 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 10:55:23 +0000 Subject: Change in osmo-sysmon[master]: fix file descriptor leak in osysmon_file_read Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/11943 Change subject: fix file descriptor leak in osysmon_file_read ...................................................................... fix file descriptor leak in osysmon_file_read Don't forget to close the file which was opened at the beginning of this function's scope. Found by Coverity. Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Related: CID#189756 --- M osysmon_file.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/43/11943/1 diff --git a/osysmon_file.c b/osysmon_file.c index 6f826b4..518b20d 100644 --- a/osysmon_file.c +++ b/osysmon_file.c @@ -93,6 +93,7 @@ while ((nl = strrchr(buf, '\n'))) *nl = '\0'; value_node_add(parent, parent, of->cfg.name, buf); + fclose(f); } /*********************************************************************** -- To view, visit https://gerrit.osmocom.org/11943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Gerrit-Change-Number: 11943 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:00:31 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 11:00:31 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 2: (1 comment) Please elaborate - either complete function as you'd like to see it or test-case which you think current version would fail. I have hard time wrapping my head around this. https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 126 PS2, Line 126: if (int(length) != 0): > if length == 0 or payload... Either I'm not following or this doesn't make sense. What's the point of go into recursion on 2nd message if the length of the 1st one already indicates that we should return None? -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 11:00:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:06:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 11:06:14 +0000 Subject: Change in osmo-sysmon[master]: fix file descriptor leak in osysmon_file_read In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11943 ) Change subject: fix file descriptor leak in osysmon_file_read ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11943/1/osysmon_file.c File osysmon_file.c: https://gerrit.osmocom.org/#/c/11943/1/osysmon_file.c at 90 PS1, Line 90: return; Shouldn't we close it here as well? https://gerrit.osmocom.org/#/c/11943/1/osysmon_file.c at 96 PS1, Line 96: fclose(f); Actually I think we can close it right after fgets() but before checking it's result. This would require moving fgets() outside of if. Not sure if it's better or not. -- To view, visit https://gerrit.osmocom.org/11943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Gerrit-Change-Number: 11943 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 27 Nov 2018 11:06:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:09:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:09:37 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c at 913 PS4, Line 913: msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); > did you guys figure out what "?2:1" code Pau meant in the earlier comment? It's about extended cause, I saw Max adding some code to handle that recently. Not sure if it can be applied here. -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 11:09:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:10:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 11:10:58 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: After some talking: if there is no "proper" solution to be had any time soon, I would also be ok with merging this as-is and pushing a different db upgrade method into the future. After all, the comment in the .sql file does indicate the column to the reader. A drawback is that when I take the hlr.sql file to apply to a clean db with sqlite3 directly it is the old scheme, but then again osmo-hlr would upgrade on its first run. Still open: don't upgrade silently, error and make the user decide to allow upgrading the db? -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 11:10:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:11:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:11:16 +0000 Subject: Change in osmo-msc[master]: libmsc/transaction.c: cosmetic: fix typo In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11941 ) Change subject: libmsc/transaction.c: cosmetic: fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d72b856e40ba81ee2f1e60693055705b5993b09 Gerrit-Change-Number: 11941 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 11:11:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:11:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:11:18 +0000 Subject: Change in osmo-msc[master]: libmsc/transaction.c: cosmetic: fix typo In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11941 ) Change subject: libmsc/transaction.c: cosmetic: fix typo ...................................................................... libmsc/transaction.c: cosmetic: fix typo Change-Id: I6d72b856e40ba81ee2f1e60693055705b5993b09 --- M src/libmsc/transaction.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index be14420..680d7f3 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -35,7 +35,7 @@ void _gsm911_nc_ss_trans_free(struct gsm_trans *trans); /*! Find a transaction in connection for given protocol + transaction ID - * \param[in] conn Connection in whihc we want to find transaction + * \param[in] conn Connection in which we want to find transaction * \param[in] proto Protocol of transaction * \param[in] trans_id Transaction ID of transaction * \returns Matching transaction, if any -- To view, visit https://gerrit.osmocom.org/11941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6d72b856e40ba81ee2f1e60693055705b5993b09 Gerrit-Change-Number: 11941 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:14:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:14:54 +0000 Subject: Change in osmo-bsc[master]: follow-up: logging tweak for Immediate Assignment In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11942 ) Change subject: follow-up: logging tweak for Immediate Assignment ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11942/1/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/#/c/11942/1/src/osmo-bsc/lchan_fsm.c at 107 PS1, Line 107: * (Timeout?) was already logged elsewhere. Just tear down the lchan. */ You talk about tearing down the lchan here, but I don't see any code doing that? -- To view, visit https://gerrit.osmocom.org/11942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 Gerrit-Change-Number: 11942 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 11:14:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:17:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:17:50 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11936 ) Change subject: Move common Trap-related code into separate file ...................................................................... Patch Set 3: Code-Review+2 Ah sorry I thought the trap_helper.py was under scripts/ dir, that's why. -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 11:17:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:18:29 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 11:18:29 +0000 Subject: Change in osmo-sysmon[master]: fix file descriptor leak in osysmon_file_read In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11943 ) Change subject: fix file descriptor leak in osysmon_file_read ...................................................................... Patch Set 1: Code-Review+2 (1 comment) OK to merge the first fix, but even nicer to fix the other one as well right away https://gerrit.osmocom.org/#/c/11943/1/osysmon_file.c File osysmon_file.c: https://gerrit.osmocom.org/#/c/11943/1/osysmon_file.c at 96 PS1, Line 96: fclose(f); > Actually I think we can close it right after fgets() but before checking it's result. [?] I agree res = fgets(); fclose(f); if (res == NULL)... -- To view, visit https://gerrit.osmocom.org/11943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Gerrit-Change-Number: 11943 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 27 Nov 2018 11:18:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 27 11:19:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 27 Nov 2018 11:19:04 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-cellmgr-ng_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#58?= In-Reply-To: <1143565675.853.1543231140480.JavaMail.jenkins@jenkins.osmocom.org> References: <1143565675.853.1543231140480.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <263023304.873.1543317544531.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 172.26 KB...] config.status: executing libtool commands + PKG_CONFIG_PATH=/build/deps/libosmo-sccp/..//install/lib/pkgconfig + make -j 8 install echo 0.10.0.30-5371 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-sccp' Making install in include make[2]: Entering directory '/build/deps/libosmo-sccp/include' Making install in osmocom make[3]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' Making install in mtp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' /usr/bin/install -c -m 644 mtp_level3.h mtp_pcap.h '/build/deps/libosmo-sccp/../install/include/osmocom/mtp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/mtp' Making install in sccp make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' /usr/bin/install -c -m 644 sccp_types.h sccp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sccp' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sccp' Making install in sigtran make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[5]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 protocol/sua.h protocol/m3ua.h protocol/mtp.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran/protocol' /usr/bin/install -c -m 644 xua_types.h xua_msg.h m2ua_types.h sccp_sap.h sigtran_sap.h sccp_helpers.h mtp_sap.h osmo_ss7.h '/build/deps/libosmo-sccp/../install/include/osmocom/sigtran' make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom/sigtran' make[4]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Entering directory '/build/deps/libosmo-sccp/include/osmocom' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[4]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Leaving directory '/build/deps/libosmo-sccp/include/osmocom' make[3]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Entering directory '/build/deps/libosmo-sccp/include' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/include' make[3]: Leaving directory '/build/deps/libosmo-sccp/include' make[2]: Leaving directory '/build/deps/libosmo-sccp/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-sccp/src' CC libxua_a-xua_msg.o CC sccp.o CC mtp_pcap.o CC sua.lo CC sccp_sap.lo CC m3ua.lo CC xua_msg.lo CC sccp_helpers.lo CC sccp2sua.lo CC sccp_scrc.lo CC sccp_sclc.lo CC sccp_scoc.lo CC sccp_user.lo CC xua_rkm.lo CC xua_default_lm_fsm.lo sccp_scoc.c: In function 'scoc_fsm_active': sccp_scoc.c:1032:9: note: #pragma message: TODO: internal disco: send N-DISCONNECT.ind to user #pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user") ^ CC osmo_ss7.lo CC osmo_ss7_hmrt.lo CC xua_asp_fsm.lo CC xua_as_fsm.lo CC osmo_ss7_vty.lo CC sccp_vty.lo CC ipa.lo AR libsccp.a AR libmtp.a AR libxua.a CCLD libosmo-sigtran.la make[3]: Entering directory '/build/deps/libosmo-sccp/src' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmo-sigtran.la '/build/deps/libosmo-sccp/../install/lib' /usr/bin/install -c -m 644 libsccp.a libmtp.a libxua.a '/build/deps/libosmo-sccp/../install/lib' ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libsccp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libmtp.a ) ( cd '/build/deps/libosmo-sccp/../install/lib' && ranlib libxua.a ) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.so.0.2.0 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.so.0.2.0 libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0 || { rm -f libosmo-sigtran.so.0 && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so.0; }; }) libtool: install: (cd /build/deps/libosmo-sccp/../install/lib && { ln -s -f libosmo-sigtran.so.0.2.0 libosmo-sigtran.so || { rm -f libosmo-sigtran.so && ln -s libosmo-sigtran.so.0.2.0 libosmo-sigtran.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.lai /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.la libtool: install: /usr/bin/install -c .libs/libosmo-sigtran.a /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: chmod 644 /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: install: ranlib /build/deps/libosmo-sccp/../install/lib/libosmo-sigtran.a libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/libosmo-sccp/../install/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/libosmo-sccp/../install/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmo-sccp/src' make[2]: Leaving directory '/build/deps/libosmo-sccp/src' Making install in tests make[2]: Entering directory '/build/deps/libosmo-sccp/tests' Making install in xua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/xua' CC xua_test.o CC sccp_test_data.o CCLD xua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/xua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/xua' Making install in sccp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' CC sccp_test.o CC sccp.o CCLD sccp_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/sccp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/sccp' Making install in mtp make[3]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' CC mtp_parse_test.o CCLD mtp_parse_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/mtp' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/mtp' Making install in m2ua make[3]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' CC m2ua_test.o CCLD m2ua_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/m2ua' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/m2ua' Making install in ss7 make[3]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' CC ss7_test.o CCLD ss7_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/ss7' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/ss7' Making install in vty make[3]: Entering directory '/build/deps/libosmo-sccp/tests/vty' CC ss7_asp_vty_test.o CCLD ss7_asp_vty_test make[4]: Entering directory '/build/deps/libosmo-sccp/tests/vty' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests/vty' make[3]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Entering directory '/build/deps/libosmo-sccp/tests' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/tests' make[3]: Leaving directory '/build/deps/libosmo-sccp/tests' make[2]: Leaving directory '/build/deps/libosmo-sccp/tests' Making install in examples make[2]: Entering directory '/build/deps/libosmo-sccp/examples' CC sccp_demo_user.o CC sccp_test_server.o CC sccp_test_vty.o CCLD sccp_demo_user make[3]: Entering directory '/build/deps/libosmo-sccp/examples' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory '/build/deps/libosmo-sccp/examples' make[2]: Leaving directory '/build/deps/libosmo-sccp/examples' Making install in stp make[2]: Entering directory '/build/deps/libosmo-sccp/stp' CC stp_main.o CCLD osmo-stp make[3]: Entering directory '/build/deps/libosmo-sccp/stp' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/bin' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-stp '/build/deps/libosmo-sccp/../install/bin' libtool: install: /usr/bin/install -c .libs/osmo-stp /build/deps/libosmo-sccp/../install/bin/osmo-stp make[3]: Leaving directory '/build/deps/libosmo-sccp/stp' make[2]: Leaving directory '/build/deps/libosmo-sccp/stp' Making install in doc make[2]: Entering directory '/build/deps/libosmo-sccp/doc' Making install in examples make[3]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Entering directory '/build/deps/libosmo-sccp/doc/examples' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/libosmo-sccp/../install/etc/osmocom' /bin/mkdir -p '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/etc/osmocom' /usr/bin/install -c -m 644 osmo-stp.cfg '/build/deps/libosmo-sccp/../install/share/doc/libosmo-sccp/examples/osmo-stp' make[4]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc/examples' make[3]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Entering directory '/build/deps/libosmo-sccp/doc' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmo-sccp/doc' make[3]: Leaving directory '/build/deps/libosmo-sccp/doc' make[2]: Leaving directory '/build/deps/libosmo-sccp/doc' Making install in contrib make[2]: Entering directory '/build/deps/libosmo-sccp/contrib' Making install in systemd make[3]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Entering directory '/build/deps/libosmo-sccp/contrib/systemd' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/lib/systemd/system' /usr/bin/install -c -m 644 osmo-stp.service '/lib/systemd/system' /usr/bin/install: cannot create regular file '/lib/systemd/system/osmo-stp.service': Permission denied make[4]: *** [install-systemdsystemunitDATA] Error 1 Makefile:326: recipe for target 'install-systemdsystemunitDATA' failed make[4]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' make[3]: *** [install-am] Error 2 Makefile:396: recipe for target 'install-am' failed make[3]: Leaving directory '/build/deps/libosmo-sccp/contrib/systemd' Makefile:360: recipe for target 'install-recursive' failed make[2]: Leaving directory '/build/deps/libosmo-sccp/contrib' make[2]: *** [install-recursive] Error 1 Makefile:487: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-sccp' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:786: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:19:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 11:19:55 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... Patch Set 5: pourquoi tu ne merge pas? waiting for the patch to acquire a bouquet first? -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 27 Nov 2018 11:19:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:24:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:24:45 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py File osmopy/osmo_ipa.py: https://gerrit.osmocom.org/#/c/11929/2/osmopy/osmo_ipa.py at 126 PS2, Line 126: if (int(length) != 0): > > if length == 0 or payload... [?] Well, that depends whether you want to return an IPA message with empty IPA payload ("return head"), or just skip it and continue looking for a CTRL message with some content (probably what you want, "return self.skip_traps(tail)"). Otherwise if you'd receive an IPA message with len(payload) == 0 followed by an IPA message containing a CTRL message, it would be lost because you return None instead of head. def skip_traps(self, data): """ Take one or more ctrl messages and data and return first non-TRAP message or None """ if data == None or len(data) == 0: return None (head, tail) = self.split_combined(data) (length, _, _, payload) = self.del_header(head) if length == 0 or payload[:(length + 3)].decode('utf-8').startswith(self.CTRL_TRAP): return self.skip_traps(tail) else: return head -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 11:24:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:27:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:27:29 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: I'm fine with including this patch (although I don't like it very much) due to all extra work required to look for other approaches (which can be improved later). But then, at least please add an extra .sql file with the "latest version" DB schema in order to easily understand and create an up-to-date database. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 11:27:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:37:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:37:04 +0000 Subject: Change in osmo-ci[master]: jobs: master-builds: Disable deprecated cellmgr-ng failing to build Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11944 Change subject: jobs: master-builds: Disable deprecated cellmgr-ng failing to build ...................................................................... jobs: master-builds: Disable deprecated cellmgr-ng failing to build cellmgr-ng is out of maintenance for a long time now (13 months) and some of its features are going to be served by osmo-stp in the future. cellmgr-ng is uanble to build against recent libosmo-sccp. Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 --- M jobs/master-builds.yml 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/44/11944/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 585a3d7..6b07694 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -27,15 +27,6 @@ repos: - asn1c - - cellmgr-ng: - concurrent: true - cmd: > - # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e PATH="$PATH:/build_bin" -w /build \ - -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh - - libasn1c: # Full triggers would be: # trigger: master-osmo-iuh, master-osmo-msc -- To view, visit https://gerrit.osmocom.org/11944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 Gerrit-Change-Number: 11944 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:46:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:46:03 +0000 Subject: Change in osmo-ci[master]: jobs: master-builds: Disable deprecated cellmgr-ng failing to build In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11944 ) Change subject: jobs: master-builds: Disable deprecated cellmgr-ng failing to build ...................................................................... jobs: master-builds: Disable deprecated cellmgr-ng failing to build cellmgr-ng is out of maintenance for a long time now (13 months) and some of its features are going to be served by osmo-stp in the future. cellmgr-ng is unable to build against recent libosmo-sccp. Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 --- M jobs/master-builds.yml 1 file changed, 0 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/44/11944/2 -- To view, visit https://gerrit.osmocom.org/11944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 Gerrit-Change-Number: 11944 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:48:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:48:21 +0000 Subject: Change in cellmgr-ng[master]: contrib/jenkins.sh: Update script to fix several issues and use recen... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11945 Change subject: contrib/jenkins.sh: Update script to fix several issues and use recent osmo-ci utils ...................................................................... contrib/jenkins.sh: Update script to fix several issues and use recent osmo-ci utils Previous script didn't clean workspace and git repositories were allegedly not being updated, hiding build failures against newer deps. Currently cellmgr-ng is not being maintained and fails to build against recent libosmo-sccp. For that dep repo, tag "old_sua" is used since after that tag, APIs changed considerably and it is known that cellmgr-ng cannot build starting from there. It's up to whoever wants to maintain it to make changes in cellmgr-ng to support newer libosmo-sccp. While building with new jenkins.sh script and "old_sua" tag, still there are some build issues (mostly related to build system), like some Makefile.am files missing some LDFLAGS. Some of them are fixed in follow-up patches. Some other are left as an exercise for whover wants to revive this repo. Change-Id: Ic597664198547ec367d7926d4e401b9734c8cfa9 --- M contrib/jenkins.sh 1 file changed, 43 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/cellmgr-ng refs/changes/45/11945/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 679df6a..17f182c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,41 +1,50 @@ #!/usr/bin/env bash +# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi set -ex -rm -rf deps/install -mkdir deps || true -cd deps -osmo-deps.sh libosmocore +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst -cd libosmocore +osmo-clean-workspace.sh + +mkdir "$deps" || true + +osmo-build-dep.sh libosmocore "" "--disable-doxygen" + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" + +osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif +osmo-build-dep.sh libosmo-sccp old_sua + +set +x +echo +echo +echo +echo " =============================== cellmgr-ng ===============================" +echo +set -x + +cd "$base" autoreconf --install --force -./configure --prefix=$PWD/../install ac_cv_path_DOXYGEN=false -$MAKE $PARALLEL_MAKE install +./configure --enable-external-tests +$MAKE $PARALLEL_MAKE +LD_LIBRARY_PATH="$inst/lib" $MAKE check \ + || cat-testlogs.sh +LD_LIBRARY_PATH="$inst/lib" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests" \ + $MAKE distcheck \ + || cat-testlogs.sh -cd ../ -osmo-deps.sh libosmo-abis -cd libosmo-abis -autoreconf --install --force -PKG_CONFIG_PATH=$PWD/../install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure --prefix=$PWD/../install -PKG_CONFIG_PATH=$PWD/..//install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE install - -cd ../ -osmo-deps.sh libosmo-netif -cd libosmo-netif -autoreconf --install --force -PKG_CONFIG_PATH=$PWD/../install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure --prefix=$PWD/../install -PKG_CONFIG_PATH=$PWD/..//install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE install - - -cd ../ -osmo-deps.sh libosmo-sccp -cd libosmo-sccp -autoreconf --install --force -PKG_CONFIG_PATH=$PWD/../install/lib/pkgconfig ./configure --prefix=$PWD/../install -PKG_CONFIG_PATH=$PWD/..//install/lib/pkgconfig $MAKE $PARALLEL_MAKE install - -cd ../../ -autoreconf --install --force -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure --enable-external-tests -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck +osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/11945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic597664198547ec367d7926d4e401b9734c8cfa9 Gerrit-Change-Number: 11945 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:48:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:48:22 +0000 Subject: Change in cellmgr-ng[master]: tests: Fix build of mtp_parse_test Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11946 Change subject: tests: Fix build of mtp_parse_test ...................................................................... tests: Fix build of mtp_parse_test Change-Id: I120f015183f05ec8477cdcd9b04379f43e20428d --- M tests/mtp/Makefile.am 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/cellmgr-ng refs/changes/46/11946/1 diff --git a/tests/mtp/Makefile.am b/tests/mtp/Makefile.am index cf48d6a..6c59eb8 100644 --- a/tests/mtp/Makefile.am +++ b/tests/mtp/Makefile.am @@ -1,8 +1,9 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -Wall +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSCCP_CFLAGS) -Wall noinst_PROGRAMS = mtp_parse_test EXTRA_DIST = mtp_parse_test.ok mtp_parse_test_SOURCES = mtp_parse_test.c $(top_srcdir)/src/sctp_m3ua_misc.c mtp_parse_test_LDADD = \ - $(LIBOSMOCORE_LIBS) + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOSCCP_LIBS) -- To view, visit https://gerrit.osmocom.org/11946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I120f015183f05ec8477cdcd9b04379f43e20428d Gerrit-Change-Number: 11946 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:48:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:48:23 +0000 Subject: Change in cellmgr-ng[master]: README: Add deprecation note Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11947 Change subject: README: Add deprecation note ...................................................................... README: Add deprecation note Change-Id: I0c6fe9d0c59110211f8cc2ac28ce93b885fd565d --- M README 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/cellmgr-ng refs/changes/47/11947/1 diff --git a/README b/README index 715e222..4a64726 100644 --- a/README +++ b/README @@ -1,3 +1,9 @@ +== DEPRECATION NOTE == + +cellmgr-ng is out of maintenance for a long time now (13 months) and some +of its features are going to be served by osmo-stp in the future. +cellmgr-ng is unable to build against recent libosmo-sccp. + == Building the cellmgr_ng == === Requirements === @@ -72,4 +78,3 @@ === POI === We do not want to have the point code indicator in the SCCP header. Currently we are removing this from the CR and DT1 messages. - -- To view, visit https://gerrit.osmocom.org/11947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0c6fe9d0c59110211f8cc2ac28ce93b885fd565d Gerrit-Change-Number: 11947 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:51:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 11:51:28 +0000 Subject: Change in cellmgr-ng[master]: contrib/jenkins.sh: Update script to fix several issues and use recen... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11945 ) Change subject: contrib/jenkins.sh: Update script to fix several issues and use recent osmo-ci utils ...................................................................... Patch Set 1: It's expected that jenkins fail. Let's merge the commits anyway if possible. -- To view, visit https://gerrit.osmocom.org/11945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic597664198547ec367d7926d4e401b9734c8cfa9 Gerrit-Change-Number: 11945 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 11:51:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:51:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 11:51:38 +0000 Subject: Change in python/osmo-python-tests[master]: Move common Trap-related code into separate file In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11936 ) Change subject: Move common Trap-related code into separate file ...................................................................... Move common Trap-related code into separate file The ctrl2cgi.py is heavily based upon soap.py - let's move all the shared code into separate file to make further modifications easier. Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Related: SYS#4399 --- M README M osmopy/__init__.py A osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 5 files changed, 147 insertions(+), 194 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/README b/README index 37cd847..76defb6 100644 --- a/README +++ b/README @@ -33,6 +33,7 @@ Libraries: osmopy/osmoutil.py - code that's shared between the scripts osmopy/osmo_ipa.py - generic implementation of IPA and Ctrl protocols in python +osmopy/trap_helper.py - generic Trap class and related helpers used by soap.py and ctrl2cgi.py osmopy/osmo_interact/{vty,ctrl}.py - general interactions with VTY and CTRL ports osmopy/obscvty.py - connect to a vty, superseded by osmo_interact/vty diff --git a/osmopy/__init__.py b/osmopy/__init__.py index 2195498..ce78caf 100644 --- a/osmopy/__init__.py +++ b/osmopy/__init__.py @@ -1,4 +1,4 @@ #!/usr/bin/env python -__version__ = '0.0.9' +__version__ = '0.1.0' -__all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'twisted_ipa'] +__all__ = ['obscvty', 'osmoutil', 'osmo_ipa', 'osmo_interact', 'trap_helper', 'twisted_ipa'] diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py new file mode 100644 index 0000000..a3ffbff --- /dev/null +++ b/osmopy/trap_helper.py @@ -0,0 +1,126 @@ +#!/usr/bin/python3 +# -*- mode: python-mode; py-indent-tabs-mode: nil -*- +""" +/* + * Copyright (C) 2018 sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +""" + +import sys, os, signal, logging, logging.handlers +from functools import partial +from osmopy.twisted_ipa import CTRL +from twisted.internet import defer + +# keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values SOAP-specific +oper = { 'inoperational' : 0, 'operational' : 1 } +admin = { 'locked' : 0, 'unlocked' : 1 } +policy = { 'off' : 0, 'on' : 1, 'grace' : 2, 'unknown' : 3 } + +# keys from OpenBSC openbsc/src/libbsc/bsc_vty.c +fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # SOAP server treats it as boolean but expects int + +class Trap(CTRL): + """ + TRAP handler (agnostic to factory's client object) + """ + def ctrl_TRAP(self, data, op_id, v): + """ + Parse CTRL TRAP and dispatch to appropriate handler after normalization + """ + (l, r) = v.split() + loc = l.split('.') + t_type = loc[-1] + p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type) + method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix + + def ctrl_SET_REPLY(self, data, _, v): + """ + Debug log for replies to our commands + """ + self.factory.log.debug('SET REPLY %s' % v) + + def ctrl_ERROR(self, data, op_id, v): + """ + We want to know if smth went wrong + """ + self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) + + def connectionMade(self): + """ + Logging wrapper, calling super() is necessary not to break reconnection logic + """ + self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) + super(CTRL, self).connectionMade() + + @defer.inlineCallbacks + def handle_locationstate(self, net, bsc, bts, trx, data): + """ + Handle location-state TRAP: parse trap content, prepare parameters and use treq's routines to post it while setting up async handlers + """ + (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',') + tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() + self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data)) + + d = self.factory.prepare_params(bsc, lon, lat, fix.get(fx, 0), tstamp, oper.get(opr, 2), admin.get(adm, 2), policy.get(pol, 3)) + + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors + # Ensure that we run only limited number of requests in parallel: + yield self.factory.semaphore.acquire() + yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit + self.factory.semaphore.release() + + def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): + """ + Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled + """ + self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) + + +def reloader(path, script, log, dbg1, dbg2, signum, _): + """ + Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation + """ + log.info("Received Signal %d - restarting..." % signum) + if signum == signal.SIGUSR1 and dbg1 not in sys.argv and dbg2 not in sys.argv: + sys.argv.append(dbg1) # enforce debug + if signum == signal.SIGUSR2 and (dbg1 in sys.argv or dbg2 in sys.argv): # disable debug + if dbg1 in sys.argv: + sys.argv.remove(dbg1) + if dbg2 in sys.argv: + sys.argv.remove(dbg2) + os.execl(path, script, *sys.argv[1:]) + +def debug_init(name, is_debug, output): + log = logging.getLogger(name) + if is_debug: + log.setLevel(logging.DEBUG) + else: + log.setLevel(logging.INFO) + log.addHandler(logging.handlers.SysLogHandler('/dev/log')) + if output: + log.addHandler(logging.StreamHandler(sys.stdout)) + + reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with caller's add_argument() + signal.signal(signal.SIGHUP, reboot) + signal.signal(signal.SIGQUIT, reboot) + signal.signal(signal.SIGUSR1, reboot) # restart and enabled debug output + signal.signal(signal.SIGUSR2, reboot) # restart and disable debug output + + return log diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index ed4522c..18cfdbe 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -29,6 +29,7 @@ from osmopy.osmo_ipa import Ctrl from treq import post, collect from functools import partial +from osmopy.trap_helper import Trap, reloader, debug_init from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers import hashlib @@ -38,13 +39,6 @@ # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') -# keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values CGI-specific -oper = { 'inoperational' : 0, 'operational' : 1 } -admin = { 'locked' : 0, 'unlocked' : 1 } -policy = { 'off' : 0, 'on' : 1, 'grace' : 2, 'unknown' : 3 } - -# keys from OpenBSC openbsc/src/libbsc/bsc_vty.c -fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # CGI server treats it as boolean but expects int @defer.inlineCallbacks def handle_reply(f, log, resp): @@ -81,65 +75,6 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res -class Trap(CTRL): - """ - TRAP handler (agnostic to factory's client object) - """ - def ctrl_TRAP(self, data, op_id, v): - """ - Parse CTRL TRAP and dispatch to appropriate handler after normalization - """ - self.factory.log.debug('TRAP %s' % v) - (l, r) = v.split() - loc = l.split('.') - t_type = loc[-1] - p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) - method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix - - def ctrl_SET_REPLY(self, data, _, v): - """ - Debug log for replies to our commands - """ - self.factory.log.debug('SET REPLY %s' % v) - - def ctrl_ERROR(self, data, op_id, v): - """ - We want to know if smth went wrong - """ - self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) - - def connectionMade(self): - """ - Logging wrapper, calling super() is necessary not to break reconnection logic - """ - self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) - super(CTRL, self).connectionMade() - - @defer.inlineCallbacks - def handle_locationstate(self, net, bsc, bts, trx, data): - """ - Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers - """ - (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',') - tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data)) - params = {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix.get(fx, 0), 'time_stamp': tstamp, 'oper_status': oper.get(opr, 2), 'admin_status': admin.get(adm, 2), 'policy_status': policy.get(pol, 3) } - params['h'] = gen_hash(params, self.factory.secret_key) - d = post(self.factory.location, None, params=params) - d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors - # Ensure that we run only limited number of requests in parallel: - yield self.factory.semaphore.acquire() - yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit - self.factory.semaphore.release() - - def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): - """ - Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled - """ - self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) - class TrapFactory(IPAFactory): """ @@ -165,21 +100,12 @@ self.log.setLevel(level) self.log.debug("Using IPA %s, CGI server: %s" % (Ctrl.version, self.location)) - -def reloader(path, script, log, dbg1, dbg2, signum, _): - """ - Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation - """ - log.info("Received Signal %d - restarting..." % signum) - if signum == signal.SIGUSR1 and dbg1 not in sys.argv and dbg2 not in sys.argv: - sys.argv.append(dbg1) # enforce debug - if signum == signal.SIGUSR2 and (dbg1 in sys.argv or dbg2 in sys.argv): # disable debug - if dbg1 in sys.argv: - sys.argv.remove(dbg1) - if dbg2 in sys.argv: - sys.argv.remove(dbg2) - os.execl(path, script, *sys.argv[1:]) - + def prepare_params(bsc, lon, lat, fix, tstamp, oper, admin, policy): + params = {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix, 'time_stamp': tstamp, 'oper_status': oper, 'admin_status': admin, 'policy_status': policy } + params['h'] = gen_hash(params, self.factory.secret_key) + d = post(self.factory.location, None, params=params) + d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) + return d if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given GCI service and Osmocom CTRL protocol.') @@ -187,27 +113,14 @@ p.add_argument('-a', '--addr-ctrl', default='localhost', help="Adress to use for CTRL interface, defaults to localhost") p.add_argument('-p', '--port-ctrl', type=int, default=4250, help="Port to use for CTRL interface, defaults to 4250") p.add_argument('-n', '--num-max-conn', type=int, default=5, help="Max number of concurrent HTTP requests to CGI server") - p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") + p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Location URL of the CGI server") p.add_argument('-s', '--secret-key', help="Secret key used to generate verification token") p.add_argument('-c', '--config-file', help="Path Config file. Cmd line args override values in config file") args = p.parse_args() - log = logging.getLogger('CTRL2CGI') - if args.debug: - log.setLevel(logging.DEBUG) - else: - log.setLevel(logging.INFO) - log.addHandler(logging.handlers.SysLogHandler('/dev/log')) - if args.output: - log.addHandler(logging.StreamHandler(sys.stdout)) - - reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with add_argument() call above - signal.signal(signal.SIGHUP, reboot) - signal.signal(signal.SIGQUIT, reboot) - signal.signal(signal.SIGUSR1, reboot) # restart and enabled debug output - signal.signal(signal.SIGUSR2, reboot) # restart and disable debug output + log = debug_init('CTRL2CGI', args.debug, args.output) location_cfgfile = None secret_key_cfgfile = None diff --git a/scripts/soap.py b/scripts/soap.py index dc06e1e..156157c 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -30,20 +30,13 @@ from treq import post, collect from suds.client import Client from functools import partial +from osmopy.trap_helper import Trap, reloader, debug_init from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') -# keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values SOAP-specific -oper = { 'inoperational' : 0, 'operational' : 1 } -admin = { 'locked' : 0, 'unlocked' : 1 } -policy = { 'off' : 0, 'on' : 1, 'grace' : 2, 'unknown' : 3 } - -# keys from OpenBSC openbsc/src/libbsc/bsc_vty.c -fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # SOAP server treats it as boolean but expects int - def handle_reply(p, f, log, r): """ @@ -58,64 +51,6 @@ f(m) -class Trap(CTRL): - """ - TRAP handler (agnostic to factory's client object) - """ - def ctrl_TRAP(self, data, op_id, v): - """ - Parse CTRL TRAP and dispatch to appropriate handler after normalization - """ - (l, r) = v.split() - loc = l.split('.') - t_type = loc[-1] - p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type) - method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix - - def ctrl_SET_REPLY(self, data, _, v): - """ - Debug log for replies to our commands - """ - self.factory.log.debug('SET REPLY %s' % v) - - def ctrl_ERROR(self, data, op_id, v): - """ - We want to know if smth went wrong - """ - self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) - - def connectionMade(self): - """ - Logging wrapper, calling super() is necessary not to break reconnection logic - """ - self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) - super(CTRL, self).connectionMade() - - @defer.inlineCallbacks - def handle_locationstate(self, net, bsc, bts, trx, data): - """ - Handle location-state TRAP: parse trap content, build SOAP context and use treq's routines to post it while setting up async handlers - """ - (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',') - tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data)) - ctx = self.factory.client.registerSiteLocation(bsc, float(lon), float(lat), fix.get(fx, 0), tstamp, oper.get(opr, 2), admin.get(adm, 2), policy.get(pol, 3)) - d = post(self.factory.location, ctx.envelope) - d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s" % (e, bsc)), bsc) # handle HTTP errors - # Ensure that we run only limited number of requests in parallel: - yield self.factory.semaphore.acquire() - yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit - self.factory.semaphore.release() - - def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): - """ - Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled - """ - self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) - - class TrapFactory(IPAFactory): """ Store SOAP client object so TRAP handler can use it for requests @@ -140,21 +75,12 @@ self.log.setLevel(level) self.log.debug("Using IPA %s, SUDS client: %s" % (Ctrl.version, soap)) - -def reloader(path, script, log, dbg1, dbg2, signum, _): - """ - Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation - """ - log.info("Received Signal %d - restarting..." % signum) - if signum == signal.SIGUSR1 and dbg1 not in sys.argv and dbg2 not in sys.argv: - sys.argv.append(dbg1) # enforce debug - if signum == signal.SIGUSR2 and (dbg1 in sys.argv or dbg2 in sys.argv): # disable debug - if dbg1 in sys.argv: - sys.argv.remove(dbg1) - if dbg2 in sys.argv: - sys.argv.remove(dbg2) - os.execl(path, script, *sys.argv[1:]) - + def prepare_params(bsc, lon, lat, fix, tstamp, oper, admin, policy): + ctx = self.factory.client.registerSiteLocation(bsc, float(lon), float(lat), fix, tstamp, oper, admin, policy) + d = post(self.factory.location, ctx.envelope) + # treq's collect helper is handy to get all reply content at once using closure on ctx: + d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) + return d if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given SOAP service and Osmocom CTRL protocol.') @@ -163,25 +89,12 @@ p.add_argument('-c', '--ctrl', default='localhost', help="Adress to use for CTRL interface, defaults to localhost") p.add_argument('-w', '--wsdl', required=True, help="WSDL URL for SOAP") p.add_argument('-n', '--num', type=int, default=5, help="Max number of concurrent HTTP requests to SOAP server") - p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") + p.add_argument('-d', '--debug', action='store_true', help="Enable debug log") # keep in sync with debug_init call below p.add_argument('-o', '--output', action='store_true', help="Log to STDOUT in addition to SYSLOG") p.add_argument('-l', '--location', help="Override location found in WSDL file (don't use unless you know what you're doing)") args = p.parse_args() - log = logging.getLogger('CTRL2SOAP') - if args.debug: - log.setLevel(logging.DEBUG) - else: - log.setLevel(logging.INFO) - log.addHandler(logging.handlers.SysLogHandler('/dev/log')) - if args.output: - log.addHandler(logging.StreamHandler(sys.stdout)) - - reboot = partial(reloader, os.path.abspath(__file__), os.path.basename(__file__), log, '-d', '--debug') # keep in sync with add_argument() call above - signal.signal(signal.SIGHUP, reboot) - signal.signal(signal.SIGQUIT, reboot) - signal.signal(signal.SIGUSR1, reboot) # restart and enabled debug output - signal.signal(signal.SIGUSR2, reboot) # restart and disable debug output + log = debug_init('CTRL2SOAP', args.debug, args.output) log.info("SOAP proxy %s starting with PID %d ..." % (__version__, os.getpid())) reactor.connectTCP(args.ctrl, args.port, TrapFactory(args.ctrl, args.port, Trap, defer.DeferredSemaphore(args.num), log, args.wsdl, args.location)) -- To view, visit https://gerrit.osmocom.org/11936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 Gerrit-Change-Number: 11936 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 11:52:50 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 11:52:50 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 3: > if you'd receive an IPA message with len(payload) == 0 followed by an IPA message containing a CTRL message Could you provide an example - how this can be generated? -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 11:52:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:00:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 12:00:48 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c at 913 PS4, Line 913: msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); > It's about extended cause, I saw Max adding some code to handle that recently. [?] Yes, it does - at least it's the same IE. See gsm0808_cause_ext() in libosmocore -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 12:00:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:01:51 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 12:01:51 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 4: On another note - most likely I'll need to add LCLS-related stuff to this message later on. -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 12:01:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:06:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 12:06:16 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11654 ) Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/11654/3/src/osmo-bsc/bsc_vty.c at 3916 PS3, Line 3916: "Calculate T3113 dynamically based on channel config and load\n" > Point 1 is, we often have #defines to re-use the exact same string again, because only one doc strin [?] Following your logic, it's clear that in "foo bar?", ? applies only to last parameter, and not to whole sentence, so of course having "no" in front of it means the opposite, like in human language. Another topic is whether it would make sense to print whole parameter list description up to the point where "?" is used, instead of only printing the description of last parameter. That way you'd get "Not bar-description". But it's a separate topic. -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 27 Nov 2018 12:06:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:07:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 12:07:31 +0000 Subject: Change in osmo-bsc[master]: paging: Add VTY options to calculate T3113 timeout dynamically In-Reply-To: References: Message-ID: Hello Stefan Sperling, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11654 to look at the new patch set (#5). Change subject: paging: Add VTY options to calculate T3113 timeout dynamically ...................................................................... paging: Add VTY options to calculate T3113 timeout dynamically The idea is to have a base static value which is set like before "timer t3113 [seconds]", but now have a part of this timeout calculated dynamically based on BTS channel configuration and channel load. This patch only implements initial support to calculate based on channel configuration, but doesn't include code to calculate based on channel load. To implement the later part, we probably need to keep track of BTS paging queues per paging group, which we don't do nowadays. Dynamic calculation is enabled by default, and default static base value is decreased accordingly. This way, in a typical setup were the default 10 seconds were used, now the calculated final value is 11 seconds. That's intended because it was observed experimentally in osmo-gsm-tester with a similar channel setup that sometimes paging response can arrive slightly later than 10 seconds. Related: OS#3680 Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/gsm_timers.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/gsm_timers_vty.c M src/osmo-bsc/net_init.c M src/osmo-bsc/paging.c 7 files changed, 85 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11654/5 -- To view, visit https://gerrit.osmocom.org/11654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4fb2969b690151415038631fb6ad059aa6835c7f Gerrit-Change-Number: 11654 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:10:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 12:10:53 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 3: > > if you'd receive an IPA message with len(payload) == 0 followed > by an IPA message containing a CTRL message > > Could you provide an example - how this can be generated? Can you provide an example on how each an every check we do in osmocom code when receiving data over a socket can be generated? Shall we ask this kind of question every time we want to secure an app misbehaving due to receiving non-expected information? This check comes for free and actually simplifies the function in number of lines. -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 12:10:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:15:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 12:15:56 +0000 Subject: Change in cellmgr-ng[master]: vty: skip installing cmds now always installed by default In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/4605 ) Change subject: vty: skip installing cmds now always installed by default ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/4605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fc8142756040c98c1862ddb18a77a032f2a7143 Gerrit-Change-Number: 4605 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 12:15:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:16:36 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 12:16:36 +0000 Subject: Change in python/osmo-python-tests[master]: Re-apply changes to trap_helper.py Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11948 Change subject: Re-apply changes to trap_helper.py ...................................................................... Re-apply changes to trap_helper.py Due to changes getting out of sync, changes from I44035323b70f04eb8f5dc12123cb708f53eba188 and I21ff593be420a374a00073953c9254a013c43164 were overwritten by I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 moving code to different file. Fix this by re-applying those changes in new location. Change-Id: I811f307ded63e7e1544243921ee07dceae81e295 --- M osmopy/trap_helper.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/48/11948/1 diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index a3ffbff..4704564 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -43,11 +43,12 @@ """ Parse CTRL TRAP and dispatch to appropriate handler after normalization """ + self.factory.log.debug('TRAP %s' % v) (l, r) = v.split() loc = l.split('.') t_type = loc[-1] p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type) + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix def ctrl_SET_REPLY(self, data, _, v): -- To view, visit https://gerrit.osmocom.org/11948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I811f307ded63e7e1544243921ee07dceae81e295 Gerrit-Change-Number: 11948 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:17:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 12:17:47 +0000 Subject: Change in python/osmo-python-tests[master]: Re-apply changes to trap_helper.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11948 ) Change subject: Re-apply changes to trap_helper.py ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I811f307ded63e7e1544243921ee07dceae81e295 Gerrit-Change-Number: 11948 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 12:17:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:21:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 12:21:52 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/#/c/11932/1/src/osmo-bts-trx/trx_if.c at 199 PS1, Line 199: trx_ctrl_cmd > Another approach: this symbol becomes trx_ctrl_cmd_cb(), [?] TBH, I'm not sure it really has benefits over my patch, since this function is only called in this file, but I'll do it so we can merge it. -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 12:21:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:23:10 2018 From: gerrit-no-reply at lists.osmocom.org (roh) Date: Tue, 27 Nov 2018 12:23:10 +0000 Subject: Change in osmo-trx[master]: change scaling factor from .3 to .7 for lms sdr devices to improve th... Message-ID: roh has uploaded this change for review. ( https://gerrit.osmocom.org/11949 Change subject: change scaling factor from .3 to .7 for lms sdr devices to improve the signal slope ...................................................................... change scaling factor from .3 to .7 for lms sdr devices to improve the signal slope Change-Id: I2d1ba5cbd4ba98f912eb2e3e9f5383b69b28ff5b --- M Transceiver52M/device/lms/LMSDevice.h 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/49/11949/1 diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 349efbb..b73ad89 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -28,7 +28,8 @@ #include #include -#define LIMESDR_TX_AMPL 0.3 +// this was 0.3 before - values above 0.8 give more phase noise, values below 0.6 give too much amplitude resolution/noise to pass gmsk validation on a E4406 +#define LIMESDR_TX_AMPL 0.7 /** A class to handle a LimeSuite supported device */ class LMSDevice:public RadioDevice { -- To view, visit https://gerrit.osmocom.org/11949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2d1ba5cbd4ba98f912eb2e3e9f5383b69b28ff5b Gerrit-Change-Number: 11949 Gerrit-PatchSet: 1 Gerrit-Owner: roh -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:24:40 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 12:24:40 +0000 Subject: Change in osmo-bsc[master]: follow-up: logging tweak for Immediate Assignment In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11942 ) Change subject: follow-up: logging tweak for Immediate Assignment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 Gerrit-Change-Number: 11942 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 12:24:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:26:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 12:26:59 +0000 Subject: Change in osmo-trx[master]: change scaling factor from .3 to .7 for lms sdr devices to improve th... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11949 ) Change subject: change scaling factor from .3 to .7 for lms sdr devices to improve the signal slope ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11949/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11949/1//COMMIT_MSG at 7 PS1, Line 7: change scaling factor from .3 to .7 for lms sdr devices to improve the signal slope Prepend "lms:" for easy/quickly categorization of scope of the patch. Something like: lms: Change scaling factor from .3 to .7 to improve signal slope https://gerrit.osmocom.org/#/c/11949/1/Transceiver52M/device/lms/LMSDevice.h File Transceiver52M/device/lms/LMSDevice.h: https://gerrit.osmocom.org/#/c/11949/1/Transceiver52M/device/lms/LMSDevice.h at 31 PS1, Line 31: // this was 0.3 before - values above 0.8 give more phase noise, values below 0.6 give too much amplitude resolution/noise to pass gmsk validation on a E4406 We usually use /* */ type comments. No need to specify it was 0.3 before, we have git log for that ;) Probably add word "experimentally found" or similar to understand it doesn't come from some spec sheets from producer. -- To view, visit https://gerrit.osmocom.org/11949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d1ba5cbd4ba98f912eb2e3e9f5383b69b28ff5b Gerrit-Change-Number: 11949 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 12:26:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 12:46:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 12:46:02 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11932 to look at the new patch set (#3). Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT Before this patch, PDCH DEACT was (n)acked to the BSC without taking into account if TRX succeeded or failed to set the TS: 20181123044720655 DRLL <0002> rsl.c:2523 (bts=0,trx=0,ts=0,ss=0) Rx RLL DATA_REQ Abis -> LAPDm 20181123044720700 DRSL <0000> rsl.c:2805 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) ss=0 Rx RSL IPAC_PDCH_DEACT 20181123044720700 DRSL <0000> rsl.c:2205 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still active 20181123044720700 DRSL <0000> rsl.c:2131 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT NACK (cause = 0x0f) 20181123044720700 DPCU <0009> pcu_sock.c:124 Sending info 20181123044720700 DPCU <0009> pcu_sock.c:139 BTS is up 20181123044720700 DPCU <0009> pcu_sock.c:232 trx=0 ts=7: available (tsc=7 arfcn=868) 20181123044720703 DPCU <0009> pcu_sock.c:608 Deactivate request received: TRX=0 TX=6 20181123044720703 DL1C <0006> l1sap.c:1519 deactivating channel chan_nr=TCH/F on TS6 trx=0 20181123044720703 DTRX <000b> trx_if.c:242 Enqueuing TRX control command 'CMD NOHANDOVER 6 0' 20181123044720703 DL1C <0006> l1sap.c:648 deactivate confirm chan_nr=TCH/F on TS6 trx=0 20181123044720703 DRSL <0000> rsl.c:714 (bts=0,trx=0,ts=6,ss=0) not sending REL ACK 20181123044720703 DRSL <0000> rsl.c:2264 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: channel disconnected, will reconnect as TCH 20181123044720703 DL1C <0006> scheduler.c:593 Configuring multiframe with TCH/F+SACCH trx=0 ts=6 20181123044720703 DTRX <000b> trx_if.c:242 Enqueuing TRX control command 'CMD SETSLOT 6 1' 20181123044720703 DL1C <0006> l1_if.c:780 (bts=0,trx=0,ts=6) bts_model_ts_connect(as_pchan=TCH/F) success, calling cb_ts_connected() 20181123044720703 DRSL <0000> rsl.c:2339 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: timeslot connected as TCH/F 20181123044720703 DRSL <0000> rsl.c:2440 (bts=0,trx=0,ts=6,ss=0) TCH/F_PDCH switched to TCH/F mode (ts->flags == 0) 20181123044720703 DRSL <0000> rsl.c:2103 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT ACK 20181123044720704 DTRX <000b> trx_if.c:492 Response message: 'RSP NOHANDOVER 0 6' 20181123044720705 DTRX <000b> trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 3 files changed, 83 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/11932/3 -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 13:00:05 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 13:00:05 +0000 Subject: Change in python/osmo-python-tests[master]: Re-apply changes to trap_helper.py In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11948 ) Change subject: Re-apply changes to trap_helper.py ...................................................................... Re-apply changes to trap_helper.py Due to changes getting out of sync, changes from I44035323b70f04eb8f5dc12123cb708f53eba188 and I21ff593be420a374a00073953c9254a013c43164 were overwritten by I7b59f2dbded9074d15f2d2f40bf5a92ed02601e2 moving code to different file. Fix this by re-applying those changes in new location. Change-Id: I811f307ded63e7e1544243921ee07dceae81e295 --- M osmopy/trap_helper.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index a3ffbff..4704564 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -43,11 +43,12 @@ """ Parse CTRL TRAP and dispatch to appropriate handler after normalization """ + self.factory.log.debug('TRAP %s' % v) (l, r) = v.split() loc = l.split('.') t_type = loc[-1] p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda: "Unhandled %s trap" % t_type) + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix def ctrl_SET_REPLY(self, data, _, v): -- To view, visit https://gerrit.osmocom.org/11948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I811f307ded63e7e1544243921ee07dceae81e295 Gerrit-Change-Number: 11948 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 13:35:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 13:35:47 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: I found a way to check the existence of tables in the schema: https://www.sqlite.org/fileformat2.html#storage_of_the_sql_database_schema Also, we could simply use 'PRAGMA user_version' as our version field instead of adding a new table. This pragma returns '0' in our current schema and can be set to '1' and above for future versions. Working on a new patch... -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 13:35:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 14:32:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 14:32:44 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11898/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11898/4//COMMIT_MSG at 14 PS4, Line 14: Furthermore, introduce a new column to the subscriber table which is > when a commit log has a paragraph starting in the bottom with "Furthermore", that's an almost certain indicator that it should be a separate patch. > > Let's add the schema and meta data first, and in a separate patch add the new subscriber column and just bump the db schema version. This request doesn't make a lot of sense to me. If we don't change both the version number and the schema in the same commit, there is a risk that someone will be creating databases which use schema version 1 but are otherwise identical to the old schema. How could the upgrade path work reliably in this situation? -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 14:32:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 14:39:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 14:39:30 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11898/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11898/4//COMMIT_MSG at 14 PS4, Line 14: Furthermore, introduce a new column to the subscriber table which is > > when a commit log has a paragraph starting in the bottom with "Furthermore", that's an almost cert [?] Oh, what you're saying is that version 1 and 0 should be identical? Sure, I suppose we could do that. But the patch as it is provides a nice example of how to do a schema upgrade, and this upgrade is non-invasive. So this can't really hurt a lot, can it? -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 14:39:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 14:41:28 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 14:41:28 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 4: > Patch Set 4: Code-Review-1 > Also, I think an upgrade should be opt-in. Add a --db-allow-upgrade cmdline option and otherwise error out hinting at that option if an upgrade would be required. What is the benefit? The user will have to upgrade the DB in any case. If the DB is not upgraded, then osmo-hlr won't even start because even just preparing any SQL statements which perform a select from non-existent columns will fail with an error. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 14:41:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 14:42:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 14:42:15 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11898 to look at the new patch set (#5). Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database Make use of pragma user_version to store our database schema version. The present schema is now identitifed as 'version 0' and will be automatically upgraded to schema version 1 when a database is opened. As part of the schema upgrade, introduce a new column to the subscriber table which is intended to track the timestamp of the last LU received from a given subscriber. This functionality is not yet implemented. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/Makefile.am M sql/hlr.sql A sql/hlr_index.sql M src/Makefile.am M src/db.c R src/db_sql2c.sed 6 files changed, 176 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/5 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 14:47:29 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 14:47:29 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 5: > - If needed, run upgrade commands. I think I would put them in a separate .sql file and make a string array of it, exactly like db_bootstrap.h is generated from hlr.sql; e.g. upgrade_0_to_1.sql generates upgrade_0_to_1.h? We'd probably rename db_bootstrap.sed to sql_to_c.sed and re-use. I mean, it's ok to do the upgrade with SQL strings directly in C, but so far we're keeping the SQL strings apart from C pretty nicely, and it's less cluttered to write SQL in a separate file without C quotes. I agree. For now I have kept the upgrade in C strings. If we are otherwise happy with this time, I'll invest the extra time and store upgrade staments in separate SQL files. > To test the upgrade code path, we should probably add a tests/upgrade/ with a hlr_v0.sql that also adds some data, and write an explicit test (.sh?) to invoke 'osmo-hlr --db-allow-upgrade' and verify the result (`sqlite3 db .dump`?). (maybe useful for that would be a '--check-db-and-exit' option as well) I think the currently proposed schema update is rather trivial, but sure, we can add tests. I'd rather get the core of the change merged first, though. Manual testing has already been performed. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 14:47:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 14:48:17 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 14:48:17 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 5: > If we are otherwise happy with this time, Oops, typo: s/time/patch/ -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 14:48:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 14:58:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 14:58:21 +0000 Subject: Change in osmo-mgw[master]: add DLCX command statistics to osmo-mgw In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11521 ) Change subject: add DLCX command statistics to osmo-mgw ...................................................................... add DLCX command statistics to osmo-mgw Add a counter group for DLCX commands. The group contains counters for successful connection processing as well as various error conditions. This provides a quick overview of DLCX failures on each trunk throughout the lifetime of the osmo-mgw process. The counters are displayed by 'show mgcp stats' and 'show rate-counters' While here, rename MGCP_MDCX_FAIL_DEFERRED_BY_POLICY to MGCP_MDCX_DEFERRED_BY_POLICY; we have decided that deferred connections aren't failures, and this keeps names used by DLCX and MDCX in sync. Also remove some allocation failure checks with OSMO_ASSERT(); such checks aren't en vogue anymore. Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Depends: I80d36181600901ae2e0f321dc02b5d54ddc94139I Related: OS#2660 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 66 insertions(+), 11 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index aa5607f..034a780 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -152,9 +152,20 @@ MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC, MGCP_MDCX_FAIL_START_RTP, MGCP_MDCX_FAIL_REJECTED_BY_POLICY, - MGCP_MDCX_FAIL_DEFERRED_BY_POLICY + MGCP_MDCX_DEFERRED_BY_POLICY }; +/* Global MCGP DLCX related rate counters */ +enum { + MGCP_DLCX_SUCCESS, + MGCP_DLCX_FAIL_WILDCARD, + MGCP_DLCX_FAIL_NO_CONN, + MGCP_DLCX_FAIL_INVALID_CALLID, + MGCP_DLCX_FAIL_INVALID_CONNID, + MGCP_DLCX_FAIL_UNHANDLED_PARAM, + MGCP_DLCX_FAIL_REJECTED_BY_POLICY, + MGCP_DLCX_DEFERRED_BY_POLICY, +}; struct mgcp_trunk_config { struct llist_head entry; @@ -198,6 +209,8 @@ struct rate_ctr_group *mgcp_crcx_ctr_group; /* Rate counter group which contains stats for processed MDCX commands. */ struct rate_ctr_group *mgcp_mdcx_ctr_group; + /* Rate counter group which contains stats for processed DLCX commands. */ + struct rate_ctr_group *mgcp_dlcx_ctr_group; /* Rate counter group which aggregates stats of individual RTP connections. */ struct rate_ctr_group *all_rtp_conn_stats; }; diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 3313164..eaf0e5a 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -93,7 +93,7 @@ [MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC] = {"mdcx:no_remote_conn_desc", "no opposite end specified for connection."}, [MGCP_MDCX_FAIL_START_RTP] = {"mdcx:start_rtp_failure", "failure to start RTP processing."}, [MGCP_MDCX_FAIL_REJECTED_BY_POLICY] = {"mdcx:conn_rejected", "connection rejected by policy."}, - [MGCP_MDCX_FAIL_DEFERRED_BY_POLICY] = {"mdcx:conn_deferred", "connection deferred by policy."}, + [MGCP_MDCX_DEFERRED_BY_POLICY] = {"mdcx:conn_deferred", "connection deferred by policy."}, }; const static struct rate_ctr_group_desc mgcp_mdcx_ctr_group_desc = { @@ -104,6 +104,25 @@ .ctr_desc = mgcp_mdcx_ctr_desc }; +static const struct rate_ctr_desc mgcp_dlcx_ctr_desc[] = { + [MGCP_DLCX_SUCCESS] = {"dlcx:success", "DLCX command processed successfully."}, + [MGCP_DLCX_FAIL_WILDCARD] = {"dlcx:wildcard", "wildcard names in DLCX commands are unsupported."}, + [MGCP_DLCX_FAIL_NO_CONN] = {"dlcx:no_conn", "endpoint specified in DLCX command has no active connections."}, + [MGCP_DLCX_FAIL_INVALID_CALLID] = {"dlcx:callid", "CallId specified in DLCX command mismatches endpoint's CallId ."}, + [MGCP_DLCX_FAIL_INVALID_CONNID] = {"dlcx:connid", "connection ID specified in DLCX command does not exist on endpoint."}, + [MGCP_DLCX_FAIL_UNHANDLED_PARAM] = {"dlcx:unhandled_param", "unhandled parameter in DLCX command."}, + [MGCP_DLCX_FAIL_REJECTED_BY_POLICY] = {"dlcx:rejected", "connection deletion rejected by policy."}, + [MGCP_DLCX_DEFERRED_BY_POLICY] = {"dlcx:deferred", "connection deletion deferred by policy."}, +}; + +const static struct rate_ctr_group_desc mgcp_dlcx_ctr_group_desc = { + .group_name_prefix = "dlcx", + .group_description = "dlcx statistics", + .class_id = OSMO_STATS_CLASS_GLOBAL, + .num_ctr = ARRAY_SIZE(mgcp_dlcx_ctr_desc), + .ctr_desc = mgcp_dlcx_ctr_desc +}; + const static struct rate_ctr_group_desc all_rtp_conn_rate_ctr_group_desc = { .group_name_prefix = "all_rtp_conn", .group_description = "aggregated statistics for all rtp connections", @@ -1192,7 +1211,7 @@ LOGP(DLMGCP, LOGL_DEBUG, "MDCX: endpoint:0x%x deferred by policy\n", ENDPOINT_NUMBER(endp)); - rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_DEFERRED_BY_POLICY]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_DEFERRED_BY_POLICY]); return NULL; break; case MGCP_POLICY_CONT: @@ -1237,7 +1256,9 @@ /* DLCX command handler, processes the received command */ static struct msgb *handle_delete_con(struct mgcp_parse_data *p) { + struct mgcp_trunk_config *tcfg = p->endp->tcfg; struct mgcp_endpoint *endp = p->endp; + struct rate_ctr_group *rate_ctrs = tcfg->mgcp_dlcx_ctr_group; int error_code = 400; int silent = 0; char *line; @@ -1254,6 +1275,7 @@ LOGP(DLMGCP, LOGL_ERROR, "DLCX: endpoint:0x%x wildcarded endpoint names not supported.\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_WILDCARD]); return create_err_response(endp, 507, "DLCX", p->trans); } @@ -1261,6 +1283,7 @@ LOGP(DLMGCP, LOGL_ERROR, "DLCX: endpoint:0x%x endpoint is not holding a connection.\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_NO_CONN]); return create_err_response(endp, 515, "DLCX", p->trans); } @@ -1272,13 +1295,16 @@ case 'C': if (mgcp_verify_call_id(endp, line + 3) != 0) { error_code = 516; + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_INVALID_CALLID]); goto error3; } break; case 'I': conn_id = (const char *)line + 3; - if ((error_code = mgcp_verify_ci(endp, conn_id))) + if ((error_code = mgcp_verify_ci(endp, conn_id))) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_INVALID_CONNID]); goto error3; + } break; case 'Z': silent = strcmp("noanswer", line + 3) == 0; @@ -1287,6 +1313,7 @@ LOGP(DLMGCP, LOGL_NOTICE, "DLCX: endpoint:0x%x Unhandled MGCP option: '%c'/%d\n", ENDPOINT_NUMBER(endp), line[0], line[0]); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_UNHANDLED_PARAM]); return create_err_response(NULL, 539, "DLCX", p->trans); break; } @@ -1302,12 +1329,14 @@ LOGP(DLMGCP, LOGL_NOTICE, "DLCX: endpoint:0x%x rejected by policy\n", ENDPOINT_NUMBER(endp)); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_REJECTED_BY_POLICY]); if (silent) goto out_silent; return create_err_response(endp, 400, "DLCX", p->trans); break; case MGCP_POLICY_DEFER: /* stop processing */ + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_DEFERRED_BY_POLICY]); return NULL; break; case MGCP_POLICY_CONT: @@ -1320,9 +1349,13 @@ * wildcarded DLCX and drop all connections at once. (See also * RFC3435 Section F.7) */ if (!conn_id) { + int num_conns = llist_count(&endp->conns); LOGP(DLMGCP, LOGL_NOTICE, - "DLCX: endpoint:0x%x missing ci (connectionIdentifier), will remove all connections at once\n", - ENDPOINT_NUMBER(endp)); + "DLCX: endpoint:0x%x missing ci (connectionIdentifier), will remove all connections (%d total) at once\n", + num_conns, ENDPOINT_NUMBER(endp)); + + if (num_conns > 0) + rate_ctr_add(&rate_ctrs->ctr[MGCP_DLCX_SUCCESS], num_conns); mgcp_endp_release(endp); @@ -1334,9 +1367,10 @@ /* Find the connection */ conn = mgcp_conn_get_rtp(endp, conn_id); - if (!conn) + if (!conn) { + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_INVALID_CONNID]); goto error3; - + } /* save the statistics of the current connection */ mgcp_format_stats(stats, sizeof(stats), conn->conn); @@ -1361,6 +1395,7 @@ p->cfg->change_cb(endp->tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_DLCX); + rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_SUCCESS]); if (silent) goto out_silent; return create_ok_resp_with_param(endp, 250, "DLCX", p->trans, stats); @@ -1503,24 +1538,27 @@ * a better way of assigning indices? */ static unsigned int crcx_rate_ctr_index = 0; static unsigned int mdcx_rate_ctr_index = 0; + static unsigned int dlcx_rate_ctr_index = 0; static unsigned int all_rtp_conn_rate_ctr_index = 0; if (trunk->mgcp_crcx_ctr_group == NULL) { trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index); - OSMO_ASSERT(trunk->mgcp_crcx_ctr_group); talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group); crcx_rate_ctr_index++; } if (trunk->mgcp_mdcx_ctr_group == NULL) { trunk->mgcp_mdcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_mdcx_ctr_group_desc, mdcx_rate_ctr_index); - OSMO_ASSERT(trunk->mgcp_mdcx_ctr_group); talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group); mdcx_rate_ctr_index++; } + if (trunk->mgcp_dlcx_ctr_group == NULL) { + trunk->mgcp_dlcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_dlcx_ctr_group_desc, dlcx_rate_ctr_index); + talloc_set_destructor(trunk->mgcp_dlcx_ctr_group, free_rate_counter_group); + dlcx_rate_ctr_index++; + } if (trunk->all_rtp_conn_stats == NULL) { trunk->all_rtp_conn_stats = rate_ctr_group_alloc(ctx, &all_rtp_conn_rate_ctr_group_desc, all_rtp_conn_rate_ctr_index); - OSMO_ASSERT(trunk->all_rtp_conn_stats); talloc_set_destructor(trunk->all_rtp_conn_stats, free_rate_counter_group); all_rtp_conn_rate_ctr_index++; } diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index e40d412..83f845a 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -249,6 +249,10 @@ vty_out(vty, " %s:%s", cfg->mgcp_crcx_ctr_group->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_crcx_ctr_group); } + if (show_stats && cfg->mgcp_dlcx_ctr_group) { + vty_out(vty, " %s:%s", cfg->mgcp_dlcx_ctr_group->desc->group_description, VTY_NEWLINE); + vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_dlcx_ctr_group); + } if (show_stats && cfg->mgcp_mdcx_ctr_group) { vty_out(vty, " %s:%s", cfg->mgcp_mdcx_ctr_group->desc->group_description, VTY_NEWLINE); vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_mdcx_ctr_group); -- To view, visit https://gerrit.osmocom.org/11521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie0dde2faf02fd68a69f986973d39b1bea367039b Gerrit-Change-Number: 11521 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 15:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 27 Nov 2018 15:02:11 +0000 Subject: Change in osmo-sysmon[master]: fix file descriptor leak in osysmon_file_read In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11943 to look at the new patch set (#2). Change subject: fix file descriptor leak in osysmon_file_read ...................................................................... fix file descriptor leak in osysmon_file_read Don't forget to close the file which was opened at the beginning of this function's scope. Found by Coverity. Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Related: CID#189756 --- M osysmon_file.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/43/11943/2 -- To view, visit https://gerrit.osmocom.org/11943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Gerrit-Change-Number: 11943 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 15:05:44 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 15:05:44 +0000 Subject: Change in osmo-sysmon[master]: fix file descriptor leak in osysmon_file_read In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11943 ) Change subject: fix file descriptor leak in osysmon_file_read ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Just a minor thing though - can be merged either way. https://gerrit.osmocom.org/#/c/11943/2/osysmon_file.c File osysmon_file.c: https://gerrit.osmocom.org/#/c/11943/2/osysmon_file.c at 80 PS2, Line 80: char *s, *nl; Seems like you don't need new variable. https://gerrit.osmocom.org/#/c/11943/2/osysmon_file.c at 93 PS2, Line 93: } s is not used after here and nl is not used before. -- To view, visit https://gerrit.osmocom.org/11943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Gerrit-Change-Number: 11943 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 27 Nov 2018 15:05:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 15:34:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 15:34:17 +0000 Subject: Change in cellmgr-ng[master]: tests: Fix build of mtp_parse_test In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11946 ) Change subject: tests: Fix build of mtp_parse_test ...................................................................... tests: Fix build of mtp_parse_test Change-Id: I120f015183f05ec8477cdcd9b04379f43e20428d --- M tests/mtp/Makefile.am 1 file changed, 3 insertions(+), 2 deletions(-) Objections: Jenkins Builder: Fails diff --git a/tests/mtp/Makefile.am b/tests/mtp/Makefile.am index cf48d6a..6c59eb8 100644 --- a/tests/mtp/Makefile.am +++ b/tests/mtp/Makefile.am @@ -1,8 +1,9 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -Wall +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSCCP_CFLAGS) -Wall noinst_PROGRAMS = mtp_parse_test EXTRA_DIST = mtp_parse_test.ok mtp_parse_test_SOURCES = mtp_parse_test.c $(top_srcdir)/src/sctp_m3ua_misc.c mtp_parse_test_LDADD = \ - $(LIBOSMOCORE_LIBS) + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOSCCP_LIBS) -- To view, visit https://gerrit.osmocom.org/11946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I120f015183f05ec8477cdcd9b04379f43e20428d Gerrit-Change-Number: 11946 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 15:34:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 15:34:17 +0000 Subject: Change in cellmgr-ng[master]: contrib/jenkins.sh: Update script to fix several issues and use recen... In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11945 ) Change subject: contrib/jenkins.sh: Update script to fix several issues and use recent osmo-ci utils ...................................................................... contrib/jenkins.sh: Update script to fix several issues and use recent osmo-ci utils Previous script didn't clean workspace and git repositories were allegedly not being updated, hiding build failures against newer deps. Currently cellmgr-ng is not being maintained and fails to build against recent libosmo-sccp. For that dep repo, tag "old_sua" is used since after that tag, APIs changed considerably and it is known that cellmgr-ng cannot build starting from there. It's up to whoever wants to maintain it to make changes in cellmgr-ng to support newer libosmo-sccp. While building with new jenkins.sh script and "old_sua" tag, still there are some build issues (mostly related to build system), like some Makefile.am files missing some LDFLAGS. Some of them are fixed in follow-up patches. Some other are left as an exercise for whover wants to revive this repo. Change-Id: Ic597664198547ec367d7926d4e401b9734c8cfa9 --- M contrib/jenkins.sh 1 file changed, 43 insertions(+), 34 deletions(-) Objections: Jenkins Builder: Fails diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 679df6a..17f182c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,41 +1,50 @@ #!/usr/bin/env bash +# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi set -ex -rm -rf deps/install -mkdir deps || true -cd deps -osmo-deps.sh libosmocore +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst -cd libosmocore +osmo-clean-workspace.sh + +mkdir "$deps" || true + +osmo-build-dep.sh libosmocore "" "--disable-doxygen" + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" + +osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif +osmo-build-dep.sh libosmo-sccp old_sua + +set +x +echo +echo +echo +echo " =============================== cellmgr-ng ===============================" +echo +set -x + +cd "$base" autoreconf --install --force -./configure --prefix=$PWD/../install ac_cv_path_DOXYGEN=false -$MAKE $PARALLEL_MAKE install +./configure --enable-external-tests +$MAKE $PARALLEL_MAKE +LD_LIBRARY_PATH="$inst/lib" $MAKE check \ + || cat-testlogs.sh +LD_LIBRARY_PATH="$inst/lib" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests" \ + $MAKE distcheck \ + || cat-testlogs.sh -cd ../ -osmo-deps.sh libosmo-abis -cd libosmo-abis -autoreconf --install --force -PKG_CONFIG_PATH=$PWD/../install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure --prefix=$PWD/../install -PKG_CONFIG_PATH=$PWD/..//install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE install - -cd ../ -osmo-deps.sh libosmo-netif -cd libosmo-netif -autoreconf --install --force -PKG_CONFIG_PATH=$PWD/../install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure --prefix=$PWD/../install -PKG_CONFIG_PATH=$PWD/..//install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE install - - -cd ../ -osmo-deps.sh libosmo-sccp -cd libosmo-sccp -autoreconf --install --force -PKG_CONFIG_PATH=$PWD/../install/lib/pkgconfig ./configure --prefix=$PWD/../install -PKG_CONFIG_PATH=$PWD/..//install/lib/pkgconfig $MAKE $PARALLEL_MAKE install - -cd ../../ -autoreconf --install --force -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure --enable-external-tests -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck +osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/11945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic597664198547ec367d7926d4e401b9734c8cfa9 Gerrit-Change-Number: 11945 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 15:34:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 15:34:17 +0000 Subject: Change in cellmgr-ng[master]: README: Add deprecation note In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11947 ) Change subject: README: Add deprecation note ...................................................................... README: Add deprecation note Change-Id: I0c6fe9d0c59110211f8cc2ac28ce93b885fd565d --- M README 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README b/README index 715e222..4a64726 100644 --- a/README +++ b/README @@ -1,3 +1,9 @@ +== DEPRECATION NOTE == + +cellmgr-ng is out of maintenance for a long time now (13 months) and some +of its features are going to be served by osmo-stp in the future. +cellmgr-ng is unable to build against recent libosmo-sccp. + == Building the cellmgr_ng == === Requirements === @@ -72,4 +78,3 @@ === POI === We do not want to have the point code indicator in the SCCP header. Currently we are removing this from the CR and DT1 messages. - -- To view, visit https://gerrit.osmocom.org/11947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0c6fe9d0c59110211f8cc2ac28ce93b885fd565d Gerrit-Change-Number: 11947 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 15:34:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 15:34:17 +0000 Subject: Change in cellmgr-ng[master]: vty: skip installing cmds now always installed by default In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/4605 ) Change subject: vty: skip installing cmds now always installed by default ...................................................................... vty: skip installing cmds now always installed by default Depends: I5021c64a787b63314e0f2f1cba0b8fc7bff4f09b Change-Id: I0fc8142756040c98c1862ddb18a77a032f2a7143 --- M src/mgcp/mgcp_vty.c M src/vty_interface.c 2 files changed, 0 insertions(+), 31 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved diff --git a/src/mgcp/mgcp_vty.c b/src/mgcp/mgcp_vty.c index dfcc6fe..85c70c5 100644 --- a/src/mgcp/mgcp_vty.c +++ b/src/mgcp/mgcp_vty.c @@ -858,7 +858,6 @@ install_element(CONFIG_NODE, &cfg_mgcp_cmd); install_node(&mgcp_node, config_write_mgcp); - install_default(MGCP_NODE); install_element(MGCP_NODE, &ournode_exit_cmd); install_element(MGCP_NODE, &ournode_end_cmd); install_element(MGCP_NODE, &cfg_mgcp_local_ip_cmd); @@ -883,7 +882,6 @@ install_element(MGCP_NODE, &cfg_mgcp_vtrunk_cmd); install_node(&vtrunk_node, config_write_vtrunk); - install_default(VTRUNK_NODE); install_element(VTRUNK_NODE, &ournode_exit_cmd); install_element(VTRUNK_NODE, &ournode_end_cmd); install_element(VTRUNK_NODE, &cfg_vtrunk_number_endp_cmd); @@ -897,7 +895,6 @@ install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd); install_node(&trunk_node, config_write_trunk); - install_default(TRUNK_NODE); install_element(TRUNK_NODE, &ournode_exit_cmd); install_element(TRUNK_NODE, &ournode_end_cmd); install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd); diff --git a/src/vty_interface.c b/src/vty_interface.c index 3a654c0..ab90897 100644 --- a/src/vty_interface.c +++ b/src/vty_interface.c @@ -77,31 +77,6 @@ return vty->node; } - -DEFUN(node_exit, node_exit_cmd, - "exit", "Exit the current node\n") -{ - ss7_go_parent(vty); - return CMD_SUCCESS; -} - -DEFUN(node_end, node_end_cmd, - "end", "End the current mode and change to the enable node\n") -{ - switch (vty->node) { - case VIEW_NODE: - case ENABLE_NODE: - break; - default: - vty_config_unlock(vty); - vty->node = ENABLE_NODE; - vty->index = NULL; - vty->index_sub = NULL; - break; - } - return CMD_SUCCESS; -} - static struct vty_app_info vty_info = { .name = "OsmoSTP", .version = VERSION, @@ -1316,9 +1291,6 @@ static void install_defaults(int node) { - install_default(node); - install_element(node, &node_exit_cmd); - install_element(node, &node_end_cmd); install_element(node, &cfg_description_cmd); install_element(node, &cfg_no_description_cmd); } -- To view, visit https://gerrit.osmocom.org/4605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0fc8142756040c98c1862ddb18a77a032f2a7143 Gerrit-Change-Number: 4605 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue Nov 27 15:39:10 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 27 Nov 2018 15:39:10 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-cellmgr-ng_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#59?= In-Reply-To: <263023304.873.1543317544531.JavaMail.jenkins@jenkins.osmocom.org> References: <263023304.873.1543317544531.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <37989701.875.1543333150090.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [Pau Espin Pedrol] contrib/jenkins.sh: Update script to fix several issues and use recent [Pau Espin Pedrol] tests: Fix build of mtp_parse_test [Neels Hofmeyr] vty: skip installing cmds now always installed by default [Neels Hofmeyr] README: Add deprecation note ------------------------------------------ [...truncated 216.86 KB...] automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/Makefile.am:8: warning: source file 'mgcp/mgcp_protocol.c' is in a subdirectory, src/Makefile.am:8: but option 'subdir-objects' is disabled src/Makefile.am:8: warning: source file 'mgcp/mgcp_network.c' is in a subdirectory, src/Makefile.am:8: but option 'subdir-objects' is disabled src/Makefile.am:8: warning: source file 'mgcp/mgcp_vty.c' is in a subdirectory, src/Makefile.am:8: but option 'subdir-objects' is disabled src/Makefile.am:24: warning: source file 'input/ipaccess.c' is in a subdirectory, src/Makefile.am:24: but option 'subdir-objects' is disabled src/Makefile.am: installing './depcomp' tests/dtmf/Makefile.am:7: warning: source file '$(top_srcdir)/src/dtmf_scheduler.c' is in a subdirectory, tests/dtmf/Makefile.am:7: but option 'subdir-objects' is disabled tests/isup/Makefile.am:7: warning: source file '$(top_srcdir)/src/isup.c' is in a subdirectory, tests/isup/Makefile.am:7: but option 'subdir-objects' is disabled tests/mgcp/Makefile.am:7: warning: source file '$(top_srcdir)/src/mgcp_patch.c' is in a subdirectory, tests/mgcp/Makefile.am:7: but option 'subdir-objects' is disabled tests/mgcp/Makefile.am:7: warning: source file '$(top_srcdir)/src/mgcp/mgcp_protocol.c' is in a subdirectory, tests/mgcp/Makefile.am:7: but option 'subdir-objects' is disabled tests/mgcp/Makefile.am:7: warning: source file '$(top_srcdir)/src/mgcp/mgcp_network.c' is in a subdirectory, tests/mgcp/Makefile.am:7: but option 'subdir-objects' is disabled tests/mgcp/Makefile.am:7: warning: source file '$(top_srcdir)/src/debug.c' is in a subdirectory, tests/mgcp/Makefile.am:7: but option 'subdir-objects' is disabled tests/mtp/Makefile.am:6: warning: source file '$(top_srcdir)/src/sctp_m3ua_misc.c' is in a subdirectory, tests/mtp/Makefile.am:6: but option 'subdir-objects' is disabled tests/patching/Makefile.am:6: warning: source file '$(top_srcdir)/src/bss_patch.c' is in a subdirectory, tests/patching/Makefile.am:6: but option 'subdir-objects' is disabled tests/patching/Makefile.am:6: warning: source file '$(top_srcdir)/src/debug.c' is in a subdirectory, tests/patching/Makefile.am:6: but option 'subdir-objects' is disabled + ./configure --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for ranlib... ranlib checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking net-snmp/net-snmp-config.h usability... yes checking net-snmp/net-snmp-config.h presence... yes checking for net-snmp/net-snmp-config.h... yes checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOVTY... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY tests... yes checking for sctp_sendmsg in -lsctp... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/mgcp/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating tests/mtp/Makefile config.status: creating tests/patching/Makefile config.status: creating tests/isup/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/dtmf/Makefile config.status: creating Makefile config.status: creating cellmgr_config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands + make -j 8 echo 1.3.0.84-72e29 > .version-t && mv .version-t .version (CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/bash /build/missing autoheader) rm -f stamp-h1 touch cellmgr_config.h.in cd . && /bin/bash ./config.status cellmgr_config.h config.status: creating cellmgr_config.h config.status: cellmgr_config.h is unchanged make all-recursive make[1]: Entering directory '/build' Making all in include make[2]: Entering directory '/build/include' Making all in mgcp make[3]: Entering directory '/build/include/mgcp' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/include/mgcp' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' CC mtp_layer3.o CC main.o CC thread.o CC ipaccess.o CC pcap.o CC bss_patch.o CC bssap_sccp.o CC bsc_sccp.o CC bsc_ussd.o main.c: In function 'main': main.c:68:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC links.o CC msc_conn.o CC link_udp.o CC snmp_mtp.o CC debug.o CC isup.o CC mtp_link.o snmp_mtp.c: In function 'link_up_cb': snmp_mtp.c:49:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] int link_index = (int) data; ^ snmp_mtp.c: In function 'link_down_cb': snmp_mtp.c:65:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] int link_index = (int) data; ^ snmp_mtp.c: In function 'send_pdu': snmp_mtp.c:84:40: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] status = snmp_async_send(ss, pdu, cb, (void *) link_id); ^ CC counter.o CC sccp_state.o CC bsc.o CC ss7_application.o CC vty_interface_legacy.o CC vty_interface_cmds.o CC mgcp_patch.o CC mgcp_callagent.o CC isup_filter.o CC main_stp.o CC sctp_m2ua.o CC vty_interface.o main_stp.c: In function 'main': main_stp.c:212:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC sctp_m3ua_client.o CC sctp_m3ua_misc.o CC mgcp_ss7.o CC mgcp_ss7_vty.o sctp_m2ua.c: In function 'm2ua_conn_destroy': sctp_m2ua.c:91:3: warning: #warning "Notify any other AS(P) for failover scenario" [-Wcpp] #warning "Notify any other AS(P) for failover scenario" ^ CC mgcp_hw.o CC mgcp_network.o CC mgcp_protocol.o mgcp_ss7.c: In function 'main': mgcp_ss7.c:1014:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ mgcp_hw.c: In function 'mgcp_hw_connect': mgcp_hw.c:68:2: warning: #warning "NO Uniporte" [-Wcpp] #warning "NO Uniporte" ^ mgcp/mgcp_protocol.c: In function 'find_e1_endpoint': mgcp/mgcp_protocol.c:291:2: warning: #warning "One should check if the endpoint is blocked!" [-Wcpp] #warning "One should check if the endpoint is blocked!" ^ mgcp/mgcp_network.c:38:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ CC mgcp_vty.o mgcp/mgcp_network.c: In function 'patch_and_count': mgcp/mgcp_network.c:173:2: warning: #warning "Always allow to patch the SSRC" [-Wcpp] #warning "Always allow to patch the SSRC" ^ mgcp/mgcp_network.c: In function 'receive_from': mgcp/mgcp_network.c:328:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC dtmf_scheduler.o CCLD cellmgr_ng CCLD mgcp_mgw CCLD osmo-stp make[2]: Leaving directory '/build/src' Making all in tests make[2]: Entering directory '/build/tests' Making all in mtp make[3]: Entering directory '/build/tests/mtp' CC mtp_parse_test.o CC sctp_m3ua_misc.o CCLD mtp_parse_test make[3]: Leaving directory '/build/tests/mtp' Making all in patching make[3]: Entering directory '/build/tests/patching' CC patching_test.o CC bss_patch.o CC debug.o patching_test.c: In function 'main': patching_test.c:417:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD patching_test make[3]: Leaving directory '/build/tests/patching' Making all in isup make[3]: Entering directory '/build/tests/isup' CC isup.o CC isup_parse_test.o ../../src/isup.c:24:36: fatal error: osmocom/mtp/mtp_level3.h: No such file or directory #include ^ compilation terminated. make[3]: *** [isup.o] Error 1 Makefile:338: recipe for target 'isup.o' failed make[3]: Leaving directory '/build/tests/isup' Makefile:327: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/tests' make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 Makefile:370: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make: *** [all] Error 2 Makefile:310: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue Nov 27 15:40:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 15:40:43 +0000 Subject: Change in osmo-ci[master]: jobs: master-builds: Disable deprecated cellmgr-ng failing to build In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11944 ) Change subject: jobs: master-builds: Disable deprecated cellmgr-ng failing to build ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 Gerrit-Change-Number: 11944 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 27 Nov 2018 15:40:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 15:40:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 15:40:52 +0000 Subject: Change in osmo-ci[master]: jobs: master-builds: Disable deprecated cellmgr-ng failing to build In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11944 ) Change subject: jobs: master-builds: Disable deprecated cellmgr-ng failing to build ...................................................................... Patch Set 2: -Verified -- To view, visit https://gerrit.osmocom.org/11944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 Gerrit-Change-Number: 11944 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 27 Nov 2018 15:40:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 16:17:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 16:17:43 +0000 Subject: Change in osmo-ci[master]: jobs: master-builds: Disable deprecated cellmgr-ng failing to build In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11944 ) Change subject: jobs: master-builds: Disable deprecated cellmgr-ng failing to build ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/11944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 Gerrit-Change-Number: 11944 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 16:17:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 16:17:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 16:17:46 +0000 Subject: Change in osmo-ci[master]: jobs: master-builds: Disable deprecated cellmgr-ng failing to build In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11944 ) Change subject: jobs: master-builds: Disable deprecated cellmgr-ng failing to build ...................................................................... jobs: master-builds: Disable deprecated cellmgr-ng failing to build cellmgr-ng is out of maintenance for a long time now (13 months) and some of its features are going to be served by osmo-stp in the future. cellmgr-ng is unable to build against recent libosmo-sccp. Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 --- M jobs/master-builds.yml 1 file changed, 0 insertions(+), 9 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 585a3d7..6b07694 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -27,15 +27,6 @@ repos: - asn1c - - cellmgr-ng: - concurrent: true - cmd: > - # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e PATH="$PATH:/build_bin" -w /build \ - -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh - - libasn1c: # Full triggers would be: # trigger: master-osmo-iuh, master-osmo-msc -- To view, visit https://gerrit.osmocom.org/11944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0869ec932ba3b3a9d3d8521b25f677e011334315 Gerrit-Change-Number: 11944 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 16:44:20 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 27 Nov 2018 16:44:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Start the timer at the beginning of f_init Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/11950 Change subject: bsc: Start the timer at the beginning of f_init ...................................................................... bsc: Start the timer at the beginning of f_init This avoids a possible indefinite timeout if osmo-bsc crashes during the test. Ticket: OS#3713 Change-Id: I88f6254d9d2d90ab49a3c3d8255af25ca6ffe624 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/11950/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 53e4396..962d6c6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -310,6 +310,9 @@ } g_initialized := true; + T_guard.start; + activate(as_Tguard()); + /* Call a function of our 'parent component' BSSAP_Adapter_CT to start the * MSC-side BSSAP emulation */ if (handler_mode) { @@ -336,8 +339,6 @@ f_wait_oml(i, "connected", 5.0); } - T_guard.start; - activate(as_Tguard()); } /* expect to receive a RSL message matching a specified template on a given BTS / stream */ -- To view, visit https://gerrit.osmocom.org/11950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I88f6254d9d2d90ab49a3c3d8255af25ca6ffe624 Gerrit-Change-Number: 11950 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 16:46:44 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 27 Nov 2018 16:46:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Start the timer at the beginning of f_init In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/11950 ) Change subject: bsc: Start the timer at the beginning of f_init ...................................................................... Patch Set 1: If the value of tguard is now too short for some of the tests we'll need to increase it again, but I wanted to wait for the bsc to not crash before we touch it. -- To view, visit https://gerrit.osmocom.org/11950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88f6254d9d2d90ab49a3c3d8255af25ca6ffe624 Gerrit-Change-Number: 11950 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 16:46:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 16:58:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 16:58:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Start the timer at the beginning of f_init In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11950 ) Change subject: bsc: Start the timer at the beginning of f_init ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I88f6254d9d2d90ab49a3c3d8255af25ca6ffe624 Gerrit-Change-Number: 11950 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 16:58:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 17:02:27 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 17:02:27 +0000 Subject: Change in python/osmo-python-tests[master]: Update trap helper Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11951 Change subject: Update trap helper ...................................................................... Update trap helper * add missing import * update docs * add helper functions Change-Id: Ie6dc8808efc76ad96b400913e5caa405bce7d970 Related: SYS#4399 --- M osmopy/trap_helper.py 1 file changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/51/11951/1 diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index 4704564..f7a64c8 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -22,7 +22,7 @@ */ """ -import sys, os, signal, logging, logging.handlers +import sys, os, datetime, signal, logging, logging.handlers from functools import partial from osmopy.twisted_ipa import CTRL from twisted.internet import defer @@ -35,6 +35,42 @@ # keys from OpenBSC openbsc/src/libbsc/bsc_vty.c fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # SOAP server treats it as boolean but expects int +def split_type(v): + """ + Split TRAP type into list + """ + (l, _) = v.split() + return l.split('.') + +def get_r(v): + """ + Split TRAP record + """ + (_, r) = v.split() + return r + +def get_type(v): + """ + Get TRAP type + """ + loc = split_type(v) + return loc[-1] + +def make_params(bsc, data): + """ + Make parameters for request + """ + (ts, fx, lat, lon, _, opr, adm, pol, _, _) = data.split(',') + tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() + return {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix.get(fx, 0), 'time_stamp': tstamp, 'oper_status': oper.get(opr, 2), 'admin_status': admin.get(adm, 2), 'policy_status': policy.get(pol, 3) } + +def p_h(v): + """ + Parse helper for method dispatch: expected format is net.0.bsc.666.bts.2.trx.1 + """ + loc = split_type(v) + return partial(lambda a, i: a[i] if len(a) > i else None, loc) + class Trap(CTRL): """ TRAP handler (agnostic to factory's client object) @@ -109,6 +145,9 @@ os.execl(path, script, *sys.argv[1:]) def debug_init(name, is_debug, output): + """ + Initialize signal handlers and logging + """ log = logging.getLogger(name) if is_debug: log.setLevel(logging.DEBUG) -- To view, visit https://gerrit.osmocom.org/11951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6dc8808efc76ad96b400913e5caa405bce7d970 Gerrit-Change-Number: 11951 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 17:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 17:02:28 +0000 Subject: Change in python/osmo-python-tests[master]: Move Trap class back to separate files Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11952 Change subject: Move Trap class back to separate files ...................................................................... Move Trap class back to separate files After further testing it turns out that Trap() have too many implementation details which makes it cumbersome to be shared. Instead, it's easier to make it into wrapper over shared functions. Change-Id: I8a3c62bcdf4286f8127c5b6d8dee6d740aca23b9 --- M scripts/ctrl2cgi.py M scripts/soap.py 2 files changed, 114 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/52/11952/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 18cfdbe..9c47c92 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,14 +22,14 @@ */ """ -__version__ = "0.0.1" # bump this on every non-trivial change +__version__ = "0.0.2" # bump this on every non-trivial change from twisted.internet import defer, reactor from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version from osmopy.osmo_ipa import Ctrl from treq import post, collect from functools import partial -from osmopy.trap_helper import Trap, reloader, debug_init +from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers import hashlib @@ -75,6 +75,61 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res +class Trap(CTRL): + """ + TRAP handler (agnostic to factory's client object) + """ + def ctrl_TRAP(self, data, op_id, v): + """ + Parse CTRL TRAP and dispatch to appropriate handler after normalization + """ + self.factory.log.debug('TRAP %s' % v) + t_type = get_type(v) + p = p_h(v) + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) + method(p(1), p(3), p(5), p(7), get_r(v)) + + def ctrl_SET_REPLY(self, data, _, v): + """ + Debug log for replies to our commands + """ + self.factory.log.debug('SET REPLY %s' % v) + + def ctrl_ERROR(self, data, op_id, v): + """ + We want to know if smth went wrong + """ + self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) + + def connectionMade(self): + """ + Logging wrapper, calling super() is necessary not to break reconnection logic + """ + self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) + super(CTRL, self).connectionMade() + + @defer.inlineCallbacks + def handle_locationstate(self, net, bsc, bts, trx, data): + """ + Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers + """ + params = make_params(bsc, data) + self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['tstamp'], data)) + params['h'] = gen_hash(params, self.factory.secret_key) + d = post(self.factory.location, None, params=params) + d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors + # Ensure that we run only limited number of requests in parallel: + yield self.factory.semaphore.acquire() + yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit + self.factory.semaphore.release() + + def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): + """ + Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled + """ + self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) + class TrapFactory(IPAFactory): """ @@ -100,12 +155,6 @@ self.log.setLevel(level) self.log.debug("Using IPA %s, CGI server: %s" % (Ctrl.version, self.location)) - def prepare_params(bsc, lon, lat, fix, tstamp, oper, admin, policy): - params = {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix, 'time_stamp': tstamp, 'oper_status': oper, 'admin_status': admin, 'policy_status': policy } - params['h'] = gen_hash(params, self.factory.secret_key) - d = post(self.factory.location, None, params=params) - d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) - return d if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given GCI service and Osmocom CTRL protocol.') diff --git a/scripts/soap.py b/scripts/soap.py index 156157c..7c44603 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -30,7 +30,7 @@ from treq import post, collect from suds.client import Client from functools import partial -from osmopy.trap_helper import Trap, reloader, debug_init +from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers @@ -51,6 +51,62 @@ f(m) +class Trap(CTRL): + """ + TRAP handler (agnostic to factory's client object) + """ + def ctrl_TRAP(self, data, op_id, v): + """ + Parse CTRL TRAP and dispatch to appropriate handler after normalization + """ + self.factory.log.debug('TRAP %s' % v) + t_type = get_type(v) + p = p_h(v) + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) + method(p(1), p(3), p(5), p(7), get_r(v)) + + def ctrl_SET_REPLY(self, data, _, v): + """ + Debug log for replies to our commands + """ + self.factory.log.debug('SET REPLY %s' % v) + + def ctrl_ERROR(self, data, op_id, v): + """ + We want to know if smth went wrong + """ + self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) + + def connectionMade(self): + """ + Logging wrapper, calling super() is necessary not to break reconnection logic + """ + self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) + super(CTRL, self).connectionMade() + + @defer.inlineCallbacks + def handle_locationstate(self, net, bsc, bts, trx, data): + """ + Handle location-state TRAP: parse trap content, build SOAP context and use treq's routines to post it while setting up async handlers + """ + params = make_params(bsc, data) + self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['tstamp'], data)) + ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status']) + d = post(self.factory.location, ctx.envelope) + d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors + # Ensure that we run only limited number of requests in parallel: + yield self.factory.semaphore.acquire() + yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit + self.factory.semaphore.release() + + def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): + """ + Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled + """ + self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) + + class TrapFactory(IPAFactory): """ Store SOAP client object so TRAP handler can use it for requests @@ -75,12 +131,6 @@ self.log.setLevel(level) self.log.debug("Using IPA %s, SUDS client: %s" % (Ctrl.version, soap)) - def prepare_params(bsc, lon, lat, fix, tstamp, oper, admin, policy): - ctx = self.factory.client.registerSiteLocation(bsc, float(lon), float(lat), fix, tstamp, oper, admin, policy) - d = post(self.factory.location, ctx.envelope) - # treq's collect helper is handy to get all reply content at once using closure on ctx: - d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) - return d if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given SOAP service and Osmocom CTRL protocol.') -- To view, visit https://gerrit.osmocom.org/11952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8a3c62bcdf4286f8127c5b6d8dee6d740aca23b9 Gerrit-Change-Number: 11952 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 17:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 17:02:28 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11953 Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... ctrl2cgi: fix deferred callbacks Previously handle_reply() was marked as deferred callback unlike soap.py where it's synchronous function. This seems to be causing issues where some of the callbacks are not yield properly. Let's move to the known-to-work semantics of soap.py where async functions are limited to Trap() class. Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 5 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/53/11953/1 diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 9c47c92..5a2c8c7 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.2" # bump this on every non-trivial change +__version__ = "0.0.3" # bump this on every non-trivial change from twisted.internet import defer, reactor from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version @@ -40,25 +40,12 @@ assert V(twisted_ipa_version) > V('0.4') - at defer.inlineCallbacks def handle_reply(f, log, resp): """ Reply handler: process raw CGI server response, function f to run for each command """ - #log.debug('HANDLE_REPLY: code=%r' % (resp.code)) - #for key,val in resp.headers.getAllRawHeaders(): - # log.debug('HANDLE_REPLY: key=%r val=%r' % (key, val)) - if resp.code != 200: - resp_body = yield resp.text() - log.critical('Received HTTP response %d: %s' % (resp.code, resp_body)) - return - - parsed = yield resp.json() - #log.debug("RESPONSE: %r" % (parsed)) - bsc_id = parsed.get('commands')[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format - log.info("Received CGI response for BSC %s with %d commands, error status: %s" % (bsc_id, len(parsed.get('commands')), parsed.get('error'))) - log.debug("BSC %s commands: %r" % (bsc_id, parsed.get('commands'))) - for t in parsed.get('commands'): # Process commands format + decoded = json.loads(resp.decode('utf-8')) + for t in decoded.get('commands'): # Process commands format (_, m) = Ctrl().cmd(*t.split()) f(m) @@ -116,8 +103,8 @@ params = make_params(bsc, data) self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['tstamp'], data)) params['h'] = gen_hash(params, self.factory.secret_key) - d = post(self.factory.location, None, params=params) - d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx + d = post(self.factory.location, params) + d.addCallback(collect, partial(handle_reply, self.transport.write, self.factory.log)) d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: yield self.factory.semaphore.acquire() -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 17:06:26 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 27 Nov 2018 17:06:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Start the timer at the beginning of f_init In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/11950 ) Change subject: bsc: Start the timer at the beginning of f_init ...................................................................... bsc: Start the timer at the beginning of f_init This avoids a possible indefinite timeout if osmo-bsc crashes during the test. Ticket: OS#3713 Change-Id: I88f6254d9d2d90ab49a3c3d8255af25ca6ffe624 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 53e4396..962d6c6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -310,6 +310,9 @@ } g_initialized := true; + T_guard.start; + activate(as_Tguard()); + /* Call a function of our 'parent component' BSSAP_Adapter_CT to start the * MSC-side BSSAP emulation */ if (handler_mode) { @@ -336,8 +339,6 @@ f_wait_oml(i, "connected", 5.0); } - T_guard.start; - activate(as_Tguard()); } /* expect to receive a RSL message matching a specified template on a given BTS / stream */ -- To view, visit https://gerrit.osmocom.org/11950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I88f6254d9d2d90ab49a3c3d8255af25ca6ffe624 Gerrit-Change-Number: 11950 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 17:26:04 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 17:26:04 +0000 Subject: Change in python/osmo-python-tests[master]: Update trap helper In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11951 ) Change subject: Update trap helper ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6dc8808efc76ad96b400913e5caa405bce7d970 Gerrit-Change-Number: 11951 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 27 Nov 2018 17:26:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 17:27:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 17:27:20 +0000 Subject: Change in python/osmo-python-tests[master]: Move Trap class back to separate files In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11952 ) Change subject: Move Trap class back to separate files ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a3c62bcdf4286f8127c5b6d8dee6d740aca23b9 Gerrit-Change-Number: 11952 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Tue, 27 Nov 2018 17:27:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 17:27:59 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 17:27:59 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 17:27:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 17:48:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 17:48:11 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: ts_is_pchan_switching: Set correct target pchan fo... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11954 Change subject: bsc: timeslot_fsm: ts_is_pchan_switching: Set correct target pchan for IPA dynts ...................................................................... bsc: timeslot_fsm: ts_is_pchan_switching: Set correct target pchan for IPA dynts For IPA dynamic TS, we never go to NONE but deactivating PDCH automatically sets it as TCH/F, as can also be seen in ts_fsm_wait_pdch_deact. Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11954/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index fc25460..011b810 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -897,8 +897,17 @@ case TS_ST_WAIT_PDCH_DEACT: /* If we were switching to a specific pchan kind, an lchan would be waiting. So this must * be NONE then. */ - if (target_pchan) + if (target_pchan) { *target_pchan = GSM_PCHAN_NONE; + switch (ts->pchan_on_init) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + *target_pchan = GSM_PCHAN_NONE; + break; + case GSM_PCHAN_TCH_F_PDCH: + *target_pchan = GSM_PCHAN_TCH_F; + break; + } + } return true; default: -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 18:19:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 18:19:40 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: ts_is_pchan_switching: Set correct target pchan fo... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11954 to look at the new patch set (#2). Change subject: bsc: timeslot_fsm: ts_is_pchan_switching: Set correct target pchan for IPA dynts ...................................................................... bsc: timeslot_fsm: ts_is_pchan_switching: Set correct target pchan for IPA dynts For IPA dynamic TS, we never go to NONE but deactivating PDCH automatically sets it as TCH/F, as can also be seen in ts_fsm_wait_pdch_deact. Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11954/2 -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:19:41 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11955 Change subject: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets ...................................................................... cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets Change-Id: I5140f98e23b8c8d16ce0cca0be66297aaf0b5653 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/11955/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index fc25460..8351ff7 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -911,6 +911,8 @@ * and will be served after the switch. (Do not check whether any lchans are actually available.) */ bool ts_usable_as_pchan(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { + enum gsm_phys_chan_config target_pchan; + if (!ts_is_usable(ts)) return false; @@ -922,11 +924,8 @@ break; } - { - enum gsm_phys_chan_config target_pchan; - if (ts_is_lchan_waiting_for_pchan(ts, &target_pchan)) - return target_pchan == as_pchan; - } + if (ts_is_lchan_waiting_for_pchan(ts, &target_pchan)) + return target_pchan == as_pchan; return ts_is_capable_of_pchan(ts, as_pchan); } -- To view, visit https://gerrit.osmocom.org/11955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5140f98e23b8c8d16ce0cca0be66297aaf0b5653 Gerrit-Change-Number: 11955 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:19:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:19:42 +0000 Subject: Change in osmo-bsc[master]: bsc: trx_count_free_ts: Fix counting of GSM_PCHAN_PDCH Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11956 Change subject: bsc: trx_count_free_ts: Fix counting of GSM_PCHAN_PDCH ...................................................................... bsc: trx_count_free_ts: Fix counting of GSM_PCHAN_PDCH PDCH were not counted since ts_for_each_lchan translates to ts_as_pchan_for_each_lchan(GSM_PCHAN_PDCH), and then pchan_subslots() returns 0 through subslots_per_pchan. Change-Id: I7a785b70fd0a34a52504e9a46b4b27889463f67e --- M src/osmo-bsc/gsm_data.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/11956/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 6d39642..f9cdd4f 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1616,7 +1616,11 @@ continue; if (ts->pchan_is == GSM_PCHAN_PDCH) { - /* Dynamic timeslots in PDCH mode will become TCH if needed. */ + /* PDCH TS don't appear in ts_for_each_lchan */ + if (pchan == GSM_PCHAN_PDCH && lchan_state_is(lchan, LCHAN_ST_UNUSED)) + count++; + /* Dynamic timeslots in PDCH mode will become TCH if needed, + and since now pchan is PDCH, we now they are unused. */ switch (ts->pchan_on_init) { case GSM_PCHAN_TCH_F_PDCH: if (pchan == GSM_PCHAN_TCH_F) @@ -1630,9 +1634,11 @@ count += 2; continue; - default: - /* Not dynamic, not applicable. */ + case GSM_PCHAN_PDCH: + /* PDCH Already counted before switch statement */ continue; + default: + OSMO_ASSERT(false); } } -- To view, visit https://gerrit.osmocom.org/11956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7a785b70fd0a34a52504e9a46b4b27889463f67e Gerrit-Change-Number: 11956 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:19:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:19:42 +0000 Subject: Change in osmo-bsc[master]: Fix ts_for_each_lchan iteration for dynamic TS in process of being PD... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11957 Change subject: Fix ts_for_each_lchan iteration for dynamic TS in process of being PDCH deactivated ...................................................................... Fix ts_for_each_lchan iteration for dynamic TS in process of being PDCH deactivated In general PDCH channels are not handled as lchans in BTS (lchan_fsm.c), and so when a TS is in ts->pchan_is=GSM_PCHAN_PDCH, no lchan slot is being used. However, during Dynamic TS PDCH Deactivation being in progress (state WAIT_PDCH_DEACT in timeslot_fsm.c), ts->pchan_is =GSM_PCHAN_PDCH, but an lchan slot of that TS is actually already being used by a TCH lchan: it's the one who initiated the deactivate in order to be able to use the TS. While being in WAIT_PDCH_DEACT state and receiving a PDCH DEACT NACK, ts_fsm_error() was called in order to kill the TS and it was expected that it would kill any lchan using it (or willing to start using it). In order to do that, it calls ts_lchans_dispatch() which in turns iterates over all lchans attached to the TS using ts_for_each_lchan(). However, when the NACK arrived we still had ts->pchan_is=GSM_PCHAN_PDCH, ts_for_each_lchan ends up calling ts_as_pchan_for_each_lchan(GSM_PCHAN_PDCH), which in turns calls pchan_subslots(GSM_PCHAN_PDCH) which returns 0, because we don't manage lchans in that mode as explained in first paragraph. This means in this case ts_for_each_lchan() is actually an empty loop while still any of the TCH channels may be in use, and won't be advertised about the TS entering in a broken state. As a result, the lchan won't be released for a while, only after T23001 expires. In ts_for_each_lchan(), as its name indicates, we want to iterate over all lchans, and then if needed check if they are in use. Other users of ts_for_each_lchan() have checks like lchan_state_is(lchan, LCHAN_ST_UNUSED) or are fine about this scenarios anyway. Related: OS#3708 Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/timeslot_fsm.c 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/11957/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 15158cd..d4318ad 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -461,8 +461,10 @@ * ts_for_each_lchan(lchan, ts) { * LOGPLCHAN(DMAIN, LOGL_DEBUG, "hello world\n"); * } - * Iterate only those lchans that have an FSM allocated. */ -#define ts_for_each_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_is) + * Iterate only those lchans that have an FSM allocated. + * ts->pchan_on_init containing dynamic TS type is passed in order to calculate + * max amount of lchans available in any of the possible modes. */ +#define ts_for_each_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_on_init) /* Same as ts_for_each_lchan() but with an explicit pchan kind (GSM_PCHAN_* constant). * Iterate only those lchans that have an FSM allocated. */ diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 659c645..f55633f 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -550,7 +550,7 @@ ts->pdch_act_allowed = true; /* For static TS, check validity. For dyn TS, figure out which PCHAN this should become. */ - ts_as_pchan_for_each_lchan(lchan, ts, ts->pchan_on_init) { + ts_for_each_lchan(lchan, ts) { if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) continue; -- To view, visit https://gerrit.osmocom.org/11957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 Gerrit-Change-Number: 11957 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:19:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:19:43 +0000 Subject: Change in osmo-bsc[master]: WIP: bsc: timeslot_fsm: Set TS state as unused instead of broken on P... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11958 Change subject: WIP: bsc: timeslot_fsm: Set TS state as unused instead of broken on PDCH DEACT NACK ...................................................................... WIP: bsc: timeslot_fsm: Set TS state as unused instead of broken on PDCH DEACT NACK The idea is to be able to recover from eventual or temporary failure in TS and don't keep it broken forever until osmo-bsc is restarted. Change-Id: I906e6123f40081b52c62bed1411fcd901981ae3d --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/11958/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index f55633f..d45f7aa 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -512,7 +512,7 @@ rate_ctr_inc(&ts->trx->bts->bts_ctrs->ctr[BTS_CTR_RSL_IPA_NACK]); /* For Osmocom style dyn TS, there actually is no NACK, since there is no RF Channel * Release NACK message in RSL. */ - ts_fsm_error(fi, TS_ST_BORKEN, "Received PDCH deactivation NACK"); + ts_fsm_error(fi, TS_ST_UNUSED, "Received PDCH deactivation NACK"); return; case TS_EV_LCHAN_REQUESTED: -- To view, visit https://gerrit.osmocom.org/11958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I906e6123f40081b52c62bed1411fcd901981ae3d Gerrit-Change-Number: 11958 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:20:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:20:33 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: ts_is_pchan_switching: Set correct target pchan fo... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: ts_is_pchan_switching: Set correct target pchan for IPA dynts ...................................................................... Patch Set 3: >From here on I still need to do some testing with osmo-gsm-tester. -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 27 Nov 2018 19:20:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:30:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:30:26 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11953/2/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11953/2/scripts/ctrl2cgi.py at a60 PS2, Line 60: Why dropping this logging? -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 19:30:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:30:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:30:28 +0000 Subject: Change in python/osmo-python-tests[master]: Update trap helper In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11951 ) Change subject: Update trap helper ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie6dc8808efc76ad96b400913e5caa405bce7d970 Gerrit-Change-Number: 11951 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 19:30:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:30:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:30:29 +0000 Subject: Change in python/osmo-python-tests[master]: Move Trap class back to separate files In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11952 ) Change subject: Move Trap class back to separate files ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a3c62bcdf4286f8127c5b6d8dee6d740aca23b9 Gerrit-Change-Number: 11952 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 19:30:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:54:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 19:54:22 +0000 Subject: Change in python/osmo-python-tests[master]: Update trap helper In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11951 ) Change subject: Update trap helper ...................................................................... Update trap helper * add missing import * update docs * add helper functions Change-Id: Ie6dc8808efc76ad96b400913e5caa405bce7d970 Related: SYS#4399 --- M osmopy/trap_helper.py 1 file changed, 40 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index 4704564..f7a64c8 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -22,7 +22,7 @@ */ """ -import sys, os, signal, logging, logging.handlers +import sys, os, datetime, signal, logging, logging.handlers from functools import partial from osmopy.twisted_ipa import CTRL from twisted.internet import defer @@ -35,6 +35,42 @@ # keys from OpenBSC openbsc/src/libbsc/bsc_vty.c fix = { 'invalid' : 0, 'fix2d' : 1, 'fix3d' : 1 } # SOAP server treats it as boolean but expects int +def split_type(v): + """ + Split TRAP type into list + """ + (l, _) = v.split() + return l.split('.') + +def get_r(v): + """ + Split TRAP record + """ + (_, r) = v.split() + return r + +def get_type(v): + """ + Get TRAP type + """ + loc = split_type(v) + return loc[-1] + +def make_params(bsc, data): + """ + Make parameters for request + """ + (ts, fx, lat, lon, _, opr, adm, pol, _, _) = data.split(',') + tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() + return {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix.get(fx, 0), 'time_stamp': tstamp, 'oper_status': oper.get(opr, 2), 'admin_status': admin.get(adm, 2), 'policy_status': policy.get(pol, 3) } + +def p_h(v): + """ + Parse helper for method dispatch: expected format is net.0.bsc.666.bts.2.trx.1 + """ + loc = split_type(v) + return partial(lambda a, i: a[i] if len(a) > i else None, loc) + class Trap(CTRL): """ TRAP handler (agnostic to factory's client object) @@ -109,6 +145,9 @@ os.execl(path, script, *sys.argv[1:]) def debug_init(name, is_debug, output): + """ + Initialize signal handlers and logging + """ log = logging.getLogger(name) if is_debug: log.setLevel(logging.DEBUG) -- To view, visit https://gerrit.osmocom.org/11951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie6dc8808efc76ad96b400913e5caa405bce7d970 Gerrit-Change-Number: 11951 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:54:22 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Tue, 27 Nov 2018 19:54:22 +0000 Subject: Change in python/osmo-python-tests[master]: Move Trap class back to separate files In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11952 ) Change subject: Move Trap class back to separate files ...................................................................... Move Trap class back to separate files After further testing it turns out that Trap() have too many implementation details which makes it cumbersome to be shared. Instead, it's easier to make it into wrapper over shared functions. Change-Id: I8a3c62bcdf4286f8127c5b6d8dee6d740aca23b9 --- M scripts/ctrl2cgi.py M scripts/soap.py 2 files changed, 114 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 18cfdbe..843aeb9 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,14 +22,14 @@ */ """ -__version__ = "0.0.1" # bump this on every non-trivial change +__version__ = "0.0.2" # bump this on every non-trivial change from twisted.internet import defer, reactor from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version from osmopy.osmo_ipa import Ctrl from treq import post, collect from functools import partial -from osmopy.trap_helper import Trap, reloader, debug_init +from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers import hashlib @@ -75,6 +75,61 @@ #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res +class Trap(CTRL): + """ + TRAP handler (agnostic to factory's client object) + """ + def ctrl_TRAP(self, data, op_id, v): + """ + Parse CTRL TRAP and dispatch to appropriate handler after normalization + """ + self.factory.log.debug('TRAP %s' % v) + t_type = get_type(v) + p = p_h(v) + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) + method(p(1), p(3), p(5), p(7), get_r(v)) + + def ctrl_SET_REPLY(self, data, _, v): + """ + Debug log for replies to our commands + """ + self.factory.log.debug('SET REPLY %s' % v) + + def ctrl_ERROR(self, data, op_id, v): + """ + We want to know if smth went wrong + """ + self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) + + def connectionMade(self): + """ + Logging wrapper, calling super() is necessary not to break reconnection logic + """ + self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) + super(CTRL, self).connectionMade() + + @defer.inlineCallbacks + def handle_locationstate(self, net, bsc, bts, trx, data): + """ + Handle location-state TRAP: parse trap content, build CGI Request and use treq's routines to post it while setting up async handlers + """ + params = make_params(bsc, data) + self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) + params['h'] = gen_hash(params, self.factory.secret_key) + d = post(self.factory.location, None, params=params) + d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors + # Ensure that we run only limited number of requests in parallel: + yield self.factory.semaphore.acquire() + yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit + self.factory.semaphore.release() + + def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): + """ + Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled + """ + self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) + class TrapFactory(IPAFactory): """ @@ -100,12 +155,6 @@ self.log.setLevel(level) self.log.debug("Using IPA %s, CGI server: %s" % (Ctrl.version, self.location)) - def prepare_params(bsc, lon, lat, fix, tstamp, oper, admin, policy): - params = {'bsc_id': bsc, 'lon': lon, 'lat': lat, 'position_validity': fix, 'time_stamp': tstamp, 'oper_status': oper, 'admin_status': admin, 'policy_status': policy } - params['h'] = gen_hash(params, self.factory.secret_key) - d = post(self.factory.location, None, params=params) - d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) - return d if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given GCI service and Osmocom CTRL protocol.') diff --git a/scripts/soap.py b/scripts/soap.py index 156157c..75acd89 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -30,7 +30,7 @@ from treq import post, collect from suds.client import Client from functools import partial -from osmopy.trap_helper import Trap, reloader, debug_init +from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers @@ -51,6 +51,62 @@ f(m) +class Trap(CTRL): + """ + TRAP handler (agnostic to factory's client object) + """ + def ctrl_TRAP(self, data, op_id, v): + """ + Parse CTRL TRAP and dispatch to appropriate handler after normalization + """ + self.factory.log.debug('TRAP %s' % v) + t_type = get_type(v) + p = p_h(v) + method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) + method(p(1), p(3), p(5), p(7), get_r(v)) + + def ctrl_SET_REPLY(self, data, _, v): + """ + Debug log for replies to our commands + """ + self.factory.log.debug('SET REPLY %s' % v) + + def ctrl_ERROR(self, data, op_id, v): + """ + We want to know if smth went wrong + """ + self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) + + def connectionMade(self): + """ + Logging wrapper, calling super() is necessary not to break reconnection logic + """ + self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) + super(CTRL, self).connectionMade() + + @defer.inlineCallbacks + def handle_locationstate(self, net, bsc, bts, trx, data): + """ + Handle location-state TRAP: parse trap content, build SOAP context and use treq's routines to post it while setting up async handlers + """ + params = make_params(bsc, data) + self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) + ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status']) + d = post(self.factory.location, ctx.envelope) + d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx + d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors + # Ensure that we run only limited number of requests in parallel: + yield self.factory.semaphore.acquire() + yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit + self.factory.semaphore.release() + + def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): + """ + Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled + """ + self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) + + class TrapFactory(IPAFactory): """ Store SOAP client object so TRAP handler can use it for requests @@ -75,12 +131,6 @@ self.log.setLevel(level) self.log.debug("Using IPA %s, SUDS client: %s" % (Ctrl.version, soap)) - def prepare_params(bsc, lon, lat, fix, tstamp, oper, admin, policy): - ctx = self.factory.client.registerSiteLocation(bsc, float(lon), float(lat), fix, tstamp, oper, admin, policy) - d = post(self.factory.location, ctx.envelope) - # treq's collect helper is handy to get all reply content at once using closure on ctx: - d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) - return d if __name__ == '__main__': p = argparse.ArgumentParser(description='Proxy between given SOAP service and Osmocom CTRL protocol.') -- To view, visit https://gerrit.osmocom.org/11952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8a3c62bcdf4286f8127c5b6d8dee6d740aca23b9 Gerrit-Change-Number: 11952 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 19:57:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 27 Nov 2018 19:57:53 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11953/2/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11953/2/scripts/ctrl2cgi.py at a51 PS2, Line 51: I think we wanted to handle resp codes for some specific feature, but I don't remember anymore. Worth checking related tickets and asking the users. -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 19:57:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 21:18:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 21:18:08 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11955 ) Change subject: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5140f98e23b8c8d16ce0cca0be66297aaf0b5653 Gerrit-Change-Number: 11955 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 21:18:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 22:21:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 22:21:12 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 5: Code-Review-1 (3 comments) the idea is to first add the schema version evaluation in one patch, without changing the schema, and making that user_version = 0. Then add the v1 column in a separate patch, bump the version and add the upgrade_to_v1. So the v1 patch really only is v1 related. Also open is the argument to add a --db-upgrade option, to avoid upgrading implicitly. Otherwise, only because the new intern tried the new version once the operator cannot operate anymore, and "sorry, there is no downgrade path". It should also be fairly easy to add a db-upgrade test. Thinking a shell script to pipe some sql to sqlite3, then start osmo-hlr --db-upgrade on it and see that an sqlite3 .dump produces expected results. The above is what I'd like to see, unless it takes inifinitely too much time. https://gerrit.osmocom.org/#/c/11898/5/src/db.c File src/db.c: https://gerrit.osmocom.org/#/c/11898/5/src/db.c at 378 PS5, Line 378: rc = sqlite3_exec(dbc->db, "PRAGMA journal_mode=WAL; PRAGMA synchonous = NORMAL;", 0, 0, &err_msg); (interesting typo in old code: "synchronous" is that breaking something?) https://gerrit.osmocom.org/#/c/11898/5/src/db.c at 383 PS5, Line 383: if (!db_is_bootstrapped(dbc)) { imagine some future scheme adds a new table. Then db_is_bootstrapped() will return false because one of the tables is missing? And then we try to populate a db assuming it is empty and fail even before we hit the db upgrade path we should be running instead? Maybe db_is_bootstrapped() should just check for the subscriber table and otherwise rely on the user_version. Checking whether all tables are really there as expected might be an additional last step after all upgrades are done. https://gerrit.osmocom.org/#/c/11898/5/src/db.c at 403 PS5, Line 403: LOGP(DDB, LOGL_ERROR, "Unable to read user version number from database '%s'\n", dbc->fname); Is the user_version always present in an sqlite db? otherwise, if I read this right, when osmo-hlr now hits a current .db file, the version is -1 because there is none, and then we don't upgrade? -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 22:21:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 22:28:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 22:28:40 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11898/5/src/Makefile.am File src/Makefile.am: https://gerrit.osmocom.org/#/c/11898/5/src/Makefile.am at 119 PS5, Line 119: echo "/* DO NOT EDIT THIS FILE. It is generated from files in osmo-hlr.git/sql/ */" > "$@" (wow, I really cooked up some voodoo here didn't I ... now wondering whether a python script "sql2c.py --struct stmt_bootstrap_sql" would be simpler. But nevermind now.) -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 22:28:40 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 22:33:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 22:33:39 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11909 ) Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... Patch Set 4: Code-Review+1 (1 comment) (leaving +2 to pespin) https://gerrit.osmocom.org/#/c/11909/4/scripts/osmo_ctrl.py File scripts/osmo_ctrl.py: https://gerrit.osmocom.org/#/c/11909/4/scripts/osmo_ctrl.py at 47 PS4, Line 47: if ret != None: (I'd even prefer 'if ret == None: continue' but nm) -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 22:33:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 22:36:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 22:36:11 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: cosmetic cleanup In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11930 ) Change subject: ctrl: cosmetic cleanup ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da Gerrit-Change-Number: 11930 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 27 Nov 2018 22:36:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 22:37:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 27 Nov 2018 22:37:53 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11955 ) Change subject: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets ...................................................................... Patch Set 1: Code-Review+2 (1 comment) In my opinion, the scope nicely indicates that the struct is only used for signaling the other function, but we had this discussion before and I was overruled. https://gerrit.osmocom.org/#/c/11955/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11955/1//COMMIT_MSG at 7 PS1, Line 7: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets and omit uneeded n? -- To view, visit https://gerrit.osmocom.org/11955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5140f98e23b8c8d16ce0cca0be66297aaf0b5653 Gerrit-Change-Number: 11955 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 27 Nov 2018 22:37:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 23:04:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 23:04:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/SS_Templates.ttcn: add SS_USSD_FACILITY_INVOKE templates Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11959 Change subject: library/SS_Templates.ttcn: add SS_USSD_FACILITY_INVOKE templates ...................................................................... library/SS_Templates.ttcn: add SS_USSD_FACILITY_INVOKE templates Change-Id: Ic561b6b2eee7315d42fcd5ec5fef182ae097d3b7 --- M library/SS_Templates.ttcn 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/11959/1 diff --git a/library/SS_Templates.ttcn b/library/SS_Templates.ttcn index 1129108..6d8fcf2 100644 --- a/library/SS_Templates.ttcn +++ b/library/SS_Templates.ttcn @@ -122,6 +122,47 @@ } } +template (value) SS_FacilityInformation ts_SS_FACILITY_INVOKE( + integer invoke_id := 1, + SS_Op_Code op_code, + OCT1 ss_code +) := { + { + invoke := { + invokeId := { present_ := invoke_id }, + linkedId := omit, + opcode := { local := enum2int(op_code) }, + argument := { + sS_ForBS_Code := { + ss_Code := ss_code, + basicService := omit, + longFTN_Supported := omit + } + } + } + } +} +template SS_FacilityInformation tr_SS_FACILITY_INVOKE( + template integer invoke_id := 1, + template integer op_code := ?, + template OCT1 ss_code := ? +) := { + { + invoke := { + invokeId := { present_ := invoke_id }, + linkedId := omit, + opcode := { local := op_code }, + argument := { + sS_ForBS_Code := { + ss_Code := ss_code, + basicService := omit, + longFTN_Supported := omit + } + } + } + } +} + template (value) SS_FacilityInformation ts_SS_USSD_FACILITY_RETURN_RESULT( integer invoke_id := 1, SS_Op_Code op_code := SS_OP_CODE_PROCESS_USS_REQ, -- To view, visit https://gerrit.osmocom.org/11959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic561b6b2eee7315d42fcd5ec5fef182ae097d3b7 Gerrit-Change-Number: 11959 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Nov 27 23:04:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 27 Nov 2018 23:04:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR_Tests.ttcn: introduce TC_mo_sss_reject Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11960 Change subject: HLR_Tests.ttcn: introduce TC_mo_sss_reject ...................................................................... HLR_Tests.ttcn: introduce TC_mo_sss_reject As at the moment, OsmoHLR doesn't support "structured" SS, such requests are being rejected. This test case aims to verify that. Change-Id: I147b919d0242b3b44e39a4587bf1b4660fa58bd2 Related: OS#3651 --- M hlr/HLR_Tests.ttcn M hlr/expected-results.xml 2 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/11960/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 29af522..f7902be 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -995,6 +995,53 @@ vc_EUSE.stop; } +/** + * Test "Structured" Supplementary Services + * + * NOTE: at the moment, OsmoHLR doesn't support "structured" SS, + * so such requests are being rejected (actually ReturnError + * with GSM0480_ERR_CODE_FACILITY_NOT_SUPPORTED). + */ +private function f_TC_mo_sss_reject() runs on HLR_ConnHdlr { + var SS_FacilityInformation ss_req; + + /* Prepare '*#21#' SS request */ + ss_req := valueof(ts_SS_FACILITY_INVOKE( + invoke_id := 0, + op_code := SS_OP_CODE_INTERROGATE_SS, + ss_code := '21'O)); + + /* Send it towards HLR */ + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ( + g_pars.sub.imsi, + g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, + enc_SS_FacilityInformation(ss_req)))); + + /* Expect ReturnError with FACILITY_NOT_SUPPORTED */ + f_SS_expect(g_pars.sub.imsi, + g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_FACILITY_RETURN_ERROR(0, 21)); +} +testcase TC_mo_sss_reject() runs on test_CT { + var HLR_ConnHdlrPars pars; + var HLR_ConnHdlr vc_conn; + var HlrSubscriber sub; + + f_init(false); + + /* Create a random subscriber */ + sub := valueof(t_Sub2G(f_rnd_imsi('26242'H), + '49161'H & f_rnd_hexstring(7, 9), "comp128v1")); + pars := valueof(t_Pars_sub(sub)); + pars.ussd.sid := f_rnd_octstring(4); + + f_vty_subscr_create(VTY, sub); + vc_conn := f_start_handler(refers(f_TC_mo_sss_reject), pars); + vc_conn.done; + f_vty_subscr_delete(VTY, sub); +} + /* TODO USSD: * MO USSD for IMSI of non-existant subscriber @@ -1035,6 +1082,9 @@ execute( TC_mo_ussd_euse() ); execute( TC_mo_ussd_euse_continue() ); execute( TC_mo_ussd_euse_defaultroute() ); + + /* "Structured" Supplementary Services */ + execute( TC_mo_sss_reject() ); }; }; diff --git a/hlr/expected-results.xml b/hlr/expected-results.xml index 5431b78..8a1ed26 100644 --- a/hlr/expected-results.xml +++ b/hlr/expected-results.xml @@ -17,4 +17,5 @@ + -- To view, visit https://gerrit.osmocom.org/11960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I147b919d0242b3b44e39a4587bf1b4660fa58bd2 Gerrit-Change-Number: 11960 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 28 06:52:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 28 Nov 2018 06:52:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#203?= In-Reply-To: <2056529441.866.1543301522860.JavaMail.jenkins@jenkins.osmocom.org> References: <2056529441.866.1543301522860.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <198589099.889.1543387923010.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.05 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Nov 28 08:46:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 28 Nov 2018 08:46:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/SS_Templates.ttcn: add SS_USSD_FACILITY_INVOKE templates In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11959 ) Change subject: library/SS_Templates.ttcn: add SS_USSD_FACILITY_INVOKE templates ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic561b6b2eee7315d42fcd5ec5fef182ae097d3b7 Gerrit-Change-Number: 11959 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 28 Nov 2018 08:46:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 08:46:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 28 Nov 2018 08:46:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR_Tests.ttcn: introduce TC_mo_sss_reject In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11960 ) Change subject: HLR_Tests.ttcn: introduce TC_mo_sss_reject ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I147b919d0242b3b44e39a4587bf1b4660fa58bd2 Gerrit-Change-Number: 11960 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 28 Nov 2018 08:46:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 08:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 28 Nov 2018 08:46:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/SS_Templates.ttcn: add SS_USSD_FACILITY_INVOKE templates In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11959 ) Change subject: library/SS_Templates.ttcn: add SS_USSD_FACILITY_INVOKE templates ...................................................................... library/SS_Templates.ttcn: add SS_USSD_FACILITY_INVOKE templates Change-Id: Ic561b6b2eee7315d42fcd5ec5fef182ae097d3b7 --- M library/SS_Templates.ttcn 1 file changed, 41 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/SS_Templates.ttcn b/library/SS_Templates.ttcn index 1129108..6d8fcf2 100644 --- a/library/SS_Templates.ttcn +++ b/library/SS_Templates.ttcn @@ -122,6 +122,47 @@ } } +template (value) SS_FacilityInformation ts_SS_FACILITY_INVOKE( + integer invoke_id := 1, + SS_Op_Code op_code, + OCT1 ss_code +) := { + { + invoke := { + invokeId := { present_ := invoke_id }, + linkedId := omit, + opcode := { local := enum2int(op_code) }, + argument := { + sS_ForBS_Code := { + ss_Code := ss_code, + basicService := omit, + longFTN_Supported := omit + } + } + } + } +} +template SS_FacilityInformation tr_SS_FACILITY_INVOKE( + template integer invoke_id := 1, + template integer op_code := ?, + template OCT1 ss_code := ? +) := { + { + invoke := { + invokeId := { present_ := invoke_id }, + linkedId := omit, + opcode := { local := op_code }, + argument := { + sS_ForBS_Code := { + ss_Code := ss_code, + basicService := omit, + longFTN_Supported := omit + } + } + } + } +} + template (value) SS_FacilityInformation ts_SS_USSD_FACILITY_RETURN_RESULT( integer invoke_id := 1, SS_Op_Code op_code := SS_OP_CODE_PROCESS_USS_REQ, -- To view, visit https://gerrit.osmocom.org/11959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic561b6b2eee7315d42fcd5ec5fef182ae097d3b7 Gerrit-Change-Number: 11959 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 08:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 28 Nov 2018 08:46:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: HLR_Tests.ttcn: introduce TC_mo_sss_reject In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11960 ) Change subject: HLR_Tests.ttcn: introduce TC_mo_sss_reject ...................................................................... HLR_Tests.ttcn: introduce TC_mo_sss_reject As at the moment, OsmoHLR doesn't support "structured" SS, such requests are being rejected. This test case aims to verify that. Change-Id: I147b919d0242b3b44e39a4587bf1b4660fa58bd2 Related: OS#3651 --- M hlr/HLR_Tests.ttcn M hlr/expected-results.xml 2 files changed, 51 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index 29af522..f7902be 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -995,6 +995,53 @@ vc_EUSE.stop; } +/** + * Test "Structured" Supplementary Services + * + * NOTE: at the moment, OsmoHLR doesn't support "structured" SS, + * so such requests are being rejected (actually ReturnError + * with GSM0480_ERR_CODE_FACILITY_NOT_SUPPORTED). + */ +private function f_TC_mo_sss_reject() runs on HLR_ConnHdlr { + var SS_FacilityInformation ss_req; + + /* Prepare '*#21#' SS request */ + ss_req := valueof(ts_SS_FACILITY_INVOKE( + invoke_id := 0, + op_code := SS_OP_CODE_INTERROGATE_SS, + ss_code := '21'O)); + + /* Send it towards HLR */ + GSUP.send(valueof(ts_GSUP_PROC_SS_REQ( + g_pars.sub.imsi, + g_pars.ussd.sid, + OSMO_GSUP_SESSION_STATE_BEGIN, + enc_SS_FacilityInformation(ss_req)))); + + /* Expect ReturnError with FACILITY_NOT_SUPPORTED */ + f_SS_expect(g_pars.sub.imsi, + g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END, + tr_SS_FACILITY_RETURN_ERROR(0, 21)); +} +testcase TC_mo_sss_reject() runs on test_CT { + var HLR_ConnHdlrPars pars; + var HLR_ConnHdlr vc_conn; + var HlrSubscriber sub; + + f_init(false); + + /* Create a random subscriber */ + sub := valueof(t_Sub2G(f_rnd_imsi('26242'H), + '49161'H & f_rnd_hexstring(7, 9), "comp128v1")); + pars := valueof(t_Pars_sub(sub)); + pars.ussd.sid := f_rnd_octstring(4); + + f_vty_subscr_create(VTY, sub); + vc_conn := f_start_handler(refers(f_TC_mo_sss_reject), pars); + vc_conn.done; + f_vty_subscr_delete(VTY, sub); +} + /* TODO USSD: * MO USSD for IMSI of non-existant subscriber @@ -1035,6 +1082,9 @@ execute( TC_mo_ussd_euse() ); execute( TC_mo_ussd_euse_continue() ); execute( TC_mo_ussd_euse_defaultroute() ); + + /* "Structured" Supplementary Services */ + execute( TC_mo_sss_reject() ); }; }; diff --git a/hlr/expected-results.xml b/hlr/expected-results.xml index 5431b78..8a1ed26 100644 --- a/hlr/expected-results.xml +++ b/hlr/expected-results.xml @@ -17,4 +17,5 @@ + -- To view, visit https://gerrit.osmocom.org/11960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I147b919d0242b3b44e39a4587bf1b4660fa58bd2 Gerrit-Change-Number: 11960 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 09:34:08 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 09:34:08 +0000 Subject: Change in osmo-msc[master]: add manuals from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has abandoned this change. ( https://gerrit.osmocom.org/11726 ) Change subject: add manuals from osmo-gsm-manuals.git ...................................................................... Abandoned Imported with the full git history, as suggested by Neels. -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:13 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:13 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoBSC files (now avail in osmo-bsc.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11961 Change subject: remove OsmoBSC files (now avail in osmo-bsc.git) ...................................................................... remove OsmoBSC files (now avail in osmo-bsc.git) Files were added in osmo-bsc.git Change-Id I92c0f771d4ffc2b0401d26e25cb0b3817e6f95ea Depends: osmo-bsc.git Change-Id I92c0f771d4ffc2b0401d26e25cb0b3817e6f95ea Related: OS#3385 Change-Id: Ib7e60990b59eeb1c5904fdcbd0c01d4a1f46fec6 --- M Makefile.am D OsmoBSC/Makefile.am D OsmoBSC/aoip-mgw-options-docinfo.xml D OsmoBSC/aoip-mgw-options.adoc D OsmoBSC/chapters/bts-examples.adoc D OsmoBSC/chapters/control.adoc D OsmoBSC/chapters/counters.adoc D OsmoBSC/chapters/counters_generated.adoc D OsmoBSC/chapters/handover.adoc D OsmoBSC/chapters/handover_inter_bsc.dot D OsmoBSC/chapters/handover_intra_bsc.dot D OsmoBSC/chapters/overview.adoc D OsmoBSC/chapters/running.adoc D OsmoBSC/message-sequences/mo_call-abis_a.msc D OsmoBSC/mgw/classic-bsc.msc D OsmoBSC/mgw/osmo-bsc-new-mgw-e1.msc D OsmoBSC/mgw/osmo-bsc-new-mgw.msc D OsmoBSC/mgw/osmo-bsc-old-sccplite.msc D OsmoBSC/om2000/README D OsmoBSC/om2000/om2k-bts.msc D OsmoBSC/om2000/om2k-mo-cf.msc D OsmoBSC/om2000/om2k-mo-is.msc D OsmoBSC/om2000/om2k-mo-rx.msc D OsmoBSC/om2000/om2k-mo-tf.msc D OsmoBSC/om2000/om2k-mo-trxc.msc D OsmoBSC/om2000/om2k-mo-ts.msc D OsmoBSC/om2000/om2k-mo-tx.msc D OsmoBSC/om2000/om2k-trx.msc D OsmoBSC/osmobsc-usermanual-docinfo.xml D OsmoBSC/osmobsc-usermanual.adoc D OsmoBSC/osmobsc-vty-reference.xml D OsmoBSC/osmux-reference-docinfo.xml D OsmoBSC/osmux-reference.adoc D OsmoBSC/vty/bsc_vty_additions.xml D OsmoBSC/vty/bsc_vty_reference.xml D OsmoBSC/vty/libbsc_vty_additions.xml M configure.ac 37 files changed, 0 insertions(+), 8,030 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/61/11961/1 -- To view, visit https://gerrit.osmocom.org/11961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7e60990b59eeb1c5904fdcbd0c01d4a1f46fec6 Gerrit-Change-Number: 11961 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:14 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:14 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoBTS files (now avail in osmo-bts.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11962 Change subject: remove OsmoBTS files (now avail in osmo-bts.git) ...................................................................... remove OsmoBTS files (now avail in osmo-bts.git) Files were added in osmo-bts.git Change-Id I728ebb56ade6dda079a0744c4e592284e1bea4f6 Depends: osmo-bts.git Change-Id I728ebb56ade6dda079a0744c4e592284e1bea4f6 Related: OS#3385 Change-Id: I34426309cb009229069e1472fac86efab38a2f6e --- M Makefile.am D OsmoBTS/Makefile.am D OsmoBTS/abis/abis-startup.msc D OsmoBTS/abis/dyn_ts_ipa_style1.msc D OsmoBTS/abis/dyn_ts_ipa_style2.msc D OsmoBTS/abis/dyn_ts_osmocom_style1.msc D OsmoBTS/abis/dyn_ts_osmocom_style2.msc D OsmoBTS/abis/ipa.adoc D OsmoBTS/abis/oml-mo-bts.msc D OsmoBTS/abis/oml-mo-carrier.msc D OsmoBTS/abis/oml-mo-channel.msc D OsmoBTS/abis/oml-mo-sitemgr.msc D OsmoBTS/abis/oml-mo-transceiver.msc D OsmoBTS/abis/oml-startup.msc D OsmoBTS/abis/oml-startup2.msc D OsmoBTS/abis/oml-startup3.msc D OsmoBTS/abis/oml.adoc D OsmoBTS/abis/rsl-startup-pri.msc D OsmoBTS/abis/rsl-startup-sec.msc D OsmoBTS/abis/rsl-tch-rtp.msc D OsmoBTS/abis/rsl.adoc D OsmoBTS/abis/rtp.adoc D OsmoBTS/chapters/architecture.adoc D OsmoBTS/chapters/bts-models.adoc D OsmoBTS/chapters/configuration.adoc D OsmoBTS/chapters/control.adoc D OsmoBTS/chapters/dynamic-timeslots.adoc D OsmoBTS/chapters/interfaces.adoc D OsmoBTS/chapters/overview.adoc D OsmoBTS/dtx.dot D OsmoBTS/osmobts-abis-docinfo.xml D OsmoBTS/osmobts-abis.adoc D OsmoBTS/osmobts-usermanual-docinfo.xml D OsmoBTS/osmobts-usermanual.adoc D OsmoBTS/osmobts-vty-reference.xml D OsmoBTS/rtp-amr-docinfo.xml D OsmoBTS/rtp-amr.adoc D OsmoBTS/vty/bts_vty_additions.xml D OsmoBTS/vty/bts_vty_reference.xml M configure.ac 40 files changed, 0 insertions(+), 7,054 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/62/11962/1 -- To view, visit https://gerrit.osmocom.org/11962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I34426309cb009229069e1472fac86efab38a2f6e Gerrit-Change-Number: 11962 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:15 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:15 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoGGSN files (now avail in osmo-ggsn.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11963 Change subject: remove OsmoGGSN files (now avail in osmo-ggsn.git) ...................................................................... remove OsmoGGSN files (now avail in osmo-ggsn.git) Files were added in osmo-ggsn.git Change-Id I14533676d5774ee0d0ee5054ba77d7dac32cff43 Depends: osmo-ggsn.git Change-Id I14533676d5774ee0d0ee5054ba77d7dac32cff43 Related: OS#3385 Change-Id: I4b9e2836a74b84bfc73ea7048a137ab5253d9045 --- M Makefile.am D OsmoGGSN/Makefile.am D OsmoGGSN/chapters/configuration.adoc D OsmoGGSN/chapters/overview.adoc D OsmoGGSN/chapters/running.adoc D OsmoGGSN/osmoggsn-usermanual-docinfo.xml D OsmoGGSN/osmoggsn-usermanual.adoc D OsmoGGSN/osmoggsn-vty-reference.xml D OsmoGGSN/vty/ggsn_vty_additions.xml D OsmoGGSN/vty/ggsn_vty_reference.xml M configure.ac 11 files changed, 0 insertions(+), 2,169 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/63/11963/1 diff --git a/Makefile.am b/Makefile.am index 1275358..dec4024 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) SUBDIRS = tests \ - OsmoGGSN \ OsmoGSMTester \ OsmoHLR \ OsmoMGCP \ diff --git a/OsmoGGSN/Makefile.am b/OsmoGGSN/Makefile.am deleted file mode 100644 index 4cbff6d..0000000 --- a/OsmoGGSN/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmoggsn-usermanual.adoc \ - osmoggsn-usermanual-docinfo.xml \ - osmoggsn-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmoggsn-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmoggsn-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGGSN/chapters/configuration.adoc b/OsmoGGSN/chapters/configuration.adoc deleted file mode 100644 index 657a014..0000000 --- a/OsmoGGSN/chapters/configuration.adoc +++ /dev/null @@ -1,335 +0,0 @@ -== Configuring OsmoGGSN - -All configuration of OsmoGGSN is performed using the VTY. For more -general information on the VTY interface, see <>. - -=== Configuring a virtual GGSN instance - -OsmoGGSN can run multiple GGSN instances inside one program/process. -Each GGSN instance binds to its own transport-layer GTP IP address and -has its own set of APNs and associated IP address pools + tun/gtp -devices. - -In most usage cases, yo will only have a single GGSN instance inside -your configuration file, like in below example: - -.Example: Single GGSN configuration section ----- -ggsn ggsn0 - gtp state-dir /tmp - gtp bind-ip 127.0.0.6 - apn internet - gtpu-mode tun - tun-device tun4 - type-support v4 - ip prefix dynamic 176.16.222.0/24 - ip dns 0 192.168.100.1 - ip dns 1 8.8.8.8 - ip ifconfig 176.16.222.0/24 - no shutdown ----- - - -==== Creating/Editing a GGSN instance - -Creating/Editing a GGSN instance can be done by the following sequence -of VTY commands: - ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# <4> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Create or edit the GGSN instance `ggsn0`. The name can be any ASCII - string, its significance is only to the local user. -<4> Your prompt is now in the `ggsn` config node, where you can - configure the properties of this GGSN instance. - -NOTE:: After creating a new GGSN instance, it is in `shutdown` mode. See -<> to take it out of shutdown, but make sure to configure it fully -before taking it out of shutdown. - -==== Configuring a GGSN instance - -The following two mandatory configuration statements have to be given -for every GGSN instance: - ----- -OsmoGGSN(config-ggsn)# gtp state-dir /var/lib/ggsn/ggsn0 <1> -OsmoGGSN(config-ggsn)# gtp bind-ip 127.0.0.6 <2> ----- -<1> Store the GSN restart state in the specified directory -<2> Bind the GGSN instance to the specified local IPv4 address - -There are some further configuration statements that can be used at the -GGSN node, some examples are given below. For a full list, see the -_OsmoGGSN VTY reference manual_ <>. - ----- -OsmoGGSN(config-ggsn)# default-apn foobar <1> ----- -<1> Configure a default APN to be used if the user-requested APN is not - found. The named APN must previously be configured - - -==== Deleting a GGSN instance - -A GGSN instance can be removed like this - -.Example: Deleting a GGSN instance ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# no ggsn ggsn0 <3> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Delete the GGSN instance - - -==== Taking a GGSN instance out of shutdown - -.Example: Taking a GGSN instance out of shutdown ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# no shutdown ggsn <4> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config ndoe of the GGSN instance `ggsn0` -<4> Take the GGSN instance out of shutdown - - -==== Shutting a GGSN instance down - -If you would like to take a GGSN instance out of service, you can -put it into shutdown mode. This will make the entire GGSN unavailable -to user traffic and permit you to e.g. reconfigure it before taking it -out of shutdown again. - -.Example: Shutting down a GGSN instance ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# shutdown ggsn <4> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config ndoe of the GGSN instance `ggsn0` -<4> Shut down the GGSN instance - - -=== Configuring an Access Point Name - -An Access Point Name (APN) represents a connection to an external packet -data network, such as the public Internet or private corporate networsk. - -APNs are selected by terminals (MS/UE) when establishing PDP contexts. - -Each OsmoGGSN GGSN instance can have any number of APNs configured. -Each APN is identified by a string name. - -==== Creating/Editing an APN - -.Example: Creating a new APN ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# apn internet <4> -OsmoGGSN(config-ggsn-apn)# <5> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config node of the GGSN instance `ggsn0` -<4> Create or Edit an APN called `internet` -<5> Your prompt is now in the `ggsn` config node, where you can - configure the properties of this GGSN instance. - -NOTE:: The newly-create APN is created in `shutdown` mode. See <> to take it -out of shutdown. - - -==== Configuring an APN - -.Example: Configuring an APN ----- -OsmoGGSN(config-ggsn-apn)# gtpu-mode tun <1> -OsmoGGSN(config-ggsn-apn)# type-support v4 <2> -OsmoGGSN(config-ggsn-apn)# ip prefix dynamic 176.16.222.0/24 <3> -OsmoGGSN(config-ggsn-apn)# ip dns 0 192.168.100.1 <4> -OsmoGGSN(config-ggsn-apn)# ip dns 1 8.8.8.8 <5> -OsmoGGSN(config-ggsn-apn)# ip ifconfig 176.16.222.0/24 <6> ----- -<1> Use the userspace GTP-U handling using a TUN device -<2> Support (only) IPv4 Addresses -<3> Specify the pool of dynamic IPv4 addresses to be allocated to PDP - contexts -<4> Specify the primary DNS server to be provided using IPCP/PCO -<5> Specify the secondary DNS server to be provided using IPCP/PCO -<6> Request OsmoGGSN to configure the `tun4` device network/netmask - -NOTE:: If you use the optional `ip ifconfig` command to set the network -device address/mask, OsmoGGSN must run with root or `CAP_NET_ADMIN` -support. It might be better to configure related tun devices at system -startup and run OsmoGGSN as non-privileged user. See <> for more -details. - - -==== Deleting an APN - -An APN configuration can be removed like this - -.Example: Deleting an APN ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# no apn internet <4> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config node of the GGSN instance `ggsn0` -<4> Delete the APN `internet` - -[[unshutdown_apn]] -==== Taking an APN out of shutdown - -In order to bring a deactived APN in `shutdown` state into active -operation, use the `no shutdown` command at the APN node as explained in -the following example: - -.Example: Taking an APN out of shutdown ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# apn internet <4> -OsmoGGSN(config-ggsn-apn)# no shutdown <5> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config ndoe of the GGSN instance `ggsn0` -<4> Enter the config ndoe of the APN `internet` -<5> Take the APN out of shutdown - - -==== Shutting an APN down - -If you would like to take an APN instance out of service, you can -put it into shutdown mode. This will make the APN unavailable -to user traffic and permit you to e.g. reconfigure it before taking it -out of shutdown again. - -.Example: Shutting down an APN ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# apn internet <4> -OsmoGGSN(config-ggsn-apn)# shutdown <5> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config ndoe of the GGSN instance `ggsn0` -<4> Enter the config ndoe of the APN `internet` -<5> Shut down the APN - -[[ggsn_no_root]] -=== Configuring for running without root privileges - -It's possible to run OsmoGGSN without root privileges if the tun devices are already configured. - -The interface creation + configuration must then happen before osmo-ggsn starting up. This can be -achieved by means such as - -* a custom shell script run as root before starting osmo-ggsn (e.g. as init script) -* systemd .netdev and .network files, if your system is using systemd-networkd (see `networkctl status`). - -==== Manual TUN device creation / configuration - -If you chose to go for custom shell/init scripts, you may use the `ip` program which is the standard -tool for network interface configuration on Linux, part of the `iproute2` package. In order to -create a tun device, you must call it like this: - -.Example: iproute2 command to create a tun device ----- -# ip tuntap add dev apn0 mode tun user username group groupname ----- - -Where _username_ and _groupname_ correspond to the User and Group that will have ownership over the -device, i.e. the privileges which you intend to run osmo-ggsn under, and _apn0_ will be the -name of the network device created. After creating the interface, you can configure its addresses -using standard means like `ip addr add` or your distribution-specific utilities/tools -to match the `ip prefix dynamic` config item, and activate the link, for example: - ----- -# ip addr add 192.168.7.0/24 dev apn0 -# ip link set apn0 up ----- - -==== systemd based TUN device creation+configuration - -If you want to have systemd take care of creating and configuring a tun device for you, -you can use the below example config files. - -.Example: device config via systemd-networkd using apn0.netdev ----- -[NetDev] -Name=apn0 <1> -Kind=tun - -[Tun] -User=username <2> -Group=username <3> ----- -<1> The network interface name of the newly-created device -<2> The username under which you will run OsmoGGSN -<3> The group name under which you will run OsmoGGSN - -.Example: network settings via systemd-networkd using ggsn.network ----- -[Match] -Name=apn0 <1> - -[Network] -Address=192.168.7.1 <2> -IPMasquerade=yes <3> ----- -<1> The netowrk device name, which must match the one in the apn0.netdev unit file above -<2> The local IP address configured on the device -<3> Requesting systemd to configure IP masquerading for this interface. Depending on your needs, - You may not want this if you have proper end-to-end routing set up, and want to have transparent - inbound IP access to your GPRS-attached devices. - -==== Config Changes - -With the tun device pre-configured in one of the ways outlined above, the main -changes in your osmo-ggsn.cfg file are: - -* remove `ip ifconfig` directive, -* make sure that `no shutdown` is present in the `apn` section as well as - `no shutdown ggsn` in the `ggsn` section. - -.Example: using externally configured tun device `apn0` as non-root ----- -ggsn ggsn0 - gtp state-dir /tmp - gtp bind-ip 127.0.0.6 - apn internet - gtpu-mode tun - tun-device apn0 - type-support v4 - ip prefix dynamic 192.168.7.0/24 - ip dns 0 192.168.100.1 - ip dns 1 8.8.8.8 - no shutdown - default-apn internet - no shutdown ggsn ----- diff --git a/OsmoGGSN/chapters/overview.adoc b/OsmoGGSN/chapters/overview.adoc deleted file mode 100644 index 632db5e..0000000 --- a/OsmoGGSN/chapters/overview.adoc +++ /dev/null @@ -1,145 +0,0 @@ -[[chapter_introduction]] -== Overview - -[[intro_overview]] -=== About OsmoGGSN - -OsmoGGSN is a Free / Open Source Software implementation of the GPRS -GGSN (Gateway GPRS support node) element in side the packet switched -core network of 2G and 3G cellular networks. - -The GGSN function is the tunnel endpoint on the core network side, -from where the external (IP) packet data network - -=== Software Components - -==== GTP Implementation (libgtp) - -The OsmoGGSN source code includes a shared library implementation of -the GTP protocol used on the GGSN-SGSN interface. This library -and associated header files are installed system-wide and are -available to other programs/applications. - -In fact, libgtp is what the OsmoSGSN also uses for its use of GTP. - -==== sgsnemu - -In order to test OsmoGGSN without running a SGSN and other elements -of a cellular network, there is a small command-line utility called -*sgsnemu* which is able to simulate the customary operations of a SGSN -towards the GGSN, such as a PDP Context Activation. - -*sgsnemu* can even be used for testing against other GGSNs, as the GTP -protocol is standardized across implementations. - -==== osmo-ggsn - -*osmo-ggsn* is the actual name of the OsmoGGSN executable program. It -implements the GGSN functionality. All parameters are set using the -configuration file, by default located in *./osmo-ggsn.cfg* - -==== systemd service file - -In *contrib/osmo-ggsn.service* you can find a sample service file for -OsmoGGSN which can be used with systemd. - -==== init script - -In *contrib/osmo-ggsn.init* you can find a sample init script to be used -on systems with classic init process. - -=== Limitations - -OsmoGGSN supports both GTP0 (GSM 09.60) and GTP1 (3GPP 29.060). In the -following tables the support of each individual message type is -detailed. The numbers before each feature indicates the relevant -section in the standard. - -==== GSM 09.60 (GTPv0) - -[options="header",cols="50%,15%,15%,15%,5%"] -|=== -| Feature | gtplib | osmo-ggsn | sgsnemu | notes -5+<|*7.4 Path Management Messages* -|7.4.1 Echo Request |Supported |Supported |Supported | -|7.4.2 Echo Response |Supported |Supported |Supported | -|7.4.3 Version Not Supported |Supported |Supported |Supported | -5+<| *7.5 Tunnel Management Messages* -|7.5.1 Create PDP Context Request|Supported |Supported |Supported | -|7.5.2 Create PDP Context Response|Supported |Supported |Supported | -|7.5.3 Update PDP Context Request|Supported |Supported |Not | -|7.5.4 Update PDP Context Response|Supported |Supported |Not | -|7.5.5 Delete PDP Context Request|Supported |Supported |Supported | -|7.5.6 Delete PDP Context Response|Supported |Supported |Supported | -|7.5.7 Create AA PDP Context Request|Unsupported |Unsupported |Unsupported | -|7.5.8 Create AA PDP Response|Unsupported |Unsupported |Unsupported | -|7.5.9 Delete AA PDP Context Request|Unsupported |Unsupported |Unsupported | -|7.5.10 Delete AA PDP Context Response|Unsupported |Unsupported |Unsupported | -|7.5.11 Error Indication |Supported |Supported |Supported | -|7.5.12 PDU Notification Request|Unsupported |Unsupported |Unsupported | -|7.5.13 PDU Notification Response|Unsupported |Unsupported |Unsupported | -|7.5.14 PDU Notification Reject Request|Unsupported |Unsupported |Unsupported | -|7.5.15 PDU Notification Reject Response|Unsupported |Unsupported |Unsupported | -5+<| *7.6 Location Management Messages* -|7.6.1 Send Routeing Information for GPRS Request|Unsupported |Unsupported |Not applicable | -|7.6.2 Send Routeing Information for GPRS Response|Unsupported |Unsupported |Not applicable | -|7.6.3 Failure Report Request|Unsupported |Unsupported |Not applicable | -|7.6.3 Failure Report Response|Unsupported |Unsupported |Not applicable | -|7.6.5 Note MS GPRS Present Request|Unsupported |Unsupported |Not applicable| -|7.6.6 Note MS GPRS Present Response|Unsupported |Unsupported |Not applicable| -5+<| *7.5 Mobility Management Messages* -|7.5.1 Identification Request|Unsupported |Not applicable|Not applicable| -|7.5.2 Identification Response|Unsupported |Not applicable|Not applicable | -|7.5.3 SGSN Context Request|Unsupported |Not applicable|Not applicable| -|7.5.4 SGSN Context Response|Unsupported |Not applicable|Not applicable| -|7.5.5 SGSN Context Acknowledge|Unsupported |Not applicable|Not applicable| -|=== - -==== 3GPP 29.060 (GTPv1) - -[options="header",cols="50%,15%,15%,15%,5%"] -|=== -|Feature |gtplib |osmo-ggsn |sgsnemu |notes -5+<|*7.2 Path Management Messages* -|7.2.1 Echo Request |Supported |Supported |Supported | -|7.2.2 Echo Response |Supported |Supported |Supported | -|7.2.3 Version Not Supported|Supported |Supported |Supported | -|7.2.4 Extension Headers Notification|Supported |Supported |Supported | -5+<|*7.3 Tunnel Management Messages* -|7.3.1 Create PDP Context Request|Supported |Supported |Supported |1 -|7.3.2 Create PDP Context Response|Supported |Supported |Supported | -|7.3.3 Update PDP Context Request|Supported |Supported |Not applicable|1 -|7.3.4 Update PDP Context Response|Supported |Supported |Not applicable| -|7.3.5 Delete PDP Context Request|Supported |Supported |Supported | -|7.3.6 Delete PDP Context Response|Supported |Supported |Supported | -|7.3.7 Error Indication |Supported |Supported |Supported | -|7.3.8 PDU Notification Request|Unsupported |Unsupported |Unsupported | -|7.3.9 PDU Notification Response|Unsupported |Unsupported |Unsupported | -|7.3.10 PDU Notification Reject Request|Unsupported |Unsupported |Unsupported | -|7.3.10 PDU Notification Reject Response|Unsupported |Unsupported |Unsupported | -5+<|*7.4 Location Management Messages* -|7.4.1 Send Routeing Information for GPRS Request|Unsupported |Unsupported |Not applicable | -|7.4.2 Send Routeing Information for GPRS Response|Unsupported |Unsupported |Not applicable | -|7.4.3 Failure Report Request|Unsupported |Unsupported |Not applicable| -|7.4.3 Failure Report Response|Unsupported |Unsupported |Not applicable| -|7.4.5 Note MS GPRS Present Request|Unsupported |Unsupported |Not applicable| -|7.4.6 Note MS GPRS Present Response|Unsupported |Unsupported |Not applicable| -5+<|*7.5 Mobility Management Messages* -|7.5.1 Identification Request|Unsupported |Not applicable|Not applicable| -|7.5.2 Identification Response|Unsupported |Not applicable |Not applicable| -|7.5.3 SGSN Context Request|Unsupported |Not applicable|Not applicable| -|7.5.4 SGSN Context Response|Unsupported |Not applicable |Not applicable| -|7.5.5 SGSN Context Acknowledge|Unsupported |Not applicable|Not applicable| -|7.5.6 Forward Relocation Request|Unsupported |Not applicable|Not applicable| -|7.5.7 Forward Relocation Response|Unsupported |Not applicable|Not applicable| -|7.5.8 Forward Relocation Complete|Unsupported |Not applicable|Not applicable| -|7.5.9 Relocation Cancel Request|Unsupported |Not applicable|Not applicable| -|7.5.10 Relocation Cancel Response|Unsupported |Not applicable|Not applicable| -|7.5.11 Forward Relocation Complete |Unsupported |Not applicable |Not applicable | -|7.5.12 Forward SRNS Context Acknowledge|Unsupported |Not applicable|Not applicable| -|7.5.13 Forward SRNS Context|Unsupported |Not applicable|Not applicable| -|=== - -Notes - -1) The "Secondary PDP Context Activation Procedure" is not supported. diff --git a/OsmoGGSN/chapters/running.adoc b/OsmoGGSN/chapters/running.adoc deleted file mode 100644 index 83470e8..0000000 --- a/OsmoGGSN/chapters/running.adoc +++ /dev/null @@ -1,82 +0,0 @@ -== Running OsmoGGSN - -The OsmoGGSN executable (`osmo-ggsn`) offers the following command-line -arguments: - -=== SYNOPSIS - -*osmo-ggsn* [-h|-V] [-D] [-c 'CONFIGFILE'] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-ggsn.cfg` in the current - working directory. - -=== Routing - -Operating the OpenGGSN tun device naturally creates a network setup with -multiple interfaces. Consider: - -* Typical Linux setups prevent forwarding of packets between separate - interfaces by default. To let subscribers reach the internet uplink from the - tun device, it may be required to enable IP forwarding. - -* Having a locally defined address range assigned to the tun device requires - either sensible routing for this address range, or that masquerading is - enabled to allow your single uplink IP address to "proxy" for the tun. - -These are decisions to be made on a network administration level. - -In a trivial case where you have a single box serving GPRS to few subscribers -on an arbitrary IP address range not known in the larger network, the easiest -way to enable GPRS uplink would be to enable IP forwarding and masquerading. - -To manually enable IPv4 forwarding and masquerading ad-hoc, you can do: - ----- -sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward" -iptables -t nat -A POSTROUTING -o '*' -j MASQUERADE ----- - -(You may want to replace `*` with the network device name, like `-o eth0`) - -There are various ways to enable these settings persistently, please refer to -your distribution's documentation -- e.g. look for @net.ipv4.ip_forward=1@ in -@/etc/sysctl.d/@, and https://wiki.debian.org/iptables for masquerading. - -=== Multiple instances - -Running multiple instances of `osmo-ggsn` is possible if all GGSN instances -are binding to different local IP addresse and all other interfaces (VTY, -OML) are separated using the appropriate configuration options. The IP based -interfaces are binding to local host by default. In order to separate the -processes, the user has to bind those services to specific but different -IP addresses. - -The VTY and the control interface can be bound to IP addresses from the loopback -address range. - -.Example: Binding VTY and control interface to a specific ip-address ----- -line vty - bind 127.0.0.2 -ctrl - bind 127.0.0.2 ----- - -Also make sure to place each instance's GTP bind on a separate IP address (GTP -uses a port number that is fixed in the GTP specifications, so it will not be -possible to pick differing ports on the same IP address), like: - ----- -ggsn ggsn0 - gtp bind-ip 127.0.0.2 ----- diff --git a/OsmoGGSN/osmoggsn-usermanual-docinfo.xml b/OsmoGGSN/osmoggsn-usermanual-docinfo.xml deleted file mode 100644 index c93d5e1..0000000 --- a/OsmoGGSN/osmoggsn-usermanual-docinfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1 - August 2017 - HW - - Initial version. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2013-2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoGGSN/osmoggsn-usermanual.adoc b/OsmoGGSN/osmoggsn-usermanual.adoc deleted file mode 100644 index 9bc3885..0000000 --- a/OsmoGGSN/osmoggsn-usermanual.adoc +++ /dev/null @@ -1,29 +0,0 @@ -OsmoGGSN User Manual -==================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -//include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - - -include::{srcdir}/chapters/configuration.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoGGSN/osmoggsn-vty-reference.xml b/OsmoGGSN/osmoggsn-vty-reference.xml deleted file mode 100644 index 3ad7e83..0000000 --- a/OsmoGGSN/osmoggsn-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 06th September 2017 - hw - Initial version as of OsmoGGSN v1.0.0 - - - - OsmoGGSN VTY Reference - - - 2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoGGSN/vty/ggsn_vty_additions.xml b/OsmoGGSN/vty/ggsn_vty_additions.xml deleted file mode 100644 index b0e8a39..0000000 --- a/OsmoGGSN/vty/ggsn_vty_additions.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - Telnet/VTY Configuration Node - - Configure parameters of the Telnet/VTY Interface, such as to which IP address it should bind/listen to. - - - - - CTRL Configuration Node - - Configure parameters of the CTRL Interface, such as to which IP address it should bind/listen to. - - - - - GGSN Instance Configuration Node - - Configure an Instance of a (virtual) GGSN - - - - - APN Configuration Node - - Configure an Access Point Name (APN) inside a GGSN Instance - - - diff --git a/OsmoGGSN/vty/ggsn_vty_reference.xml b/OsmoGGSN/vty/ggsn_vty_reference.xml deleted file mode 100644 index 7460026..0000000 --- a/OsmoGGSN/vty/ggsn_vty_reference.xml +++ /dev/null @@ -1,1447 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-ggsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-ggsn-apn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index 770df9e..cef7115 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,6 @@ osmo-gsm-manuals.pc Makefile tests/Makefile - OsmoGGSN/Makefile OsmoGSMTester/Makefile OsmoHLR/Makefile OsmoMGCP/Makefile -- To view, visit https://gerrit.osmocom.org/11963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b9e2836a74b84bfc73ea7048a137ab5253d9045 Gerrit-Change-Number: 11963 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:15 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:15 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoHLR files (now avail in osmo-hlr.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11964 Change subject: remove OsmoHLR files (now avail in osmo-hlr.git) ...................................................................... remove OsmoHLR files (now avail in osmo-hlr.git) Files were added in osmo-hlr.git Change-Id I52b7b06fddd77c6dc272004f434e9e7651f6b349 Depends: osmo-hlr.git Change-Id I52b7b06fddd77c6dc272004f434e9e7651f6b349 Related: OS#3385 Change-Id: Ice3f24888deed8affec40d5d91d71d5e1f3827c8 --- M Makefile.am D OsmoHLR/Makefile.am D OsmoHLR/chapters/control.adoc D OsmoHLR/chapters/overview.adoc D OsmoHLR/chapters/running.adoc D OsmoHLR/chapters/subscribers.adoc D OsmoHLR/chapters/ussd.adoc D OsmoHLR/example_subscriber_add_update_delete.vty D OsmoHLR/example_subscriber_cs_ps_enabled.ctrl D OsmoHLR/example_subscriber_info.ctrl D OsmoHLR/osmohlr-usermanual-docinfo.xml D OsmoHLR/osmohlr-usermanual.adoc D OsmoHLR/osmohlr-vty-reference.xml D OsmoHLR/vty/hlr_vty_additions.xml D OsmoHLR/vty/hlr_vty_reference.xml M configure.ac 16 files changed, 0 insertions(+), 1,895 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/64/11964/1 diff --git a/Makefile.am b/Makefile.am index dec4024..d13b2e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,6 @@ EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) SUBDIRS = tests \ OsmoGSMTester \ - OsmoHLR \ OsmoMGCP \ OsmoMGW \ OsmoNAT \ diff --git a/OsmoHLR/Makefile.am b/OsmoHLR/Makefile.am deleted file mode 100644 index 25d782d..0000000 --- a/OsmoHLR/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = example_subscriber_add_update_delete.vty \ - example_subscriber_cs_ps_enabled.ctrl \ - example_subscriber_info.ctrl \ - osmohlr-usermanual.adoc \ - osmohlr-usermanual-docinfo.xml \ - osmohlr-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmohlr-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.vty $(srcdir)/*.ctrl -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmohlr-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc - -OSMO_HLR_PATH ?= ../../osmo-hlr -TMP_DB = generated/hlr.db - -update-examples: update-examples-ctrl update-examples-vty - -.PHONY: found-update-deps -found-update-deps: - @if [ ! -f "$(OSMO_HLR_PATH)/sql/hlr.sql" ]; then \ - echo "You need to define OSMO_HLR_PATH to point at an osmo-hlr.git"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo-hlr)" ]; then \ - echo "osmo-hlr needs to be installed / available in the PATH"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo_verify_transcript_ctrl.py)" ]; then \ - echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo_verify_transcript_vty.py)" ]; then \ - echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \ - exit 1; \ - fi - -update-examples-ctrl: found-update-deps - mkdir -p generated - rm -f "$(TMP_DB)" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/sql/hlr.sql" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/tests/test_subscriber.sql" - osmo_verify_transcript_ctrl.py \ - -r "osmo-hlr -l $(TMP_DB) -c /n/s/osmo/src/osmo-hlr/doc/examples/osmo-hlr.cfg" \ - -p 4259 --update *.ctrl - -update-examples-vty: found-update-deps - mkdir -p generated - rm -f "$(TMP_DB)" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/sql/hlr.sql" - osmo_verify_transcript_vty.py \ - -r "osmo-hlr -l $(TMP_DB) -c /n/s/osmo/src/osmo-hlr/doc/examples/osmo-hlr.cfg" \ - -p 4258 --update *.vty diff --git a/OsmoHLR/chapters/control.adoc b/OsmoHLR/chapters/control.adoc deleted file mode 100644 index 50fd314..0000000 --- a/OsmoHLR/chapters/control.adoc +++ /dev/null @@ -1,106 +0,0 @@ -[[hlr-ctrl]] -== Control interface - -The actual protocol is described in <>, the variables common -to all programs using it are described in <>. This section -describes the CTRL interface variables specific to OsmoHLR. - -All subscriber variables are available by different selectors, which are freely -interchangeable: - -.Subscriber selectors available on OsmoHLR's Control interface -[options="header",width="100%",cols="35%,65%"] -|=== -|Selector|Comment -|subscriber.*by-imsi-*'123456'.*|Subscriber selector by IMSI, replace "123456" with the actual IMSI -|subscriber.*by-msisdn-*'123456'.*|Subscriber selector by MSISDN -|subscriber.*by-id-*'123456'.*|Subscriber selector by database ID -|=== - -Each of the above selectors feature all of these control variables: - -.Subscriber variables available on OsmoHLR's Control interface -[options="header",width="100%",cols="35%,8%,8%,8%,41%"] -|=== -|Name|Access|Trap|Value|Comment -|subscriber.by-\*.*info*|R|No||List (short) subscriber information -|subscriber.by-\*.*info-aud*|R|No||List subscriber authentication tokens -|subscriber.by-\*.*info-all*|R|No||List both 'info' and 'info-aud' in one -|subscriber.by-\*.*cs-enabled*|RW|No|'1' or '0'|Enable/disable circuit-switched access -|subscriber.by-\*.*ps-enabled*|RW|No|'1' or '0'|Enable/disable packet-switched access -|=== - -=== subscriber.by-*.info, info-aud, info-all - -Query the HLR database and return current subscriber record, in multiple lines -of the format - ----- -namevalue ----- - -To keep the reply as short as possible, some values are omitted if they are -empty. These are the returned values and their presence -modalities; for their meaning, see <>: - -.Returned values by OsmoHLR's 'info', 'info-all' and 'info-aud' commands -[options="header",width="100%",cols="15%,15%,30%,40%"] -|=== -|Returned by 'info-all' and|Name|Format|Presence -|'info'|id|-9223372036854775808 .. 9223372036854775807 (usually not negative)|always -|'info'|imsi|6 to 15 decimal digits|always -|'info'|msisdn|1 to 15 decimal digits|when non-empty -|'info'|nam_cs|'1' if CS is enabled, or '0'|always -|'info'|nam_ps|'1' if PS is enabled, or '0'|always -|'info'|vlr_number|up to 15 decimal digits|when non-empty -|'info'|sgsn_number|up to 15 decimal digits|when non-empty -|'info'|sgsn_address||when non-empty -|'info'|ms_purged_cs|'1' if CS is purged, or '0'|always -|'info'|ms_purged_ps|'1' if PS is purged, or '0'|always -|'info'|periodic_lu_timer|0..4294967295|always -|'info'|periodic_rau_tau_timer|0..4294967295|always -|'info'|lmsi|8 hex digits|always -|'info-aud'|aud2g.algo|one of 'comp128v1', 'comp128v2', 'comp128v3' or 'xor'|when valid 2G auth data is set -|'info-aud'|aud2g.ki|32 hexadecimal digits|when valid 2G auth data is set -|'info-aud'|aud3g.algo|so far always 'milenage'|when valid 3G auth data is set -|'info-aud'|aud3g.k|32 hexadecimal digits|when valid 3G auth data is set -|'info-aud'|aud3g.op|32 hexadecimal digits|when valid 3G auth data is set, *not* when OPC is set -|'info-aud'|aud3g.opc|32 hexadecimal digits|when valid 3G auth data is set, *not* when OP is set -|'info-aud'|aud3g.ind_bitlen|0..28|when valid 3G auth data is set -|'info-aud'|aud3g.sqn|0 .. 18446744073709551615|when valid 3G auth data is set -|=== - -This is an example Control Interface transcript that illustrates the various -'info' commands: - ----- -include::../example_subscriber_info.ctrl[] ----- - -=== subscriber.by-*.ps-enabled, cs-enabled - -Disable or enable packet-/circuit-switched access for the given IMSI; - -* 'ps-enabled' switches access to GPRS or UMTS data services, -* 'cs-enabled' switches access to voice services. - -When disabled, the next time this subscriber attempts to do a Location Updating -GSUP operation for the given domain (i.e. from the SGSN for 'ps-enabled', from -the MSC/VLR for 'cs-enabled'), it will be rejected by OsmoHLR. Currently -connected GSUP clients will be notified via GSUP when a subscriber is being -disabled, so that the subscriber can be dropped in case it is currently -attached. - -The current 'ps-enabled'/'cs-enabled' status can be queried by 'GET' commands, -and also by looking at 'nam_ps' and 'nam_cs' in a 'subscriber.by-*.info' -response. - -A value of "1" indicates that the given domain is enabled, which is the -default; a value of "0" disables access. - -This is an example transcript that illustrates 'ps-enabled' and 'cs-enabled' -commands: - ----- -include::../example_subscriber_cs_ps_enabled.ctrl[] ----- diff --git a/OsmoHLR/chapters/overview.adoc b/OsmoHLR/chapters/overview.adoc deleted file mode 100644 index 45802ca..0000000 --- a/OsmoHLR/chapters/overview.adoc +++ /dev/null @@ -1,69 +0,0 @@ -[[overview]] -== Overview - -This manual should help you getting started with OsmoHLR. It will cover -aspects of configuring and running the OsmoHLR. - -[[intro_overview]] -=== About OsmoHLR - -OsmoHLR is Osmocom's minimal implementation of a Home Location Register (HLR) -for 2G and 3G GSM and UMTS mobile core networks. Its interfaces are: - -- GSUP, serving towards OsmoMSC and OsmoSGSN; -- A local SQLite database; -- The Osmocom typical telnet VTY and CTRL interfaces. - -Originally, the OpenBSC project's OsmoNITB all-in-one implementation had an -integrated HLR, managing subscribers and SMS in the same local database. Along -with the separate OsmoMSC and its new VLR component, OsmoHLR was implemented -from scratch to alleviate various shortcomings of the internal HLR: - -- The separate HLR allows using centralized subscriber management for both - circuit-switched and packet-switched domains (i.e. one OsmoHLR for both - OsmoMSC and OsmoSGSN). - -- VLR and HLR brought full UMTS AKA (Authentication and Key Agreement) support, - i.e. Milenage authentication in both the full 3G variant as well as the - backwards compatible 2G variant. - -- In contrast to the OsmoNITB, the specific way the new OsmoMSC's VLR accesses - OsmoHLR brings fully asynchronous subscriber database access. - -Find the OsmoHLR issue tracker and wiki online at - -- https://osmocom.org/projects/osmo-hlr -- https://osmocom.org/projects/osmo-hlr/wiki - - -[[fig-gsm]] -.Typical GSM network architecture used with OsmoHLR -[graphviz] ----- -digraph G { - rankdir=LR; - subgraph cluster_hlr { - label = "OsmoHLR"; - GSUP [label="GSUP server"] - DB [label="SQLite DB"] - GSUP->DB - DB->CTRL [dir="back"] - DB->VTY [dir="back"] - } - - Admin [label="Admin and\nMaintenance"] - SW [label="3rd party software\nintegration"] - VTY->Admin [dir="back"] - CTRL->SW [dir="back"] - - MSC [label="MSC/VLR"] - MSC->GSUP [label="GSUP"] - SGSN->GSUP [label="GSUP"] - - BSC->MSC - HNBGW->MSC - HNBGW->SGSN - PCU->SGSN -} ----- - diff --git a/OsmoHLR/chapters/running.adoc b/OsmoHLR/chapters/running.adoc deleted file mode 100644 index 5f24746..0000000 --- a/OsmoHLR/chapters/running.adoc +++ /dev/null @@ -1,80 +0,0 @@ -== Running OsmoHLR - -The OsmoHLR executable (`osmo-hlr`) offers the following command-line -arguments: - -=== SYNOPSIS - -*osmo-hlr* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE'] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-d, --debug 'DBGMASK','DBGLEVELS'*:: - Set the log subsystems and levels for logging to stderr. This - has mostly been superseded by VTY-based logging configuration, - see <> for further information. -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-hlr.cfg` in the current - working directory. -*-s, --disable-color*:: - Disable colors for logging to stderr. This has mostly been - deprecated by VTY based logging configuration, see <> - for more information. -*-T, --timestamp*:: - Enable time-stamping of log messages to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. -*-e, --log-level 'LOGLEVEL'*:: - Set the global log level for logging to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. -*-l, --database 'DATABASE'*:: - Specify the file name of the SQLite3 database to use as HLR/AUC - storage - -=== Bootstrap the Database - -If no database exists yet, OsmoHLR will automatically create and bootstrap a -database file with empty tables. If no `-l` command-line option is provided, -this database file will be created in the current working directory. - -Alternatively, you may use the `osmo-hlr-db-tool`, which is installed along -with `osmo-hlr`, to bootstrap an empty database, or to migrate subscriber data -from an old 'OsmoNITB' database. See `osmo-hlr-db-tool --help`. - -=== Multiple instances - -Running multiple instances of `osmo-hlr` on the same computer is possible if -all interfaces (VTY, CTRL) are separated using the appropriate configuration -options. The IP based interfaces are binding to local host by default. In order -to separate the processes, the user has to bind those services to specific but -different IP addresses and/or ports. - -The VTY and the Control interface can be bound to IP addresses from the loopback -address range, for example: - ----- -line vty - bind 127.0.0.2 -ctrl - bind 127.0.0.2 ----- - -The GSUP interface can be bound to a specific IP address by the following -configuration options: - ----- -hlr - gsup - bind ip 10.23.42.1 ----- - -NOTE: At the time of writing, OsmoHLR lacks a config option to change the GSUP -port, which is by default TCP port 4222. diff --git a/OsmoHLR/chapters/subscribers.adoc b/OsmoHLR/chapters/subscribers.adoc deleted file mode 100644 index bb57d24..0000000 --- a/OsmoHLR/chapters/subscribers.adoc +++ /dev/null @@ -1,69 +0,0 @@ -== Managing Subscribers - -Subscribers are kept in a local SQLite database file and can be managed via VTY -and CTRL interfaces. - -This section provides some examples; also refer to the OsmoHLR VTY reference -manual <> as well as the Control interface described in -<>. - -=== Example: Add/Update/Delete Subscriber via VTY - -The following telnet VTY session adds a subscriber complete with GSM (2G) and -UMTS (3G and 2G) authentication tokens, and finally removes the subscriber -again; it assumes that osmo-hlr is running and listening for telnet VTY -connections on localhost: - ----- -$ telnet localhost 4258 -include::../example_subscriber_add_update_delete.vty[] ----- - -[[subscriber-params]] -=== Subscriber Parameters - -The following parameters are managed for each subscriber of the HLR, modelled -roughly after 3GPP TS 23.008, version 13.3.0; note that not all of these -parameters are necessarily in active use. - -The `aud3g` table also applies to 2G networks: it provides UMTS AKA tokens for -Milenage authentication, which is available both on 3G and 2G networks. On 2G, -when both MS and network are R99 capable (like OsmoMSC and OsmoSGSN are), the -full UMTS AKA with Milenage keys from `aud_3g`, using AUTN and extended RES -tokens, is available. With pre-R99 MS or network configurations, the GSM AKA -compatible variant of Milenage, still using the Milenage keys from `aud_3g` but -transceiving only RAND and SRES, may be applicable. (See 3GPP TS 33.102, chapter -6.8.1, Authentication and key agreement of UMTS subscribers.) - -.OsmoHLR's subscriber parameters -[options="header",width="100%",cols="20%,20%,60%"] -|=== -|Name|Example|Description -|imsi|901700000014701|identity of the SIM/USIM, 3GPP TS 23.008 chapter 2.1.1.1 -|msisdn|2342123|number to dial to reach this subscriber (multiple MSISDNs can be stored per subscriber), 3GPP TS 23.008 chapter 2.1.2 -|imeisv|4234234234234275|identity of the mobile device and software version, 3GPP TS 23.008 chapter 2.2.3 -|aud2g.algo|comp128v3|Authentication algorithm ID for GSM AKA, corresponds to enum osmo_auth_algo -|aud2g.ki||Subscriber's secret key (128bit) -|aud3g.algo|milenage|Authentication algorithm ID for UMTS AKA (applies to both 3G and 2G networks), corresponds to enum osmo_auth_algo -|aud3g.k|(32 hexadecimal digits)|Subscriber's secret key (128bit) -|aud3g.op|(32 hexadecimal digits)|Operator's secret key (128bit) -|aud3g.opc|(32 hexadecimal digits)|Secret key derived from OP and K (128bit), alternative to using OP which does not disclose OP to subscribers -|aud3g.sqn|123|Sequence number of last used key (64bit unsigned) -|aud3g.ind_bitlen|5|Nr of index bits at lower SQN end -|apn|| -|vlr_number||3GPP TS 23.008 chapter 2.4.5 -|hlr_number||3GPP TS 23.008 chapter 2.4.6 -|sgsn_number||3GPP TS 23.008 chapter 2.4.8.1 -|sgsn_address||3GPP TS 23.008 chapter 2.13.10 -|ggsn_number||3GPP TS 23.008 chapter 2.4.8.2 -|gmlc_number||3GPP TS 23.008 chapter 2.4.9.2 -|smsc_number||3GPP TS 23.008 chapter 2.4.23 -|periodic_lu_tmr||3GPP TS 23.008 chapter 2.4.24 -|periodic_rau_tau_tmr||3GPP TS 23.008 chapter 2.13.115 -|nam_cs|1|Enable/disable voice access (3GPP TS 23.008 chapter 2.1.1.2: network access mode) -|nam_ps|0|Enable/disable data access (3GPP TS 23.008 chapter 2.1.1.2: network access mode) -|lmsi||3GPP TS 23.008 chapter 2.1.8 -|ms_purged_cs|0|3GPP TS 23.008 chapter 2.7.5 -|ms_purged_ps|1|3GPP TS 23.008 chapter 2.7.6 -|=== - diff --git a/OsmoHLR/chapters/ussd.adoc b/OsmoHLR/chapters/ussd.adoc deleted file mode 100644 index be463ac..0000000 --- a/OsmoHLR/chapters/ussd.adoc +++ /dev/null @@ -1,78 +0,0 @@ -[[ussd]] -== Unstructured Supplementary Services Data (USSD) - -The _Unstructured Supplementary Services Data (USSD)_ is one service within -2G/3G networks next to other services such as circuit-switched voice, packet-switched -data and SMS (Short Message Service). - -It is on an abstract level quite similar to SMS in that USSD can be used to send -textual messages. However, there are the following differences: - -* USSD is between the MS (phone) and an USSD application on the network, while - SMS is primarily between two subscribers identified by their MSISDN -* USSD is faster, as it doesn't suffer from the complicated three-layer CP/RP/TP - protocol stack of SMS with it's acknowledgement of the acknowledged acknowledgement. -* USSD is session-oriented, i.e. a dialogue/session between subscriber and application - can persist for the transfer of more than one message. The dedicated radio channel - on the RAN remains established throughout that dialogue. - -=== USSD in Osmocom - -Until August 2018, OsmoMSC contained some minimalistic internal USSD -handling with no -ability to attach/extend it with external USSD applications. - -From August 2018 onwards, OsmoMSC doesn't contain any internal USSD -handlers/applications anymore. Instead, all USSD is transported to/from -OsmoHLR via the GSUP protocol. - -OsmoHLR contains some intenal USSD handlers and can route USSD messages -to any number of external USSD entities (EUSEs). The EUSE also use GSUP -to communicate USSD from/to OsmoHLR. - -Each EUSE is identified by its name. The name consists of a single-word -string preceding a currently fixed ("-00-00-00-00-00-00") suffix. -There is no authentication between EUSE and OsmoHLR: Any client program -able to connect to the GSUP port of OsmoHLR can register as any EUSE -(name). - -NOTE:: We plan to remove the requirement for this suffix as soon as we -are done resolving all more important issues. - -=== USSD Configuration - -USSD configuration in OsmoHLR happens within the `hlr` VTY node. - -`euse foobar-00-00-00-00-00-00` defines an EUSE with the given name `foobar` - -`ussd route prefix *123 external foobar-00-00-00-00-00-00` installs a -prefix route to the named EUSE. All USSD short codes starting with *123 will be -routed to the named EUSE. - -`ussd route prefix *#100# internal own-msisdn` installs a prefix route -to the named internal USSD handler. There above command will restore -the old behavior, in which *#100# will return a text message containing -the subscribers own phone number. There is one other handler called -`own-imsi` which will return the IMSI instead of the MSISDN. - -`ussd default-route external foobar-00-00-00-00-00-00` installs a -default route to the named EUSE. This means that all USSD codes for -which no more specific route exists will be routed to the named EUSE. - -=== Example EUSE program - -We have provided an example EUSE developed in C language using existing -Osmocom libraries for GSUP protocol handling and USSD encoding/decoding. -It will register as `foobar` EUSE to OsmoHLR on localhost. You can run -it on a different machine by specifying e.g. `osmo-euse-demo 1.2.3.4 5678` -to make it connect to OsmoHLR on IP address 1.2.3.4 and GSUP/TCP port -5678. - -The idea is that you can use this as a template to develop your own USSD -applications, or any gateways to other protocols or interfaces. - -You can find it in `osmo-hlr/src/osmo-euse-demo.c` or online by -following the link to http://git.osmocom.org/osmo-hlr/tree/src/osmo-euse-demo.c - -This demonstration program will echo back any USSD message sent/routed -to it, quoted like _You sent "..."_. diff --git a/OsmoHLR/example_subscriber_add_update_delete.vty b/OsmoHLR/example_subscriber_add_update_delete.vty deleted file mode 100644 index ca14a65..0000000 --- a/OsmoHLR/example_subscriber_add_update_delete.vty +++ /dev/null @@ -1,34 +0,0 @@ -OsmoHLR> enable -OsmoHLR# subscriber imsi 123456789023000 create -% Created subscriber 123456789023000 - ID: 1 - IMSI: 123456789023000 - MSISDN: none - -OsmoHLR# subscriber imsi 123456789023000 update msisdn 423 -% Updated subscriber IMSI='123456789023000' to MSISDN='423' - -OsmoHLR# subscriber msisdn 423 update aud3g milenage k deaf0ff1ced0d0dabbedd1ced1cef00d opc cededeffacedacefacedbadfadedbeef -OsmoHLR# subscriber msisdn 423 show - ID: 1 - IMSI: 123456789023000 - MSISDN: 423 - 3G auth: MILENAGE - K=deaf0ff1ced0d0dabbedd1ced1cef00d - OPC=cededeffacedacefacedbadfadedbeef - IND-bitlen=5 - -OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki beefedcafefaceacedaddeddecadefee -OsmoHLR# subscriber msisdn 423 show - ID: 1 - IMSI: 123456789023000 - MSISDN: 423 - 2G auth: COMP128v3 - KI=beefedcafefaceacedaddeddecadefee - 3G auth: MILENAGE - K=deaf0ff1ced0d0dabbedd1ced1cef00d - OPC=cededeffacedacefacedbadfadedbeef - IND-bitlen=5 - -OsmoHLR# subscriber imsi 123456789023000 delete -% Deleted subscriber for IMSI '123456789023000' diff --git a/OsmoHLR/example_subscriber_cs_ps_enabled.ctrl b/OsmoHLR/example_subscriber_cs_ps_enabled.ctrl deleted file mode 100644 index a103fb8..0000000 --- a/OsmoHLR/example_subscriber_cs_ps_enabled.ctrl +++ /dev/null @@ -1,71 +0,0 @@ -GET 1 subscriber.by-msisdn-103.info -GET_REPLY 1 subscriber.by-msisdn-103.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 1 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 - -GET 2 subscriber.by-msisdn-103.ps-enabled -GET_REPLY 2 subscriber.by-msisdn-103.ps-enabled 1 - -SET 3 subscriber.by-msisdn-103.ps-enabled 0 -SET_REPLY 3 subscriber.by-msisdn-103.ps-enabled OK - -GET 4 subscriber.by-msisdn-103.ps-enabled -GET_REPLY 4 subscriber.by-msisdn-103.ps-enabled 0 - -GET 5 subscriber.by-msisdn-103.info -GET_REPLY 5 subscriber.by-msisdn-103.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 0 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 - -SET 6 subscriber.by-msisdn-103.cs-enabled 0 -SET_REPLY 6 subscriber.by-msisdn-103.cs-enabled OK - -GET 7 subscriber.by-msisdn-103.cs-enabled -GET_REPLY 7 subscriber.by-msisdn-103.cs-enabled 0 - -GET 8 subscriber.by-msisdn-103.info -GET_REPLY 8 subscriber.by-msisdn-103.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 0 -nam_ps 0 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 - -SET 9 subscriber.by-msisdn-103.cs-enabled 1 -SET_REPLY 9 subscriber.by-msisdn-103.cs-enabled OK -SET 10 subscriber.by-msisdn-103.ps-enabled 1 -SET_REPLY 10 subscriber.by-msisdn-103.ps-enabled OK - -GET 11 subscriber.by-msisdn-103.info -GET_REPLY 11 subscriber.by-msisdn-103.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 1 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 diff --git a/OsmoHLR/example_subscriber_info.ctrl b/OsmoHLR/example_subscriber_info.ctrl deleted file mode 100644 index 1bdf00b..0000000 --- a/OsmoHLR/example_subscriber_info.ctrl +++ /dev/null @@ -1,42 +0,0 @@ -GET 1 subscriber.by-imsi-901990000000003.info -GET_REPLY 1 subscriber.by-imsi-901990000000003.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 1 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 - -GET 2 subscriber.by-msisdn-103.info-aud -GET_REPLY 2 subscriber.by-msisdn-103.info-aud -aud2g.algo COMP128v1 -aud2g.ki 000102030405060708090a0b0c0d0e0f -aud3g.algo MILENAGE -aud3g.k 000102030405060708090a0b0c0d0e0f -aud3g.opc 101112131415161718191a1b1c1d1e1f -aud3g.ind_bitlen 5 -aud3g.sqn 0 - -GET 3 subscriber.by-id-3.info-all -GET_REPLY 3 subscriber.by-id-3.info-all -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 1 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 -aud2g.algo COMP128v1 -aud2g.ki 000102030405060708090a0b0c0d0e0f -aud3g.algo MILENAGE -aud3g.k 000102030405060708090a0b0c0d0e0f -aud3g.opc 101112131415161718191a1b1c1d1e1f -aud3g.ind_bitlen 5 -aud3g.sqn 0 diff --git a/OsmoHLR/osmohlr-usermanual-docinfo.xml b/OsmoHLR/osmohlr-usermanual-docinfo.xml deleted file mode 100644 index d99bba7..0000000 --- a/OsmoHLR/osmohlr-usermanual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - September 18th, 2017 - NH - - Initial version; based on OsmoNITB manual version 2. - - - - - - - Neels - Hofmeyr - nhofmeyr at sysmocom.de - NH - - sysmocom - sysmocom - s.f.m.c. GmbH - Senior Developer - - - - - - 2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoHLR/osmohlr-usermanual.adoc b/OsmoHLR/osmohlr-usermanual.adoc deleted file mode 100644 index 7e709bd..0000000 --- a/OsmoHLR/osmohlr-usermanual.adoc +++ /dev/null @@ -1,36 +0,0 @@ -:gfdl-enabled: -:program-name: OsmoHLR - -OsmoHLR User Manual -==================== -Neels Hofmeyr - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::{srcdir}/chapters/subscribers.adoc[] - -include::{srcdir}/chapters/ussd.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::./common/chapters/gsup.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - diff --git a/OsmoHLR/osmohlr-vty-reference.xml b/OsmoHLR/osmohlr-vty-reference.xml deleted file mode 100644 index f2d06ef..0000000 --- a/OsmoHLR/osmohlr-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 18th September 2017 - nh - Initial - - - - OsmoHLR VTY Reference - - - 2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoHLR/vty/hlr_vty_additions.xml b/OsmoHLR/vty/hlr_vty_additions.xml deleted file mode 100644 index a4c675e..0000000 --- a/OsmoHLR/vty/hlr_vty_additions.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/OsmoHLR/vty/hlr_vty_reference.xml b/OsmoHLR/vty/hlr_vty_reference.xml deleted file mode 100644 index cc97dc4..0000000 --- a/OsmoHLR/vty/hlr_vty_reference.xml +++ /dev/null @@ -1,1162 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-hlr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-hlr-gsup - - - - - - - - - - config-hlr-euse - - diff --git a/configure.ac b/configure.ac index cef7115..74f3002 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,6 @@ Makefile tests/Makefile OsmoGSMTester/Makefile - OsmoHLR/Makefile OsmoMGCP/Makefile OsmoMGW/Makefile OsmoNAT/Makefile -- To view, visit https://gerrit.osmocom.org/11964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice3f24888deed8affec40d5d91d71d5e1f3827c8 Gerrit-Change-Number: 11964 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:15 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:15 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMGW files (now avail in osmo-mgw.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11965 Change subject: remove OsmoMGW files (now avail in osmo-mgw.git) ...................................................................... remove OsmoMGW files (now avail in osmo-mgw.git) Files were added in osmo-mgw.git Change-Id I504f05a49721f2dfe105b6c5fd1995c4e7a0be9c Depends: osmo-mgw.git Change-Id I504f05a49721f2dfe105b6c5fd1995c4e7a0be9c Related: OS#3385 Change-Id: I793a7150b676837cfa8591f7504872b04d4b1f7f --- M Makefile.am D OsmoMGW/Makefile.am D OsmoMGW/chapters/configuration.adoc D OsmoMGW/chapters/counters.adoc D OsmoMGW/chapters/counters_generated.adoc D OsmoMGW/chapters/mgcp_extensions.adoc D OsmoMGW/chapters/overview.adoc D OsmoMGW/chapters/running.adoc D OsmoMGW/osmomgw-usermanual-docinfo.xml D OsmoMGW/osmomgw-usermanual.adoc D OsmoMGW/osmomgw-vty-reference.xml D OsmoMGW/vty/mgw_vty_additions.xml D OsmoMGW/vty/mgw_vty_reference.xml M configure.ac 14 files changed, 0 insertions(+), 2,050 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/65/11965/1 diff --git a/Makefile.am b/Makefile.am index d13b2e1..f86e6fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,6 @@ SUBDIRS = tests \ OsmoGSMTester \ OsmoMGCP \ - OsmoMGW \ OsmoNAT \ OsmoNITB \ OsmoPCU \ diff --git a/OsmoMGW/Makefile.am b/OsmoMGW/Makefile.am deleted file mode 100644 index 4c0e469..0000000 --- a/OsmoMGW/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmomgw-usermanual.adoc \ - osmomgw-usermanual-docinfo.xml \ - osmomgw-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmomgw-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmomgw-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMGW/chapters/configuration.adoc b/OsmoMGW/chapters/configuration.adoc deleted file mode 100644 index c398f25..0000000 --- a/OsmoMGW/chapters/configuration.adoc +++ /dev/null @@ -1,57 +0,0 @@ -== Configuring OsmoMGW - -A basic configation of OsmoMGW mainly consists of specifying the IP address -and port on which to listen to MGCP commands, but changing the port range at -which the RTP streams terminate as well as limiting operation to a single call -agent can be done as well as changing the number of endpoints. - -=== Configuring MGCP - -By default OsmoMGW listens for MGCP on port 2427 on any IP address. If a call -agent address is configured then OsmoMGW will only answer MGCP commands from -that IP port 2727, otherwise all sources are handled. A domain can be -specified - -.Example: MGCP configuration ----- -OsmoMGW(config-mgcp)# bind ip 127.0.0.1 -OsmoMGW(config-mgcp)# bind port 2427 -OsmoMGW(config-mgcp)# call-agent ip 127.0.0.1 -OsmoMGW(config-mgcp)# domain mgw-bsc -OsmoMGW(config-mgcp)# local ip 127.0.0.1 ----- - -=== Configuring the trunk - -The first trunk (trunk 0) is considered a virtual trunk in OsmoMGW. All -endpoints of type "rtpbridge" are routed here. The virtual trunk is configured -in the config-mgcp context. - -All other trunks are configured in the config-mgcp-trunk context, but the -commands used are identical. Right now trunks are considered only for ds/e1 -type endpoints which are not yet implemented. Don't use trunks other than the -"virtual" trunk 0. - -.Example: MGCP trunk configuration ----- -OsmoMGW(config-mgcp)# number endpoints 63 <1> -OsmoMGW(config-mgcp)# rtp bind-ip 10.0.0.1 <2> -OsmoMGW(config-mgcp)# rtp port-range 12000-14000 <3> ----- -<1> Maximum number of endpoints that can be allocated at once -<2> Use this IP when binding RTP endpoints -<3> Use ports in this range when binding RTP endpoints - -There are some options to tweak how RTP forwarding behaves in OsmoMGW: - -.Example: MGCP trunk rtp options ----- -OsmoMGW(config-mgcp)# rtp keep-alive 30 <1> -OsmoMGW(config-mgcp)# rtp-patch ssrc <2> -OsmoMGW(config-mgcp)# rtp-patch timestamp <3> ----- -<1> Send dummy UDP packets periodically to RTP destination -<2> Hide SSRC changes -<3> Ensure RTP timestamp is aligned with frame duration - - diff --git a/OsmoMGW/chapters/counters.adoc b/OsmoMGW/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoMGW/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoMGW/chapters/counters_generated.adoc b/OsmoMGW/chapters/counters_generated.adoc deleted file mode 100644 index 20a4dec..0000000 --- a/OsmoMGW/chapters/counters_generated.adoc +++ /dev/null @@ -1,14 +0,0 @@ - -// autogenerated by show asciidoc counters -These counters and their description based on OsmoMGW 1.3.0.34-9cd52 (OsmoMGW). - -=== Rate Counters - -// generating tables for rate_ctr_group -== Osmo Stat Items - -// generating tables for osmo_stat_items -== Osmo Counters - -// generating tables for osmo_counters -// there are no ungrouped osmo_counters diff --git a/OsmoMGW/chapters/mgcp_extensions.adoc b/OsmoMGW/chapters/mgcp_extensions.adoc deleted file mode 100644 index 86ff643..0000000 --- a/OsmoMGW/chapters/mgcp_extensions.adoc +++ /dev/null @@ -1,68 +0,0 @@ -== MGCP Extensions - -The MGCP protocol is extendable. The following non-standard extensions are -understood by OsmoMGW. - -=== `X-Osmo-IGN` - -`X-Osmo-IGN` indicates to OsmoMGW that specific items of an endpoint should be -ignored, so that it is lenient on mismatching values that would normally -indicate collisions or configuration errors. - -==== `X-Osmo-IGN` Format - -The value part of X-Osmo-IGN must be one or more items separated by one or more -spaces. Each item consists of one or more non-whitespace characters. - -.Example: `X-Osmo-IGN` format with three ficticious items "X", "abc" and "123". ----- -X-Osmo-IGN: X abc 123 ----- - -`X-Osmo-IGN` must be issued in the MGCP section (typically as its last item), -before the SDP section starts. - -==== Supported `X-Osmo-IGN` Items - -Currently, the following `X-Osmo-IGN` items are supported: - -* `C`: ignore CallID mismatches, i.e. differing "C" values between connections - on the same endpoint. - -.Note: -`X-Osmo-IGN` does not support ignoring mismatches on the domain part of -an endpoint name, e.g. ignoring a mismatch on "example.com" in -`rtpbridge/123abc at example.com`. Instead, you may globally configure OsmoMGW -with `mgcp` / `domain *` to permit all domain parts. - -===== `X-Osmo-IGN: C` - -By default, OsmoMGW verifies that all CallIDs ("C" values) match for all -connections on any one given endpoint. To ignore CallID mismatches, pass a `C` -in the `X-Osmo-IGN` header, for the first or the second `CRCX` on an endpoint. -When the `X-Osmo-IGN: C` is sent for any one `CRCX` on an endpoint, CallID -mismatches will be ignored for that and all subsequent messages for that -endpoint. Hence this header only needs to be included once per endpoint, in any -`CRCX` message that precedes or coincides with a CallID mismatch. - -This is particularly useful for a BSC that is connected to an A/SCCPlite MSC, -where the BSC and MSC each are expected to configure their respective own -connection on a shared endpoint. For A/SCCPlite, it is impossible for the BSC -to know the CallID that the MSC will use, so CallID mismatches are inevitable. -See also OsmoBSC, which will by default pass the `X-Osmo-IGN: C` header for -endpoints associated with an A/SCCPlite MSC. - -.Example: `CRCX` message that instructs OsmoMGW to ignore CallID mismatches ----- -CRCX 2 rtpbridge/123abc at mgw MGCP 1.0 -M: recvonly -C: 2 -L: p:20 -X-Osmo-IGN: C - -v=0 -c=IN IP4 123.12.12.123 -m=audio 5904 RTP/AVP 97 -a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 ----- diff --git a/OsmoMGW/chapters/overview.adoc b/OsmoMGW/chapters/overview.adoc deleted file mode 100644 index 6a8f3e3..0000000 --- a/OsmoMGW/chapters/overview.adoc +++ /dev/null @@ -1,100 +0,0 @@ -[[overview]] -== Overview - -This manual should help you getting started with OsmoMGW. It will cover -aspects of configuring and running the media gateway. - -[[intro_overview]] -=== About OsmoMGW - -OsmoMGW is the Osmocom implementation of a media gateway to handle user -plane (voice) traffic in cellular networks. It can connect and optionally -transcode RTP voice streams between different network elements such as BTSs -and external entities like SIP. It is typically co-located with both OsmoBSC -and OsmoMSC and controlled by them via MGCP, the Media Gateway Control -Protocol. - -[[fig-bsc]] -.OsmoMGW used with OsmoBSC -[graphviz] ----- -digraph G { - rankdir = LR; - OsmoBTS -> OsmoBSC [label="Abis/IP"]; - OsmoBSC -> OsmoMSC [label="3GPP AoIP"]; - OsmoBSC -> OsmoMGW [label="MGCP"]; - OsmoBTS -> OsmoMGW [label="RTP",dir=both]; - OsmoMGW -> OsmoMSC [label="RTP",dir=both]; - {rank=same OsmoBSC OsmoMGW} - OsmoMGW [color=red]; -} ----- - -[[fig-msc]] -.OsmoMGW used with OsmoMSC -[graphviz] ----- -digraph G { - rankdir = LR; - BTS -> BSC [label="Abis"]; - BSC -> OsmoMSC [label="3GPP AoIP"]; - OsmoMSC -> OsmoMGW [label="MGCP"]; - BSC -> OsmoMGW [label="RTP",dir=both]; - OsmoMSC -> OsmoSIP [label="MNCC"]; - OsmoSIP -> PBX [label="SIP Trunk"]; - OsmoMGW -> PBX [label="RTP",dir=both]; - {rank=same OsmoMSC OsmoMGW} - OsmoSIP [label="osmo-sip-connector"]; - OsmoMGW [color=red]; - - hNodeB -> OsmoHNBGW [label="Iuh"]; - OsmoHNBGW -> OsmoMSC [label="IuCS"]; - hNodeB -> OsmoMGW [label="RTP",dir=both]; -} ----- - -=== Software Components - -OsmoMGW contains a variety of different software components, which we?ll -quickly describe in this section. - -==== MGCP Implementation - -OsmoMGW brings its own MGCP implementation through which OsmoMGW is -controlled. - -The commands implemented are CRCX, MDCX, DLCX and RSIP. The command AUEP is -implemented as a stub and will simply respond with OK. - -==== RTP implementation - -Support for IuUP which is used in 3G cells is quite lacking at the moment. -3G<->3G and 2G<->2G calls should work, but 3G<->2G does not. - -==== Audio transcoder - -Transcoding is currently not supported in OsmoMGW. - -=== Limitations - -Osmux is not yet supported in OsmoMGW. - -At the moment (July 2018), OsmoMGW only implements RTP proxy / RTP bridge -type endpoints, to each of which two RTP connections can be established. -We are planning to add endpoint types for: - -- classic E1/T1 timeslots (64kBps alaw/ulaw) -- classic E1/T1 16k sub-slots with TRAU frames for classic BTS support -- announcement/playout end-points -- conference endpoints - -=== Additional resources - -You can find the OsmoMGW issue tracker and wiki online at - -- https://osmocom.org/projects/osmomgw -- https://osmocom.org/projects/osmomgw/wiki - -RFC 3435 for MGCP is located at - -- https://tools.ietf.org/html/rfc3435 diff --git a/OsmoMGW/chapters/running.adoc b/OsmoMGW/chapters/running.adoc deleted file mode 100644 index 8565ea5..0000000 --- a/OsmoMGW/chapters/running.adoc +++ /dev/null @@ -1,25 +0,0 @@ -== Running OsmoMGW - -The OsmoMGW executable (`osmo-mgw`) offers the following command-line -arguments: - -=== SYNOPSIS - -*osmo-mgw* [-h|-V] [-D] [-c 'CONFIGFILE'] [-s] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-mgw.cfg` in the current - working directory. -*-s, --disable-color*:: - Disable colors for logging to stderr. This has mostly been - deprecated by VTY based logging configuration, see <> - for more information. diff --git a/OsmoMGW/osmomgw-usermanual-docinfo.xml b/OsmoMGW/osmomgw-usermanual-docinfo.xml deleted file mode 100644 index d801c9b..0000000 --- a/OsmoMGW/osmomgw-usermanual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - July 24th, 2018 - DW - - Initial version - - - - - - - Daniel - Willmann - dwillmann at sysmocom.de - DW - - sysmocom - sysmocom - s.f.m.c. GmbH - - - - - - 2018 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - - diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc deleted file mode 100644 index b0bc83d..0000000 --- a/OsmoMGW/osmomgw-usermanual.adoc +++ /dev/null @@ -1,33 +0,0 @@ -:gfdl-enabled: -:program-name: OsmoMGW - -OsmoMGW User Manual -==================== -Daniel Willmann - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::{srcdir}/chapters/mgcp_extensions.adoc[] - -//include::{srcdir}/chapters/counters.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - - diff --git a/OsmoMGW/osmomgw-vty-reference.xml b/OsmoMGW/osmomgw-vty-reference.xml deleted file mode 100644 index 334453e..0000000 --- a/OsmoMGW/osmomgw-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 12th December 2017 - pm - Initial - - - - OsmoMGW VTY Reference - - - 2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoMGW/vty/mgw_vty_additions.xml b/OsmoMGW/vty/mgw_vty_additions.xml deleted file mode 100644 index a4c675e..0000000 --- a/OsmoMGW/vty/mgw_vty_additions.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/OsmoMGW/vty/mgw_vty_reference.xml b/OsmoMGW/vty/mgw_vty_reference.xml deleted file mode 100644 index 834db04..0000000 --- a/OsmoMGW/vty/mgw_vty_reference.xml +++ /dev/null @@ -1,1645 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-mgcp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mgcp-trunk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index 74f3002..69dc3c1 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,6 @@ tests/Makefile OsmoGSMTester/Makefile OsmoMGCP/Makefile - OsmoMGW/Makefile OsmoNAT/Makefile OsmoNITB/Makefile OsmoPCU/Makefile -- To view, visit https://gerrit.osmocom.org/11965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I793a7150b676837cfa8591f7504872b04d4b1f7f Gerrit-Change-Number: 11965 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:16 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoPCU files (now avail in osmo-pcu.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11966 Change subject: remove OsmoPCU files (now avail in osmo-pcu.git) ...................................................................... remove OsmoPCU files (now avail in osmo-pcu.git) Files were added in osmo-pcu.git Change-Id I7270652de393a98748c0cdc51e626c17ab8f44c2 Depends: osmo-pcu.git Change-Id I7270652de393a98748c0cdc51e626c17ab8f44c2 Related: OS#3385 Change-Id: I2a1de294883491487aa270b1e30160d559ef063a --- M Makefile.am D OsmoPCU/Makefile.am D OsmoPCU/chapters/configuration.adoc D OsmoPCU/chapters/counters.adoc D OsmoPCU/chapters/counters_generated.adoc D OsmoPCU/chapters/overview.adoc D OsmoPCU/chapters/running.adoc D OsmoPCU/gb/bssgp.adoc D OsmoPCU/gb/gb-startup.msc D OsmoPCU/gb/ns.adoc D OsmoPCU/osmopcu-gb-docinfo.xml D OsmoPCU/osmopcu-gb.adoc D OsmoPCU/osmopcu-usermanual-docinfo.xml D OsmoPCU/osmopcu-usermanual.adoc D OsmoPCU/osmopcu-vty-reference.xml D OsmoPCU/vty/osmo-pcu_vty_additions.xml D OsmoPCU/vty/osmo-pcu_vty_reference.xml M configure.ac 18 files changed, 0 insertions(+), 2,479 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/66/11966/1 diff --git a/Makefile.am b/Makefile.am index f86e6fc..422df72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoPCU \ OsmoSGSN \ OsmoSIPConnector \ OsmoSTP \ diff --git a/OsmoPCU/Makefile.am b/OsmoPCU/Makefile.am deleted file mode 100644 index a741f9b..0000000 --- a/OsmoPCU/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmopcu-gb.adoc \ - osmopcu-gb-docinfo.xml \ - osmopcu-usermanual.adoc \ - osmopcu-usermanual-docinfo.xml \ - osmopcu-vty-reference.xml \ - chapters \ - gb \ - vty - -ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmopcu-gb.pdf: $(srcdir)/gb/*.adoc $(srcdir)/gb/*.msc -osmopcu-usermanual.pdf: $(srcdir)/chapters/*.adoc - -VTY_REFERENCE = osmopcu-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoPCU/chapters/configuration.adoc b/OsmoPCU/chapters/configuration.adoc deleted file mode 100644 index 6fc61c7..0000000 --- a/OsmoPCU/chapters/configuration.adoc +++ /dev/null @@ -1,205 +0,0 @@ -== Configuring OsmoPCU - -Contrary to other network elements (like OsmoBSC, OsmoNITB), the -OsmoPCU has a relatively simple minimum configuration. - -This is primarily because most of the PCU configuration happens -indirectly from the BSC, who passes the configuation over A-bis OML via -OsmoBTS and its PCU socket into OsmoPCU. - -A minimal OsmoPCU configuration file is provided below for your reference: - -.Example: Minimal OsmoPCU configuration file (`osmo-pcu.cfg`) ----- -pcu - flow-control-interval 10 <1> - cs 2 <2> - alloc-algorithm dynamic <3> - alpha 0 <4> - gamma 0 ----- -<1> send a BSSGP flow-control PDU every 10 seconds -<2> start a TBF with the initial coding scheme 2 -<3> dynamically chose between single-slot or multi-slot TBF allocations - depending on system load -<4> disable MS power control loop - -However, there are plenty of tuning parameters for people interested to -optimize PCU throughput or latency according to their requirements. - -=== Configuring the Coding Schemes and Rate Adaption - -The BSC includes a bit-mask of permitted [E]GPRS coding schemes as part -of the A-bis OML configuration. This is passed from the BTS via the PCU -socket into OsmoPCU. - -Some additional parameters can be set as described below. - -==== Initial Coding Scheme - -You can use the `cs <1-4> [<1-4>]` command at the `pcu` VTY config node -to set the initial GPRS coding scheme to be used. The optional second -value allows to specify a different initial coding scheme for uplink. - -==== Maximum Coding Scheme - -You can use the `cs max <1-4> [<1-4>]` command at the `pcu` VTY config -node to set the maximum coding scheme that should be used as part of the -rate adaption. - -==== Rate Adaption Error Thresholds - -You can use the `cs threshold <0-100> <0-100>` command at the `pcu` VTY -config node to determine the upper and lower limit for the error rate -percentage to use in the rate adaption. If the upper threshold is -reached, a lower coding sheme is chosen, and if the lower threshold is -reached, a higher coding scheme is chosen. - -==== Rate Adation Link Quality Thresholds - -You can use the `cs link-quality-ranges cs1 <0-35> cs2 <0-35> <0-35> cs3 -<0-35> <0-35> cs4 <0-35>` command at the `pcu` VTY config node to tune -the link quality ranges for the respective coding schemes. - -==== Data Size based CS downgrade Threshold - -You can use the `cs downgrade-threshold <1-10000>` command at the `pcu` -VTY config node to ask the PCU to down-grade the coding scheme if less -than the specified number of octets are left to be transmitted. - -=== Miscellaneous Configuration / Tuning Parameters - -==== Downlink TBF idle time - -After a down-link TBF is idle (all data in the current LLC downlink -queue for the MS has been transmitted), we can keep the TBF established -for a configurable time. This avoids having to go through a new one or -two phase TBF establishment once the next data for downlink arrives. - -You can use the `dl-tbf-idle-time <1-5000>` to specify that time in -units of milli-seconds. The default is 2 seconds. - -==== MS idle time - -Using the `ms-idle-time <1-7200>` command at the `pcu` VTY config node -you can configure the number of seconds for which the PCU should keep -the MS data structure alive before releasing it if there are no active -TBF for this MS. - -The OsmoPCU default value is 60 seconds, which is slightly more than -what 3GPP TS 24.008 recommends for T3314 (44s). - -The MS data structure only consumes memory in the PCU and does not -require any resources of the air interface. - -==== Forcing two-phase access - -If the MS is using a single-phase access, you can still force it to -use a two-phase access using the `two-phase-access` VTY configuration -command at the `pcu` VTY config node. - -=== Configuring BSSGP flow control - -BSSGP between SGSN and PCU contains a two-level nested flow control -mechanism: - -. one global flow control instance for the overall (downlink) traffic - from the SGSN to this PCU -. a per-MS flow control instance for each individual MS served by this - PCU - -Each of the flow control instance is implemented as a TBF (token bucket -filter). - -==== Normal BSSGP Flow Control Tuning parameters - -You can use the following commands at the `pcu` VTY config node to tune -the BSSGP flow control parameters: - -`flow-control-interval <1-10>`:: - configure the interval (in seconds) between subsequent flow - control PDUs from PCU to SGSN -`flow-control bucket-time <1-65534>`:: - set the target downlink maximum queueing time in centi-seconds. - The PCU will attempt to adjust the advertised bucket size to match this - target. - -==== Extended BSSGP Flow Control Tuning parameters - -There are some extended flow control related parameters at the `pcu` VTY -config node that override the automatic flow control as specified in the -BSSGP specification. Use them with care! - -`flow-control force-bvc-bucket-size <1-6553500>`:: - force the BVC (global) bucket size to the given number of octets -`flow-control force-bvc-leak-rate <1-6553500>`:: - force the BVC (global) bucket leak rate to the given number of bits/s -`flow-control force-ms-bucket-size <1-6553500>`:: - force the per-MS bucket size to the given number of octets -`flow-control force-ms-leak-rate <1-6553500>`:: - force the per-MS bucket leak rate to the given number of bits/s - - -=== Configuring LLC queue - -The downlink LLC queue in the PCU towards the MS can be tuned with a -variety of parameters at the `pcu` VTY config node, depending on your -needs. - -`queue lifetime <1-65534>`:: - Each downlink LLC PDU is assigned a lifetime by the SGSN, which - is respected by the PDU *unless* you use this command to - override the PDU lifetime with a larger value (in centi-seconds) -`queue lifetime infinite`:: - Never drop LLC PDUs, i.e. give them an unlimited lifetime. -`queue hysteresis <1-65535>`:: - When the downlink LLC queue is full, the PCU starts dropping - packets. Using this parameter, we can set the lifetime - hysteresis in centi-seconds, i.e. it will continue discarding - until "lifetime - hysteresis" is reached. -`queue codel`:: - Use the 'CoDel' (Controlled Delay) scheduling algorithm, which - is designed to overcome buffer bloat. It will use a default - interval of 4 seconds. -`queue codel interval <1-1000>`:: - Use the 'CoDel' (Controlled Delay) scheduling algorithm, which - is designed to overcome buffer bloat. Use the specified - interval in centi-seconds. -`queue idle-ack-delay <1-65535>`:: - Delay the request for an ACK after the last downlink LLC frame - by the specified amount of centi-seconds. - - -=== Configuring MS power control - -GPRS MS power control works completely different than the close MS power -control loop in circuit-switched GSM. - -Rather than instructing the MS constantly about which transmit power to -use, some parameters are provided to the MS by which the MS-based power -control algorithm is tuned. - -See 3GPP TS 05.08 for further information on the algorithm and the -parameters. - -You can set those parameters at the `pcu` VTY config node as follows: - -`alpha <0-10>`:: - Alpha parameter for MS power control in units of 0.1. - Make sure to set the alpha value at System Information 13 (in - the BSC), too! -`gamma <0-62>`:: - Set the gamma parameter for MS power control in units of dB. - - -=== Enabling EGPRS - -If you would like to test the currently (experimental) EGPRS support of -OsmoPCU, you can enable it using the `egprs` command at the `pcu` VTY -config node. - -WARNING: EPGRS functionality is highly experimental at the time of this -writing. Please only use if you actively would like to participate in -the OsmoPCU EGPRS development and/or testing. You will also need an -EGPRS capable OsmoBTS+PHY, which means `osmo-bts-sysmo` or -`osmo-bts-litecell15` with their associated PHY. diff --git a/OsmoPCU/chapters/counters.adoc b/OsmoPCU/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoPCU/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoPCU/chapters/counters_generated.adoc b/OsmoPCU/chapters/counters_generated.adoc deleted file mode 100644 index 2ee425e..0000000 --- a/OsmoPCU/chapters/counters_generated.adoc +++ /dev/null @@ -1,178 +0,0 @@ -// autogenerated by show asciidoc counters -These counters and their description based on Osmo-PCU 0.4.0.4-8d55 (Osmo-PCU). - -// generating tables for rate_ctr_group -// rate_ctr_group table BSSGP Peer Statistics -.bssgp:bss_ctx - BSSGP Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at BSSGP Level ( In) -| packets:out | <> | Packets at BSSGP Level (Out) -| bytes:in | <> | Bytes at BSSGP Level ( In) -| bytes:out | <> | Bytes at BSSGP Level (Out) -| blocked | <> | BVC Blocking count -| discarded | <> | BVC LLC Discarded count -| status | <> | BVC Status count -|=== -// rate_ctr_group table NSVC Peer Statistics -.ns:nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at NS Level ( In) -| packets:out | <> | Packets at NS Level (Out) -| bytes:in | <> | Bytes at NS Level ( In) -| bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count -| replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count -|=== -// rate_ctr_group table NSVC Peer Statistics -.ns:nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at NS Level ( In) -| packets:out | <> | Packets at NS Level (Out) -| bytes:in | <> | Bytes at NS Level ( In) -| bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count -| replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count -|=== -// rate_ctr_group table BTS Statistics -.bts - BTS Statistics -[options="header"] -|=== -| Name | Reference | Description -| tbf:dl:alloc | <> | TBF DL Allocated -| tbf:dl:freed | <> | TBF DL Freed -| tbf:dl:aborted | <> | TBF DL Aborted -| tbf:ul:alloc | <> | TBF UL Allocated -| tbf:ul:freed | <> | TBF UL Freed -| tbf:ul:aborted | <> | TBF UL Aborted -| tbf:reused | <> | TBF Reused -| tbf:alloc:algo-a | <> | TBF Alloc Algo A -| tbf:alloc:algo-b | <> | TBF Alloc Algo B -| tbf:failed:egprs-only | <> | TBF Failed EGPRS-only -| rlc:sent | <> | RLC Sent -| rlc:resent | <> | RLC Resent -| rlc:restarted | <> | RLC Restarted -| rlc:stalled | <> | RLC Stalled -| rlc:nacked | <> | RLC Nacked -| rlc:final_block_resent | <> | RLC Final Blk resent -| rlc:ass:timedout | <> | RLC Assign Timeout -| rlc:ass:failed | <> | RLC Assign Failed -| rlc:ack:timedout | <> | RLC Ack Timeout -| rlc:ack:failed | <> | RLC Ack Failed -| rlc:rel:timedout | <> | RLC Release Timeout -| rlc:late-block | <> | RLC Late Block -| rlc:sent-dummy | <> | RLC Sent Dummy -| rlc:sent-control | <> | RLC Sent Control -| rlc:dl_bytes | <> | RLC DL Bytes -| rlc:dl_payload_bytes | <> | RLC DL Payload Bytes -| rlc:ul_bytes | <> | RLC UL Bytes -| rlc:ul_payload_bytes | <> | RLC UL Payload Bytes -| decode:errors | <> | Decode Errors -| sba:allocated | <> | SBA Allocated -| sba:freed | <> | SBA Freed -| sba:timedout | <> | SBA Timeout -| llc:timeout | <> | Timedout Frames -| llc:dropped | <> | Dropped Frames -| llc:scheduled | <> | Scheduled Frames -| llc:dl_bytes | <> | RLC encapsulated PDUs -| llc:ul_bytes | <> | full PDUs received -| rach:requests | <> | RACH requests -| 11bit_rach:requests | <> | 11BIT_RACH requests -| spb:uplink_first_segment | <> | First seg of UL SPB -| spb:uplink_second_segment | <> | Second seg of UL SPB -| spb:downlink_first_segment | <> | First seg of DL SPB -| spb:downlink_second_segment | <> | Second seg of DL SPB -| immediate:assignment_UL | <> | Immediate Assign UL -| immediate:assignment_rej | <> | Immediate Assign Rej -| immediate:assignment_DL | <> | Immediate Assign DL -| channel:request_description | <> | Channel Request Desc -| pkt:ul_assignment | <> | Packet UL Assignment -| pkt:access_reject | <> | Packet Access Reject -| pkt:dl_assignment | <> | Packet DL Assignment -| ul:control | <> | UL control Block -| ul:assignment_poll_timeout | <> | UL Assign Timeout -| ul:assignment_failed | <> | UL Assign Failed -| dl:assignment_timeout | <> | DL Assign Timeout -| dl:assignment_failed | <> | DL Assign Failed -| pkt:ul_ack_nack_timeout | <> | PUAN Poll Timeout -| pkt:ul_ack_nack_failed | <> | PUAN poll Failed -| pkt:dl_ack_nack_timeout | <> | PDAN poll Timeout -| pkt:dl_ack_nack_failed | <> | PDAN poll Failed -| gprs:downlink_cs1 | <> | CS1 downlink -| gprs:downlink_cs2 | <> | CS2 downlink -| gprs:downlink_cs3 | <> | CS3 downlink -| gprs:downlink_cs4 | <> | CS4 downlink -| egprs:downlink_mcs1 | <> | MCS1 downlink -| egprs:downlink_mcs2 | <> | MCS2 downlink -| egprs:downlink_mcs3 | <> | MCS3 downlink -| egprs:downlink_mcs4 | <> | MCS4 downlink -| egprs:downlink_mcs5 | <> | MCS5 downlink -| egprs:downlink_mcs6 | <> | MCS6 downlink -| egprs:downlink_mcs7 | <> | MCS7 downlink -| egprs:downlink_mcs8 | <> | MCS8 downlink -| egprs:downlink_mcs9 | <> | MCS9 downlink -| gprs:uplink_cs1 | <> | CS1 Uplink -| gprs:uplink_cs2 | <> | CS2 Uplink -| gprs:uplink_cs3 | <> | CS3 Uplink -| gprs:uplink_cs4 | <> | CS4 Uplink -| egprs:uplink_mcs1 | <> | MCS1 Uplink -| egprs:uplink_mcs2 | <> | MCS2 Uplink -| egprs:uplink_mcs3 | <> | MCS3 Uplink -| egprs:uplink_mcs4 | <> | MCS4 Uplink -| egprs:uplink_mcs5 | <> | MCS5 Uplink -| egprs:uplink_mcs6 | <> | MCS6 Uplink -| egprs:uplink_mcs7 | <> | MCS7 Uplink -| egprs:uplink_mcs8 | <> | MCS8 Uplink -| egprs:uplink_mcs9 | <> | MCS9 Uplink -|=== -// generating tables for osmo_stat_items -NSVC Peer Statistics -// osmo_stat_item_group table NSVC Peer Statistics -.ns.nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| alive.delay | <> | ALIVE response time | ms -|=== -NSVC Peer Statistics -// osmo_stat_item_group table NSVC Peer Statistics -.ns.nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| alive.delay | <> | ALIVE response time | ms -|=== -BTS Statistics -// osmo_stat_item_group table BTS Statistics -.bts - BTS Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| ms.present | <> | MS Present | -|=== -// generating tables for osmo_counters -// ungrouped osmo_counters -.ungrouped osmo counters -[options="header"] -|=== -| Name | Reference | Description -|=== - - diff --git a/OsmoPCU/chapters/overview.adoc b/OsmoPCU/chapters/overview.adoc deleted file mode 100644 index 0031474..0000000 --- a/OsmoPCU/chapters/overview.adoc +++ /dev/null @@ -1,67 +0,0 @@ -== Overview - -=== About OsmoPCU - -OsmoPCU is the Osmocom implementation of the GPRS PCU (Packet Control -Unit) element inside the GPRS network. - -The OsmoPCU is co-located within the BTS and connects to OsmoBTS via its -PCU socket interface. - -On the other side, OsmoPCU is connected via the Gb interface to the -SGSN. - -[[fig-gprs-pcubts]] -.GPRS network architecture with PCU in BTS -[graphviz] ----- -digraph G { - rankdir=LR; - MS0 [label="MS"] - MS1 [label="MS"] - MS0->BTS [label="Um"] - MS1->BTS [label="Um"] - BTS->BSC [label="Abis"] - BSC->MSC [label="A"] - BTS->PCU [label="pcu_sock"] - PCU->SGSN [label="Gb"] - SGSN->GGSN [label="GTP"] -} ----- - -=== Software Components - -OsmoPCU consists of a variety of components, including - -* Gb interface (NS/BSSGP protocol) -* `pcu_sock` interface towards OsmoBTS -* TBF management for uplink and downlink TBF -* RLC/MAC protocol implementation -* per-MS context for each MS currently served -* CSN.1 encoding/decoding routines - -==== Gb Implementation - -OsmoPCU implements the ETSI/3GPP specified Gb interface, including TS -08.16 (NS), TS 08.18 (BSSGP) protocols. As transport layer for NS, it -supports NS/IP (NS encapsulated in UDP/IP). - -The actual Gb Implementation is part of the libosmogb library, which is -in turn part of the libosmocore software package. This allows the same -Gb implementation to be used from OsmoPCU, OsmoGbProxy as well as -OsmoSGSN. - -==== `pcu_sock` Interface to OsmoBTS - -The interface towards OsmoBTS is called 'pcu_sock' and implemented as a -set of non-standardized primitives over a unix domain socket. The -default file system path for this socket is `/tmp/pcu_bts`. - -The PCU socket can be changed on both OmsoBTS and OsmoPCU to a different -file/path name, primarily to permit running multiple independent BTS+PCU -pairs on a single Linux machine without having to use filesystem -namespaces or other complex configurations. - -NOTE: If you change the PCU socket path on OsmoBTS by means of the -`pcu-socket` VTY configuration command, you must ensure to make the -identical change on the OsmoPCU side. diff --git a/OsmoPCU/chapters/running.adoc b/OsmoPCU/chapters/running.adoc deleted file mode 100644 index d9f78c8..0000000 --- a/OsmoPCU/chapters/running.adoc +++ /dev/null @@ -1,33 +0,0 @@ -== Running OsmoPCU - -The OsmoPCU executable (`osmo-pcu`) offers the following command-line -options: - - -=== SYNOPSIS - -*osmo-pcu* [-h|-V] [-D] [-c 'CONFIGFILE'] [-r 'PRIO'] [-m 'MCC'] [-n 'MNC'] - - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -//*-D, --daemonize*:: -// Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-pcu.cfg` in the current - working directory. -*-r, --realtime 'PRIO'*:: - Enable use of the Linux kernel realtime priority scheduler with - the specified priority. - It is recommended you use this option on low-performance - embedded systems or systems that encounter high non-GSM/GPRS - load. -*-m, --mcc 'MCC'*:: - Use the given MCC instead of that provided by BTS via PCU socket -*-n, --mnc 'MNC'*:: - Use the given MNC instead of that provided by BTS via PCU socket diff --git a/OsmoPCU/gb/bssgp.adoc b/OsmoPCU/gb/bssgp.adoc deleted file mode 100644 index 18f1842..0000000 --- a/OsmoPCU/gb/bssgp.adoc +++ /dev/null @@ -1,501 +0,0 @@ -[[bssgp]] -== BSS GPRS Protocol (BSSGP) - -=== List of Messages - -The following tables list the BSSGP messages used by OsmoPCU, grouped -by their level of compliance with 3GPP TS 08.18. - -==== Messages Compliant With TS 08.18 - -.Messages compliant with TS 08.18 -[options="header",cols="10%,10%,20%,35%,5%,20%"] -|=== -| TS 08.18 ? | type code (hex) | This document ? | Message | <-/-> | Received/Sent by OsmoPCU -6+<| *RL and BSSGP SAP Messages:* -| 10.2.1 | 0x00 | <> | DL-UNITDATA | <- | Received -| 10.2.2 | 0x01 | <> | UL-UNITDATA | -> | Sent -| 10.2.3 | 0x02 | <> | RA-CAPABILITY | <- | Received -6+<| *GMM SAP Messages:* -| 10.3.1 | 0x06 | <> | PAGING PS | <- | Received -| 10.3.2 | 0x07 | <> | PAGING CS | <- | Received -| 10.3.7 | 0x0c | <> | SUSPEND-ACK | <- | Received -| 10.3.8 | 0x0d | <> | SUSPEND-NACK | <- | Received -| 10.3.10 | 0x0f | <> | RESUME-ACK | <- | Received -| 10.3.11 | 0x10 | <> | RESUME-NACK | <- | Received -6+<| *NM SAP Messages:* -| 10.4.9 | 0x21 | <> | BVC-BLOCK-ACK | <- | Received -| 10.4.12 | 0x22 | <> | BVC-RESET | <-/-> | Received/Sent -| 10.4.13 | 0x23 | <> | BVC-RESET-ACK | <- | Received -| 10.4.10 | 0x24 | <> | BVC-UNBLOCK | -> | Sent -| 10.4.11 | 0x25 | <> | BVC-UNBLOCK-ACK | <- | Received -| 10.4.4 | 0x26 | <> | FLOW-CONTROL-BVC | -> | Sent -| 10.4.5 | 0x27 | <> | FLOW-CONTROL-BVC-ACK | <- | Received -| 10.4.7 | 0x29 | <> | FLOW-CONTROL-MS-ACK | <- | Received -| 10.4.1 | 0x2a | <> | FLUSH-LL | <- | Received -| 10.4.15 | 0x40 | <> | SGSN-INVOKE-TRACE | <- | Received -| 10.4.14 | 0x41 | <> | STATUS | <-/-> | Received/Sent -|=== - -==== Messages Specific to OsmoPCU - -There are no OsmoPCU specific BSSGP messages. - -[[not_impl]] -==== Messages Not Implemented by OsmoPCU - -.3GPP TS 08.18 messages not implemented by OsmoPCU -[options="header",cols="10%,10%,80%"] -|=== -| TS 08.18 ? | type code (hex) | Message -3+<| *RL (relay) and BSSGP SAP Messages:* -| 10.2.4 | 0x03 | PTM-UNITDATA -3+<| *GMM (GPRS mobility management) SAP Messages:* -| 10.3.3 | 0x08 | RA-CAPABILITY-UPDATE -| 10.3.4 | 0x09 | RA-CAPABILITY-UPDATE-ACK -| 10.3.5 | 0x0a | RADIO-STATUS -| 10.3.6 | 0x0b | SUSPEND -| 10.3.9 | 0x0e | RESUME -3+<| *NM (network management) SAP Messages:* -| 10.4.8 | 0x20 | BVC-BLOCK -| 10.4.6 | 0x28 | FLOW-CONTROL-MS -| 10.4.2 | 0x2b | FLUSH-LL-ACK -| 10.4.3 | 0x2c | LLC-DISCARDED -3+<| *PFM (packet flow management) SAP Messages:* -| 10.4.16 | 0x50 | DOWNLOAD-BSS-PFC -| 10.4.17 | 0x51 | CREATE-BSS-PFC -| 10.4.18 | 0x52 | CREATE-BSS-PFC-ACK -| 10.4.19 | 0x53 | CREATE-BSS-PFC-NACK -| 10.4.20 | 0x54 | MODIFY-BSS-PFC -| 10.4.21 | 0x55 | MODIFY-BSS-PFC-ACK -| 10.4.22 | 0x56 | DELETE-BSS-PFC -| 10.4.23 | 0x57 | DELETE-BSS-PFC-ACK -|=== - - -=== Details on Compliant BSSGP Messages - -[[dl_unit_data]] -==== DL-UNITDATA - -This message conforms to 3GPP TS 08.18 ? 10.2.1, with the following -limitations: - -* OsmoPCU does not support QoS -* all optional IEs except for IMSI and old TLLI are ignored. - -._DL-UNITDATA_ IE limitations -[options="header",cols="10%,30%,60%"] -|=== -| TS 08.18 ? | IE Name | Handling -| 11.3.28 | QoS Profile | _ignored_ -| 11.3.22 | MS Radio Access Capability | _ignored_ -| 11.3.27 | Priority | _ignored_ -| 11.3.11 | DRX Parameters | _ignored_ -| 1.3.42 | PFI | _ignored_ -| 11.3.19 | LSA Information | _ignored_ -| 11.3.47 | Service UTRAN CCO | _ignored_ -|=== - -[[ul_unit_data]] -==== UL-UNITDATA - -This message conforms to 3GPP TS 08.18 ? 10.2.2, with the following limitations: - -* OsmoPCU does not send optional IEs - PFI (? 12.3.42) and LSA - Identifier List (? 11.3.18). -* QoS Profile (? 11.3.28) IE is always set to 0x04. - -[[ra_capab]] -==== RA-CAPABILITY - -This message is received and logged but ignored by OsmoPCU at the moment. - -[[paging_ps]] -==== PAGING PS - -This message conforms to 3GPP TS 08.18 ? 10.3.1, with the following -limitations: - -* only IMSI and P-TMSI are parsed by OsmoPCU. - -._DL-UNITDATA_ IE limitations -[options="header",cols="10%,30%,60%"] -|=== -| TS 08.18 ? | IE Name | Handling -| 11.3.11 | DRX Parameters | _ignored_ -| 11.3.6 | BVCI | _ignored_ -| 11.3.17 | Location Are | _ignored_ -| 11.3.31 | Routeing Area | _ignored_ -| 11.3.3 | BSS Area Indication | _ignored_ -| 11.3.42 | PFI | _ignored_ -| 11.3.43 | ABQP | _ignored_ -| 11.3.28 | QoS Profile | _ignored_ -| 11.3.36 | P-TMSI | treated as mandatory (in case of absence paging with 0-length P-TMSI will be sent) -|=== - - -[[paging_cs]] -==== PAGING CS - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[susp_ack]] -==== SUSPEND-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[susp_nack]] -==== SUSPEND-NACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[res_ack]] -==== RESUME-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[res_nack]] -==== RESUME-NACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[block_ack]] -==== BVC-BLOCK-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[bvc_reset]] -==== BVC-RESET - -OsmoPCU never transmits optional Feature bitmap (3GPP TS 08.18 ? -11.3.40) IE. - -Receiving BVC RESET will cause OsmoPCU to respond with "Unknown BVCI" -status message. - -[[reset_ack]] -==== BVC-RESET-ACK - -This message conforms to 3GPP TS 08.18 ? 10.4.13. - -After receiving it OsmoPCU completes the RESET procedure for BVC -according to 3GPP TS 08.18 ? 8.4. - -[[unblock_ack]] -==== BVC-UNBLOCK-ACK - -This message conforms to 3GPP TS 08.18 ? 10.4.11. - -After receiving it OsmoPCU completes the RESET procedure for BVC -according to 3GPP TS 08.18 ? 8.3. - -[[bvc_unblock]] -==== BVC-UNBLOCK - -This message conforms to 3GPP TS 08.18 ? 10.4.10 and is send by -OsmoPCU as part of UNBLOCK procedure described in 3GPP TS 08.18 ? 8.3. - -[[flow_ms_ack]] -==== FLOW-CONTROL-MS-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[flow_bvc_ack]] -==== FLOW-CONTROL-BVC-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[flow_bvc]] -==== FLOW-CONTROL-BVC - -This message conforms to 3GPP TS 08.18 ? 10.4.4, with the following -limitations: - -* OsmoPCU does not support Current Bucket Level (CBL) feature so - Bucket_Full Ratio (TS 08.18 ? 11.3.46) IE is not transmitted as part - of this message. - -[[flush_ll]] -==== FLUSH-LL - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[invoke_trace]] -==== SGSN-INVOKE-TRACE - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[bssgp_status]] -==== STATUS - -This message conforms to 3GPP TS 08.18 ? 10.4.14. - -=== Information Elements Overview - -All of the IEs handled by OsmoPCU are listed below, with limitations -and additions to 3GPP TS 08.18 specified in more detail. - -==== IEs Conforming to 3GPP TS 08.18 - -The following Information Elements are accepted by OsmoPCU. Not all -IEs are actually evaluated. - -.IEs conforming to 3GPP TS 08.18 -[options="header",cols="5%,10%,40%,5%,40%"] -|=== -| tag (hex) | TS 08.18 ? | IE name | <-/-> | Received/Sent by OsmoPCU -| 0x00 | 11.3.1 | Alignment Octets | <-/-> | Received/Sent -| 0x01 | 11.3.2 | Bmax default MS | -> | Sent -| 0x02 | 11.3.3 | BSS Area Indication | <- | Received -| 0x03 | 11.3.4 | Bucket Leak Rate | -> | Sent -| 0x04 | 11.3.6 | BVCI | <-/-> | Received/Sent -| 0x05 | 11.3.5 | BVC Bucket Size | -> | Sent -| 0x06 | 11.3.7 | BVC Measurement | -> | Sent -| 0x07 | 11.3.8 | Cause | <-/-> | Received/Sent -| 0x08 | 11.3.9 | Cell Identifier | -> | Sent -| 0x09 | 11.3.10 | Channel needed | <- | Received -| 0x0a | 11.3.11 | DRX Parameters | <- | Received -| 0x0b | 11.3.12 | eMLPP-Priority | <- | Received -| 0x0c | 11.3.13 | Flush Action | <- | Received -| 0x0d | 11.3.14 | IMSI | <-/-> | Received/Sent -| 0x0e | 11.3.15 | LLC-PDU | <-/-> | Received/Sent -| 0x0f | 11.3.16 | LLC Frames Discarded | -> | Sent -| 0x10 | 11.3.17 | Location Area | <- | Received -| 0x11 | 11.3.20 | Mobile Id | <- | Received -| 0x12 | 11.3.21 | MS Bucket Size | -> | Sent -| 0x13 | 11.3.22 | MS Radio Access Capability | <- | Received -| 0x14 | 11.3.23 | OMC Id | <- | Received -| 0x15 | 11.3.24 | PDU In Error | <-/-> | Received/Sent -| 0x16 | 11.3.25 | PDU Lifetime | <- | Received -| 0x17 | 11.3.27 | Priority | <- | Received -| 0x19 | 11.3.29 | Radio Cause | -> | Sent -| 0x1a | 11.3.30 | RA-Cap-UPD-Cause | -> | Sent -| 0x1b | 11.3.31 | Routeing Area | <-/-> | Received/Sent -| 0x1c | 11.3.32 | R_default_MS | -> | Sent -| 0x1d | 11.3.33 | Suspend Reference Number | <-/-> | Received/Sent -| 0x1e | 11.3.34 | Tag | <-/-> | Received/Sent -| 0x1f | 11.3.35 | TLLI | <-/-> | Received/Sent -| 0x20 | 11.3.36 | TMSI | <-/-> | Received/Sent -| 0x21 | 11.3.37 | Trace Reference | <- | Received -| 0x22 | 11.3.38 | Trace Type | <- | Received -| 0x23 | 11.3.39 | TransactionId | <- | Received -| 0x24 | 11.3.40 | Trigger Id | <- | Received -| 0x25 | 11.3.41 | Number of octets affected | -> | Sent -| 0x26 | 11.3.18 | LSA Identifier List | -> | Sent -| 0x27 | 11.3.19 | LSA Information | <- | Received -| 0x28 | 11.3.42 | Packet Flow Identifier | <-/-> | Received/Sent -| 0x3a | 11.3.43 | Aggregate BSS QoS Profile (ABQP) | <-/-> | Received/Sent -| 0x3b | 11.3.45 | Feature Bitmap | <-/-> | Received/Sent -| 0x3c | 11.3.46 | Bucket_Full Ratio | -> | Sent -| 0x3d | 11.3.47 | Service UTRAN CCO (Cell Change Order) | <- | Received -|=== - -==== IEs Not Conforming to 3GPP TS 08.18 - -.IEs not conforming to 3GPP TS 08.18 -[options="header",cols="5%,10%,30%,55%"] -|=== -| tag (hex) | TS 08.18 ? | IE name | Description -| 0x18 | 11.3.28 | QoS Profile | Received value is ignored. Sent value is hard-coded to 0x4 (3 octets). -|=== - -==== Additional Attributes and Parameters - -There are no OsmoPCU specific additional Attributes and Parameters. - -=== Details on IEs - -==== BSS Area Indication - -This IE is ignored by OsmoPCU. - -==== Bucket Leak Rate - -The value used by OsmoPCU for this IE can be set through configuration -file or vty via "flow-control force-ms-leak-rate <1-6553500>" command. - -==== BVC Bucket Size - -The value used by OsmoPCU for this IE can be set through configuration file or vty via -"flow-control force-bvc-bucket-size <1-6553500>" command. - -==== Channel needed - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== DRX Parameters - -This IE is ignored by OsmoPCU. - -==== eMLPP-Priority - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Flush Action - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== LLC Frames Discarded - -This IE is not available because entire message which contains it -(LLC-DISCARDED) is not implemented by OsmoPCU - see for <> -details. - -==== Location Area - -This IE is ignored by OsmoPCU. - -==== Mobile Id - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== MS Bucket Size - -The value used by OsmoPCU for this IE can be set through configuration -file or vty via "flow-control force-ms-bucket-size <1-6553500>" -command. - -==== MS Radio Access Capability - -This IE is ignored by OsmoPCU. - -==== OMC Id - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Priority - -This IE is ignored by OsmoPCU. - -==== QoS Profile - -No QoS is supported by OsmoPCU so this IE is ignored or safe default -used when mandatory. - -==== Radio Cause - -This IE is not available because entire message which contains it -(RADIO-STATUS) is not implemented by OsmoPCU - see for <> -details. - -==== RA-Cap-UPD-Cause - -This IE is not available because entire message which contains it -(RA-CAPABILITY-UPDATE-ACK) is not implemented by OsmoPCU - see for -<> details. - -==== Routeing Area - -This IE is ignored by OsmoPCU upon receiving. - -The messages which might require this IE to be send are not -implemented by OsmoPCU - see for <> details. - -==== Suspend Reference Number - -This IE is ignored by OsmoPCU upon receiving. - -The messages which might require this IE to be send are not -implemented by OsmoPCU - see for <> details. - -==== Tag - -This IE currently only used by OsmoPCU for Flow Control procedure (TS -08.18 ? 8.2). In other cases it's either ignored or unavailable. - -==== Trace Reference - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Trace Type - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== TransactionId - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Trigger Id - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Number of octets affected - -This IE is not available because the messages which contains it -(FLUSH-LL-ACK and LLC-DISCARDE) are not implemented by OsmoPCU - see -for <> details. - -==== LSA Information - -This IE is ignored by OsmoPCU. - -==== LSA Identifier List - -This IE is not implemented by OsmoPCU. - -==== Packet Flow Identifier - -This IE is ignored by OsmoPCU upon receiving. - -The messages which might require this IE to be send are not -implemented by OsmoPCU - see for <> details. - -==== Aggregate BSS QoS Profile (ABQP) - -This IE is ignored by OsmoPCU upon receiving. - -The messages which might require this IE to be send are not -implemented by OsmoPCU - see for <> details. - -==== Feature Bitmap - -This IE is not implemented by OsmoPCU. - -This IE is ignored by OsmoPCU when received. - -Absence of Feature Bitmap automatically disables optional features for -Network Service Entity (NSE) communicating with OsmoPCU. - -==== Bucket_Full Ratio - -This IE is not implemented by OsmoPCU. - -==== Service UTRAN CCO (Cell Change Order) - -This IE is ignored by OsmoPCU. - -=== Gb BSSGP Initialization / PCU bring-up - -The BSSGP initialization directly follows NS connection establishment -described in <>. - -OsmoPCU allocates a BVC context for the BVCI given by OsmoBTS, which -in turn receives it from OsmoBSC or OsmoNITB via OML procedures. - -In addition to the BVCI identifying the OsmoPCU side of BSSGP -connection, there is also special BVCI which is accepted by OsmoPCU in -accordance with 3GPP TS 08.18 ? 5.4.1: BVCI = 0 represents signaling data -between SGSN and PCU in contrast to PTP (Peer-To-Peer) user's data. - -The mapping between BSSGP PDUs and signaling or PTP BVCIs is available -in 3GPP TS 08.18 Table 5.4. diff --git a/OsmoPCU/gb/gb-startup.msc b/OsmoPCU/gb/gb-startup.msc deleted file mode 100644 index d76022a..0000000 --- a/OsmoPCU/gb/gb-startup.msc +++ /dev/null @@ -1,27 +0,0 @@ -msc { - hscale="1.2"; - bsc [label="BSC"], bts [label="BTS"], pcu [label="PCU"], sgsn [label="SGSN"]; - - |||; - bts box bsc [label="A-bis OML connection"]; - bsc => bts [label="Set OML Attrbibutes (NSVC,CELL)"]; - bts rbox pcu [label="PCU Unix Domain Socket"]; - pcu => bts [label="connect to PCU socket"]; - pcu <: bts [label="Config. parameters"]; - pcu rbox pcu [label="bind/connect UDP socket"]; - pcu note sgsn [label="NS-over-IP (UDP port 23000)"]; - pcu => sgsn [label="NS RESET"]; - pcu <= sgsn [label="NS RESET ACK"]; - ...; - pcu => sgsn [label="NS UNBLOCK"]; - pcu <= sgsn [label="NS UNBLOCK ACK"]; - pcu box sgsn [label="NS link established"]; - ...; - pcu => sgsn [label="BVC RESET"]; - pcu <= sgsn [label="BVC RESET ACK"]; - ...; - pcu => sgsn [label="BVC UNBLOCK"]; - pcu <= sgsn [label="BVC UNBLOCK ACK"]; - pcu box sgsn [label="BSSGP link established"]; - |||; -} diff --git a/OsmoPCU/gb/ns.adoc b/OsmoPCU/gb/ns.adoc deleted file mode 100644 index c94e018..0000000 --- a/OsmoPCU/gb/ns.adoc +++ /dev/null @@ -1,227 +0,0 @@ -== Network Service (NS) - -=== List of Messages - -The following tables list the NS messages used by OsmoPCU, grouped by their -level of compliance with 3GPP TS 08.16. - -==== Messages Compliant With 3GPP TS 08.16 - -The NS protocol is implemented inside libosmocore so none of the messages below are sent by OsmoPCU explicitly. -Instead corresponding functions from libosmocore are called which send and receive messages as necessary. See <> for details -on establishing NS connection. - -.Messages compliant with 3GPP TS 08.16 -[options="header",cols="10%,10%,20%,35%,5%,20%"] -|=== -| TS 08.16 ? | type code (hex) | This document ? | Message | <-/-> | Received/Sent by OsmoPCU -| 9.2.10 | 0x00 | <> | NS-UNITDATA | <-/-> | Received/Sent -| 9.2.5 | 0x02 | <> | NS-RESET | <-/-> | Received/Sent -| 9.2.6 | 0x03 | <> | NS-RESET-ACK | <-/-> | Received/Sent -| 9.2.3 | 0x04 | <> | NS-BLOCK | <-/-> | Received/Sent -| 9.2.4 | 0x05 | <> | NS-BLOCK-ACK | <-/-> | Received/Sent -| 9.2.8 | 0x06 | <> | NS-UNBLOCK | <-/-> | Received/Sent -| 9.2.9 | 0x07 | <> | NS-UNBLOCK-ACK | <-/-> | Received/Sent -| 9.2.7 | 0x08 | <> | NS-STATUS | <-/-> | Received/Sent -| 9.2.1 | 0x0a | <> | NS-ALIVE | <-/-> | Received/Sent -| 9.2.2 | 0x0b | <> | NS-ALIVE-ACK | <-/-> | Received/Sent -|=== - -==== Messages Specific to OsmoPCU - -There are no OsmoPCU specific NS messages. - -==== Messages Not Implemented by OsmoPCU - -All the NS protocol messages from 3GPP TS 08.16 are implemented in OsmoPCU. - -=== Details on Compliant NS Messages - -[[ns_unit_data]] -==== NS-UNITDATA - -This PDU transfers one NS SDU (specified in 3GPP TS 08.18) between -OsmoPCU and SGSN. Upon receiving it OsmoPCU passes it to BSSGP -implementation to handle. It is also sent by BSSGP as necessary - see -<> for details. - -It contains BVCI (<>) and NS SDU (<>) IEs. - -[[ns_reset]] -==== NS-RESET - -This message is send by OsmoPCU in order to initiate reset procedure -described in 3GPP TS 08.16 ? 7.3. The expected reply is NS-RESET-ACK -(<>) message. If no expected reply is received in 3 -seconds than the sending is retried up to 3 times. When this message -is received it is replied with NS-RESET-ACK (<>). -It might be ignored under conditions described in 3GPP TS 08.16 ? 7.3.1. - -The message conforms to 3GPP TS 08.16 ? 9.2.5 specification. - -It contains Cause (<>), NSVCI (<>) and NSEI (<>) IEs. - -[[ns_reset_ack]] -==== NS-RESET-ACK - -This message is sent as a response to proper NS-RESET (<>) -message initiating reset procedure. - -The message conforms to 3GPP TS 08.16 ? 9.2.6 specification. - -It contains NSVCI (<>) and NSEI (<>) IEs. - -[[ns_block]] -==== NS-BLOCK - -Upon receiving this message corresponding NS-VC is marked as blocked -by OsmoPCU and NS-BLOCK-ACK (<>) reply is transmitted. -When this message is sent by OsmoPCU corresponding NS-BLOCK-ACK -(<>) reply is expected before NS-VC is actually marked -as blocked. This behavior follows the blocking procedure described in -3GPP TS 08.16 ? 7.2. - -The message conforms to 3GPP TS 08.16 ? 9.2.3 specification. - -It contains Cause (<>) and NSVCI (<>) IEs. - -[[ns_block_ack]] -==== NS-BLOCK-ACK - -This message is sent by OsmoPCU automatically upon reception of -correct NS-BLOCK (<>) message. It is expected as a reply -for NS-BLOCK (<>) message sent by OsmoPCU. - -The message conforms to 3GPP TS 08.16 ? 9.2.4 specification. - -It contains NSVCI (<>) IE. - -[[ns_unblock]] -==== NS-UNBLOCK - -Upon receiving this message corresponding NS-VC is unblocked by -OsmoPCU and NS-UNBLOCK-ACK (<>) reply is sent. When -this message is sent by OsmoPCU corresponding NS-UNBLOCK-ACK -(<>) reply is expected before NS-VC is actually marked -as unblocked. This behavior follows the blocking procedure described -in 3GPP TS 08.16 ? 7.2. - -The message conforms to 3GPP TS 08.16 ? 9.2.8 specification. - -[[ns_unblock_ack]] -==== NS-UNBLOCK-ACK - -Receiving this message notifies OsmoPCU that NS-VC unblocking request -is confirmed and thus NS-VC is marked as unblocked. This message is -also sent as a reply to NS-UNBLOCK (<>) message. - -The message conforms to 3GPP TS 08.16 ? 9.2.9 specification. - -[[ns_status]] -==== NS-STATUS - -This message is sent to inform other party about error conditions as a -response to various unexpected PDUs or PDUs with unexpected/missing -data. If this message is received for unknown NS-VC it is ignored in -accordance with 3GPP TS 08.16 ? 7.5.1, otherwise the error cause is -logged if present in NS-STATUS. - -The message conforms to 3GPP TS 08.16 ? 9.2.7 specification. - -It contains Cause (<>) and might (depending on actual error) -contain NSVCI (<>), NS PDU (<>) and BVCI -(<>) IEs. - -[[ns_alive]] -==== NS-ALIVE - -This message is sent periodically to test connectivity according to -3GPP TS 08.16 ? 4.5.3. The expected response is NS-ALIVE-ACK -(<>). If no such response arrives within given amount of -time (3 seconds) than another NS-ALIVE message is sent and failed test -attempt is recorded. After 10 failed attempts NS connection is -considered dead and OsmoPCU tries to reconnect. - -The message conforms to 3GPP TS 08.16 ? 9.2.1 specification. - -[[ns_alive_ack]] -==== NS-ALIVE-ACK - -This message is sent automatically in reply to NS-ALIVE (<>) -message. - -The message conforms to 3GPP TS 08.16 ? 9.2.2 specification. - -=== Information Elements Overview - -All of the IEs handled by OsmoPCU are listed below, with limitations and -additions to 3GPP TS 08.16 specified in more detail. - -==== IEs Conforming to 3GPP TS 08.16 - -The following Information Elements are accepted by OsmoPCU. - -.IEs conforming to 3GPP TS 08.16 -[options="header",cols="5%,10%,40%,5%,40%"] -|=== -| tag (hex) | TS 08.16 ? | IE name | <-/-> | Received/Sent by OsmoPCU -| 0x00 | 10.3.2 | Cause | <-/-> | Received/Sent -| 0x01 | 10.3.5 | NSVCI | <-/-> | Received/Sent -| 0x02 | 10.3.3 | NS PDU | <-/-> | Received/Sent -| 0x03 | 10.3.1 | BVCI | <-/-> | Received/Sent -| 0x04 | 10.3.6 | NSEI | <-/-> | Received/Sent -|=== - -==== IEs Not Conforming to 3GPP TS 08.16 - -All IEs defined in 3GPP TS 08.16 ? 10.3 are supported by OsmoPCU. - -==== Additional Attributes and Parameters - -There are no OsmoPCU specific additional Attributes and Parameters. - -=== Details on IEs - -[[ie_cause]] -==== Cause - -This IE contains reason for a procedure or error as described in 3GPP TS 08.16 ? 10.3.2. - -[[ie_nsvci]] -==== NSVCI - -This IE represents NSVCI identity described in <> and 3GPP TS 08.16 ? 10.3.5. - -[[ie_nspdu]] -==== NS PDU - -This IE contains PDU (possibly truncated) which cause error described -in NS-STATUS message (<>) as described in 3GPP TS 08.16 ? -10.3.3. - -[[ie_nssdu]] -==== NS SDU - -This IE contains BSSGP data - see <> for details. - -[[ie_bvci]] -==== BVCI - -This IE represents BSSGP identity described in <> and 3GPP TS 08.16 -? 10.3.1. - -[[ie_nsei]] -==== NSEI - -This IE represents NSEI identity described in <> and 3GPP TS 08.16 ? -10.3.6. - -[[ns_init]] -=== Gb NS Initialization / PCU bring-up - -OsmoPCU binds and connects an UDP socket for NS using port numbers and IP -information given by OsmoBTS via the PCU socket. OsmoBTS in turn -receives this information from the BSC vi A-bis OML. - -Following successful initialization of the UDP socket, the reset -procedure is initiated as described in <>. diff --git a/OsmoPCU/osmopcu-gb-docinfo.xml b/OsmoPCU/osmopcu-gb-docinfo.xml deleted file mode 100644 index 23ec3d1..0000000 --- a/OsmoPCU/osmopcu-gb-docinfo.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - 0 - February 2016 - HW, MS - - Initial version, reflecting OsmoPCU master branch as on 2016-Mar-02 - (commit 22d7e75e1f160e5337140d9f3dcb2679b621b646). - - - - - - - Max - Suraev - msuraev at sysmocom.de - MS - - sysmocom - sysmocom - s.f.m.c. GmbH - Software Developer - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2015-2016 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoPCU/osmopcu-gb.adoc b/OsmoPCU/osmopcu-gb.adoc deleted file mode 100644 index 00576c9..0000000 --- a/OsmoPCU/osmopcu-gb.adoc +++ /dev/null @@ -1,95 +0,0 @@ -:gfdl-enabled: - -OsmoPCU Gb Protocol Specification -================================= -Harald Welte - -== Introduction - -This document describes the Gb interface of *OsmoPCU*. Based on 3GPP TS -08.16 and 08.18, this document indicates which of the 3GPP specified Gb -messages and IEs are implemented according to 3GPP specifications, which of -these are not or not fully implemented, as well as OsmoPCU-specific extensions -to the Gb interface not specified by 3GPP. - -Extensions to the Gb interface specific to OsmoPCU are detailed in this -document. For details on the messages and IEs that comply with above-mentioned -3GPP specifications, please refer to those documents. - -.3GPP document versions referred to by this document -[cols="20%,80%"] -|=== -|3GPP TS 08.56 | version 8.0.1 Release 1999 -|3GPP TS 08.58 | version 8.6.0 Release 1999 -|3GPP TS 08.60 | version 8.2.1 Release 1999 -|3GPP TS 12.21 | version 8.0.0 Release 1999 -|3GPP TS 08.16 | version 8.0.1 Release 1999 -|3GPP TS 08.18 | version 8.12.0 Release 1999 -|=== - -.IETF documents referred to by his document -[cols="20%,80%"] -|=== -|IETF RFC 768 | User Datagram Protocol -|IETF RFC 791 | Internet Protocol -|=== - -== Overview - -The OsmoPCU Gb interface consists of the NS (Network Services) and -BSSGP (Base Station Subsystem Gateway Protocol), encapsulated in UDP -(User Datagram Protocol) and IP (Internet Protocol) version 4. -Use of other underlying protocols (e. g. Frame Relay) is not supported. - -.UDP port numbers used by OsmoPCU Gb/IP -[options="header",width="50%",cols="35%,65%"] -|=== -|TCP Port Number|Usage -|23000|NS over UDP (default port) -|=== - -The NS-over-UDP link is established in the PCU -> SGSN direction, i.e. -the PCU is running as client while the SGSN is running as server. - -Establishment of the NS-over-UDP link is only possible after OsmoPCU -has been configured via the *PCU socket* interface from OsmoBTS. - -OsmoBTS in turn receives relevant configuration parameters from -OsmoBSC or the BSC component inside OsmoNITB. - -.Overview of Gb link establishment -["mscgen"] ----- -include::{srcdir}/gb/gb-startup.msc[] ----- - -[[ident]] -=== Identities - -The Gb interface identities of the PCU are configured via BSC -> -OsmoBTS -> PCU Socket. They consist of - -NSEI:: NS Equipment Identifier -NSVCI:: NS Virtual Connection Identifier -BVCI:: BSSGP Virtual Connection Identifier - -For an explanation of those identifiers and their use in the NS and -BSSGP protocols, please see the relevant 3GPP specifications for NS (TS 08.16) -and BSSGP (TS 08.18). - -In most cases, all above identities belong to different namespaces and -must be unique within their respective namespace and within the SGSN -they connect to. - -This means that typically each OsmoPCU has one unique set of NSEI, -NSVCI and BVCI in your network. - -include::{srcdir}/gb/ns.adoc[] - -include::{srcdir}/gb/bssgp.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoPCU/osmopcu-usermanual-docinfo.xml b/OsmoPCU/osmopcu-usermanual-docinfo.xml deleted file mode 100644 index ecc6742..0000000 --- a/OsmoPCU/osmopcu-usermanual-docinfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1 - February 13, 2016 - HW - - Initial version. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2013-2016 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoPCU/osmopcu-usermanual.adoc b/OsmoPCU/osmopcu-usermanual.adoc deleted file mode 100644 index bf25cfd..0000000 --- a/OsmoPCU/osmopcu-usermanual.adoc +++ /dev/null @@ -1,30 +0,0 @@ -:gfdl-enabled: - -OsmoPCU User Manual -=================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::{srcdir}/chapters/counters.adoc[] - -include::./common/chapters/gb.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoPCU/osmopcu-vty-reference.xml b/OsmoPCU/osmopcu-vty-reference.xml deleted file mode 100644 index f8c39ec..0000000 --- a/OsmoPCU/osmopcu-vty-reference.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - -]> - - - - - - v1 - 5th March 2014 - hf - Initial version for 0.2-307 - - - - OsmoPCU VTY Reference - - - 2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - diff --git a/OsmoPCU/vty/osmo-pcu_vty_additions.xml b/OsmoPCU/vty/osmo-pcu_vty_additions.xml deleted file mode 100644 index 55d75e4..0000000 --- a/OsmoPCU/vty/osmo-pcu_vty_additions.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - PCU Configuration Node - The main PCU configuration including the timeslot - assignment algorithm and other parameters. - - - diff --git a/OsmoPCU/vty/osmo-pcu_vty_reference.xml b/OsmoPCU/vty/osmo-pcu_vty_reference.xml deleted file mode 100644 index bf1532d..0000000 --- a/OsmoPCU/vty/osmo-pcu_vty_reference.xml +++ /dev/null @@ -1,941 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/configure.ac b/configure.ac index 69dc3c1..fff6a4f 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoPCU/Makefile OsmoSGSN/Makefile OsmoSIPConnector/Makefile OsmoSTP/Makefile -- To view, visit https://gerrit.osmocom.org/11966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2a1de294883491487aa270b1e30160d559ef063a Gerrit-Change-Number: 11966 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:16 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSIPConnector files (now avail in osmo-sip-connector.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11968 Change subject: remove OsmoSIPConnector files (now avail in osmo-sip-connector.git) ...................................................................... remove OsmoSIPConnector files (now avail in osmo-sip-connector.git) Files were added in osmo-sip-connector.git Change-Id I1317131ed6765fec996344fc6ed08350187b615b Depends: osmo-sip-connector.git Change-Id I1317131ed6765fec996344fc6ed08350187b615b Related: OS#3385 Change-Id: Id77812586eb21932b563b57e75cd85b721b7d6ab --- M Makefile.am D OsmoSIPConnector/Makefile.am D OsmoSIPConnector/chapters/configuration.adoc D OsmoSIPConnector/chapters/overview.adoc D OsmoSIPConnector/chapters/running.adoc D OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml D OsmoSIPConnector/osmosipconnector-usermanual.adoc D OsmoSIPConnector/osmosipconnector-vty-reference.xml D OsmoSIPConnector/vty/sipconn_vty_additions.xml D OsmoSIPConnector/vty/sipconn_vty_reference.xml M configure.ac 11 files changed, 0 insertions(+), 1,448 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/68/11968/1 diff --git a/Makefile.am b/Makefile.am index da712fe..6c2879f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoSIPConnector \ OsmoSTP \ OsmoTRX \ OsmocomBB diff --git a/OsmoSIPConnector/Makefile.am b/OsmoSIPConnector/Makefile.am deleted file mode 100644 index f2bb064..0000000 --- a/OsmoSIPConnector/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmosipconnector-usermanual.adoc \ - osmosipconnector-usermanual-docinfo.xml \ - osmosipconnector-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmosipconnector-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmosipconnector-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSIPConnector/chapters/configuration.adoc b/OsmoSIPConnector/chapters/configuration.adoc deleted file mode 100644 index 5cd57fa..0000000 --- a/OsmoSIPConnector/chapters/configuration.adoc +++ /dev/null @@ -1,53 +0,0 @@ -== Configuring OsmoSIPConnector - -The configuration of OsmoSIPConnector consists mainly of two parts: -configuring the MNCC interface towards the MSC and configuring the SIP -interface towards the PBX. - -=== Configuring MNCC - -Configuring the MNCC interface is very simple. It has to be pointed to -the same path that OsmoMSC is also using. This means that OsmoMSC and -OsmoSIPConnector need to be running on the same machine or have a shared -directory that supports UNIX domain sockets. - -Note that you need to start `osmo-msc` with the `--mncc-sock` option and point -to the same file that osmo-sip-connector is configured to use. See the OsmoMSC -manual for more information. - -The example config below assumes that OsmoMSC was started with the command -line `osmo-msc -M /tmp/msc_mncc`. - -.Example: MNCC configuration ----- -OsmoSIPcon(config)# mncc -OsmoSIPcon(config-mncc)# socket-path /tmp/msc_mncc ----- - -=== Configuring SIP - -This section covers the SIP configuration. Source and destination IP and port -can be set for the connection to the PBX. - -.Example: SIP configuration ----- -OsmoSIPcon(config)# sip -OsmoSIPcon(config-sip)# local 10.0.0.1 5060 <1> -OsmoSIPcon(config-sip)# remote 10.0.0.2 5060 <2> ----- -<1> The local IP/port to use -<2> The remote SIP IP/port that the PBX uses - -There is also an option to use the IMSI as calling (source) address for -MO- and as called (destination) address for MT-calls. - -.Example: Use IMSI instead of MSISDN ----- -OsmoSIPcon(config)# app -OsmoSIPcon(config-app)# use-imsi <1> ----- -<1> Use the IMSI for MO calling and MT called address - -Since OsmoSIPConnector is just a shim between OsmoMSC and a proper SIP server -this is the extent of the configuration. Setting up a dialplan and other -SIP-related configuration should be done in the actual SIP server. diff --git a/OsmoSIPConnector/chapters/overview.adoc b/OsmoSIPConnector/chapters/overview.adoc deleted file mode 100644 index 24fe8b9..0000000 --- a/OsmoSIPConnector/chapters/overview.adoc +++ /dev/null @@ -1,48 +0,0 @@ -[[overview]] -== Overview - -This manual should help you getting started with OsmoSIPConnector. It will -cover aspects of configuring and running OsmoSIPConnector. - -[[intro_overview]] -=== About OsmoSIPConnector - -OsmoSIPConnector translates between Mobile Network Call Control (MNCC) -used in the GSM newtwork and Voice over IP SIP call control messages so that -speech calls can traverse through the mobile network to SIP and vice versa. It -has the following interfaces: - -- MNCC UNIX domain socket towards `osmo-msc` -- SIP towards the PBX -- The Osmocom typical telnet VTY interface. - -Find the OsmoSIPConnector issue tracker and wiki online at - -- https://osmocom.org/projects/osmo-sip-connector -- https://osmocom.org/projects/osmo-sip-connector/wiki - - -[[fig-gsm]] -.Typical GSM network architecture used with OsmoSIPConnector -[graphviz] ----- -digraph G{ - rankdir = LR; - "osmo-sip-connector" [color="red"]; - OsmoMGWB [label="OsmoMGW\n(BSC)"]; - OsmoMGWM [label="OsmoMGW\n(MSC)"]; - MS -> BTS [label = "Um"]; - BTS -> OsmoBSC [label = "Abis"]; - OsmoBSC -> OsmoMSC [label = "AoIP" ]; - OsmoMSC -> "osmo-sip-connector" [label = "MNCC"]; - "osmo-sip-connector" -> "PBX" [label = "SIP"]; - BTS -> OsmoMGWB [label = "RTP"]; - OsmoMGWB -> OsmoMGWM [label = "RTP"]; - OsmoMGWM -> "PBX" [label = "RTP"]; - OsmoBSC -> OsmoMGWB [label = "MGCP" ]; - OsmoMSC -> OsmoMGWM [label = "MGCP" ]; - { rank = same; OsmoBSC; OsmoMGWB; } - { rank = same; OsmoMSC; OsmoMGWM; } -} ----- - diff --git a/OsmoSIPConnector/chapters/running.adoc b/OsmoSIPConnector/chapters/running.adoc deleted file mode 100644 index 85ccddc..0000000 --- a/OsmoSIPConnector/chapters/running.adoc +++ /dev/null @@ -1,84 +0,0 @@ -== Running OsmoSIPConnectoer - -The OsmoSIPConnector executable (`osmo-sip-connector`) offers the following -command-line arguments: - -=== SYNOPSIS - -*osmo-sip-connector* [-h] [-c 'CONFIGFILE'] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-sip-connector.cfg` in the - current working directory. - -=== Colocation with OsmoMSC - -Since the MNCC interface used to communicate between OsmoMSC and -OsmoSIPConnector is a UNIX domain socket both processes must run on the same -machine or have a shared directory that supports sharing UNIX domain sockets. - -=== Multiple instances - -Running multiple instances of `osmo-sip-connector` on the same computer is -possible if all interfaces (VTY, CTRL) are separated using the appropriate -configuration options. The IP based interfaces are binding to local host by -default. In order to separate the processes, the user has to bind those -services to specific but different IP addresses and/or ports. - -The VTY and the Control interface can be bound to IP addresses from the -loopback address range, for example: - ----- -line vty - bind 127.0.0.2 -ctrl - bind 127.0.0.2 ----- - -For the SIP client a different IP/port combination also needs to be used, for -example: - ----- -sip - local 0.0.0.0 5061 ----- - -The socket path for the MNCC interface also needs to change, which can be done -with the following configuration snippet: - ----- -mncc - socket-path /tmp/msc2_mncc ----- - -=== DTMF signaling - -In VoIP based telephony networks DTMF (Dual-tone multi-frequency signaling) can -be signaled through multiple methods. Common methods are in-band, RFC2833 and -sip-info messages. - -Osmo-sip-connector is using sip-info messages to signal DTMF tones. When a DTMF -tone is signaled at the MNCC socket interface, osmo-sip-connector will generate -a matching sip-info message to forward the DTMF signal to the PBX. Depending on -the PBX software reconfiguring the DTMF signaling method to sip-info may be -necessary. - -While sending DTMF tones through the MNCC interface to a SIP leg, the current -implementation of osmo-sip-connector does not support sending DTMF tones in the -opposite direction. Any attempts to send DTMF tones to an MNCC leg will be -confirmed with a status 405 "Method not allowed". - -The reason for this limitation is that in mobile networks, depending on the -signaling direction, the signaling of DTMF tones is implemented differently. -A mobile originated DTMF tone is signaled through out of band messages, -which arrive at osmo-sip-connector on as MNCC DTMF START/STOP messages. Those -messages can be directly translated to sip-info messages. However, in the -other direction (mobile terminated), an in-band signaling method is used. This -means that osmo-sip-connector would have to translate an incoming DTMF sip-info -message into an audio sample that then would have to be injected into the -voice stream. Currently this scheme is not implemented in osmo-sip-connector. \ No newline at end of file diff --git a/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml b/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml deleted file mode 100644 index 937e054..0000000 --- a/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1 - August 04th, 2018 - DW - - Initial version - - - - - - - Daniel - Willmann - dwillmann at sysmocom.de - DW - - sysmocom - sysmocom - s.f.m.c. GmbH - - - - - - 2018 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoSIPConnector/osmosipconnector-usermanual.adoc b/OsmoSIPConnector/osmosipconnector-usermanual.adoc deleted file mode 100644 index 72d7127..0000000 --- a/OsmoSIPConnector/osmosipconnector-usermanual.adoc +++ /dev/null @@ -1,28 +0,0 @@ -:gfdl-enabled: -:program-name: OsmoSIPConnector - -OsmoSIPConnector User Manual -============================ -Daniel Willmann - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - diff --git a/OsmoSIPConnector/osmosipconnector-vty-reference.xml b/OsmoSIPConnector/osmosipconnector-vty-reference.xml deleted file mode 100644 index 0eeb952..0000000 --- a/OsmoSIPConnector/osmosipconnector-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 21st August 2018 - dw - Initial - - - - OsmoSIPConnector VTY Reference - - - 2018 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoSIPConnector/vty/sipconn_vty_additions.xml b/OsmoSIPConnector/vty/sipconn_vty_additions.xml deleted file mode 100644 index a4c675e..0000000 --- a/OsmoSIPConnector/vty/sipconn_vty_additions.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/OsmoSIPConnector/vty/sipconn_vty_reference.xml b/OsmoSIPConnector/vty/sipconn_vty_reference.xml deleted file mode 100644 index dee42e6..0000000 --- a/OsmoSIPConnector/vty/sipconn_vty_reference.xml +++ /dev/null @@ -1,1132 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-sip - - - - - - - - - - - - - - - - - - - - - - - - config-mncc - - - - - - - - - config-app - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index 7eabd3a..e036384 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoSIPConnector/Makefile OsmoSTP/Makefile OsmoTRX/Makefile OsmocomBB/Makefile) -- To view, visit https://gerrit.osmocom.org/11968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id77812586eb21932b563b57e75cd85b721b7d6ab Gerrit-Change-Number: 11968 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:17 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSTP files (now avail in libosmo-sccp.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11969 Change subject: remove OsmoSTP files (now avail in libosmo-sccp.git) ...................................................................... remove OsmoSTP files (now avail in libosmo-sccp.git) Files were added in libosmo-sccp.git Change-Id Ib5a22c2ea81fdde036bf9efb47d785a830b88c93 Depends: libosmo-sccp.git Change-Id Ib5a22c2ea81fdde036bf9efb47d785a830b88c93 Related: OS#3385 Change-Id: I971ef93a675412ea27d8bf193db6b9b35428f0bc --- M Makefile.am D OsmoSTP/Makefile.am D OsmoSTP/chapters/overview.adoc D OsmoSTP/osmostp-usermanual-docinfo.xml D OsmoSTP/osmostp-usermanual.adoc D OsmoSTP/osmostp-vty-reference.xml D OsmoSTP/vty/osmo-stp_vty_reference.xml M configure.ac 8 files changed, 0 insertions(+), 1,669 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/69/11969/1 diff --git a/Makefile.am b/Makefile.am index 6c2879f..eb86032 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoSTP \ OsmoTRX \ OsmocomBB diff --git a/OsmoSTP/Makefile.am b/OsmoSTP/Makefile.am deleted file mode 100644 index eb4ec9d..0000000 --- a/OsmoSTP/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmostp-usermanual.adoc \ - osmostp-usermanual-docinfo.xml \ - osmostp-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmostp-usermanual.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmostp-usermanual.pdf: $(srcdir)/chapters/*.adoc -aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc - -VTY_REFERENCE = osmostp-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSTP/chapters/overview.adoc b/OsmoSTP/chapters/overview.adoc deleted file mode 100644 index e69de29..0000000 --- a/OsmoSTP/chapters/overview.adoc +++ /dev/null diff --git a/OsmoSTP/osmostp-usermanual-docinfo.xml b/OsmoSTP/osmostp-usermanual-docinfo.xml deleted file mode 100644 index 4253957..0000000 --- a/OsmoSTP/osmostp-usermanual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - April 16, 2017 - HW - - Initial OsmoSTP manual - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2012-2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoSTP/osmostp-usermanual.adoc b/OsmoSTP/osmostp-usermanual.adoc deleted file mode 100644 index 9f41e5d..0000000 --- a/OsmoSTP/osmostp-usermanual.adoc +++ /dev/null @@ -1,34 +0,0 @@ -OsmoSTP User Manual -=================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -// include::{srcdir}/chapters/overview.adoc[] - -include::./common/chapters/sigtran.adoc[] - -include::./common/chapters/sigtran-osmocom.adoc[] - -//include::{srcdir}/chapters/running.adoc[] -// include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -//include::./common/chapters/bts.adoc[] - -//include::../OsmoNITB/chapters/bts-examples.adoc[] - -//include::./common/chapters/control_if.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - diff --git a/OsmoSTP/osmostp-vty-reference.xml b/OsmoSTP/osmostp-vty-reference.xml deleted file mode 100644 index ae0f7b0..0000000 --- a/OsmoSTP/osmostp-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - April 16, 2017 - h2 - Initial - - - - OsmoSTP VTY Reference - - - 2012-2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoSTP/vty/osmo-stp_vty_reference.xml b/OsmoSTP/vty/osmo-stp_vty_reference.xml deleted file mode 100644 index 308c369..0000000 --- a/OsmoSTP/vty/osmo-stp_vty_reference.xml +++ /dev/null @@ -1,1532 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-listen - - - - - - - - - - - - - - - - config-cs7-rt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index e036384..e7c47a1 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,5 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoSTP/Makefile OsmoTRX/Makefile OsmocomBB/Makefile) -- To view, visit https://gerrit.osmocom.org/11969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I971ef93a675412ea27d8bf193db6b9b35428f0bc Gerrit-Change-Number: 11969 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:17 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoTRX files (now avail in osmo-trx.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11970 Change subject: remove OsmoTRX files (now avail in osmo-trx.git) ...................................................................... remove OsmoTRX files (now avail in osmo-trx.git) Files were added in osmo-trx.git Change-Id I2762171af0bf719a34ba12a0c2e4dcc206098beb Depends: osmo-trx.git Change-Id I2762171af0bf719a34ba12a0c2e4dcc206098beb Related: OS#3385 Change-Id: If7cd43eec5f9d20f7f4200340e96ed0e0908e253 --- M Makefile.am D OsmoTRX/Makefile.am D OsmoTRX/chapters/code-architecture.adoc D OsmoTRX/chapters/configuration.adoc D OsmoTRX/chapters/control.adoc D OsmoTRX/chapters/counters.adoc D OsmoTRX/chapters/counters_generated.adoc D OsmoTRX/chapters/overview.adoc D OsmoTRX/chapters/running.adoc D OsmoTRX/chapters/trx-architectures.adoc D OsmoTRX/chapters/trx-backends.adoc D OsmoTRX/chapters/trx-devices.adoc D OsmoTRX/osmotrx-usermanual-docinfo.xml D OsmoTRX/osmotrx-usermanual.adoc D OsmoTRX/osmotrx-vty-reference.xml D OsmoTRX/vty/trx_vty_additions.xml D OsmoTRX/vty/trx_vty_reference.xml M configure.ac 18 files changed, 0 insertions(+), 1,827 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/70/11970/1 diff --git a/Makefile.am b/Makefile.am index eb86032..fdafc0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoTRX \ OsmocomBB $(top_srcdir)/.version: diff --git a/OsmoTRX/Makefile.am b/OsmoTRX/Makefile.am deleted file mode 100644 index ce5f241..0000000 --- a/OsmoTRX/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmotrx-usermanual.adoc \ - osmotrx-usermanual-docinfo.xml \ - osmotrx-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmotrx-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmotrx-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoTRX/chapters/code-architecture.adoc b/OsmoTRX/chapters/code-architecture.adoc deleted file mode 100644 index 18d0e3a..0000000 --- a/OsmoTRX/chapters/code-architecture.adoc +++ /dev/null @@ -1,141 +0,0 @@ -[[code_architecture]] -== Code Architecture - -[[fig-code-architecture-general]] -.General overview of main OsmoTRX components -[graphviz] ----- -digraph hierarchy { -node[shape=record,style=filled,fillcolor=gray95] -edge[dir=back, arrowtail=empty] - -2[label = "{Transceiver|+ constructor()\l+ destructor()\l+ init()\l+ numChans()\l+ receiveFIFO()\l+ setSignalHandler()}"] -3[label = "{RadioInterface|...}"] -4[label = "{RadioInterfaceResamp|...}"] -5[label = "{RadioInterfaceMulti|...}"] -6[label = "{RadioDevice|...}"] -7[label = "{UHDDevice|...}"] -8[label = "{LMSDevice|...}"] -9[label = "{USRPDevice|...}"] - -2->3[arrowtail=odiamond] -3->4[constraint=false] -3->5[constraint=false] -3->6[arrowtail=odiamond] -6->7 -6->8 -6->9 -} ----- - -[[fig-code-architecture-threads]] -.Example of thread architecture with OsmoTRX configured to use 2 logical RF channels (Trx=Transceiver, RI=RadioIface) -[graphviz] ----- -digraph hierarchy { -node[shape=record,style=filled,fillcolor=gray95] - -trans [label="Transceiver"]; -radioiface [label="RadioInterface"]; -radiodev [label="RadioDevice"]; - -trans:nw->trans:ne [label="Trx.ControlServiceLoop_0"]; -trans:nw->trans:ne [label="Trx.ControlServiceLoop_1"]; -trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_0"]; -trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_1"]; -radioiface:e->trans:e [label="Trx.RxServiceLoop_0"]; -radioiface:e->trans:e [label="Trx.RxServiceLoop_1"]; -radioiface->radiodev[label="RI.AlignRadioServiceLoop"]; -radioiface:sw->radiodev:nw [label="Trx.TxLowerLoop"]; -radiodev:ne->radioiface:se [label="Trx.RxLowerLoop"]; -} ----- - -[[code_component_transceiver]] -=== Transceiver - -The Transceiver is the main component managing the other components running in -the OsmoTRX process. There's a unique instance per process. - -This class is quite complex from code point of view, as it starts lots of -different threads and hence the interaction with this class from the outside is -quite limited. Only interaction possible is to: - -* `Transceiver()`: Create an instance through its constructor, at this time most - configuration is handed to it. -* `init()`: Start running all the threads. -* `receiveFIFO()`: Attach a `radioInterface` channel FIFO in order to use it. -* `setSignalHandler()`: Used to set up a callback to receive certain events - asynchronously from the Transceiver. No assumptions can be made about from - which thread is the callback being called, which means multi-thread locking - precautions may be required in certain cases, similar to usual signal handler - processing. One important event received through this path is for instance - when the Transceiver detected a fatal error which requires it to stop. Since - it cannot stop itself (see destructor below), stopping procedure must be - delegated to the user who created the instance. -* `~Transceiver()`: The destructor, which stops all running threads created at - `init()` time. Destroying the object is the only way to stop the `Transceiver` - completely, and must be called from a thread not managed by the - `Transceiver`, otherwise it will deadlock. Usually it is stopped from the main - thread, the one that called the constructor during startup. - -During `init()` time, `Transceiver` will create a noticeable amount of threads, -which may vary depending on the amount of RF channels requested. - -Static amount of Threads (1 per `Transceiver` instance): - -* `RxLowerLoop`: This thread is responsible for reading bursts from the - `RadioInterface`, storing them into its FIFO and sending Clock Indications - (<>) to _osmo-bts_trx_. -* `TxLowerLoop`: Manages pushing bursts from buffers in the FIFO into the - `RadioInterface` at expected correct time based on the Transceiver clock. - -Dynamic amount of Threads (1 per RF logical channel on the `Transceiver` instance): - -* `ControlServiceLoop`: Handles commands from the Per-ARFCN Control Interface - socket (<>). Each thread is responsible for managing one - socket related to one ARFCN or which is the same, to one RF logical channel. - These are the only threads expected to use the private `start()` and `stop()` - methods of the `Transceiver()` class, since those methods don't stop any of - the `ControlServiceLoop` threads as they must keep running to handle new - commands (for instance, to re-start processing samples with the _POWERON_ - command). -* `RxServiceLoop`: Each thread of this type pulls bursts from the - `RadioInterface` FIFO for one specific logical RF channel and handles it - according to the slot and burst correlation type, finally sending proper data - over the TRX Manager UDP socket (<>). -* `TxPriorityQueueServiceLoop`: Blocks reading from one ARFCN specific TRX - Manager UDP socket (<>), and fills the `RadioInterface` with it - setting clock related information. - -[[code_component_radioiface]] -=== RadioInterface - -The `RadioInterface` sits between the `Transceiver` and the `RadioDevice`, and -provides extra features to the pipe like channelizers, resamplers, Tx/Rx -synchronization on some devices, etc. - -If the `RadioDevice` it drives requires it (only _USRP1_ so far), the -`RadioIntercace` will start and manage a thread internally called -`AlignRadioServiceLoop` which will align current RX and TX timestamps. - -Different features are offered through different `RadioInterface` subclasses -which are selected based on configuration and device detected at runtime. Using -these features may impact on the amount of CPU required to run the entire pipe. - -==== RadioInterfaceResamp - -This subclass of `RadioInterface` is automatically selected when some known -specific UHD are to be used, since they require resampling to work properly. -Some of this devices are for instance Ettus B100, USRP2 and X3XX models. - -==== RadioInterfaceMulti - -This subclass of `RadioInterface` is used when <> is requested. - -[[code_component_radiodev]] -=== RadioDevice - -The `RadioDevice` class is responsible for driving the actual Hardware device. -It is actually only an interface, and it is implemented in each backend which in -turn becomes a specific OsmoTRX binary, see <>. diff --git a/OsmoTRX/chapters/configuration.adoc b/OsmoTRX/chapters/configuration.adoc deleted file mode 100644 index 87d7903..0000000 --- a/OsmoTRX/chapters/configuration.adoc +++ /dev/null @@ -1,85 +0,0 @@ -== Configuring OsmTRX - -OsmoTRX will read the configuration at startup time and configure the -transceiver accordingly after validating the configuration. - -OsmoTRX can handle several TRX channels, but at least one must be configured in -order to be able to start it successfully. Channels must be present in the -configuration file in incremental order, starting from 0 and be consecutive. - -Example configuration files for different devices and setups can be found in -`doc/examples/` in 'osmo-trx' git repository. - -=== Documented example - -.Example: Static GGSN/APN configuration (single catch-all GGSN) ----- -trx - bind-ip 127.0.0.1 <1> - remote-ip 127.0.0.1 <2> - base-port 5700 <3> - egprs disable <4> - tx-sps 4 <5> - rx-sps 4 <6> - chan 0 <7> - tx-path BAND1 <8> - rx-path LNAW <9> ----- -<1> Configure the local IP address at the TRX used for the connection against `osmo-bts-trx`. -<2> Specify the IP address of `osmo-bts-trx` to connect to. -<3> Specify the reference base UDP port to use for communication. -<4> Don't enable EDGE support. -<5> Use 4 TX samples per symbol. This is device specific. -<6> Use 4 RX samples per symbol. This is device specific. -<7> Configure the first channel. As no other channels are specified, `osmo-trx` assumes it is using only one channel. -<8> Configure the device to use `BAND1` Tx antenna path from all the available ones (device specific). -<9> Configure the device to use `LNAW` Rx antenna path from all the available ones (device specific). - -[[multiarfcn_mode]] -=== Multi-ARFCN mode - -The Multi-ARFCN feature allows to have a multi-carrier approach multiplexed on a -single physical RF channel, which can introduce several benefits, such as lower -cost and higher capacity support. - -Multi-ARFCN support is available since osmo-trx release `0.2.0`, and it was -added specifically in commit `76764278169d252980853251daeb9f1ba0c246e1`. - -This feature is useful for instance if you want to run more than 1 TRX with an -Ettus B200 device, or 3 TRX with an Ettus B210 device, since they support only 1 -and 2 physical RF channels respectively. No device from other providers or even -other devices than B200 and B210 from Ettus are known to support this feature. - -With multi-ARFCN enabled, ARFCN spacing is fixed at 800 kHz or 4 GSM channels. -So if TRX-0 is set to ARFCN 51, TRX-1 _must_ be set to 55, and so on. Up to -three ARFCN's is supported for multi-TRX. - -From BTS and BSC point of view, supporting multiple TRX through multi-ARFCN -feature in OsmoTRX doesn't make any difference from a regular multi-TRX setup, -leaving apart of course the mentioned ARFCN limitations explained above and as a -consequence physical installation and operational differences. - -.Example: osmo-bts-trx.cfg using 2 TRX against an osmo-trx driven device ----- -phy 0 - osmotrx ip local 127.0.0.1 - osmotrx ip remote 127.0.0.1 - instance 0 - instance 1 -bts 0 - ... - band GSM-1800 - trx 0 - phy 0 instance 0 - trx 1 - phy 0 instance 1 ----- - -.Example: osmo-trx.cfg using Multi-ARFCN mode to run 2 TRX ----- -trx - ... - multi-arfcn enable - chan 0 - chan 1 ----- diff --git a/OsmoTRX/chapters/control.adoc b/OsmoTRX/chapters/control.adoc deleted file mode 100644 index 168769a..0000000 --- a/OsmoTRX/chapters/control.adoc +++ /dev/null @@ -1,12 +0,0 @@ -[[control]] -== Control interface - -The actual protocol is described in <>, the variables -common to all programs using it are described in <>. Here we -describe variables specific to OsmoTRX. - -.Variables available over control interface -[options="header",width="100%",cols="20%,5%,5%,50%,20%"] -|=== -|Name|Access|Trap|Value|Comment -|=== diff --git a/OsmoTRX/chapters/counters.adoc b/OsmoTRX/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoTRX/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoTRX/chapters/counters_generated.adoc b/OsmoTRX/chapters/counters_generated.adoc deleted file mode 100644 index b40dc37..0000000 --- a/OsmoTRX/chapters/counters_generated.adoc +++ /dev/null @@ -1,7 +0,0 @@ -// autogenerated by show asciidoc counters -These counters and their description based on OsmoTRX 0.2.0.61-408f (OsmoTRX). - -// generating tables for rate_ctr_group -// generating tables for osmo_stat_items -// generating tables for osmo_counters -// there are no ungrouped osmo_counters diff --git a/OsmoTRX/chapters/overview.adoc b/OsmoTRX/chapters/overview.adoc deleted file mode 100644 index 785e26b..0000000 --- a/OsmoTRX/chapters/overview.adoc +++ /dev/null @@ -1,62 +0,0 @@ -[[chapter_introduction]] -== Overview - -[[intro_overview]] -=== About OsmoTRX - -OsmoTRX is a C/C++ language implementation of the GSM radio modem, -originally developed as the 'Transceiver' part of OpenBTS. This radio -modem offers an interface based on top of UDP streams. - - -The OsmoBTS bts_model code for OsmoTRX is called -`osmo-bts-trx`. It implements the UDP stream interface of -OsmoTRX, so both parts can be used together to implement a complete GSM -BTS based on general-purpose computing SDR. - -As OsmoTRX is general-purpose software running on top of Linux, it is -thus not tied to any specific physical hardware. At the time of this -writing, OsmoTRX supports a variety of Lime Microsystems and Ettus USRP SDRs via -the UHD driver, as well as the Fairwaves UmTRX and derived products. - -OsmoTRX is not a complete GSM PHY but 'just' the radio modem. This -means that all of the Layer 1 functionality such as scheduling, -convolutional coding, etc. is actually also implemented inside OsmoBTS. -OsmoTRX is a software-defined radio transceiver that implements the Layer 1 -physical layer of a BTS comprising the following 3GPP specifications: - -* TS 05.01 "Physical layer on the radio path" -* TS 05.02 "Multiplexing and Multiple Access on the Radio Path" -* TS 05.04 "Modulation" -* TS 05.10 "Radio subsystem synchronization - -As such, the boundary between OsmoTRX and `osmo-bts-trx` is at -a much lower interface, which is an internal interface of other more -traditional GSM PHY implementations. - -Besides OsmoTRX, there are also other implementations (both Free -Software and proprietary) that implement the same UDP stream based radio -modem interface. - -[[fig-gprs-pcubts]] -.GSM network architecture with OsmoTRX and OsmoBTS -[graphviz] ----- -digraph G { - rankdir=LR; - MS0 [label="MS"]; - MS1 [label="MS"]; - MS0->SDR[label="Um"]; - MS1->SDR [label="Um"]; - SDR -> OsmoTRX [label="Raw Samples"]; - OsmoTRX->BTS [label="bursts over UDP"]; - BTS->BSC [label="Abis"]; - BSC->MSC [label="A"]; - BTS->PCU [label="pcu_sock"]; - PCU->SGSN [label="Gb"]; - OsmoTRX [color=red]; -} ----- - -For more information see -https://osmocom.org/projects/osmotrx/wiki/OsmoTRX diff --git a/OsmoTRX/chapters/running.adoc b/OsmoTRX/chapters/running.adoc deleted file mode 100644 index 7ed2884..0000000 --- a/OsmoTRX/chapters/running.adoc +++ /dev/null @@ -1,19 +0,0 @@ -== Running OsmoTRX - -The OsmoTRX executable (`osmo-trx`) offers the following command-line -options: - - -=== SYNOPSIS - -*osmo-trx* [-h] [-C 'CONFIGFILE'] - - -=== OPTIONS - -*-h*:: - Print a short help message about the supported options -*-C 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo_trx.cfg` in the current - working directory. diff --git a/OsmoTRX/chapters/trx-architectures.adoc b/OsmoTRX/chapters/trx-architectures.adoc deleted file mode 100644 index 66eae5e..0000000 --- a/OsmoTRX/chapters/trx-architectures.adoc +++ /dev/null @@ -1,34 +0,0 @@ -[[osmotrx_arch_support]] -== OsmoTRX hardware architecture support - -OsmoTRX comes out-of-the-box with several algorithms and operations -optimized for certain instruction-set architectures, as well as non-optimized -fall-back algorithms in case required instruction sets are not supported by the -compiler at compile time or by the executing machine at run-time. Support for -these optimized algorithms can be enabled and disabled by means of configure -flags. Accelerated operations include pulse shape filtering, resampling, -sequence correlation, and many other signal processing operations. - -On Intel processors, OsmoTRX makes heavy use of the Streaming SIMD Extensions -(SSE) instruction set. SSE3 is the minimum requirement for accelerated use. -SSE3 is present in the majority of Intel processors since later versions of the -Pentium 4 architecture and is also present on low power Atom processors. Support -is automatically detected at build time. SSE4.1 instruction set is supported -too. This feature is enabled by default unless explicitly disabled by passing -the configure flag _--with-sse=no_. When enabled, the compiler will build an -extra version of each of the supported algorithms using each of the supported -mentioned instruction sets. Then, at run-time, OsmoTRX will auto-detect -capabilities of the executing machine and enable an optimized algorithm using -the most suitable available (previously compiled) instruction set. - -On ARM processors, NEON and NEON FMA are supported. Different to the x86, there -is no auto-detection in this case, nor difference between compile and runtime. -NEON support is disabled by default and can be enabled by passing the flag -_--with-neon=yes_ to the configure script; the used compiler must support NEON -instruction set and the resulting binary will only run fine on an ARM board -supporting NEON extensions. Running OsmoTRX built with flag _--with-neon_ on a -board without NEON instruction set support, will most probably end up in the -process being killed with a _SIGILL_ Illegal Instruction signal by the operating -system. NEON FMA (Fused Multiply-Add) is an extension to the NEON instruction -set, and its use in OsmoTRX can be enabled by passing the _--with_neon_vfpv4_ -flag, which will also implicitly enable NEON support (_--with_neon_). diff --git a/OsmoTRX/chapters/trx-backends.adoc b/OsmoTRX/chapters/trx-backends.adoc deleted file mode 100644 index 8829fa6..0000000 --- a/OsmoTRX/chapters/trx-backends.adoc +++ /dev/null @@ -1,46 +0,0 @@ -[[trx_backends]] -== OsmoTRX backend support - -[[backend_uhd]] -=== `osmo-trx-uhd` for UHD based Transceivers - -This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the -device, that is configuring it and reading/writing samples from/to it. - -So far, this backend has been mostly used to drive devices such as the Ettus -B200 family and Fairwaves UmTRX family, and used to be the default backend used -for legacy @osmo-trx@ binary when per-backend binaries didn't exist yet. - -Any device providing generic support for UHD should theoretically be able to be -run through this backend without much effort, but pracitcal experience showed -that some devices don't play well with it, such as the LimeSDR family of -devices, which showed far better results when using its native interface. - -Related code can be found in the _Transceiver52M/device/uhd/_ directory in -_osmo-trx.git_. - -[[backend_lms]] -=== `osmo-trx-lms` for LimeSuite based Transceivers - -This OsmoTRX model uses LimeSuite API and library to drive the device, that is -configuring it and reading/writing samples from/to it. - -This backend was developed in order to be used together with LimeSDR-USB and -LimeSDR-mini devices, due to to the poor results obtained with the UHD backend, -and to simplify the stack. - -Related code can be found in the _Transceiver52M/device/lms/_ directory in -_osmo-trx.git_. - -[[backend_usrp1]] -=== `osmo-trx-usrp1` for libusrp based Transceivers - -This OsmoTRX model uses the legacy libusrp driver provided in GNU Radio 3.4.2. - -As this code was dropped from GNU Radio at some point and was found very -difficult to build, some work was done to create a standalone libusrp which can -be nowadays found as a separate git repository together with other osmocom git -repositories, in https://git.osmocom.org/libusrp/ - -Related code can be found in the _Transceiver52M/device/usrp1/_ directory in -_osmo-trx.git_. diff --git a/OsmoTRX/chapters/trx-devices.adoc b/OsmoTRX/chapters/trx-devices.adoc deleted file mode 100644 index 10c8529..0000000 --- a/OsmoTRX/chapters/trx-devices.adoc +++ /dev/null @@ -1,90 +0,0 @@ -[[osmotrx_device_support]] -== OsmoTRX hardware device support - -OsmoTRX consists of a _common_ part that applies to all TRX devices as well as -_hardware-specific_ parts for each TRX device. The hardware-specific parts are -usually provided by vendor-specific or device-specific libraries that are then -handled by some OsmoTRX glue code presenting a unified interface towards the -rest of the code by means of a _RadioDevice_ class. - -The common part includes the core TRX architecture as well as code for -implementing the external interfaces such as the TRX Manager UDP socket, -control, and VTY interfaces. - -The hardware-specific parts include support for driving one particular -implementation of a radio modem. Such a physical layer -implementation can come in many forms. Sometimes it runs on a general -purpose CPU, sometimes on a dedicated ARM core, a dedicated DSP, a -combination of DSP and FPGA. - -Joining the common part with each of the available backends results in a -different binary with different suffix for each backend. For instance, when -OsmoTRX is built with UHD backend, an _osmo-trx-uhd_ binary is generated; when -OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated. -Build of different backend can be enabled and disabled by means of configure -flags, which can be found in each subsection relative to each backend below. - -[[dev_ettus_usrp1]] -=== Ettus USRP1 - -The binary _osmo-trx-usrp1_ is used to drive this device, see <>. - -[[dev_ettus_b200]] -=== Ettus B200 - -The binary _osmo-trx-uhd_ is used to drive this device, see <>. - -Comes only with 1 RF channel. It can still be used in a multi-TRX setup by using -the <> feature. By using this feature, one can drive up to 3 -TRX (with the restrictions explained there). - -[[dev_ettus_b200]] -=== Ettus B210 - -The binary _osmo-trx-uhd_ is used to drive this device, see <>. - -Comes with 2 RF channels, which can be used to set up a multi-TRX BTS. However, -due to a shared local oscillator for both RF channels, ARFCN separation can be -up about 25 MHz. - -This device also supports the <> feature. By using this -feature, one can drive up to 3 TRX (with the restrictions explained there). -Please note that the above configurations cannot be combined, which means -maximum number of TRX one can achieve is 2 by using separate physical RF -channels, or 3 by using multi-ARFCN method. You cannot support, for example, 6 -ARFCN operation on B210 using 3 TRX on side A and another 3 TRX on side B. - -[[dev_limesdr_usb]] -=== LimeSDR-USB - -The binary _osmo-trx-lms_ is used to drive this device, see <>. - -This device comes with 2 RF channels, so it should theoretically be possible to -run a multi-TRX setup with it, but there are yet no records that this kind of -setup was tested with this device. - -This device has 3 different Rx paths with different antenna connectors in the -PCB, each with a different frequency and bandwidth range. One should make sure -the physical antenna is connected to the correct connector matching the Rx path -you want to use. If one wants to be able to use the device in both 900 and 1800 -MHz GSM bands and easily switch between them, then Rx Path `LNAW` should be used -,since it is the only one covering both bands, and the antenna physically plugged -accordingly. Following example shows how to then configure _osmo-trx-lms_ to use -that Rx path to read samples. - -.Example: Configure osmo-trx-lms to use LNAW as Rx path and BAND1 as Tx Path ----- -trx - ... - chan 0 - tx-path BAND1 - rx-path LNAW ----- - -[[dev_limesdr_mini]] -=== LimeSDR-mini - -The binary _osmo-trx-lms_ is used to drive this device, see <>. - -As a smaller brother of the [[dev_limesdr_usb]], this device comes only with 1 -RF channel. As a result, it can only hold 1 TRX as of today. diff --git a/OsmoTRX/osmotrx-usermanual-docinfo.xml b/OsmoTRX/osmotrx-usermanual-docinfo.xml deleted file mode 100644 index 34225be..0000000 --- a/OsmoTRX/osmotrx-usermanual-docinfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1 - March 6, 2019 - PE - - Initial version. - - - - - - - Pau - Espin Pedrol - pespin at sysmocom.de - PE - - sysmocom - sysmocom - s.f.m.c. GmbH - Software Developer - - - - - - 2018 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc deleted file mode 100644 index a17a899..0000000 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ /dev/null @@ -1,42 +0,0 @@ -:gfdl-enabled: - -OsmoTRX User Manual -==================== -Pau Espin Pedrol - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/counters.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::{srcdir}/chapters/trx-architectures.adoc[] - -include::{srcdir}/chapters/trx-devices.adoc[] - -include::{srcdir}/chapters/trx-backends.adoc[] - -include::{srcdir}/chapters/code-architecture.adoc[] - -include::./common/chapters/trx_if.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoTRX/osmotrx-vty-reference.xml b/OsmoTRX/osmotrx-vty-reference.xml deleted file mode 100644 index 4291929..0000000 --- a/OsmoTRX/osmotrx-vty-reference.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - -]> - - - - - - v1 - 6th March 2018 - pe - Initial - - - - OsmoTRX VTY Reference - - - 2018 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - diff --git a/OsmoTRX/vty/trx_vty_additions.xml b/OsmoTRX/vty/trx_vty_additions.xml deleted file mode 100644 index a4c675e..0000000 --- a/OsmoTRX/vty/trx_vty_additions.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/OsmoTRX/vty/trx_vty_reference.xml b/OsmoTRX/vty/trx_vty_reference.xml deleted file mode 100644 index ffc642a..0000000 --- a/OsmoTRX/vty/trx_vty_reference.xml +++ /dev/null @@ -1,1183 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-trx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-trx-chan - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index e7c47a1..a6f29a0 100644 --- a/configure.ac +++ b/configure.ac @@ -32,5 +32,4 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoTRX/Makefile OsmocomBB/Makefile) -- To view, visit https://gerrit.osmocom.org/11970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If7cd43eec5f9d20f7f4200340e96ed0e0908e253 Gerrit-Change-Number: 11970 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:27 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMSC files (now avail in osmo-msc.git) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: remove OsmoMSC files (now avail in osmo-msc.git) ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Nov 2018 10:00:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 28 Nov 2018 10:23:06 +0000 Subject: Change in osmo-sysmon[master]: fix file descriptor leak in osysmon_file_read In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11943 ) Change subject: fix file descriptor leak in osysmon_file_read ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Gerrit-Change-Number: 11943 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 28 Nov 2018 10:23:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:23:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:23:57 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoNITB: bsc_vty_additions.xml: replace symlink with copy Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11971 Change subject: OsmoNITB: bsc_vty_additions.xml: replace symlink with copy ...................................................................... OsmoNITB: bsc_vty_additions.xml: replace symlink with copy Replace the symlink that points to OsmoBSC/vty/bsc_vty_additions.xml with a copy of that file, so we can delete the OsmoBSC dir. Change-Id: Ifbffc90d56f0fa90d2da77dd7807cd0bb197c0d7 --- D OsmoNITB/vty/bsc_vty_additions.xml A OsmoNITB/vty/bsc_vty_additions.xml 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/71/11971/1 diff --git a/OsmoNITB/vty/bsc_vty_additions.xml b/OsmoNITB/vty/bsc_vty_additions.xml deleted file mode 120000 index 5def5f1..0000000 --- a/OsmoNITB/vty/bsc_vty_additions.xml +++ /dev/null @@ -1 +0,0 @@ -../../OsmoBSC/vty/bsc_vty_additions.xml \ No newline at end of file diff --git a/OsmoNITB/vty/bsc_vty_additions.xml b/OsmoNITB/vty/bsc_vty_additions.xml new file mode 100644 index 0000000..f62f8b1 --- /dev/null +++ b/OsmoNITB/vty/bsc_vty_additions.xml @@ -0,0 +1,10 @@ + + + This node allows to configure the MSC connection related + settings. + + + This node allows to configure the BSC connection related + settings. + + -- To view, visit https://gerrit.osmocom.org/11971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbffc90d56f0fa90d2da77dd7807cd0bb197c0d7 Gerrit-Change-Number: 11971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:36:30 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:36:30 +0000 Subject: Change in osmo-bsc[master]: contrib/jenkins.sh: build manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11972 Change subject: contrib/jenkins.sh: build manuals ...................................................................... contrib/jenkins.sh: build manuals Related: OS#3385 Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/11972/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0be4fe0..b570de5 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -29,6 +29,7 @@ osmo-build-dep.sh libosmo-netif osmo-build-dep.sh libosmo-sccp osmo-build-dep.sh osmo-mgw +osmo-build-dep.sh osmo-gsm-manuals set +x echo @@ -40,7 +41,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror +./configure --enable-sanitize --enable-external-tests --enable-werror --enable-manuals $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/11972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 Gerrit-Change-Number: 11972 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 28 11:19:05 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 28 Nov 2018 11:19:05 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-cellmgr-ng_=C2=BB_a1=3Ddefa?= =?UTF-8?Q?ult,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#60?= In-Reply-To: <37989701.875.1543333150090.JavaMail.jenkins@jenkins.osmocom.org> References: <37989701.875.1543333150090.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <9429210.891.1543403945550.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 215.89 KB...] src/Makefile.am:14: warning: source file 'input/ipaccess.c' is in a subdirectory, src/Makefile.am:14: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. src/Makefile.am:8: warning: source file 'mgcp/mgcp_protocol.c' is in a subdirectory, src/Makefile.am:8: but option 'subdir-objects' is disabled src/Makefile.am:8: warning: source file 'mgcp/mgcp_network.c' is in a subdirectory, src/Makefile.am:8: but option 'subdir-objects' is disabled src/Makefile.am:8: warning: source file 'mgcp/mgcp_vty.c' is in a subdirectory, src/Makefile.am:8: but option 'subdir-objects' is disabled src/Makefile.am:24: warning: source file 'input/ipaccess.c' is in a subdirectory, src/Makefile.am:24: but option 'subdir-objects' is disabled src/Makefile.am: installing './depcomp' tests/dtmf/Makefile.am:7: warning: source file '$(top_srcdir)/src/dtmf_scheduler.c' is in a subdirectory, tests/dtmf/Makefile.am:7: but option 'subdir-objects' is disabled tests/isup/Makefile.am:7: warning: source file '$(top_srcdir)/src/isup.c' is in a subdirectory, tests/isup/Makefile.am:7: but option 'subdir-objects' is disabled tests/mgcp/Makefile.am:7: warning: source file '$(top_srcdir)/src/mgcp_patch.c' is in a subdirectory, tests/mgcp/Makefile.am:7: but option 'subdir-objects' is disabled tests/mgcp/Makefile.am:7: warning: source file '$(top_srcdir)/src/mgcp/mgcp_protocol.c' is in a subdirectory, tests/mgcp/Makefile.am:7: but option 'subdir-objects' is disabled tests/mgcp/Makefile.am:7: warning: source file '$(top_srcdir)/src/mgcp/mgcp_network.c' is in a subdirectory, tests/mgcp/Makefile.am:7: but option 'subdir-objects' is disabled tests/mgcp/Makefile.am:7: warning: source file '$(top_srcdir)/src/debug.c' is in a subdirectory, tests/mgcp/Makefile.am:7: but option 'subdir-objects' is disabled tests/mtp/Makefile.am:6: warning: source file '$(top_srcdir)/src/sctp_m3ua_misc.c' is in a subdirectory, tests/mtp/Makefile.am:6: but option 'subdir-objects' is disabled tests/patching/Makefile.am:6: warning: source file '$(top_srcdir)/src/bss_patch.c' is in a subdirectory, tests/patching/Makefile.am:6: but option 'subdir-objects' is disabled tests/patching/Makefile.am:6: warning: source file '$(top_srcdir)/src/debug.c' is in a subdirectory, tests/patching/Makefile.am:6: but option 'subdir-objects' is disabled + ./configure --enable-external-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for ranlib... ranlib checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking net-snmp/net-snmp-config.h usability... yes checking net-snmp/net-snmp-config.h presence... yes checking for net-snmp/net-snmp-config.h... yes checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for LIBOSMOCORE... yes checking for LIBOSMOGSM... yes checking for LIBOSMOSCCP... yes checking for LIBOSMOVTY... yes checking for python... /usr/bin/python checking for python version... 2.7 checking for python platform... linux2 checking for python script directory... ${prefix}/lib/python2.7/dist-packages checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages checking for osmotestvty.py... yes checking whether to enable VTY tests... yes checking for sctp_sendmsg in -lsctp... yes checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating include/Makefile config.status: creating include/mgcp/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating tests/mtp/Makefile config.status: creating tests/patching/Makefile config.status: creating tests/isup/Makefile config.status: creating tests/mgcp/Makefile config.status: creating tests/dtmf/Makefile config.status: creating Makefile config.status: creating cellmgr_config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands + make -j 8 echo 1.3.0.84-72e29 > .version-t && mv .version-t .version make all-recursive make[1]: Entering directory '/build' Making all in include make[2]: Entering directory '/build/include' Making all in mgcp make[3]: Entering directory '/build/include/mgcp' make[3]: Nothing to be done for 'all'. make[3]: Leaving directory '/build/include/mgcp' make[3]: Entering directory '/build/include' make[3]: Nothing to be done for 'all-am'. make[3]: Leaving directory '/build/include' make[2]: Leaving directory '/build/include' Making all in src make[2]: Entering directory '/build/src' CC mtp_layer3.o CC main.o CC thread.o CC ipaccess.o CC pcap.o CC bss_patch.o CC bsc_sccp.o CC bssap_sccp.o main.c: In function 'main': main.c:68:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC bsc_ussd.o CC links.o CC msc_conn.o CC link_udp.o CC snmp_mtp.o CC debug.o CC isup.o CC mtp_link.o snmp_mtp.c: In function 'link_up_cb': snmp_mtp.c:49:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] int link_index = (int) data; ^ snmp_mtp.c: In function 'link_down_cb': snmp_mtp.c:65:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] int link_index = (int) data; ^ snmp_mtp.c: In function 'send_pdu': snmp_mtp.c:84:40: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] status = snmp_async_send(ss, pdu, cb, (void *) link_id); ^ CC counter.o CC sccp_state.o CC bsc.o CC ss7_application.o CC vty_interface_legacy.o CC vty_interface_cmds.o CC mgcp_patch.o CC mgcp_callagent.o CC isup_filter.o CC main_stp.o CC sctp_m2ua.o CC vty_interface.o main_stp.c: In function 'main': main_stp.c:212:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC sctp_m3ua_client.o CC sctp_m3ua_misc.o CC mgcp_ss7.o sctp_m2ua.c: In function 'm2ua_conn_destroy': sctp_m2ua.c:91:3: warning: #warning "Notify any other AS(P) for failover scenario" [-Wcpp] #warning "Notify any other AS(P) for failover scenario" ^ CC mgcp_ss7_vty.o CC mgcp_hw.o CC mgcp_protocol.o mgcp_ss7.c: In function 'main': mgcp_ss7.c:1014:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CC mgcp_network.o mgcp_hw.c: In function 'mgcp_hw_connect': mgcp_hw.c:68:2: warning: #warning "NO Uniporte" [-Wcpp] #warning "NO Uniporte" ^ CC mgcp_vty.o mgcp/mgcp_protocol.c: In function 'find_e1_endpoint': mgcp/mgcp_protocol.c:291:2: warning: #warning "One should check if the endpoint is blocked!" [-Wcpp] #warning "One should check if the endpoint is blocked!" ^ mgcp/mgcp_network.c:38:2: warning: #warning "Make use of the rtp proxy code" [-Wcpp] #warning "Make use of the rtp proxy code" ^ mgcp/mgcp_network.c: In function 'patch_and_count': mgcp/mgcp_network.c:173:2: warning: #warning "Always allow to patch the SSRC" [-Wcpp] #warning "Always allow to patch the SSRC" ^ mgcp/mgcp_network.c: In function 'receive_from': mgcp/mgcp_network.c:328:3: warning: #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." [-Wcpp] #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." ^ CC dtmf_scheduler.o CCLD cellmgr_ng CCLD osmo-stp CCLD mgcp_mgw make[2]: Leaving directory '/build/src' Making all in tests make[2]: Entering directory '/build/tests' Making all in mtp make[3]: Entering directory '/build/tests/mtp' CC sctp_m3ua_misc.o CC mtp_parse_test.o CCLD mtp_parse_test make[3]: Leaving directory '/build/tests/mtp' Making all in patching make[3]: Entering directory '/build/tests/patching' CC debug.o CC patching_test.o CC bss_patch.o patching_test.c: In function 'main': patching_test.c:417:2: warning: 'osmo_init_logging' is deprecated (declared at /build/deps/install/stow/libosmocore/include/osmocom/core/application.h:20): use osmo_init_logging2() instead to avoid a NULL talloc ctx [-Wdeprecated-declarations] osmo_init_logging(&log_info); ^ CCLD patching_test make[3]: Leaving directory '/build/tests/patching' Making all in isup make[3]: Entering directory '/build/tests/isup' CC isup_parse_test.o CC isup.o ../../src/isup.c:24:36: fatal error: osmocom/mtp/mtp_level3.h: No such file or directory #include ^ compilation terminated. make[3]: *** [isup.o] Error 1 Makefile:338: recipe for target 'isup.o' failed make[3]: Leaving directory '/build/tests/isup' make[2]: *** [all-recursive] Error 1 Makefile:327: recipe for target 'all-recursive' failed make[2]: Leaving directory '/build/tests' Makefile:370: recipe for target 'all-recursive' failed make[1]: Leaving directory '/build' make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 Makefile:310: recipe for target 'all' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:24:45 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 11:24:45 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11953 to look at the new patch set (#3). Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... ctrl2cgi: fix deferred callbacks Previously handle_reply() was marked as deferred callback unlike soap.py where it's synchronous function. This seems to be causing issues where some of the callbacks are not yield properly. Let's move to the known-to-work semantics of soap.py where async functions are limited to Trap() class. Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 7 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/53/11953/3 -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:24:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 11:24:46 +0000 Subject: Change in python/osmo-python-tests[master]: Drop unused Trap() class Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11973 Change subject: Drop unused Trap() class ...................................................................... Drop unused Trap() class Change-Id: Ic2066a66f99a059fc65cf3092170e248288c04d4 --- M osmopy/trap_helper.py 1 file changed, 0 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/73/11973/1 diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index f7a64c8..6f4b95d 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -71,65 +71,6 @@ loc = split_type(v) return partial(lambda a, i: a[i] if len(a) > i else None, loc) -class Trap(CTRL): - """ - TRAP handler (agnostic to factory's client object) - """ - def ctrl_TRAP(self, data, op_id, v): - """ - Parse CTRL TRAP and dispatch to appropriate handler after normalization - """ - self.factory.log.debug('TRAP %s' % v) - (l, r) = v.split() - loc = l.split('.') - t_type = loc[-1] - p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) - method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix - - def ctrl_SET_REPLY(self, data, _, v): - """ - Debug log for replies to our commands - """ - self.factory.log.debug('SET REPLY %s' % v) - - def ctrl_ERROR(self, data, op_id, v): - """ - We want to know if smth went wrong - """ - self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) - - def connectionMade(self): - """ - Logging wrapper, calling super() is necessary not to break reconnection logic - """ - self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) - super(CTRL, self).connectionMade() - - @defer.inlineCallbacks - def handle_locationstate(self, net, bsc, bts, trx, data): - """ - Handle location-state TRAP: parse trap content, prepare parameters and use treq's routines to post it while setting up async handlers - """ - (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',') - tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data)) - - d = self.factory.prepare_params(bsc, lon, lat, fix.get(fx, 0), tstamp, oper.get(opr, 2), admin.get(adm, 2), policy.get(pol, 3)) - - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors - # Ensure that we run only limited number of requests in parallel: - yield self.factory.semaphore.acquire() - yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit - self.factory.semaphore.release() - - def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): - """ - Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled - """ - self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) - - def reloader(path, script, log, dbg1, dbg2, signum, _): """ Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation -- To view, visit https://gerrit.osmocom.org/11973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2066a66f99a059fc65cf3092170e248288c04d4 Gerrit-Change-Number: 11973 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:24:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 11:24:46 +0000 Subject: Change in python/osmo-python-tests[master]: Move command processing into shared function Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11974 Change subject: Move command processing into shared function ...................................................................... Move command processing into shared function Change-Id: I4e40607a9aa5e03a7b3f5b68e4261828209a5813 --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 3 files changed, 19 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/74/11974/1 diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index 6f4b95d..d07ebd3 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -24,6 +24,7 @@ import sys, os, datetime, signal, logging, logging.handlers from functools import partial +from osmopy.osmo_ipa import Ctrl from osmopy.twisted_ipa import CTRL from twisted.internet import defer @@ -56,6 +57,17 @@ loc = split_type(v) return loc[-1] +def comm_proc(comm, f, log): + """ + Command processor: takes function f to run for each command + """ + bsc_id = comm[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format + log.debug("BSC %s commands: %r" % (bsc_id, comm)) + for t in comm: + (_, m) = Ctrl().cmd(*t.split()) + f(m) + return bsc_id + def make_params(bsc, data): """ Make parameters for request diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index c566a7c..6818b2a 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,14 +22,14 @@ */ """ -__version__ = "0.0.3" # bump this on every non-trivial change +__version__ = "0.0.4" # bump this on every non-trivial change from twisted.internet import defer, reactor from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version from osmopy.osmo_ipa import Ctrl from treq import post, collect from functools import partial -from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params +from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers import hashlib @@ -45,11 +45,7 @@ Reply handler: process raw CGI server response, function f to run for each command """ decoded = json.loads(resp.decode('utf-8')) - bsc_id = decoded.get('commands')[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format - log.debug("BSC %s commands: %r" % (bsc_id, decoded.get('commands'))) - for t in decoded.get('commands'): # Process commands format - (_, m) = Ctrl().cmd(*t.split()) - f(m) + comm_proc(decoded.get('commands'), f, log) def gen_hash(params, skey): input = '' diff --git a/scripts/soap.py b/scripts/soap.py index 75acd89..6bf786c 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.7.1" # bump this on every non-trivial change +__version__ = "0.7.2" # bump this on every non-trivial change from twisted.internet import defer, reactor from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version @@ -30,7 +30,7 @@ from treq import post, collect from suds.client import Client from functools import partial -from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params +from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers @@ -40,15 +40,11 @@ def handle_reply(p, f, log, r): """ - Reply handler: takes function p to process raw SOAP server reply r, function f to run for each command and verbosity flag v + Reply handler: takes function p to process raw SOAP server reply r, function f to run for each command """ repl = p(r) # result is expected to have both commands[] array and error string (could be None) - bsc_id = repl.commands[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format + bsc_id = comm_proc(repl.commands, f, log) log.info("Received SOAP response for BSC %s with %d commands, error status: %s" % (bsc_id, len(repl.commands), repl.error)) - log.debug("BSC %s commands: %s" % (bsc_id, repl.commands)) - for t in repl.commands: # Process OpenBscCommands format from .wsdl - (_, m) = Ctrl().cmd(*t.split()) - f(m) class Trap(CTRL): -- To view, visit https://gerrit.osmocom.org/11974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4e40607a9aa5e03a7b3f5b68e4261828209a5813 Gerrit-Change-Number: 11974 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:24:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 11:24:46 +0000 Subject: Change in python/osmo-python-tests[master]: Improve code style Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/11975 Change subject: Improve code style ...................................................................... Improve code style * reorder imports to make pylint3 happy * drop unused imports * use proper spacing for list constants * don't use reserved names for internal variables The check was run as follows: pylint3 -d C0103,C0301,C0410,C0326,R0913,R0901 ... to disable useless warnings. Change-Id: I5b90ee790f73dc509081401776911f25e43f1801 --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 3 files changed, 21 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/75/11975/1 diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index d07ebd3..d4a3b75 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -25,8 +25,6 @@ import sys, os, datetime, signal, logging, logging.handlers from functools import partial from osmopy.osmo_ipa import Ctrl -from osmopy.twisted_ipa import CTRL -from twisted.internet import defer # keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values SOAP-specific oper = { 'inoperational' : 0, 'operational' : 1 } diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 6818b2a..1d6813d 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -24,17 +24,17 @@ __version__ = "0.0.4" # bump this on every non-trivial change -from twisted.internet import defer, reactor -from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version -from osmopy.osmo_ipa import Ctrl -from treq import post, collect -from functools import partial -from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc -from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available -import argparse, datetime, signal, sys, os, logging, logging.handlers +import argparse, os, logging, logging.handlers import hashlib import json import configparser +from functools import partial +from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available +from twisted.internet import defer, reactor +from treq import post, collect +from osmopy.trap_helper import debug_init, get_type, get_r, p_h, make_params, comm_proc +from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version +from osmopy.osmo_ipa import Ctrl # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') @@ -48,14 +48,14 @@ comm_proc(decoded.get('commands'), f, log) def gen_hash(params, skey): - input = '' - for key in ['time_stamp','position_validity','admin_status','policy_status']: - input += str(params.get(key)) - input += skey - for key in ['bsc_id','lat','lon','position_validity']: - input += str(params.get(key)) + inp = '' + for key in ['time_stamp', 'position_validity', 'admin_status', 'policy_status']: + inp += str(params.get(key)) + inp += skey + for key in ['bsc_id', 'lat', 'lon', 'position_validity']: + inp += str(params.get(key)) m = hashlib.md5() - m.update(input.encode('utf-8')) + m.update(inp.encode('utf-8')) res = m.hexdigest() #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res diff --git a/scripts/soap.py b/scripts/soap.py index 6bf786c..267b4d8 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -24,15 +24,15 @@ __version__ = "0.7.2" # bump this on every non-trivial change +import argparse, os, logging +from functools import partial +from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available from twisted.internet import defer, reactor +from suds.client import Client +from treq import post, collect +from osmopy.trap_helper import debug_init, get_type, get_r, p_h, make_params, comm_proc from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version from osmopy.osmo_ipa import Ctrl -from treq import post, collect -from suds.client import Client -from functools import partial -from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc -from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available -import argparse, datetime, signal, sys, os, logging, logging.handlers # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') -- To view, visit https://gerrit.osmocom.org/11975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5b90ee790f73dc509081401776911f25e43f1801 Gerrit-Change-Number: 11975 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:26:12 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 11:26:12 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Patch Set 2: (1 comment) Logging should be fixed in follow-up patches. https://gerrit.osmocom.org/#/c/11953/2/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11953/2/scripts/ctrl2cgi.py at a51 PS2, Line 51: > I think we wanted to handle resp codes for some specific feature, but I don't remember anymore. [?] Nothing found so far. We can always add this later on if necessary once the current issues are resolved. -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 11:26:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:38:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 11:38:10 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, daniel, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11929 to look at the new patch set (#4). Change subject: ctrl: add function to skip TRAP messages ...................................................................... ctrl: add function to skip TRAP messages This allows to easy skip TRAP messages when we do not want to process them (for example when waiting for REPLY to a single command). Update documentation and version accordingly. Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 --- M osmopy/osmo_ipa.py 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/29/11929/4 -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:38:47 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 11:38:47 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: cosmetic cleanup In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11930 ) Change subject: ctrl: cosmetic cleanup ...................................................................... ctrl: cosmetic cleanup * remove unused function * move internal function call outside of main Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da --- M scripts/osmo_ctrl.py 1 file changed, 1 insertion(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py index ac20050..2fb1765 100755 --- a/scripts/osmo_ctrl.py +++ b/scripts/osmo_ctrl.py @@ -38,6 +38,7 @@ return sck def do_set_get(sck, var, value = None): + _leftovers(sck, socket.MSG_DONTWAIT) (r, c) = Ctrl().cmd(var, value) sck.send(c) ret = sck.recv(4096) @@ -47,10 +48,6 @@ (a, _, _) = do_set_get(sck, var, val) return a -def get_var(sck, var): - (_, _, v) = do_set_get(sck, var) - return v - def _leftovers(sck, fl): """ Read outstanding data if any according to flags @@ -102,13 +99,11 @@ if options.cmd_set: if len(args) < 2: parser.error("Set requires var and value arguments") - _leftovers(sock, socket.MSG_DONTWAIT) print("Got message:", set_var(sock, args[0], ' '.join(args[1:]))) if options.cmd_get: if len(args) != 1: parser.error("Get requires the var argument") - _leftovers(sock, socket.MSG_DONTWAIT) (a, _, _) = do_set_get(sock, args[0]) print("Got message:", a) -- To view, visit https://gerrit.osmocom.org/11930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da Gerrit-Change-Number: 11930 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:45:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 11:45:52 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 11:45:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:45:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 11:45:54 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11909 ) Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 11:45:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 11:51:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 11:51:08 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11955 ) Change subject: cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets ...................................................................... cosmetic: bsc: timeslot_fsm: Clean uneeded scope brackets Change-Id: I5140f98e23b8c8d16ce0cca0be66297aaf0b5653 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index fc25460..8351ff7 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -911,6 +911,8 @@ * and will be served after the switch. (Do not check whether any lchans are actually available.) */ bool ts_usable_as_pchan(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config as_pchan) { + enum gsm_phys_chan_config target_pchan; + if (!ts_is_usable(ts)) return false; @@ -922,11 +924,8 @@ break; } - { - enum gsm_phys_chan_config target_pchan; - if (ts_is_lchan_waiting_for_pchan(ts, &target_pchan)) - return target_pchan == as_pchan; - } + if (ts_is_lchan_waiting_for_pchan(ts, &target_pchan)) + return target_pchan == as_pchan; return ts_is_capable_of_pchan(ts, as_pchan); } -- To view, visit https://gerrit.osmocom.org/11955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5140f98e23b8c8d16ce0cca0be66297aaf0b5653 Gerrit-Change-Number: 11955 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:00:46 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:00:46 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl: add function to skip TRAP messages In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11929 ) Change subject: ctrl: add function to skip TRAP messages ...................................................................... ctrl: add function to skip TRAP messages This allows to easy skip TRAP messages when we do not want to process them (for example when waiting for REPLY to a single command). Update documentation and version accordingly. Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 --- M osmopy/osmo_ipa.py 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/osmopy/osmo_ipa.py b/osmopy/osmo_ipa.py index c371023..f957f41 100755 --- a/osmopy/osmo_ipa.py +++ b/osmopy/osmo_ipa.py @@ -2,7 +2,7 @@ # -*- mode: python-mode; py-indent-tabs-mode: nil -*- """ /* - * Copyright (C) 2016 sysmocom s.f.m.c. GmbH + * Copyright (C) 2016-2018 sysmocom s.f.m.c. GmbH * * All Rights Reserved * @@ -28,7 +28,7 @@ """ Stateless IPA protocol multiplexer: add/remove/parse (extended) header """ - version = "0.0.6" + version = "0.0.7" TCP_PORT_OML = 3002 TCP_PORT_RSL = 3003 # OpenBSC extensions: OSMO, MGCP_OLD @@ -114,6 +114,21 @@ return struct.unpack('>HBB', data[:4]) + (data[4:], ) # length, protocol, extension, data return dlen, proto, None, data[3:] # length, protocol, _, data + def skip_traps(self, data): + """ + Take one or more ctrl messages and data and return first non-TRAP message or None + """ + if data == None or len(data) == 0: + return None + + (head, tail) = self.split_combined(data) + (length, _, _, payload) = self.del_header(head) + # skip over broken messages as well as TRAPs + if length == 0 or payload[:(length + 3)].decode('utf-8').startswith(self.CTRL_TRAP): + return self.skip_traps(tail) + + return head + def split_combined(self, data): """ Split the data which contains multiple concatenated IPA messages into tuple (first, rest) where 'rest' contains -- To view, visit https://gerrit.osmocom.org/11929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I51ce207c19a1ca96c3e2af7d5efd64f79b02fbb4 Gerrit-Change-Number: 11929 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:00:54 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:00:54 +0000 Subject: Change in python/osmo-python-tests[master]: osmo_ctrl.py: properly ignore out-of-order traps In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11909 ) Change subject: osmo_ctrl.py: properly ignore out-of-order traps ...................................................................... osmo_ctrl.py: properly ignore out-of-order traps Sometimes when we set variable we might receive arbitrary number of TRAP messages before we get SET_REPLY. Those could be either separate messages or combined together with SET_REPLY depending on tcp buffering at server side. Let's handle this gracefully by skipping over all TRAP messages. An example command which often triggers this behavior: ./osmo_ctrl.py -s -d 127.0.0.1 -p 4249 bts.0.location (date +%s)",fix2d,1,2,3" Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Related: SYS#4399 --- M scripts/osmo_ctrl.py 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py index 2fb1765..8a67fd8 100755 --- a/scripts/osmo_ctrl.py +++ b/scripts/osmo_ctrl.py @@ -41,7 +41,13 @@ _leftovers(sck, socket.MSG_DONTWAIT) (r, c) = Ctrl().cmd(var, value) sck.send(c) - ret = sck.recv(4096) + while True: + ret = sck.recv(4096) + # handle multiple messages, ignore TRAPs + ret = Ctrl().skip_traps(ret) + if ret != None: + (i, k, v) = Ctrl().parse(ret) + break; return (Ctrl().rem_header(ret),) + Ctrl().verify(ret, r, var, value) def set_var(sck, var, val): -- To view, visit https://gerrit.osmocom.org/11909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Gerrit-Change-Number: 11909 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:01:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:01:59 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Patch Set 2: > (1 comment) > > Logging should be fixed in follow-up patches. Fine, but I'd like to stop seeing code being moved somewhere and then moved back, stuff being removed and then added later, and so on. If you need to fix an issue there's no need to merge changes blindly, you can test it easily where the bug happens (it's python, just copy the file there one you have your changes). -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 12:01:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:05:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:05:47 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11953/3/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11953/3/scripts/ctrl2cgi.py at a51 PS3, Line 51: This resp.code stuff can still be used after changes in this commit, so I don't see how is it related to this commit. It should be in a separate commit if needed at all, but I think it's fine keeping it. -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 12:05:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:06:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:06:36 +0000 Subject: Change in python/osmo-python-tests[master]: Drop unused Trap() class In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11973 ) Change subject: Drop unused Trap() class ...................................................................... Patch Set 1: Code-Review+2 I'm starting to be really lost with all these code movements forward and backward. -- To view, visit https://gerrit.osmocom.org/11973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic2066a66f99a059fc65cf3092170e248288c04d4 Gerrit-Change-Number: 11973 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 12:06:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:08:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:08:11 +0000 Subject: Change in python/osmo-python-tests[master]: Move command processing into shared function In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11974 ) Change subject: Move command processing into shared function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4e40607a9aa5e03a7b3f5b68e4261828209a5813 Gerrit-Change-Number: 11974 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 12:08:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:08:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:08:31 +0000 Subject: Change in python/osmo-python-tests[master]: Improve code style In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11975 ) Change subject: Improve code style ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5b90ee790f73dc509081401776911f25e43f1801 Gerrit-Change-Number: 11975 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 12:08:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:31:21 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:31:21 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Patch Set 3: (1 comment) The very point of this commit is to get rid of "yield" calls in this function which fixes all the issues I've seen before while testing locally. So if we actually need this error code than I can try to come up with a way of checking it. But it'll be separate commit or patch series. Which should be carefully tested not to break async semantics again. https://gerrit.osmocom.org/#/c/11953/3/scripts/ctrl2cgi.py File scripts/ctrl2cgi.py: https://gerrit.osmocom.org/#/c/11953/3/scripts/ctrl2cgi.py at a51 PS3, Line 51: > This resp.code stuff can still be used after changes in this commit No, it can not. The resp is a simple byte sequence which have neither .code nor .body - please have a look at code change. -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 12:31:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:38:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:38:26 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMSC files (now avail in osmo-msc.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11738 ) Change subject: remove OsmoMSC files (now avail in osmo-msc.git) ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 28 Nov 2018 12:38:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:38:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:38:55 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoNITB: bsc_vty_additions.xml: replace symlink with copy In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11971 ) Change subject: OsmoNITB: bsc_vty_additions.xml: replace symlink with copy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifbffc90d56f0fa90d2da77dd7807cd0bb197c0d7 Gerrit-Change-Number: 11971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:38:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:39:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:39:58 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoBSC files (now avail in osmo-bsc.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11961 ) Change subject: remove OsmoBSC files (now avail in osmo-bsc.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib7e60990b59eeb1c5904fdcbd0c01d4a1f46fec6 Gerrit-Change-Number: 11961 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:39:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:41:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:41:21 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoBTS files (now avail in osmo-bts.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11962 ) Change subject: remove OsmoBTS files (now avail in osmo-bts.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I34426309cb009229069e1472fac86efab38a2f6e Gerrit-Change-Number: 11962 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:41:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:41:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:41:40 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoGGSN files (now avail in osmo-ggsn.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11963 ) Change subject: remove OsmoGGSN files (now avail in osmo-ggsn.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b9e2836a74b84bfc73ea7048a137ab5253d9045 Gerrit-Change-Number: 11963 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:41:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:42:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:42:06 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoHLR files (now avail in osmo-hlr.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11964 ) Change subject: remove OsmoHLR files (now avail in osmo-hlr.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice3f24888deed8affec40d5d91d71d5e1f3827c8 Gerrit-Change-Number: 11964 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:42:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:42:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:42:36 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMGW files (now avail in osmo-mgw.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11965 ) Change subject: remove OsmoMGW files (now avail in osmo-mgw.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I793a7150b676837cfa8591f7504872b04d4b1f7f Gerrit-Change-Number: 11965 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:42:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:43:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:43:09 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoPCU files (now avail in osmo-pcu.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11966 ) Change subject: remove OsmoPCU files (now avail in osmo-pcu.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2a1de294883491487aa270b1e30160d559ef063a Gerrit-Change-Number: 11966 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:43:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:43:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:43:42 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSGSN files (now avail in osmo-sgsn.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11967 ) Change subject: remove OsmoSGSN files (now avail in osmo-sgsn.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia6fae983bbcabceb3f470af750c724e12c96423e Gerrit-Change-Number: 11967 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:43:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:44:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:44:08 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSIPConnector files (now avail in osmo-sip-connector.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11968 ) Change subject: remove OsmoSIPConnector files (now avail in osmo-sip-connector.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id77812586eb21932b563b57e75cd85b721b7d6ab Gerrit-Change-Number: 11968 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:44:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:44:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:44:41 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSTP files (now avail in libosmo-sccp.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11969 ) Change subject: remove OsmoSTP files (now avail in libosmo-sccp.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I971ef93a675412ea27d8bf193db6b9b35428f0bc Gerrit-Change-Number: 11969 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:44:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:45:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:45:10 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoTRX files (now avail in osmo-trx.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11970 ) Change subject: remove OsmoTRX files (now avail in osmo-trx.git) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If7cd43eec5f9d20f7f4200340e96ed0e0908e253 Gerrit-Change-Number: 11970 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:45:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:49:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 12:49:44 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 12:49:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:50:37 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:50:37 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 4: Actually, could we add "const struct osmo_lcls *lcls" parameter to the function? That way we don't have to change its signature later on. -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:50:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:51:11 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:51:11 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 4: I mean gsm0808_create_handover_performed() of course. -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 12:51:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:52:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:52:48 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... ctrl2cgi: fix deferred callbacks Previously handle_reply() was marked as deferred callback unlike soap.py where it's synchronous function. This seems to be causing issues where some of the callbacks are not yield properly. Let's move to the known-to-work semantics of soap.py where async functions are limited to Trap() class. Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Related: SYS#4399 --- M scripts/ctrl2cgi.py 1 file changed, 7 insertions(+), 18 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 843aeb9..c566a7c 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.0.2" # bump this on every non-trivial change +__version__ = "0.0.3" # bump this on every non-trivial change from twisted.internet import defer, reactor from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version @@ -40,25 +40,14 @@ assert V(twisted_ipa_version) > V('0.4') - at defer.inlineCallbacks def handle_reply(f, log, resp): """ Reply handler: process raw CGI server response, function f to run for each command """ - #log.debug('HANDLE_REPLY: code=%r' % (resp.code)) - #for key,val in resp.headers.getAllRawHeaders(): - # log.debug('HANDLE_REPLY: key=%r val=%r' % (key, val)) - if resp.code != 200: - resp_body = yield resp.text() - log.critical('Received HTTP response %d: %s' % (resp.code, resp_body)) - return - - parsed = yield resp.json() - #log.debug("RESPONSE: %r" % (parsed)) - bsc_id = parsed.get('commands')[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format - log.info("Received CGI response for BSC %s with %d commands, error status: %s" % (bsc_id, len(parsed.get('commands')), parsed.get('error'))) - log.debug("BSC %s commands: %r" % (bsc_id, parsed.get('commands'))) - for t in parsed.get('commands'): # Process commands format + decoded = json.loads(resp.decode('utf-8')) + bsc_id = decoded.get('commands')[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format + log.debug("BSC %s commands: %r" % (bsc_id, decoded.get('commands'))) + for t in decoded.get('commands'): # Process commands format (_, m) = Ctrl().cmd(*t.split()) f(m) @@ -116,8 +105,8 @@ params = make_params(bsc, data) self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data)) params['h'] = gen_hash(params, self.factory.secret_key) - d = post(self.factory.location, None, params=params) - d.addCallback(partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx + d = post(self.factory.location, params) + d.addCallback(collect, partial(handle_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors # Ensure that we run only limited number of requests in parallel: yield self.factory.semaphore.acquire() -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:52:48 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:52:48 +0000 Subject: Change in python/osmo-python-tests[master]: Drop unused Trap() class In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11973 ) Change subject: Drop unused Trap() class ...................................................................... Drop unused Trap() class Change-Id: Ic2066a66f99a059fc65cf3092170e248288c04d4 --- M osmopy/trap_helper.py 1 file changed, 0 insertions(+), 59 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index f7a64c8..6f4b95d 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -71,65 +71,6 @@ loc = split_type(v) return partial(lambda a, i: a[i] if len(a) > i else None, loc) -class Trap(CTRL): - """ - TRAP handler (agnostic to factory's client object) - """ - def ctrl_TRAP(self, data, op_id, v): - """ - Parse CTRL TRAP and dispatch to appropriate handler after normalization - """ - self.factory.log.debug('TRAP %s' % v) - (l, r) = v.split() - loc = l.split('.') - t_type = loc[-1] - p = partial(lambda a, i: a[i] if len(a) > i else None, loc) # parse helper - method = getattr(self, 'handle_' + t_type.replace('-', ''), lambda *_: "Unhandled %s trap" % t_type) - method(p(1), p(3), p(5), p(7), r) # we expect net.0.bsc.666.bts.2.trx.1 format for trap prefix - - def ctrl_SET_REPLY(self, data, _, v): - """ - Debug log for replies to our commands - """ - self.factory.log.debug('SET REPLY %s' % v) - - def ctrl_ERROR(self, data, op_id, v): - """ - We want to know if smth went wrong - """ - self.factory.log.debug('CTRL ERROR [%s] %s' % (op_id, v)) - - def connectionMade(self): - """ - Logging wrapper, calling super() is necessary not to break reconnection logic - """ - self.factory.log.info("Connected to CTRL@%s:%d" % (self.factory.host, self.factory.port)) - super(CTRL, self).connectionMade() - - @defer.inlineCallbacks - def handle_locationstate(self, net, bsc, bts, trx, data): - """ - Handle location-state TRAP: parse trap content, prepare parameters and use treq's routines to post it while setting up async handlers - """ - (ts, fx, lat, lon, height, opr, adm, pol, mcc, mnc) = data.split(',') - tstamp = datetime.datetime.fromtimestamp(float(ts)).isoformat() - self.factory.log.debug('location-state@%s.%s.%s.%s (%s) [%s/%s] => %s' % (net, bsc, bts, trx, tstamp, mcc, mnc, data)) - - d = self.factory.prepare_params(bsc, lon, lat, fix.get(fx, 0), tstamp, oper.get(opr, 2), admin.get(adm, 2), policy.get(pol, 3)) - - d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors - # Ensure that we run only limited number of requests in parallel: - yield self.factory.semaphore.acquire() - yield d # we end up here only if semaphore is available which means it's ok to fire the request without exceeding the limit - self.factory.semaphore.release() - - def handle_notificationrejectionv1(self, net, bsc, bts, trx, data): - """ - Handle notification-rejection-v1 TRAP: just an example to show how more message types can be handled - """ - self.factory.log.debug('notification-rejection-v1 at bsc-id %s => %s' % (bsc, data)) - - def reloader(path, script, log, dbg1, dbg2, signum, _): """ Signal handler: we have to use execl() because twisted's reactor is not restartable due to some bug in twisted implementation -- To view, visit https://gerrit.osmocom.org/11973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic2066a66f99a059fc65cf3092170e248288c04d4 Gerrit-Change-Number: 11973 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:52:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:52:49 +0000 Subject: Change in python/osmo-python-tests[master]: Move command processing into shared function In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11974 ) Change subject: Move command processing into shared function ...................................................................... Move command processing into shared function Change-Id: I4e40607a9aa5e03a7b3f5b68e4261828209a5813 --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 3 files changed, 19 insertions(+), 15 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index 6f4b95d..d07ebd3 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -24,6 +24,7 @@ import sys, os, datetime, signal, logging, logging.handlers from functools import partial +from osmopy.osmo_ipa import Ctrl from osmopy.twisted_ipa import CTRL from twisted.internet import defer @@ -56,6 +57,17 @@ loc = split_type(v) return loc[-1] +def comm_proc(comm, f, log): + """ + Command processor: takes function f to run for each command + """ + bsc_id = comm[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format + log.debug("BSC %s commands: %r" % (bsc_id, comm)) + for t in comm: + (_, m) = Ctrl().cmd(*t.split()) + f(m) + return bsc_id + def make_params(bsc, data): """ Make parameters for request diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index c566a7c..6818b2a 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -22,14 +22,14 @@ */ """ -__version__ = "0.0.3" # bump this on every non-trivial change +__version__ = "0.0.4" # bump this on every non-trivial change from twisted.internet import defer, reactor from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version from osmopy.osmo_ipa import Ctrl from treq import post, collect from functools import partial -from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params +from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers import hashlib @@ -45,11 +45,7 @@ Reply handler: process raw CGI server response, function f to run for each command """ decoded = json.loads(resp.decode('utf-8')) - bsc_id = decoded.get('commands')[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format - log.debug("BSC %s commands: %r" % (bsc_id, decoded.get('commands'))) - for t in decoded.get('commands'): # Process commands format - (_, m) = Ctrl().cmd(*t.split()) - f(m) + comm_proc(decoded.get('commands'), f, log) def gen_hash(params, skey): input = '' diff --git a/scripts/soap.py b/scripts/soap.py index 75acd89..6bf786c 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -22,7 +22,7 @@ */ """ -__version__ = "0.7.1" # bump this on every non-trivial change +__version__ = "0.7.2" # bump this on every non-trivial change from twisted.internet import defer, reactor from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version @@ -30,7 +30,7 @@ from treq import post, collect from suds.client import Client from functools import partial -from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params +from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available import argparse, datetime, signal, sys, os, logging, logging.handlers @@ -40,15 +40,11 @@ def handle_reply(p, f, log, r): """ - Reply handler: takes function p to process raw SOAP server reply r, function f to run for each command and verbosity flag v + Reply handler: takes function p to process raw SOAP server reply r, function f to run for each command """ repl = p(r) # result is expected to have both commands[] array and error string (could be None) - bsc_id = repl.commands[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format + bsc_id = comm_proc(repl.commands, f, log) log.info("Received SOAP response for BSC %s with %d commands, error status: %s" % (bsc_id, len(repl.commands), repl.error)) - log.debug("BSC %s commands: %s" % (bsc_id, repl.commands)) - for t in repl.commands: # Process OpenBscCommands format from .wsdl - (_, m) = Ctrl().cmd(*t.split()) - f(m) class Trap(CTRL): -- To view, visit https://gerrit.osmocom.org/11974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4e40607a9aa5e03a7b3f5b68e4261828209a5813 Gerrit-Change-Number: 11974 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 12:52:49 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 12:52:49 +0000 Subject: Change in python/osmo-python-tests[master]: Improve code style In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11975 ) Change subject: Improve code style ...................................................................... Improve code style * reorder imports to make pylint3 happy * drop unused imports * use proper spacing for list constants * don't use reserved names for internal variables The check was run as follows: pylint3 -d C0103,C0301,C0410,C0326,R0913,R0901 ... to disable useless warnings. Change-Id: I5b90ee790f73dc509081401776911f25e43f1801 --- M osmopy/trap_helper.py M scripts/ctrl2cgi.py M scripts/soap.py 3 files changed, 21 insertions(+), 23 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py index d07ebd3..d4a3b75 100644 --- a/osmopy/trap_helper.py +++ b/osmopy/trap_helper.py @@ -25,8 +25,6 @@ import sys, os, datetime, signal, logging, logging.handlers from functools import partial from osmopy.osmo_ipa import Ctrl -from osmopy.twisted_ipa import CTRL -from twisted.internet import defer # keys from OpenBSC openbsc/src/libbsc/bsc_rf_ctrl.c, values SOAP-specific oper = { 'inoperational' : 0, 'operational' : 1 } diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py index 6818b2a..1d6813d 100755 --- a/scripts/ctrl2cgi.py +++ b/scripts/ctrl2cgi.py @@ -24,17 +24,17 @@ __version__ = "0.0.4" # bump this on every non-trivial change -from twisted.internet import defer, reactor -from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version -from osmopy.osmo_ipa import Ctrl -from treq import post, collect -from functools import partial -from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc -from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available -import argparse, datetime, signal, sys, os, logging, logging.handlers +import argparse, os, logging, logging.handlers import hashlib import json import configparser +from functools import partial +from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available +from twisted.internet import defer, reactor +from treq import post, collect +from osmopy.trap_helper import debug_init, get_type, get_r, p_h, make_params, comm_proc +from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version +from osmopy.osmo_ipa import Ctrl # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') @@ -48,14 +48,14 @@ comm_proc(decoded.get('commands'), f, log) def gen_hash(params, skey): - input = '' - for key in ['time_stamp','position_validity','admin_status','policy_status']: - input += str(params.get(key)) - input += skey - for key in ['bsc_id','lat','lon','position_validity']: - input += str(params.get(key)) + inp = '' + for key in ['time_stamp', 'position_validity', 'admin_status', 'policy_status']: + inp += str(params.get(key)) + inp += skey + for key in ['bsc_id', 'lat', 'lon', 'position_validity']: + inp += str(params.get(key)) m = hashlib.md5() - m.update(input.encode('utf-8')) + m.update(inp.encode('utf-8')) res = m.hexdigest() #print('HASH: \nparams="%r"\ninput="%s" \nres="%s"' %(params, input, res)) return res diff --git a/scripts/soap.py b/scripts/soap.py index 6bf786c..267b4d8 100755 --- a/scripts/soap.py +++ b/scripts/soap.py @@ -24,15 +24,15 @@ __version__ = "0.7.2" # bump this on every non-trivial change +import argparse, os, logging +from functools import partial +from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available from twisted.internet import defer, reactor +from suds.client import Client +from treq import post, collect +from osmopy.trap_helper import debug_init, get_type, get_r, p_h, make_params, comm_proc from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version from osmopy.osmo_ipa import Ctrl -from treq import post, collect -from suds.client import Client -from functools import partial -from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc -from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available -import argparse, datetime, signal, sys, os, logging, logging.handlers # we don't support older versions of TwistedIPA module assert V(twisted_ipa_version) > V('0.4') -- To view, visit https://gerrit.osmocom.org/11975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5b90ee790f73dc509081401776911f25e43f1801 Gerrit-Change-Number: 11975 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:03:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Wed, 28 Nov 2018 13:03:33 +0000 Subject: Change in python/osmo-python-tests[master]: ctrl2cgi: fix deferred callbacks In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11953 ) Change subject: ctrl2cgi: fix deferred callbacks ...................................................................... Patch Set 4: > I'd like to stop seeing code being moved somewhere and then moved back I'd like to stop fixing other people's messed up async code. Neither are likely to happen because people make mistakes. Also, I don't think that philosophical discussions belong to patch review comments. -- To view, visit https://gerrit.osmocom.org/11953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Gerrit-Change-Number: 11953 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 28 Nov 2018 13:03:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:37:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:37:23 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoNITB: bsc_vty_additions.xml: replace symlink with copy In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11971 ) Change subject: OsmoNITB: bsc_vty_additions.xml: replace symlink with copy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifbffc90d56f0fa90d2da77dd7807cd0bb197c0d7 Gerrit-Change-Number: 11971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 13:37:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:39 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoTRX files (now avail in osmo-trx.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11970 ) Change subject: remove OsmoTRX files (now avail in osmo-trx.git) ...................................................................... remove OsmoTRX files (now avail in osmo-trx.git) Files were added in osmo-trx.git Change-Id I2762171af0bf719a34ba12a0c2e4dcc206098beb Depends: osmo-trx.git Change-Id I2762171af0bf719a34ba12a0c2e4dcc206098beb Related: OS#3385 Change-Id: If7cd43eec5f9d20f7f4200340e96ed0e0908e253 --- M Makefile.am D OsmoTRX/Makefile.am D OsmoTRX/chapters/code-architecture.adoc D OsmoTRX/chapters/configuration.adoc D OsmoTRX/chapters/control.adoc D OsmoTRX/chapters/counters.adoc D OsmoTRX/chapters/counters_generated.adoc D OsmoTRX/chapters/overview.adoc D OsmoTRX/chapters/running.adoc D OsmoTRX/chapters/trx-architectures.adoc D OsmoTRX/chapters/trx-backends.adoc D OsmoTRX/chapters/trx-devices.adoc D OsmoTRX/osmotrx-usermanual-docinfo.xml D OsmoTRX/osmotrx-usermanual.adoc D OsmoTRX/osmotrx-vty-reference.xml D OsmoTRX/vty/trx_vty_additions.xml D OsmoTRX/vty/trx_vty_reference.xml M configure.ac 18 files changed, 0 insertions(+), 1,827 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index eb86032..fdafc0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoTRX \ OsmocomBB $(top_srcdir)/.version: diff --git a/OsmoTRX/Makefile.am b/OsmoTRX/Makefile.am deleted file mode 100644 index ce5f241..0000000 --- a/OsmoTRX/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmotrx-usermanual.adoc \ - osmotrx-usermanual-docinfo.xml \ - osmotrx-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmotrx-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmotrx-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoTRX/chapters/code-architecture.adoc b/OsmoTRX/chapters/code-architecture.adoc deleted file mode 100644 index 18d0e3a..0000000 --- a/OsmoTRX/chapters/code-architecture.adoc +++ /dev/null @@ -1,141 +0,0 @@ -[[code_architecture]] -== Code Architecture - -[[fig-code-architecture-general]] -.General overview of main OsmoTRX components -[graphviz] ----- -digraph hierarchy { -node[shape=record,style=filled,fillcolor=gray95] -edge[dir=back, arrowtail=empty] - -2[label = "{Transceiver|+ constructor()\l+ destructor()\l+ init()\l+ numChans()\l+ receiveFIFO()\l+ setSignalHandler()}"] -3[label = "{RadioInterface|...}"] -4[label = "{RadioInterfaceResamp|...}"] -5[label = "{RadioInterfaceMulti|...}"] -6[label = "{RadioDevice|...}"] -7[label = "{UHDDevice|...}"] -8[label = "{LMSDevice|...}"] -9[label = "{USRPDevice|...}"] - -2->3[arrowtail=odiamond] -3->4[constraint=false] -3->5[constraint=false] -3->6[arrowtail=odiamond] -6->7 -6->8 -6->9 -} ----- - -[[fig-code-architecture-threads]] -.Example of thread architecture with OsmoTRX configured to use 2 logical RF channels (Trx=Transceiver, RI=RadioIface) -[graphviz] ----- -digraph hierarchy { -node[shape=record,style=filled,fillcolor=gray95] - -trans [label="Transceiver"]; -radioiface [label="RadioInterface"]; -radiodev [label="RadioDevice"]; - -trans:nw->trans:ne [label="Trx.ControlServiceLoop_0"]; -trans:nw->trans:ne [label="Trx.ControlServiceLoop_1"]; -trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_0"]; -trans:w->radioiface:w [label="Trx.TxPriorityQueueServiceLoop_1"]; -radioiface:e->trans:e [label="Trx.RxServiceLoop_0"]; -radioiface:e->trans:e [label="Trx.RxServiceLoop_1"]; -radioiface->radiodev[label="RI.AlignRadioServiceLoop"]; -radioiface:sw->radiodev:nw [label="Trx.TxLowerLoop"]; -radiodev:ne->radioiface:se [label="Trx.RxLowerLoop"]; -} ----- - -[[code_component_transceiver]] -=== Transceiver - -The Transceiver is the main component managing the other components running in -the OsmoTRX process. There's a unique instance per process. - -This class is quite complex from code point of view, as it starts lots of -different threads and hence the interaction with this class from the outside is -quite limited. Only interaction possible is to: - -* `Transceiver()`: Create an instance through its constructor, at this time most - configuration is handed to it. -* `init()`: Start running all the threads. -* `receiveFIFO()`: Attach a `radioInterface` channel FIFO in order to use it. -* `setSignalHandler()`: Used to set up a callback to receive certain events - asynchronously from the Transceiver. No assumptions can be made about from - which thread is the callback being called, which means multi-thread locking - precautions may be required in certain cases, similar to usual signal handler - processing. One important event received through this path is for instance - when the Transceiver detected a fatal error which requires it to stop. Since - it cannot stop itself (see destructor below), stopping procedure must be - delegated to the user who created the instance. -* `~Transceiver()`: The destructor, which stops all running threads created at - `init()` time. Destroying the object is the only way to stop the `Transceiver` - completely, and must be called from a thread not managed by the - `Transceiver`, otherwise it will deadlock. Usually it is stopped from the main - thread, the one that called the constructor during startup. - -During `init()` time, `Transceiver` will create a noticeable amount of threads, -which may vary depending on the amount of RF channels requested. - -Static amount of Threads (1 per `Transceiver` instance): - -* `RxLowerLoop`: This thread is responsible for reading bursts from the - `RadioInterface`, storing them into its FIFO and sending Clock Indications - (<>) to _osmo-bts_trx_. -* `TxLowerLoop`: Manages pushing bursts from buffers in the FIFO into the - `RadioInterface` at expected correct time based on the Transceiver clock. - -Dynamic amount of Threads (1 per RF logical channel on the `Transceiver` instance): - -* `ControlServiceLoop`: Handles commands from the Per-ARFCN Control Interface - socket (<>). Each thread is responsible for managing one - socket related to one ARFCN or which is the same, to one RF logical channel. - These are the only threads expected to use the private `start()` and `stop()` - methods of the `Transceiver()` class, since those methods don't stop any of - the `ControlServiceLoop` threads as they must keep running to handle new - commands (for instance, to re-start processing samples with the _POWERON_ - command). -* `RxServiceLoop`: Each thread of this type pulls bursts from the - `RadioInterface` FIFO for one specific logical RF channel and handles it - according to the slot and burst correlation type, finally sending proper data - over the TRX Manager UDP socket (<>). -* `TxPriorityQueueServiceLoop`: Blocks reading from one ARFCN specific TRX - Manager UDP socket (<>), and fills the `RadioInterface` with it - setting clock related information. - -[[code_component_radioiface]] -=== RadioInterface - -The `RadioInterface` sits between the `Transceiver` and the `RadioDevice`, and -provides extra features to the pipe like channelizers, resamplers, Tx/Rx -synchronization on some devices, etc. - -If the `RadioDevice` it drives requires it (only _USRP1_ so far), the -`RadioIntercace` will start and manage a thread internally called -`AlignRadioServiceLoop` which will align current RX and TX timestamps. - -Different features are offered through different `RadioInterface` subclasses -which are selected based on configuration and device detected at runtime. Using -these features may impact on the amount of CPU required to run the entire pipe. - -==== RadioInterfaceResamp - -This subclass of `RadioInterface` is automatically selected when some known -specific UHD are to be used, since they require resampling to work properly. -Some of this devices are for instance Ettus B100, USRP2 and X3XX models. - -==== RadioInterfaceMulti - -This subclass of `RadioInterface` is used when <> is requested. - -[[code_component_radiodev]] -=== RadioDevice - -The `RadioDevice` class is responsible for driving the actual Hardware device. -It is actually only an interface, and it is implemented in each backend which in -turn becomes a specific OsmoTRX binary, see <>. diff --git a/OsmoTRX/chapters/configuration.adoc b/OsmoTRX/chapters/configuration.adoc deleted file mode 100644 index 87d7903..0000000 --- a/OsmoTRX/chapters/configuration.adoc +++ /dev/null @@ -1,85 +0,0 @@ -== Configuring OsmTRX - -OsmoTRX will read the configuration at startup time and configure the -transceiver accordingly after validating the configuration. - -OsmoTRX can handle several TRX channels, but at least one must be configured in -order to be able to start it successfully. Channels must be present in the -configuration file in incremental order, starting from 0 and be consecutive. - -Example configuration files for different devices and setups can be found in -`doc/examples/` in 'osmo-trx' git repository. - -=== Documented example - -.Example: Static GGSN/APN configuration (single catch-all GGSN) ----- -trx - bind-ip 127.0.0.1 <1> - remote-ip 127.0.0.1 <2> - base-port 5700 <3> - egprs disable <4> - tx-sps 4 <5> - rx-sps 4 <6> - chan 0 <7> - tx-path BAND1 <8> - rx-path LNAW <9> ----- -<1> Configure the local IP address at the TRX used for the connection against `osmo-bts-trx`. -<2> Specify the IP address of `osmo-bts-trx` to connect to. -<3> Specify the reference base UDP port to use for communication. -<4> Don't enable EDGE support. -<5> Use 4 TX samples per symbol. This is device specific. -<6> Use 4 RX samples per symbol. This is device specific. -<7> Configure the first channel. As no other channels are specified, `osmo-trx` assumes it is using only one channel. -<8> Configure the device to use `BAND1` Tx antenna path from all the available ones (device specific). -<9> Configure the device to use `LNAW` Rx antenna path from all the available ones (device specific). - -[[multiarfcn_mode]] -=== Multi-ARFCN mode - -The Multi-ARFCN feature allows to have a multi-carrier approach multiplexed on a -single physical RF channel, which can introduce several benefits, such as lower -cost and higher capacity support. - -Multi-ARFCN support is available since osmo-trx release `0.2.0`, and it was -added specifically in commit `76764278169d252980853251daeb9f1ba0c246e1`. - -This feature is useful for instance if you want to run more than 1 TRX with an -Ettus B200 device, or 3 TRX with an Ettus B210 device, since they support only 1 -and 2 physical RF channels respectively. No device from other providers or even -other devices than B200 and B210 from Ettus are known to support this feature. - -With multi-ARFCN enabled, ARFCN spacing is fixed at 800 kHz or 4 GSM channels. -So if TRX-0 is set to ARFCN 51, TRX-1 _must_ be set to 55, and so on. Up to -three ARFCN's is supported for multi-TRX. - -From BTS and BSC point of view, supporting multiple TRX through multi-ARFCN -feature in OsmoTRX doesn't make any difference from a regular multi-TRX setup, -leaving apart of course the mentioned ARFCN limitations explained above and as a -consequence physical installation and operational differences. - -.Example: osmo-bts-trx.cfg using 2 TRX against an osmo-trx driven device ----- -phy 0 - osmotrx ip local 127.0.0.1 - osmotrx ip remote 127.0.0.1 - instance 0 - instance 1 -bts 0 - ... - band GSM-1800 - trx 0 - phy 0 instance 0 - trx 1 - phy 0 instance 1 ----- - -.Example: osmo-trx.cfg using Multi-ARFCN mode to run 2 TRX ----- -trx - ... - multi-arfcn enable - chan 0 - chan 1 ----- diff --git a/OsmoTRX/chapters/control.adoc b/OsmoTRX/chapters/control.adoc deleted file mode 100644 index 168769a..0000000 --- a/OsmoTRX/chapters/control.adoc +++ /dev/null @@ -1,12 +0,0 @@ -[[control]] -== Control interface - -The actual protocol is described in <>, the variables -common to all programs using it are described in <>. Here we -describe variables specific to OsmoTRX. - -.Variables available over control interface -[options="header",width="100%",cols="20%,5%,5%,50%,20%"] -|=== -|Name|Access|Trap|Value|Comment -|=== diff --git a/OsmoTRX/chapters/counters.adoc b/OsmoTRX/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoTRX/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoTRX/chapters/counters_generated.adoc b/OsmoTRX/chapters/counters_generated.adoc deleted file mode 100644 index b40dc37..0000000 --- a/OsmoTRX/chapters/counters_generated.adoc +++ /dev/null @@ -1,7 +0,0 @@ -// autogenerated by show asciidoc counters -These counters and their description based on OsmoTRX 0.2.0.61-408f (OsmoTRX). - -// generating tables for rate_ctr_group -// generating tables for osmo_stat_items -// generating tables for osmo_counters -// there are no ungrouped osmo_counters diff --git a/OsmoTRX/chapters/overview.adoc b/OsmoTRX/chapters/overview.adoc deleted file mode 100644 index 785e26b..0000000 --- a/OsmoTRX/chapters/overview.adoc +++ /dev/null @@ -1,62 +0,0 @@ -[[chapter_introduction]] -== Overview - -[[intro_overview]] -=== About OsmoTRX - -OsmoTRX is a C/C++ language implementation of the GSM radio modem, -originally developed as the 'Transceiver' part of OpenBTS. This radio -modem offers an interface based on top of UDP streams. - - -The OsmoBTS bts_model code for OsmoTRX is called -`osmo-bts-trx`. It implements the UDP stream interface of -OsmoTRX, so both parts can be used together to implement a complete GSM -BTS based on general-purpose computing SDR. - -As OsmoTRX is general-purpose software running on top of Linux, it is -thus not tied to any specific physical hardware. At the time of this -writing, OsmoTRX supports a variety of Lime Microsystems and Ettus USRP SDRs via -the UHD driver, as well as the Fairwaves UmTRX and derived products. - -OsmoTRX is not a complete GSM PHY but 'just' the radio modem. This -means that all of the Layer 1 functionality such as scheduling, -convolutional coding, etc. is actually also implemented inside OsmoBTS. -OsmoTRX is a software-defined radio transceiver that implements the Layer 1 -physical layer of a BTS comprising the following 3GPP specifications: - -* TS 05.01 "Physical layer on the radio path" -* TS 05.02 "Multiplexing and Multiple Access on the Radio Path" -* TS 05.04 "Modulation" -* TS 05.10 "Radio subsystem synchronization - -As such, the boundary between OsmoTRX and `osmo-bts-trx` is at -a much lower interface, which is an internal interface of other more -traditional GSM PHY implementations. - -Besides OsmoTRX, there are also other implementations (both Free -Software and proprietary) that implement the same UDP stream based radio -modem interface. - -[[fig-gprs-pcubts]] -.GSM network architecture with OsmoTRX and OsmoBTS -[graphviz] ----- -digraph G { - rankdir=LR; - MS0 [label="MS"]; - MS1 [label="MS"]; - MS0->SDR[label="Um"]; - MS1->SDR [label="Um"]; - SDR -> OsmoTRX [label="Raw Samples"]; - OsmoTRX->BTS [label="bursts over UDP"]; - BTS->BSC [label="Abis"]; - BSC->MSC [label="A"]; - BTS->PCU [label="pcu_sock"]; - PCU->SGSN [label="Gb"]; - OsmoTRX [color=red]; -} ----- - -For more information see -https://osmocom.org/projects/osmotrx/wiki/OsmoTRX diff --git a/OsmoTRX/chapters/running.adoc b/OsmoTRX/chapters/running.adoc deleted file mode 100644 index 7ed2884..0000000 --- a/OsmoTRX/chapters/running.adoc +++ /dev/null @@ -1,19 +0,0 @@ -== Running OsmoTRX - -The OsmoTRX executable (`osmo-trx`) offers the following command-line -options: - - -=== SYNOPSIS - -*osmo-trx* [-h] [-C 'CONFIGFILE'] - - -=== OPTIONS - -*-h*:: - Print a short help message about the supported options -*-C 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo_trx.cfg` in the current - working directory. diff --git a/OsmoTRX/chapters/trx-architectures.adoc b/OsmoTRX/chapters/trx-architectures.adoc deleted file mode 100644 index 66eae5e..0000000 --- a/OsmoTRX/chapters/trx-architectures.adoc +++ /dev/null @@ -1,34 +0,0 @@ -[[osmotrx_arch_support]] -== OsmoTRX hardware architecture support - -OsmoTRX comes out-of-the-box with several algorithms and operations -optimized for certain instruction-set architectures, as well as non-optimized -fall-back algorithms in case required instruction sets are not supported by the -compiler at compile time or by the executing machine at run-time. Support for -these optimized algorithms can be enabled and disabled by means of configure -flags. Accelerated operations include pulse shape filtering, resampling, -sequence correlation, and many other signal processing operations. - -On Intel processors, OsmoTRX makes heavy use of the Streaming SIMD Extensions -(SSE) instruction set. SSE3 is the minimum requirement for accelerated use. -SSE3 is present in the majority of Intel processors since later versions of the -Pentium 4 architecture and is also present on low power Atom processors. Support -is automatically detected at build time. SSE4.1 instruction set is supported -too. This feature is enabled by default unless explicitly disabled by passing -the configure flag _--with-sse=no_. When enabled, the compiler will build an -extra version of each of the supported algorithms using each of the supported -mentioned instruction sets. Then, at run-time, OsmoTRX will auto-detect -capabilities of the executing machine and enable an optimized algorithm using -the most suitable available (previously compiled) instruction set. - -On ARM processors, NEON and NEON FMA are supported. Different to the x86, there -is no auto-detection in this case, nor difference between compile and runtime. -NEON support is disabled by default and can be enabled by passing the flag -_--with-neon=yes_ to the configure script; the used compiler must support NEON -instruction set and the resulting binary will only run fine on an ARM board -supporting NEON extensions. Running OsmoTRX built with flag _--with-neon_ on a -board without NEON instruction set support, will most probably end up in the -process being killed with a _SIGILL_ Illegal Instruction signal by the operating -system. NEON FMA (Fused Multiply-Add) is an extension to the NEON instruction -set, and its use in OsmoTRX can be enabled by passing the _--with_neon_vfpv4_ -flag, which will also implicitly enable NEON support (_--with_neon_). diff --git a/OsmoTRX/chapters/trx-backends.adoc b/OsmoTRX/chapters/trx-backends.adoc deleted file mode 100644 index 8829fa6..0000000 --- a/OsmoTRX/chapters/trx-backends.adoc +++ /dev/null @@ -1,46 +0,0 @@ -[[trx_backends]] -== OsmoTRX backend support - -[[backend_uhd]] -=== `osmo-trx-uhd` for UHD based Transceivers - -This OsmoTRX model uses _libuhd_ (UHD, USRP Hardware Driver) to drive the -device, that is configuring it and reading/writing samples from/to it. - -So far, this backend has been mostly used to drive devices such as the Ettus -B200 family and Fairwaves UmTRX family, and used to be the default backend used -for legacy @osmo-trx@ binary when per-backend binaries didn't exist yet. - -Any device providing generic support for UHD should theoretically be able to be -run through this backend without much effort, but pracitcal experience showed -that some devices don't play well with it, such as the LimeSDR family of -devices, which showed far better results when using its native interface. - -Related code can be found in the _Transceiver52M/device/uhd/_ directory in -_osmo-trx.git_. - -[[backend_lms]] -=== `osmo-trx-lms` for LimeSuite based Transceivers - -This OsmoTRX model uses LimeSuite API and library to drive the device, that is -configuring it and reading/writing samples from/to it. - -This backend was developed in order to be used together with LimeSDR-USB and -LimeSDR-mini devices, due to to the poor results obtained with the UHD backend, -and to simplify the stack. - -Related code can be found in the _Transceiver52M/device/lms/_ directory in -_osmo-trx.git_. - -[[backend_usrp1]] -=== `osmo-trx-usrp1` for libusrp based Transceivers - -This OsmoTRX model uses the legacy libusrp driver provided in GNU Radio 3.4.2. - -As this code was dropped from GNU Radio at some point and was found very -difficult to build, some work was done to create a standalone libusrp which can -be nowadays found as a separate git repository together with other osmocom git -repositories, in https://git.osmocom.org/libusrp/ - -Related code can be found in the _Transceiver52M/device/usrp1/_ directory in -_osmo-trx.git_. diff --git a/OsmoTRX/chapters/trx-devices.adoc b/OsmoTRX/chapters/trx-devices.adoc deleted file mode 100644 index 10c8529..0000000 --- a/OsmoTRX/chapters/trx-devices.adoc +++ /dev/null @@ -1,90 +0,0 @@ -[[osmotrx_device_support]] -== OsmoTRX hardware device support - -OsmoTRX consists of a _common_ part that applies to all TRX devices as well as -_hardware-specific_ parts for each TRX device. The hardware-specific parts are -usually provided by vendor-specific or device-specific libraries that are then -handled by some OsmoTRX glue code presenting a unified interface towards the -rest of the code by means of a _RadioDevice_ class. - -The common part includes the core TRX architecture as well as code for -implementing the external interfaces such as the TRX Manager UDP socket, -control, and VTY interfaces. - -The hardware-specific parts include support for driving one particular -implementation of a radio modem. Such a physical layer -implementation can come in many forms. Sometimes it runs on a general -purpose CPU, sometimes on a dedicated ARM core, a dedicated DSP, a -combination of DSP and FPGA. - -Joining the common part with each of the available backends results in a -different binary with different suffix for each backend. For instance, when -OsmoTRX is built with UHD backend, an _osmo-trx-uhd_ binary is generated; when -OsmoTRX is built with LimeSuite backend, an _osmo-trx-lms_ binary is generated. -Build of different backend can be enabled and disabled by means of configure -flags, which can be found in each subsection relative to each backend below. - -[[dev_ettus_usrp1]] -=== Ettus USRP1 - -The binary _osmo-trx-usrp1_ is used to drive this device, see <>. - -[[dev_ettus_b200]] -=== Ettus B200 - -The binary _osmo-trx-uhd_ is used to drive this device, see <>. - -Comes only with 1 RF channel. It can still be used in a multi-TRX setup by using -the <> feature. By using this feature, one can drive up to 3 -TRX (with the restrictions explained there). - -[[dev_ettus_b200]] -=== Ettus B210 - -The binary _osmo-trx-uhd_ is used to drive this device, see <>. - -Comes with 2 RF channels, which can be used to set up a multi-TRX BTS. However, -due to a shared local oscillator for both RF channels, ARFCN separation can be -up about 25 MHz. - -This device also supports the <> feature. By using this -feature, one can drive up to 3 TRX (with the restrictions explained there). -Please note that the above configurations cannot be combined, which means -maximum number of TRX one can achieve is 2 by using separate physical RF -channels, or 3 by using multi-ARFCN method. You cannot support, for example, 6 -ARFCN operation on B210 using 3 TRX on side A and another 3 TRX on side B. - -[[dev_limesdr_usb]] -=== LimeSDR-USB - -The binary _osmo-trx-lms_ is used to drive this device, see <>. - -This device comes with 2 RF channels, so it should theoretically be possible to -run a multi-TRX setup with it, but there are yet no records that this kind of -setup was tested with this device. - -This device has 3 different Rx paths with different antenna connectors in the -PCB, each with a different frequency and bandwidth range. One should make sure -the physical antenna is connected to the correct connector matching the Rx path -you want to use. If one wants to be able to use the device in both 900 and 1800 -MHz GSM bands and easily switch between them, then Rx Path `LNAW` should be used -,since it is the only one covering both bands, and the antenna physically plugged -accordingly. Following example shows how to then configure _osmo-trx-lms_ to use -that Rx path to read samples. - -.Example: Configure osmo-trx-lms to use LNAW as Rx path and BAND1 as Tx Path ----- -trx - ... - chan 0 - tx-path BAND1 - rx-path LNAW ----- - -[[dev_limesdr_mini]] -=== LimeSDR-mini - -The binary _osmo-trx-lms_ is used to drive this device, see <>. - -As a smaller brother of the [[dev_limesdr_usb]], this device comes only with 1 -RF channel. As a result, it can only hold 1 TRX as of today. diff --git a/OsmoTRX/osmotrx-usermanual-docinfo.xml b/OsmoTRX/osmotrx-usermanual-docinfo.xml deleted file mode 100644 index 34225be..0000000 --- a/OsmoTRX/osmotrx-usermanual-docinfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1 - March 6, 2019 - PE - - Initial version. - - - - - - - Pau - Espin Pedrol - pespin at sysmocom.de - PE - - sysmocom - sysmocom - s.f.m.c. GmbH - Software Developer - - - - - - 2018 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoTRX/osmotrx-usermanual.adoc b/OsmoTRX/osmotrx-usermanual.adoc deleted file mode 100644 index a17a899..0000000 --- a/OsmoTRX/osmotrx-usermanual.adoc +++ /dev/null @@ -1,42 +0,0 @@ -:gfdl-enabled: - -OsmoTRX User Manual -==================== -Pau Espin Pedrol - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/counters.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::{srcdir}/chapters/trx-architectures.adoc[] - -include::{srcdir}/chapters/trx-devices.adoc[] - -include::{srcdir}/chapters/trx-backends.adoc[] - -include::{srcdir}/chapters/code-architecture.adoc[] - -include::./common/chapters/trx_if.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoTRX/osmotrx-vty-reference.xml b/OsmoTRX/osmotrx-vty-reference.xml deleted file mode 100644 index 4291929..0000000 --- a/OsmoTRX/osmotrx-vty-reference.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - -]> - - - - - - v1 - 6th March 2018 - pe - Initial - - - - OsmoTRX VTY Reference - - - 2018 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - diff --git a/OsmoTRX/vty/trx_vty_additions.xml b/OsmoTRX/vty/trx_vty_additions.xml deleted file mode 100644 index a4c675e..0000000 --- a/OsmoTRX/vty/trx_vty_additions.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/OsmoTRX/vty/trx_vty_reference.xml b/OsmoTRX/vty/trx_vty_reference.xml deleted file mode 100644 index ffc642a..0000000 --- a/OsmoTRX/vty/trx_vty_reference.xml +++ /dev/null @@ -1,1183 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-trx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-trx-chan - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index e7c47a1..a6f29a0 100644 --- a/configure.ac +++ b/configure.ac @@ -32,5 +32,4 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoTRX/Makefile OsmocomBB/Makefile) -- To view, visit https://gerrit.osmocom.org/11970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If7cd43eec5f9d20f7f4200340e96ed0e0908e253 Gerrit-Change-Number: 11970 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:39 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSTP files (now avail in libosmo-sccp.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11969 ) Change subject: remove OsmoSTP files (now avail in libosmo-sccp.git) ...................................................................... remove OsmoSTP files (now avail in libosmo-sccp.git) Files were added in libosmo-sccp.git Change-Id Ib5a22c2ea81fdde036bf9efb47d785a830b88c93 Depends: libosmo-sccp.git Change-Id Ib5a22c2ea81fdde036bf9efb47d785a830b88c93 Related: OS#3385 Change-Id: I971ef93a675412ea27d8bf193db6b9b35428f0bc --- M Makefile.am D OsmoSTP/Makefile.am D OsmoSTP/chapters/overview.adoc D OsmoSTP/osmostp-usermanual-docinfo.xml D OsmoSTP/osmostp-usermanual.adoc D OsmoSTP/osmostp-vty-reference.xml D OsmoSTP/vty/osmo-stp_vty_reference.xml M configure.ac 8 files changed, 0 insertions(+), 1,669 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index 6c2879f..eb86032 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoSTP \ OsmoTRX \ OsmocomBB diff --git a/OsmoSTP/Makefile.am b/OsmoSTP/Makefile.am deleted file mode 100644 index eb4ec9d..0000000 --- a/OsmoSTP/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmostp-usermanual.adoc \ - osmostp-usermanual-docinfo.xml \ - osmostp-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmostp-usermanual.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmostp-usermanual.pdf: $(srcdir)/chapters/*.adoc -aoip-mgw-options.pdf: $(srcdir)/aoip-mgw-options.adoc $(srcdir)/mgw/*.msc - -VTY_REFERENCE = osmostp-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSTP/chapters/overview.adoc b/OsmoSTP/chapters/overview.adoc deleted file mode 100644 index e69de29..0000000 --- a/OsmoSTP/chapters/overview.adoc +++ /dev/null diff --git a/OsmoSTP/osmostp-usermanual-docinfo.xml b/OsmoSTP/osmostp-usermanual-docinfo.xml deleted file mode 100644 index 4253957..0000000 --- a/OsmoSTP/osmostp-usermanual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - April 16, 2017 - HW - - Initial OsmoSTP manual - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2012-2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoSTP/osmostp-usermanual.adoc b/OsmoSTP/osmostp-usermanual.adoc deleted file mode 100644 index 9f41e5d..0000000 --- a/OsmoSTP/osmostp-usermanual.adoc +++ /dev/null @@ -1,34 +0,0 @@ -OsmoSTP User Manual -=================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -// include::{srcdir}/chapters/overview.adoc[] - -include::./common/chapters/sigtran.adoc[] - -include::./common/chapters/sigtran-osmocom.adoc[] - -//include::{srcdir}/chapters/running.adoc[] -// include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -//include::./common/chapters/bts.adoc[] - -//include::../OsmoNITB/chapters/bts-examples.adoc[] - -//include::./common/chapters/control_if.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - diff --git a/OsmoSTP/osmostp-vty-reference.xml b/OsmoSTP/osmostp-vty-reference.xml deleted file mode 100644 index ae0f7b0..0000000 --- a/OsmoSTP/osmostp-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - April 16, 2017 - h2 - Initial - - - - OsmoSTP VTY Reference - - - 2012-2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoSTP/vty/osmo-stp_vty_reference.xml b/OsmoSTP/vty/osmo-stp_vty_reference.xml deleted file mode 100644 index 308c369..0000000 --- a/OsmoSTP/vty/osmo-stp_vty_reference.xml +++ /dev/null @@ -1,1532 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-listen - - - - - - - - - - - - - - - - config-cs7-rt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index e036384..e7c47a1 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,5 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoSTP/Makefile OsmoTRX/Makefile OsmocomBB/Makefile) -- To view, visit https://gerrit.osmocom.org/11969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I971ef93a675412ea27d8bf193db6b9b35428f0bc Gerrit-Change-Number: 11969 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:40 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSIPConnector files (now avail in osmo-sip-connector.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11968 ) Change subject: remove OsmoSIPConnector files (now avail in osmo-sip-connector.git) ...................................................................... remove OsmoSIPConnector files (now avail in osmo-sip-connector.git) Files were added in osmo-sip-connector.git Change-Id I1317131ed6765fec996344fc6ed08350187b615b Depends: osmo-sip-connector.git Change-Id I1317131ed6765fec996344fc6ed08350187b615b Related: OS#3385 Change-Id: Id77812586eb21932b563b57e75cd85b721b7d6ab --- M Makefile.am D OsmoSIPConnector/Makefile.am D OsmoSIPConnector/chapters/configuration.adoc D OsmoSIPConnector/chapters/overview.adoc D OsmoSIPConnector/chapters/running.adoc D OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml D OsmoSIPConnector/osmosipconnector-usermanual.adoc D OsmoSIPConnector/osmosipconnector-vty-reference.xml D OsmoSIPConnector/vty/sipconn_vty_additions.xml D OsmoSIPConnector/vty/sipconn_vty_reference.xml M configure.ac 11 files changed, 0 insertions(+), 1,448 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index da712fe..6c2879f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoSIPConnector \ OsmoSTP \ OsmoTRX \ OsmocomBB diff --git a/OsmoSIPConnector/Makefile.am b/OsmoSIPConnector/Makefile.am deleted file mode 100644 index f2bb064..0000000 --- a/OsmoSIPConnector/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmosipconnector-usermanual.adoc \ - osmosipconnector-usermanual-docinfo.xml \ - osmosipconnector-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmosipconnector-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmosipconnector-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSIPConnector/chapters/configuration.adoc b/OsmoSIPConnector/chapters/configuration.adoc deleted file mode 100644 index 5cd57fa..0000000 --- a/OsmoSIPConnector/chapters/configuration.adoc +++ /dev/null @@ -1,53 +0,0 @@ -== Configuring OsmoSIPConnector - -The configuration of OsmoSIPConnector consists mainly of two parts: -configuring the MNCC interface towards the MSC and configuring the SIP -interface towards the PBX. - -=== Configuring MNCC - -Configuring the MNCC interface is very simple. It has to be pointed to -the same path that OsmoMSC is also using. This means that OsmoMSC and -OsmoSIPConnector need to be running on the same machine or have a shared -directory that supports UNIX domain sockets. - -Note that you need to start `osmo-msc` with the `--mncc-sock` option and point -to the same file that osmo-sip-connector is configured to use. See the OsmoMSC -manual for more information. - -The example config below assumes that OsmoMSC was started with the command -line `osmo-msc -M /tmp/msc_mncc`. - -.Example: MNCC configuration ----- -OsmoSIPcon(config)# mncc -OsmoSIPcon(config-mncc)# socket-path /tmp/msc_mncc ----- - -=== Configuring SIP - -This section covers the SIP configuration. Source and destination IP and port -can be set for the connection to the PBX. - -.Example: SIP configuration ----- -OsmoSIPcon(config)# sip -OsmoSIPcon(config-sip)# local 10.0.0.1 5060 <1> -OsmoSIPcon(config-sip)# remote 10.0.0.2 5060 <2> ----- -<1> The local IP/port to use -<2> The remote SIP IP/port that the PBX uses - -There is also an option to use the IMSI as calling (source) address for -MO- and as called (destination) address for MT-calls. - -.Example: Use IMSI instead of MSISDN ----- -OsmoSIPcon(config)# app -OsmoSIPcon(config-app)# use-imsi <1> ----- -<1> Use the IMSI for MO calling and MT called address - -Since OsmoSIPConnector is just a shim between OsmoMSC and a proper SIP server -this is the extent of the configuration. Setting up a dialplan and other -SIP-related configuration should be done in the actual SIP server. diff --git a/OsmoSIPConnector/chapters/overview.adoc b/OsmoSIPConnector/chapters/overview.adoc deleted file mode 100644 index 24fe8b9..0000000 --- a/OsmoSIPConnector/chapters/overview.adoc +++ /dev/null @@ -1,48 +0,0 @@ -[[overview]] -== Overview - -This manual should help you getting started with OsmoSIPConnector. It will -cover aspects of configuring and running OsmoSIPConnector. - -[[intro_overview]] -=== About OsmoSIPConnector - -OsmoSIPConnector translates between Mobile Network Call Control (MNCC) -used in the GSM newtwork and Voice over IP SIP call control messages so that -speech calls can traverse through the mobile network to SIP and vice versa. It -has the following interfaces: - -- MNCC UNIX domain socket towards `osmo-msc` -- SIP towards the PBX -- The Osmocom typical telnet VTY interface. - -Find the OsmoSIPConnector issue tracker and wiki online at - -- https://osmocom.org/projects/osmo-sip-connector -- https://osmocom.org/projects/osmo-sip-connector/wiki - - -[[fig-gsm]] -.Typical GSM network architecture used with OsmoSIPConnector -[graphviz] ----- -digraph G{ - rankdir = LR; - "osmo-sip-connector" [color="red"]; - OsmoMGWB [label="OsmoMGW\n(BSC)"]; - OsmoMGWM [label="OsmoMGW\n(MSC)"]; - MS -> BTS [label = "Um"]; - BTS -> OsmoBSC [label = "Abis"]; - OsmoBSC -> OsmoMSC [label = "AoIP" ]; - OsmoMSC -> "osmo-sip-connector" [label = "MNCC"]; - "osmo-sip-connector" -> "PBX" [label = "SIP"]; - BTS -> OsmoMGWB [label = "RTP"]; - OsmoMGWB -> OsmoMGWM [label = "RTP"]; - OsmoMGWM -> "PBX" [label = "RTP"]; - OsmoBSC -> OsmoMGWB [label = "MGCP" ]; - OsmoMSC -> OsmoMGWM [label = "MGCP" ]; - { rank = same; OsmoBSC; OsmoMGWB; } - { rank = same; OsmoMSC; OsmoMGWM; } -} ----- - diff --git a/OsmoSIPConnector/chapters/running.adoc b/OsmoSIPConnector/chapters/running.adoc deleted file mode 100644 index 85ccddc..0000000 --- a/OsmoSIPConnector/chapters/running.adoc +++ /dev/null @@ -1,84 +0,0 @@ -== Running OsmoSIPConnectoer - -The OsmoSIPConnector executable (`osmo-sip-connector`) offers the following -command-line arguments: - -=== SYNOPSIS - -*osmo-sip-connector* [-h] [-c 'CONFIGFILE'] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-sip-connector.cfg` in the - current working directory. - -=== Colocation with OsmoMSC - -Since the MNCC interface used to communicate between OsmoMSC and -OsmoSIPConnector is a UNIX domain socket both processes must run on the same -machine or have a shared directory that supports sharing UNIX domain sockets. - -=== Multiple instances - -Running multiple instances of `osmo-sip-connector` on the same computer is -possible if all interfaces (VTY, CTRL) are separated using the appropriate -configuration options. The IP based interfaces are binding to local host by -default. In order to separate the processes, the user has to bind those -services to specific but different IP addresses and/or ports. - -The VTY and the Control interface can be bound to IP addresses from the -loopback address range, for example: - ----- -line vty - bind 127.0.0.2 -ctrl - bind 127.0.0.2 ----- - -For the SIP client a different IP/port combination also needs to be used, for -example: - ----- -sip - local 0.0.0.0 5061 ----- - -The socket path for the MNCC interface also needs to change, which can be done -with the following configuration snippet: - ----- -mncc - socket-path /tmp/msc2_mncc ----- - -=== DTMF signaling - -In VoIP based telephony networks DTMF (Dual-tone multi-frequency signaling) can -be signaled through multiple methods. Common methods are in-band, RFC2833 and -sip-info messages. - -Osmo-sip-connector is using sip-info messages to signal DTMF tones. When a DTMF -tone is signaled at the MNCC socket interface, osmo-sip-connector will generate -a matching sip-info message to forward the DTMF signal to the PBX. Depending on -the PBX software reconfiguring the DTMF signaling method to sip-info may be -necessary. - -While sending DTMF tones through the MNCC interface to a SIP leg, the current -implementation of osmo-sip-connector does not support sending DTMF tones in the -opposite direction. Any attempts to send DTMF tones to an MNCC leg will be -confirmed with a status 405 "Method not allowed". - -The reason for this limitation is that in mobile networks, depending on the -signaling direction, the signaling of DTMF tones is implemented differently. -A mobile originated DTMF tone is signaled through out of band messages, -which arrive at osmo-sip-connector on as MNCC DTMF START/STOP messages. Those -messages can be directly translated to sip-info messages. However, in the -other direction (mobile terminated), an in-band signaling method is used. This -means that osmo-sip-connector would have to translate an incoming DTMF sip-info -message into an audio sample that then would have to be injected into the -voice stream. Currently this scheme is not implemented in osmo-sip-connector. \ No newline at end of file diff --git a/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml b/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml deleted file mode 100644 index 937e054..0000000 --- a/OsmoSIPConnector/osmosipconnector-usermanual-docinfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1 - August 04th, 2018 - DW - - Initial version - - - - - - - Daniel - Willmann - dwillmann at sysmocom.de - DW - - sysmocom - sysmocom - s.f.m.c. GmbH - - - - - - 2018 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoSIPConnector/osmosipconnector-usermanual.adoc b/OsmoSIPConnector/osmosipconnector-usermanual.adoc deleted file mode 100644 index 72d7127..0000000 --- a/OsmoSIPConnector/osmosipconnector-usermanual.adoc +++ /dev/null @@ -1,28 +0,0 @@ -:gfdl-enabled: -:program-name: OsmoSIPConnector - -OsmoSIPConnector User Manual -============================ -Daniel Willmann - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - diff --git a/OsmoSIPConnector/osmosipconnector-vty-reference.xml b/OsmoSIPConnector/osmosipconnector-vty-reference.xml deleted file mode 100644 index 0eeb952..0000000 --- a/OsmoSIPConnector/osmosipconnector-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 21st August 2018 - dw - Initial - - - - OsmoSIPConnector VTY Reference - - - 2018 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoSIPConnector/vty/sipconn_vty_additions.xml b/OsmoSIPConnector/vty/sipconn_vty_additions.xml deleted file mode 100644 index a4c675e..0000000 --- a/OsmoSIPConnector/vty/sipconn_vty_additions.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/OsmoSIPConnector/vty/sipconn_vty_reference.xml b/OsmoSIPConnector/vty/sipconn_vty_reference.xml deleted file mode 100644 index dee42e6..0000000 --- a/OsmoSIPConnector/vty/sipconn_vty_reference.xml +++ /dev/null @@ -1,1132 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-sip - - - - - - - - - - - - - - - - - - - - - - - - config-mncc - - - - - - - - - config-app - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index 7eabd3a..e036384 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoSIPConnector/Makefile OsmoSTP/Makefile OsmoTRX/Makefile OsmocomBB/Makefile) -- To view, visit https://gerrit.osmocom.org/11968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id77812586eb21932b563b57e75cd85b721b7d6ab Gerrit-Change-Number: 11968 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:40 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoPCU files (now avail in osmo-pcu.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11966 ) Change subject: remove OsmoPCU files (now avail in osmo-pcu.git) ...................................................................... remove OsmoPCU files (now avail in osmo-pcu.git) Files were added in osmo-pcu.git Change-Id I7270652de393a98748c0cdc51e626c17ab8f44c2 Depends: osmo-pcu.git Change-Id I7270652de393a98748c0cdc51e626c17ab8f44c2 Related: OS#3385 Change-Id: I2a1de294883491487aa270b1e30160d559ef063a --- M Makefile.am D OsmoPCU/Makefile.am D OsmoPCU/chapters/configuration.adoc D OsmoPCU/chapters/counters.adoc D OsmoPCU/chapters/counters_generated.adoc D OsmoPCU/chapters/overview.adoc D OsmoPCU/chapters/running.adoc D OsmoPCU/gb/bssgp.adoc D OsmoPCU/gb/gb-startup.msc D OsmoPCU/gb/ns.adoc D OsmoPCU/osmopcu-gb-docinfo.xml D OsmoPCU/osmopcu-gb.adoc D OsmoPCU/osmopcu-usermanual-docinfo.xml D OsmoPCU/osmopcu-usermanual.adoc D OsmoPCU/osmopcu-vty-reference.xml D OsmoPCU/vty/osmo-pcu_vty_additions.xml D OsmoPCU/vty/osmo-pcu_vty_reference.xml M configure.ac 18 files changed, 0 insertions(+), 2,479 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index f86e6fc..422df72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoPCU \ OsmoSGSN \ OsmoSIPConnector \ OsmoSTP \ diff --git a/OsmoPCU/Makefile.am b/OsmoPCU/Makefile.am deleted file mode 100644 index a741f9b..0000000 --- a/OsmoPCU/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmopcu-gb.adoc \ - osmopcu-gb-docinfo.xml \ - osmopcu-usermanual.adoc \ - osmopcu-usermanual-docinfo.xml \ - osmopcu-vty-reference.xml \ - chapters \ - gb \ - vty - -ASCIIDOC = osmopcu-usermanual.adoc osmopcu-gb.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc -osmopcu-gb.pdf: $(srcdir)/gb/*.adoc $(srcdir)/gb/*.msc -osmopcu-usermanual.pdf: $(srcdir)/chapters/*.adoc - -VTY_REFERENCE = osmopcu-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoPCU/chapters/configuration.adoc b/OsmoPCU/chapters/configuration.adoc deleted file mode 100644 index 6fc61c7..0000000 --- a/OsmoPCU/chapters/configuration.adoc +++ /dev/null @@ -1,205 +0,0 @@ -== Configuring OsmoPCU - -Contrary to other network elements (like OsmoBSC, OsmoNITB), the -OsmoPCU has a relatively simple minimum configuration. - -This is primarily because most of the PCU configuration happens -indirectly from the BSC, who passes the configuation over A-bis OML via -OsmoBTS and its PCU socket into OsmoPCU. - -A minimal OsmoPCU configuration file is provided below for your reference: - -.Example: Minimal OsmoPCU configuration file (`osmo-pcu.cfg`) ----- -pcu - flow-control-interval 10 <1> - cs 2 <2> - alloc-algorithm dynamic <3> - alpha 0 <4> - gamma 0 ----- -<1> send a BSSGP flow-control PDU every 10 seconds -<2> start a TBF with the initial coding scheme 2 -<3> dynamically chose between single-slot or multi-slot TBF allocations - depending on system load -<4> disable MS power control loop - -However, there are plenty of tuning parameters for people interested to -optimize PCU throughput or latency according to their requirements. - -=== Configuring the Coding Schemes and Rate Adaption - -The BSC includes a bit-mask of permitted [E]GPRS coding schemes as part -of the A-bis OML configuration. This is passed from the BTS via the PCU -socket into OsmoPCU. - -Some additional parameters can be set as described below. - -==== Initial Coding Scheme - -You can use the `cs <1-4> [<1-4>]` command at the `pcu` VTY config node -to set the initial GPRS coding scheme to be used. The optional second -value allows to specify a different initial coding scheme for uplink. - -==== Maximum Coding Scheme - -You can use the `cs max <1-4> [<1-4>]` command at the `pcu` VTY config -node to set the maximum coding scheme that should be used as part of the -rate adaption. - -==== Rate Adaption Error Thresholds - -You can use the `cs threshold <0-100> <0-100>` command at the `pcu` VTY -config node to determine the upper and lower limit for the error rate -percentage to use in the rate adaption. If the upper threshold is -reached, a lower coding sheme is chosen, and if the lower threshold is -reached, a higher coding scheme is chosen. - -==== Rate Adation Link Quality Thresholds - -You can use the `cs link-quality-ranges cs1 <0-35> cs2 <0-35> <0-35> cs3 -<0-35> <0-35> cs4 <0-35>` command at the `pcu` VTY config node to tune -the link quality ranges for the respective coding schemes. - -==== Data Size based CS downgrade Threshold - -You can use the `cs downgrade-threshold <1-10000>` command at the `pcu` -VTY config node to ask the PCU to down-grade the coding scheme if less -than the specified number of octets are left to be transmitted. - -=== Miscellaneous Configuration / Tuning Parameters - -==== Downlink TBF idle time - -After a down-link TBF is idle (all data in the current LLC downlink -queue for the MS has been transmitted), we can keep the TBF established -for a configurable time. This avoids having to go through a new one or -two phase TBF establishment once the next data for downlink arrives. - -You can use the `dl-tbf-idle-time <1-5000>` to specify that time in -units of milli-seconds. The default is 2 seconds. - -==== MS idle time - -Using the `ms-idle-time <1-7200>` command at the `pcu` VTY config node -you can configure the number of seconds for which the PCU should keep -the MS data structure alive before releasing it if there are no active -TBF for this MS. - -The OsmoPCU default value is 60 seconds, which is slightly more than -what 3GPP TS 24.008 recommends for T3314 (44s). - -The MS data structure only consumes memory in the PCU and does not -require any resources of the air interface. - -==== Forcing two-phase access - -If the MS is using a single-phase access, you can still force it to -use a two-phase access using the `two-phase-access` VTY configuration -command at the `pcu` VTY config node. - -=== Configuring BSSGP flow control - -BSSGP between SGSN and PCU contains a two-level nested flow control -mechanism: - -. one global flow control instance for the overall (downlink) traffic - from the SGSN to this PCU -. a per-MS flow control instance for each individual MS served by this - PCU - -Each of the flow control instance is implemented as a TBF (token bucket -filter). - -==== Normal BSSGP Flow Control Tuning parameters - -You can use the following commands at the `pcu` VTY config node to tune -the BSSGP flow control parameters: - -`flow-control-interval <1-10>`:: - configure the interval (in seconds) between subsequent flow - control PDUs from PCU to SGSN -`flow-control bucket-time <1-65534>`:: - set the target downlink maximum queueing time in centi-seconds. - The PCU will attempt to adjust the advertised bucket size to match this - target. - -==== Extended BSSGP Flow Control Tuning parameters - -There are some extended flow control related parameters at the `pcu` VTY -config node that override the automatic flow control as specified in the -BSSGP specification. Use them with care! - -`flow-control force-bvc-bucket-size <1-6553500>`:: - force the BVC (global) bucket size to the given number of octets -`flow-control force-bvc-leak-rate <1-6553500>`:: - force the BVC (global) bucket leak rate to the given number of bits/s -`flow-control force-ms-bucket-size <1-6553500>`:: - force the per-MS bucket size to the given number of octets -`flow-control force-ms-leak-rate <1-6553500>`:: - force the per-MS bucket leak rate to the given number of bits/s - - -=== Configuring LLC queue - -The downlink LLC queue in the PCU towards the MS can be tuned with a -variety of parameters at the `pcu` VTY config node, depending on your -needs. - -`queue lifetime <1-65534>`:: - Each downlink LLC PDU is assigned a lifetime by the SGSN, which - is respected by the PDU *unless* you use this command to - override the PDU lifetime with a larger value (in centi-seconds) -`queue lifetime infinite`:: - Never drop LLC PDUs, i.e. give them an unlimited lifetime. -`queue hysteresis <1-65535>`:: - When the downlink LLC queue is full, the PCU starts dropping - packets. Using this parameter, we can set the lifetime - hysteresis in centi-seconds, i.e. it will continue discarding - until "lifetime - hysteresis" is reached. -`queue codel`:: - Use the 'CoDel' (Controlled Delay) scheduling algorithm, which - is designed to overcome buffer bloat. It will use a default - interval of 4 seconds. -`queue codel interval <1-1000>`:: - Use the 'CoDel' (Controlled Delay) scheduling algorithm, which - is designed to overcome buffer bloat. Use the specified - interval in centi-seconds. -`queue idle-ack-delay <1-65535>`:: - Delay the request for an ACK after the last downlink LLC frame - by the specified amount of centi-seconds. - - -=== Configuring MS power control - -GPRS MS power control works completely different than the close MS power -control loop in circuit-switched GSM. - -Rather than instructing the MS constantly about which transmit power to -use, some parameters are provided to the MS by which the MS-based power -control algorithm is tuned. - -See 3GPP TS 05.08 for further information on the algorithm and the -parameters. - -You can set those parameters at the `pcu` VTY config node as follows: - -`alpha <0-10>`:: - Alpha parameter for MS power control in units of 0.1. - Make sure to set the alpha value at System Information 13 (in - the BSC), too! -`gamma <0-62>`:: - Set the gamma parameter for MS power control in units of dB. - - -=== Enabling EGPRS - -If you would like to test the currently (experimental) EGPRS support of -OsmoPCU, you can enable it using the `egprs` command at the `pcu` VTY -config node. - -WARNING: EPGRS functionality is highly experimental at the time of this -writing. Please only use if you actively would like to participate in -the OsmoPCU EGPRS development and/or testing. You will also need an -EGPRS capable OsmoBTS+PHY, which means `osmo-bts-sysmo` or -`osmo-bts-litecell15` with their associated PHY. diff --git a/OsmoPCU/chapters/counters.adoc b/OsmoPCU/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoPCU/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoPCU/chapters/counters_generated.adoc b/OsmoPCU/chapters/counters_generated.adoc deleted file mode 100644 index 2ee425e..0000000 --- a/OsmoPCU/chapters/counters_generated.adoc +++ /dev/null @@ -1,178 +0,0 @@ -// autogenerated by show asciidoc counters -These counters and their description based on Osmo-PCU 0.4.0.4-8d55 (Osmo-PCU). - -// generating tables for rate_ctr_group -// rate_ctr_group table BSSGP Peer Statistics -.bssgp:bss_ctx - BSSGP Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at BSSGP Level ( In) -| packets:out | <> | Packets at BSSGP Level (Out) -| bytes:in | <> | Bytes at BSSGP Level ( In) -| bytes:out | <> | Bytes at BSSGP Level (Out) -| blocked | <> | BVC Blocking count -| discarded | <> | BVC LLC Discarded count -| status | <> | BVC Status count -|=== -// rate_ctr_group table NSVC Peer Statistics -.ns:nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at NS Level ( In) -| packets:out | <> | Packets at NS Level (Out) -| bytes:in | <> | Bytes at NS Level ( In) -| bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count -| replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count -|=== -// rate_ctr_group table NSVC Peer Statistics -.ns:nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at NS Level ( In) -| packets:out | <> | Packets at NS Level (Out) -| bytes:in | <> | Bytes at NS Level ( In) -| bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count -| replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count -|=== -// rate_ctr_group table BTS Statistics -.bts - BTS Statistics -[options="header"] -|=== -| Name | Reference | Description -| tbf:dl:alloc | <> | TBF DL Allocated -| tbf:dl:freed | <> | TBF DL Freed -| tbf:dl:aborted | <> | TBF DL Aborted -| tbf:ul:alloc | <> | TBF UL Allocated -| tbf:ul:freed | <> | TBF UL Freed -| tbf:ul:aborted | <> | TBF UL Aborted -| tbf:reused | <> | TBF Reused -| tbf:alloc:algo-a | <> | TBF Alloc Algo A -| tbf:alloc:algo-b | <> | TBF Alloc Algo B -| tbf:failed:egprs-only | <> | TBF Failed EGPRS-only -| rlc:sent | <> | RLC Sent -| rlc:resent | <> | RLC Resent -| rlc:restarted | <> | RLC Restarted -| rlc:stalled | <> | RLC Stalled -| rlc:nacked | <> | RLC Nacked -| rlc:final_block_resent | <> | RLC Final Blk resent -| rlc:ass:timedout | <> | RLC Assign Timeout -| rlc:ass:failed | <> | RLC Assign Failed -| rlc:ack:timedout | <> | RLC Ack Timeout -| rlc:ack:failed | <> | RLC Ack Failed -| rlc:rel:timedout | <> | RLC Release Timeout -| rlc:late-block | <> | RLC Late Block -| rlc:sent-dummy | <> | RLC Sent Dummy -| rlc:sent-control | <> | RLC Sent Control -| rlc:dl_bytes | <> | RLC DL Bytes -| rlc:dl_payload_bytes | <> | RLC DL Payload Bytes -| rlc:ul_bytes | <> | RLC UL Bytes -| rlc:ul_payload_bytes | <> | RLC UL Payload Bytes -| decode:errors | <> | Decode Errors -| sba:allocated | <> | SBA Allocated -| sba:freed | <> | SBA Freed -| sba:timedout | <> | SBA Timeout -| llc:timeout | <> | Timedout Frames -| llc:dropped | <> | Dropped Frames -| llc:scheduled | <> | Scheduled Frames -| llc:dl_bytes | <> | RLC encapsulated PDUs -| llc:ul_bytes | <> | full PDUs received -| rach:requests | <> | RACH requests -| 11bit_rach:requests | <> | 11BIT_RACH requests -| spb:uplink_first_segment | <> | First seg of UL SPB -| spb:uplink_second_segment | <> | Second seg of UL SPB -| spb:downlink_first_segment | <> | First seg of DL SPB -| spb:downlink_second_segment | <> | Second seg of DL SPB -| immediate:assignment_UL | <> | Immediate Assign UL -| immediate:assignment_rej | <> | Immediate Assign Rej -| immediate:assignment_DL | <> | Immediate Assign DL -| channel:request_description | <> | Channel Request Desc -| pkt:ul_assignment | <> | Packet UL Assignment -| pkt:access_reject | <> | Packet Access Reject -| pkt:dl_assignment | <> | Packet DL Assignment -| ul:control | <> | UL control Block -| ul:assignment_poll_timeout | <> | UL Assign Timeout -| ul:assignment_failed | <> | UL Assign Failed -| dl:assignment_timeout | <> | DL Assign Timeout -| dl:assignment_failed | <> | DL Assign Failed -| pkt:ul_ack_nack_timeout | <> | PUAN Poll Timeout -| pkt:ul_ack_nack_failed | <> | PUAN poll Failed -| pkt:dl_ack_nack_timeout | <> | PDAN poll Timeout -| pkt:dl_ack_nack_failed | <> | PDAN poll Failed -| gprs:downlink_cs1 | <> | CS1 downlink -| gprs:downlink_cs2 | <> | CS2 downlink -| gprs:downlink_cs3 | <> | CS3 downlink -| gprs:downlink_cs4 | <> | CS4 downlink -| egprs:downlink_mcs1 | <> | MCS1 downlink -| egprs:downlink_mcs2 | <> | MCS2 downlink -| egprs:downlink_mcs3 | <> | MCS3 downlink -| egprs:downlink_mcs4 | <> | MCS4 downlink -| egprs:downlink_mcs5 | <> | MCS5 downlink -| egprs:downlink_mcs6 | <> | MCS6 downlink -| egprs:downlink_mcs7 | <> | MCS7 downlink -| egprs:downlink_mcs8 | <> | MCS8 downlink -| egprs:downlink_mcs9 | <> | MCS9 downlink -| gprs:uplink_cs1 | <> | CS1 Uplink -| gprs:uplink_cs2 | <> | CS2 Uplink -| gprs:uplink_cs3 | <> | CS3 Uplink -| gprs:uplink_cs4 | <> | CS4 Uplink -| egprs:uplink_mcs1 | <> | MCS1 Uplink -| egprs:uplink_mcs2 | <> | MCS2 Uplink -| egprs:uplink_mcs3 | <> | MCS3 Uplink -| egprs:uplink_mcs4 | <> | MCS4 Uplink -| egprs:uplink_mcs5 | <> | MCS5 Uplink -| egprs:uplink_mcs6 | <> | MCS6 Uplink -| egprs:uplink_mcs7 | <> | MCS7 Uplink -| egprs:uplink_mcs8 | <> | MCS8 Uplink -| egprs:uplink_mcs9 | <> | MCS9 Uplink -|=== -// generating tables for osmo_stat_items -NSVC Peer Statistics -// osmo_stat_item_group table NSVC Peer Statistics -.ns.nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| alive.delay | <> | ALIVE response time | ms -|=== -NSVC Peer Statistics -// osmo_stat_item_group table NSVC Peer Statistics -.ns.nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| alive.delay | <> | ALIVE response time | ms -|=== -BTS Statistics -// osmo_stat_item_group table BTS Statistics -.bts - BTS Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| ms.present | <> | MS Present | -|=== -// generating tables for osmo_counters -// ungrouped osmo_counters -.ungrouped osmo counters -[options="header"] -|=== -| Name | Reference | Description -|=== - - diff --git a/OsmoPCU/chapters/overview.adoc b/OsmoPCU/chapters/overview.adoc deleted file mode 100644 index 0031474..0000000 --- a/OsmoPCU/chapters/overview.adoc +++ /dev/null @@ -1,67 +0,0 @@ -== Overview - -=== About OsmoPCU - -OsmoPCU is the Osmocom implementation of the GPRS PCU (Packet Control -Unit) element inside the GPRS network. - -The OsmoPCU is co-located within the BTS and connects to OsmoBTS via its -PCU socket interface. - -On the other side, OsmoPCU is connected via the Gb interface to the -SGSN. - -[[fig-gprs-pcubts]] -.GPRS network architecture with PCU in BTS -[graphviz] ----- -digraph G { - rankdir=LR; - MS0 [label="MS"] - MS1 [label="MS"] - MS0->BTS [label="Um"] - MS1->BTS [label="Um"] - BTS->BSC [label="Abis"] - BSC->MSC [label="A"] - BTS->PCU [label="pcu_sock"] - PCU->SGSN [label="Gb"] - SGSN->GGSN [label="GTP"] -} ----- - -=== Software Components - -OsmoPCU consists of a variety of components, including - -* Gb interface (NS/BSSGP protocol) -* `pcu_sock` interface towards OsmoBTS -* TBF management for uplink and downlink TBF -* RLC/MAC protocol implementation -* per-MS context for each MS currently served -* CSN.1 encoding/decoding routines - -==== Gb Implementation - -OsmoPCU implements the ETSI/3GPP specified Gb interface, including TS -08.16 (NS), TS 08.18 (BSSGP) protocols. As transport layer for NS, it -supports NS/IP (NS encapsulated in UDP/IP). - -The actual Gb Implementation is part of the libosmogb library, which is -in turn part of the libosmocore software package. This allows the same -Gb implementation to be used from OsmoPCU, OsmoGbProxy as well as -OsmoSGSN. - -==== `pcu_sock` Interface to OsmoBTS - -The interface towards OsmoBTS is called 'pcu_sock' and implemented as a -set of non-standardized primitives over a unix domain socket. The -default file system path for this socket is `/tmp/pcu_bts`. - -The PCU socket can be changed on both OmsoBTS and OsmoPCU to a different -file/path name, primarily to permit running multiple independent BTS+PCU -pairs on a single Linux machine without having to use filesystem -namespaces or other complex configurations. - -NOTE: If you change the PCU socket path on OsmoBTS by means of the -`pcu-socket` VTY configuration command, you must ensure to make the -identical change on the OsmoPCU side. diff --git a/OsmoPCU/chapters/running.adoc b/OsmoPCU/chapters/running.adoc deleted file mode 100644 index d9f78c8..0000000 --- a/OsmoPCU/chapters/running.adoc +++ /dev/null @@ -1,33 +0,0 @@ -== Running OsmoPCU - -The OsmoPCU executable (`osmo-pcu`) offers the following command-line -options: - - -=== SYNOPSIS - -*osmo-pcu* [-h|-V] [-D] [-c 'CONFIGFILE'] [-r 'PRIO'] [-m 'MCC'] [-n 'MNC'] - - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -//*-D, --daemonize*:: -// Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-pcu.cfg` in the current - working directory. -*-r, --realtime 'PRIO'*:: - Enable use of the Linux kernel realtime priority scheduler with - the specified priority. - It is recommended you use this option on low-performance - embedded systems or systems that encounter high non-GSM/GPRS - load. -*-m, --mcc 'MCC'*:: - Use the given MCC instead of that provided by BTS via PCU socket -*-n, --mnc 'MNC'*:: - Use the given MNC instead of that provided by BTS via PCU socket diff --git a/OsmoPCU/gb/bssgp.adoc b/OsmoPCU/gb/bssgp.adoc deleted file mode 100644 index 18f1842..0000000 --- a/OsmoPCU/gb/bssgp.adoc +++ /dev/null @@ -1,501 +0,0 @@ -[[bssgp]] -== BSS GPRS Protocol (BSSGP) - -=== List of Messages - -The following tables list the BSSGP messages used by OsmoPCU, grouped -by their level of compliance with 3GPP TS 08.18. - -==== Messages Compliant With TS 08.18 - -.Messages compliant with TS 08.18 -[options="header",cols="10%,10%,20%,35%,5%,20%"] -|=== -| TS 08.18 ? | type code (hex) | This document ? | Message | <-/-> | Received/Sent by OsmoPCU -6+<| *RL and BSSGP SAP Messages:* -| 10.2.1 | 0x00 | <> | DL-UNITDATA | <- | Received -| 10.2.2 | 0x01 | <> | UL-UNITDATA | -> | Sent -| 10.2.3 | 0x02 | <> | RA-CAPABILITY | <- | Received -6+<| *GMM SAP Messages:* -| 10.3.1 | 0x06 | <> | PAGING PS | <- | Received -| 10.3.2 | 0x07 | <> | PAGING CS | <- | Received -| 10.3.7 | 0x0c | <> | SUSPEND-ACK | <- | Received -| 10.3.8 | 0x0d | <> | SUSPEND-NACK | <- | Received -| 10.3.10 | 0x0f | <> | RESUME-ACK | <- | Received -| 10.3.11 | 0x10 | <> | RESUME-NACK | <- | Received -6+<| *NM SAP Messages:* -| 10.4.9 | 0x21 | <> | BVC-BLOCK-ACK | <- | Received -| 10.4.12 | 0x22 | <> | BVC-RESET | <-/-> | Received/Sent -| 10.4.13 | 0x23 | <> | BVC-RESET-ACK | <- | Received -| 10.4.10 | 0x24 | <> | BVC-UNBLOCK | -> | Sent -| 10.4.11 | 0x25 | <> | BVC-UNBLOCK-ACK | <- | Received -| 10.4.4 | 0x26 | <> | FLOW-CONTROL-BVC | -> | Sent -| 10.4.5 | 0x27 | <> | FLOW-CONTROL-BVC-ACK | <- | Received -| 10.4.7 | 0x29 | <> | FLOW-CONTROL-MS-ACK | <- | Received -| 10.4.1 | 0x2a | <> | FLUSH-LL | <- | Received -| 10.4.15 | 0x40 | <> | SGSN-INVOKE-TRACE | <- | Received -| 10.4.14 | 0x41 | <> | STATUS | <-/-> | Received/Sent -|=== - -==== Messages Specific to OsmoPCU - -There are no OsmoPCU specific BSSGP messages. - -[[not_impl]] -==== Messages Not Implemented by OsmoPCU - -.3GPP TS 08.18 messages not implemented by OsmoPCU -[options="header",cols="10%,10%,80%"] -|=== -| TS 08.18 ? | type code (hex) | Message -3+<| *RL (relay) and BSSGP SAP Messages:* -| 10.2.4 | 0x03 | PTM-UNITDATA -3+<| *GMM (GPRS mobility management) SAP Messages:* -| 10.3.3 | 0x08 | RA-CAPABILITY-UPDATE -| 10.3.4 | 0x09 | RA-CAPABILITY-UPDATE-ACK -| 10.3.5 | 0x0a | RADIO-STATUS -| 10.3.6 | 0x0b | SUSPEND -| 10.3.9 | 0x0e | RESUME -3+<| *NM (network management) SAP Messages:* -| 10.4.8 | 0x20 | BVC-BLOCK -| 10.4.6 | 0x28 | FLOW-CONTROL-MS -| 10.4.2 | 0x2b | FLUSH-LL-ACK -| 10.4.3 | 0x2c | LLC-DISCARDED -3+<| *PFM (packet flow management) SAP Messages:* -| 10.4.16 | 0x50 | DOWNLOAD-BSS-PFC -| 10.4.17 | 0x51 | CREATE-BSS-PFC -| 10.4.18 | 0x52 | CREATE-BSS-PFC-ACK -| 10.4.19 | 0x53 | CREATE-BSS-PFC-NACK -| 10.4.20 | 0x54 | MODIFY-BSS-PFC -| 10.4.21 | 0x55 | MODIFY-BSS-PFC-ACK -| 10.4.22 | 0x56 | DELETE-BSS-PFC -| 10.4.23 | 0x57 | DELETE-BSS-PFC-ACK -|=== - - -=== Details on Compliant BSSGP Messages - -[[dl_unit_data]] -==== DL-UNITDATA - -This message conforms to 3GPP TS 08.18 ? 10.2.1, with the following -limitations: - -* OsmoPCU does not support QoS -* all optional IEs except for IMSI and old TLLI are ignored. - -._DL-UNITDATA_ IE limitations -[options="header",cols="10%,30%,60%"] -|=== -| TS 08.18 ? | IE Name | Handling -| 11.3.28 | QoS Profile | _ignored_ -| 11.3.22 | MS Radio Access Capability | _ignored_ -| 11.3.27 | Priority | _ignored_ -| 11.3.11 | DRX Parameters | _ignored_ -| 1.3.42 | PFI | _ignored_ -| 11.3.19 | LSA Information | _ignored_ -| 11.3.47 | Service UTRAN CCO | _ignored_ -|=== - -[[ul_unit_data]] -==== UL-UNITDATA - -This message conforms to 3GPP TS 08.18 ? 10.2.2, with the following limitations: - -* OsmoPCU does not send optional IEs - PFI (? 12.3.42) and LSA - Identifier List (? 11.3.18). -* QoS Profile (? 11.3.28) IE is always set to 0x04. - -[[ra_capab]] -==== RA-CAPABILITY - -This message is received and logged but ignored by OsmoPCU at the moment. - -[[paging_ps]] -==== PAGING PS - -This message conforms to 3GPP TS 08.18 ? 10.3.1, with the following -limitations: - -* only IMSI and P-TMSI are parsed by OsmoPCU. - -._DL-UNITDATA_ IE limitations -[options="header",cols="10%,30%,60%"] -|=== -| TS 08.18 ? | IE Name | Handling -| 11.3.11 | DRX Parameters | _ignored_ -| 11.3.6 | BVCI | _ignored_ -| 11.3.17 | Location Are | _ignored_ -| 11.3.31 | Routeing Area | _ignored_ -| 11.3.3 | BSS Area Indication | _ignored_ -| 11.3.42 | PFI | _ignored_ -| 11.3.43 | ABQP | _ignored_ -| 11.3.28 | QoS Profile | _ignored_ -| 11.3.36 | P-TMSI | treated as mandatory (in case of absence paging with 0-length P-TMSI will be sent) -|=== - - -[[paging_cs]] -==== PAGING CS - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[susp_ack]] -==== SUSPEND-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[susp_nack]] -==== SUSPEND-NACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[res_ack]] -==== RESUME-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[res_nack]] -==== RESUME-NACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[block_ack]] -==== BVC-BLOCK-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[bvc_reset]] -==== BVC-RESET - -OsmoPCU never transmits optional Feature bitmap (3GPP TS 08.18 ? -11.3.40) IE. - -Receiving BVC RESET will cause OsmoPCU to respond with "Unknown BVCI" -status message. - -[[reset_ack]] -==== BVC-RESET-ACK - -This message conforms to 3GPP TS 08.18 ? 10.4.13. - -After receiving it OsmoPCU completes the RESET procedure for BVC -according to 3GPP TS 08.18 ? 8.4. - -[[unblock_ack]] -==== BVC-UNBLOCK-ACK - -This message conforms to 3GPP TS 08.18 ? 10.4.11. - -After receiving it OsmoPCU completes the RESET procedure for BVC -according to 3GPP TS 08.18 ? 8.3. - -[[bvc_unblock]] -==== BVC-UNBLOCK - -This message conforms to 3GPP TS 08.18 ? 10.4.10 and is send by -OsmoPCU as part of UNBLOCK procedure described in 3GPP TS 08.18 ? 8.3. - -[[flow_ms_ack]] -==== FLOW-CONTROL-MS-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[flow_bvc_ack]] -==== FLOW-CONTROL-BVC-ACK - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[flow_bvc]] -==== FLOW-CONTROL-BVC - -This message conforms to 3GPP TS 08.18 ? 10.4.4, with the following -limitations: - -* OsmoPCU does not support Current Bucket Level (CBL) feature so - Bucket_Full Ratio (TS 08.18 ? 11.3.46) IE is not transmitted as part - of this message. - -[[flush_ll]] -==== FLUSH-LL - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[invoke_trace]] -==== SGSN-INVOKE-TRACE - -This message is received and logged but ignored by OsmoPCU at the -moment. - -[[bssgp_status]] -==== STATUS - -This message conforms to 3GPP TS 08.18 ? 10.4.14. - -=== Information Elements Overview - -All of the IEs handled by OsmoPCU are listed below, with limitations -and additions to 3GPP TS 08.18 specified in more detail. - -==== IEs Conforming to 3GPP TS 08.18 - -The following Information Elements are accepted by OsmoPCU. Not all -IEs are actually evaluated. - -.IEs conforming to 3GPP TS 08.18 -[options="header",cols="5%,10%,40%,5%,40%"] -|=== -| tag (hex) | TS 08.18 ? | IE name | <-/-> | Received/Sent by OsmoPCU -| 0x00 | 11.3.1 | Alignment Octets | <-/-> | Received/Sent -| 0x01 | 11.3.2 | Bmax default MS | -> | Sent -| 0x02 | 11.3.3 | BSS Area Indication | <- | Received -| 0x03 | 11.3.4 | Bucket Leak Rate | -> | Sent -| 0x04 | 11.3.6 | BVCI | <-/-> | Received/Sent -| 0x05 | 11.3.5 | BVC Bucket Size | -> | Sent -| 0x06 | 11.3.7 | BVC Measurement | -> | Sent -| 0x07 | 11.3.8 | Cause | <-/-> | Received/Sent -| 0x08 | 11.3.9 | Cell Identifier | -> | Sent -| 0x09 | 11.3.10 | Channel needed | <- | Received -| 0x0a | 11.3.11 | DRX Parameters | <- | Received -| 0x0b | 11.3.12 | eMLPP-Priority | <- | Received -| 0x0c | 11.3.13 | Flush Action | <- | Received -| 0x0d | 11.3.14 | IMSI | <-/-> | Received/Sent -| 0x0e | 11.3.15 | LLC-PDU | <-/-> | Received/Sent -| 0x0f | 11.3.16 | LLC Frames Discarded | -> | Sent -| 0x10 | 11.3.17 | Location Area | <- | Received -| 0x11 | 11.3.20 | Mobile Id | <- | Received -| 0x12 | 11.3.21 | MS Bucket Size | -> | Sent -| 0x13 | 11.3.22 | MS Radio Access Capability | <- | Received -| 0x14 | 11.3.23 | OMC Id | <- | Received -| 0x15 | 11.3.24 | PDU In Error | <-/-> | Received/Sent -| 0x16 | 11.3.25 | PDU Lifetime | <- | Received -| 0x17 | 11.3.27 | Priority | <- | Received -| 0x19 | 11.3.29 | Radio Cause | -> | Sent -| 0x1a | 11.3.30 | RA-Cap-UPD-Cause | -> | Sent -| 0x1b | 11.3.31 | Routeing Area | <-/-> | Received/Sent -| 0x1c | 11.3.32 | R_default_MS | -> | Sent -| 0x1d | 11.3.33 | Suspend Reference Number | <-/-> | Received/Sent -| 0x1e | 11.3.34 | Tag | <-/-> | Received/Sent -| 0x1f | 11.3.35 | TLLI | <-/-> | Received/Sent -| 0x20 | 11.3.36 | TMSI | <-/-> | Received/Sent -| 0x21 | 11.3.37 | Trace Reference | <- | Received -| 0x22 | 11.3.38 | Trace Type | <- | Received -| 0x23 | 11.3.39 | TransactionId | <- | Received -| 0x24 | 11.3.40 | Trigger Id | <- | Received -| 0x25 | 11.3.41 | Number of octets affected | -> | Sent -| 0x26 | 11.3.18 | LSA Identifier List | -> | Sent -| 0x27 | 11.3.19 | LSA Information | <- | Received -| 0x28 | 11.3.42 | Packet Flow Identifier | <-/-> | Received/Sent -| 0x3a | 11.3.43 | Aggregate BSS QoS Profile (ABQP) | <-/-> | Received/Sent -| 0x3b | 11.3.45 | Feature Bitmap | <-/-> | Received/Sent -| 0x3c | 11.3.46 | Bucket_Full Ratio | -> | Sent -| 0x3d | 11.3.47 | Service UTRAN CCO (Cell Change Order) | <- | Received -|=== - -==== IEs Not Conforming to 3GPP TS 08.18 - -.IEs not conforming to 3GPP TS 08.18 -[options="header",cols="5%,10%,30%,55%"] -|=== -| tag (hex) | TS 08.18 ? | IE name | Description -| 0x18 | 11.3.28 | QoS Profile | Received value is ignored. Sent value is hard-coded to 0x4 (3 octets). -|=== - -==== Additional Attributes and Parameters - -There are no OsmoPCU specific additional Attributes and Parameters. - -=== Details on IEs - -==== BSS Area Indication - -This IE is ignored by OsmoPCU. - -==== Bucket Leak Rate - -The value used by OsmoPCU for this IE can be set through configuration -file or vty via "flow-control force-ms-leak-rate <1-6553500>" command. - -==== BVC Bucket Size - -The value used by OsmoPCU for this IE can be set through configuration file or vty via -"flow-control force-bvc-bucket-size <1-6553500>" command. - -==== Channel needed - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== DRX Parameters - -This IE is ignored by OsmoPCU. - -==== eMLPP-Priority - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Flush Action - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== LLC Frames Discarded - -This IE is not available because entire message which contains it -(LLC-DISCARDED) is not implemented by OsmoPCU - see for <> -details. - -==== Location Area - -This IE is ignored by OsmoPCU. - -==== Mobile Id - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== MS Bucket Size - -The value used by OsmoPCU for this IE can be set through configuration -file or vty via "flow-control force-ms-bucket-size <1-6553500>" -command. - -==== MS Radio Access Capability - -This IE is ignored by OsmoPCU. - -==== OMC Id - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Priority - -This IE is ignored by OsmoPCU. - -==== QoS Profile - -No QoS is supported by OsmoPCU so this IE is ignored or safe default -used when mandatory. - -==== Radio Cause - -This IE is not available because entire message which contains it -(RADIO-STATUS) is not implemented by OsmoPCU - see for <> -details. - -==== RA-Cap-UPD-Cause - -This IE is not available because entire message which contains it -(RA-CAPABILITY-UPDATE-ACK) is not implemented by OsmoPCU - see for -<> details. - -==== Routeing Area - -This IE is ignored by OsmoPCU upon receiving. - -The messages which might require this IE to be send are not -implemented by OsmoPCU - see for <> details. - -==== Suspend Reference Number - -This IE is ignored by OsmoPCU upon receiving. - -The messages which might require this IE to be send are not -implemented by OsmoPCU - see for <> details. - -==== Tag - -This IE currently only used by OsmoPCU for Flow Control procedure (TS -08.18 ? 8.2). In other cases it's either ignored or unavailable. - -==== Trace Reference - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Trace Type - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== TransactionId - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Trigger Id - -This IE is ignored because entire message which contains it is ignored -by OsmoPCU - see <> for details. - -==== Number of octets affected - -This IE is not available because the messages which contains it -(FLUSH-LL-ACK and LLC-DISCARDE) are not implemented by OsmoPCU - see -for <> details. - -==== LSA Information - -This IE is ignored by OsmoPCU. - -==== LSA Identifier List - -This IE is not implemented by OsmoPCU. - -==== Packet Flow Identifier - -This IE is ignored by OsmoPCU upon receiving. - -The messages which might require this IE to be send are not -implemented by OsmoPCU - see for <> details. - -==== Aggregate BSS QoS Profile (ABQP) - -This IE is ignored by OsmoPCU upon receiving. - -The messages which might require this IE to be send are not -implemented by OsmoPCU - see for <> details. - -==== Feature Bitmap - -This IE is not implemented by OsmoPCU. - -This IE is ignored by OsmoPCU when received. - -Absence of Feature Bitmap automatically disables optional features for -Network Service Entity (NSE) communicating with OsmoPCU. - -==== Bucket_Full Ratio - -This IE is not implemented by OsmoPCU. - -==== Service UTRAN CCO (Cell Change Order) - -This IE is ignored by OsmoPCU. - -=== Gb BSSGP Initialization / PCU bring-up - -The BSSGP initialization directly follows NS connection establishment -described in <>. - -OsmoPCU allocates a BVC context for the BVCI given by OsmoBTS, which -in turn receives it from OsmoBSC or OsmoNITB via OML procedures. - -In addition to the BVCI identifying the OsmoPCU side of BSSGP -connection, there is also special BVCI which is accepted by OsmoPCU in -accordance with 3GPP TS 08.18 ? 5.4.1: BVCI = 0 represents signaling data -between SGSN and PCU in contrast to PTP (Peer-To-Peer) user's data. - -The mapping between BSSGP PDUs and signaling or PTP BVCIs is available -in 3GPP TS 08.18 Table 5.4. diff --git a/OsmoPCU/gb/gb-startup.msc b/OsmoPCU/gb/gb-startup.msc deleted file mode 100644 index d76022a..0000000 --- a/OsmoPCU/gb/gb-startup.msc +++ /dev/null @@ -1,27 +0,0 @@ -msc { - hscale="1.2"; - bsc [label="BSC"], bts [label="BTS"], pcu [label="PCU"], sgsn [label="SGSN"]; - - |||; - bts box bsc [label="A-bis OML connection"]; - bsc => bts [label="Set OML Attrbibutes (NSVC,CELL)"]; - bts rbox pcu [label="PCU Unix Domain Socket"]; - pcu => bts [label="connect to PCU socket"]; - pcu <: bts [label="Config. parameters"]; - pcu rbox pcu [label="bind/connect UDP socket"]; - pcu note sgsn [label="NS-over-IP (UDP port 23000)"]; - pcu => sgsn [label="NS RESET"]; - pcu <= sgsn [label="NS RESET ACK"]; - ...; - pcu => sgsn [label="NS UNBLOCK"]; - pcu <= sgsn [label="NS UNBLOCK ACK"]; - pcu box sgsn [label="NS link established"]; - ...; - pcu => sgsn [label="BVC RESET"]; - pcu <= sgsn [label="BVC RESET ACK"]; - ...; - pcu => sgsn [label="BVC UNBLOCK"]; - pcu <= sgsn [label="BVC UNBLOCK ACK"]; - pcu box sgsn [label="BSSGP link established"]; - |||; -} diff --git a/OsmoPCU/gb/ns.adoc b/OsmoPCU/gb/ns.adoc deleted file mode 100644 index c94e018..0000000 --- a/OsmoPCU/gb/ns.adoc +++ /dev/null @@ -1,227 +0,0 @@ -== Network Service (NS) - -=== List of Messages - -The following tables list the NS messages used by OsmoPCU, grouped by their -level of compliance with 3GPP TS 08.16. - -==== Messages Compliant With 3GPP TS 08.16 - -The NS protocol is implemented inside libosmocore so none of the messages below are sent by OsmoPCU explicitly. -Instead corresponding functions from libosmocore are called which send and receive messages as necessary. See <> for details -on establishing NS connection. - -.Messages compliant with 3GPP TS 08.16 -[options="header",cols="10%,10%,20%,35%,5%,20%"] -|=== -| TS 08.16 ? | type code (hex) | This document ? | Message | <-/-> | Received/Sent by OsmoPCU -| 9.2.10 | 0x00 | <> | NS-UNITDATA | <-/-> | Received/Sent -| 9.2.5 | 0x02 | <> | NS-RESET | <-/-> | Received/Sent -| 9.2.6 | 0x03 | <> | NS-RESET-ACK | <-/-> | Received/Sent -| 9.2.3 | 0x04 | <> | NS-BLOCK | <-/-> | Received/Sent -| 9.2.4 | 0x05 | <> | NS-BLOCK-ACK | <-/-> | Received/Sent -| 9.2.8 | 0x06 | <> | NS-UNBLOCK | <-/-> | Received/Sent -| 9.2.9 | 0x07 | <> | NS-UNBLOCK-ACK | <-/-> | Received/Sent -| 9.2.7 | 0x08 | <> | NS-STATUS | <-/-> | Received/Sent -| 9.2.1 | 0x0a | <> | NS-ALIVE | <-/-> | Received/Sent -| 9.2.2 | 0x0b | <> | NS-ALIVE-ACK | <-/-> | Received/Sent -|=== - -==== Messages Specific to OsmoPCU - -There are no OsmoPCU specific NS messages. - -==== Messages Not Implemented by OsmoPCU - -All the NS protocol messages from 3GPP TS 08.16 are implemented in OsmoPCU. - -=== Details on Compliant NS Messages - -[[ns_unit_data]] -==== NS-UNITDATA - -This PDU transfers one NS SDU (specified in 3GPP TS 08.18) between -OsmoPCU and SGSN. Upon receiving it OsmoPCU passes it to BSSGP -implementation to handle. It is also sent by BSSGP as necessary - see -<> for details. - -It contains BVCI (<>) and NS SDU (<>) IEs. - -[[ns_reset]] -==== NS-RESET - -This message is send by OsmoPCU in order to initiate reset procedure -described in 3GPP TS 08.16 ? 7.3. The expected reply is NS-RESET-ACK -(<>) message. If no expected reply is received in 3 -seconds than the sending is retried up to 3 times. When this message -is received it is replied with NS-RESET-ACK (<>). -It might be ignored under conditions described in 3GPP TS 08.16 ? 7.3.1. - -The message conforms to 3GPP TS 08.16 ? 9.2.5 specification. - -It contains Cause (<>), NSVCI (<>) and NSEI (<>) IEs. - -[[ns_reset_ack]] -==== NS-RESET-ACK - -This message is sent as a response to proper NS-RESET (<>) -message initiating reset procedure. - -The message conforms to 3GPP TS 08.16 ? 9.2.6 specification. - -It contains NSVCI (<>) and NSEI (<>) IEs. - -[[ns_block]] -==== NS-BLOCK - -Upon receiving this message corresponding NS-VC is marked as blocked -by OsmoPCU and NS-BLOCK-ACK (<>) reply is transmitted. -When this message is sent by OsmoPCU corresponding NS-BLOCK-ACK -(<>) reply is expected before NS-VC is actually marked -as blocked. This behavior follows the blocking procedure described in -3GPP TS 08.16 ? 7.2. - -The message conforms to 3GPP TS 08.16 ? 9.2.3 specification. - -It contains Cause (<>) and NSVCI (<>) IEs. - -[[ns_block_ack]] -==== NS-BLOCK-ACK - -This message is sent by OsmoPCU automatically upon reception of -correct NS-BLOCK (<>) message. It is expected as a reply -for NS-BLOCK (<>) message sent by OsmoPCU. - -The message conforms to 3GPP TS 08.16 ? 9.2.4 specification. - -It contains NSVCI (<>) IE. - -[[ns_unblock]] -==== NS-UNBLOCK - -Upon receiving this message corresponding NS-VC is unblocked by -OsmoPCU and NS-UNBLOCK-ACK (<>) reply is sent. When -this message is sent by OsmoPCU corresponding NS-UNBLOCK-ACK -(<>) reply is expected before NS-VC is actually marked -as unblocked. This behavior follows the blocking procedure described -in 3GPP TS 08.16 ? 7.2. - -The message conforms to 3GPP TS 08.16 ? 9.2.8 specification. - -[[ns_unblock_ack]] -==== NS-UNBLOCK-ACK - -Receiving this message notifies OsmoPCU that NS-VC unblocking request -is confirmed and thus NS-VC is marked as unblocked. This message is -also sent as a reply to NS-UNBLOCK (<>) message. - -The message conforms to 3GPP TS 08.16 ? 9.2.9 specification. - -[[ns_status]] -==== NS-STATUS - -This message is sent to inform other party about error conditions as a -response to various unexpected PDUs or PDUs with unexpected/missing -data. If this message is received for unknown NS-VC it is ignored in -accordance with 3GPP TS 08.16 ? 7.5.1, otherwise the error cause is -logged if present in NS-STATUS. - -The message conforms to 3GPP TS 08.16 ? 9.2.7 specification. - -It contains Cause (<>) and might (depending on actual error) -contain NSVCI (<>), NS PDU (<>) and BVCI -(<>) IEs. - -[[ns_alive]] -==== NS-ALIVE - -This message is sent periodically to test connectivity according to -3GPP TS 08.16 ? 4.5.3. The expected response is NS-ALIVE-ACK -(<>). If no such response arrives within given amount of -time (3 seconds) than another NS-ALIVE message is sent and failed test -attempt is recorded. After 10 failed attempts NS connection is -considered dead and OsmoPCU tries to reconnect. - -The message conforms to 3GPP TS 08.16 ? 9.2.1 specification. - -[[ns_alive_ack]] -==== NS-ALIVE-ACK - -This message is sent automatically in reply to NS-ALIVE (<>) -message. - -The message conforms to 3GPP TS 08.16 ? 9.2.2 specification. - -=== Information Elements Overview - -All of the IEs handled by OsmoPCU are listed below, with limitations and -additions to 3GPP TS 08.16 specified in more detail. - -==== IEs Conforming to 3GPP TS 08.16 - -The following Information Elements are accepted by OsmoPCU. - -.IEs conforming to 3GPP TS 08.16 -[options="header",cols="5%,10%,40%,5%,40%"] -|=== -| tag (hex) | TS 08.16 ? | IE name | <-/-> | Received/Sent by OsmoPCU -| 0x00 | 10.3.2 | Cause | <-/-> | Received/Sent -| 0x01 | 10.3.5 | NSVCI | <-/-> | Received/Sent -| 0x02 | 10.3.3 | NS PDU | <-/-> | Received/Sent -| 0x03 | 10.3.1 | BVCI | <-/-> | Received/Sent -| 0x04 | 10.3.6 | NSEI | <-/-> | Received/Sent -|=== - -==== IEs Not Conforming to 3GPP TS 08.16 - -All IEs defined in 3GPP TS 08.16 ? 10.3 are supported by OsmoPCU. - -==== Additional Attributes and Parameters - -There are no OsmoPCU specific additional Attributes and Parameters. - -=== Details on IEs - -[[ie_cause]] -==== Cause - -This IE contains reason for a procedure or error as described in 3GPP TS 08.16 ? 10.3.2. - -[[ie_nsvci]] -==== NSVCI - -This IE represents NSVCI identity described in <> and 3GPP TS 08.16 ? 10.3.5. - -[[ie_nspdu]] -==== NS PDU - -This IE contains PDU (possibly truncated) which cause error described -in NS-STATUS message (<>) as described in 3GPP TS 08.16 ? -10.3.3. - -[[ie_nssdu]] -==== NS SDU - -This IE contains BSSGP data - see <> for details. - -[[ie_bvci]] -==== BVCI - -This IE represents BSSGP identity described in <> and 3GPP TS 08.16 -? 10.3.1. - -[[ie_nsei]] -==== NSEI - -This IE represents NSEI identity described in <> and 3GPP TS 08.16 ? -10.3.6. - -[[ns_init]] -=== Gb NS Initialization / PCU bring-up - -OsmoPCU binds and connects an UDP socket for NS using port numbers and IP -information given by OsmoBTS via the PCU socket. OsmoBTS in turn -receives this information from the BSC vi A-bis OML. - -Following successful initialization of the UDP socket, the reset -procedure is initiated as described in <>. diff --git a/OsmoPCU/osmopcu-gb-docinfo.xml b/OsmoPCU/osmopcu-gb-docinfo.xml deleted file mode 100644 index 23ec3d1..0000000 --- a/OsmoPCU/osmopcu-gb-docinfo.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - 0 - February 2016 - HW, MS - - Initial version, reflecting OsmoPCU master branch as on 2016-Mar-02 - (commit 22d7e75e1f160e5337140d9f3dcb2679b621b646). - - - - - - - Max - Suraev - msuraev at sysmocom.de - MS - - sysmocom - sysmocom - s.f.m.c. GmbH - Software Developer - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2015-2016 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoPCU/osmopcu-gb.adoc b/OsmoPCU/osmopcu-gb.adoc deleted file mode 100644 index 00576c9..0000000 --- a/OsmoPCU/osmopcu-gb.adoc +++ /dev/null @@ -1,95 +0,0 @@ -:gfdl-enabled: - -OsmoPCU Gb Protocol Specification -================================= -Harald Welte - -== Introduction - -This document describes the Gb interface of *OsmoPCU*. Based on 3GPP TS -08.16 and 08.18, this document indicates which of the 3GPP specified Gb -messages and IEs are implemented according to 3GPP specifications, which of -these are not or not fully implemented, as well as OsmoPCU-specific extensions -to the Gb interface not specified by 3GPP. - -Extensions to the Gb interface specific to OsmoPCU are detailed in this -document. For details on the messages and IEs that comply with above-mentioned -3GPP specifications, please refer to those documents. - -.3GPP document versions referred to by this document -[cols="20%,80%"] -|=== -|3GPP TS 08.56 | version 8.0.1 Release 1999 -|3GPP TS 08.58 | version 8.6.0 Release 1999 -|3GPP TS 08.60 | version 8.2.1 Release 1999 -|3GPP TS 12.21 | version 8.0.0 Release 1999 -|3GPP TS 08.16 | version 8.0.1 Release 1999 -|3GPP TS 08.18 | version 8.12.0 Release 1999 -|=== - -.IETF documents referred to by his document -[cols="20%,80%"] -|=== -|IETF RFC 768 | User Datagram Protocol -|IETF RFC 791 | Internet Protocol -|=== - -== Overview - -The OsmoPCU Gb interface consists of the NS (Network Services) and -BSSGP (Base Station Subsystem Gateway Protocol), encapsulated in UDP -(User Datagram Protocol) and IP (Internet Protocol) version 4. -Use of other underlying protocols (e. g. Frame Relay) is not supported. - -.UDP port numbers used by OsmoPCU Gb/IP -[options="header",width="50%",cols="35%,65%"] -|=== -|TCP Port Number|Usage -|23000|NS over UDP (default port) -|=== - -The NS-over-UDP link is established in the PCU -> SGSN direction, i.e. -the PCU is running as client while the SGSN is running as server. - -Establishment of the NS-over-UDP link is only possible after OsmoPCU -has been configured via the *PCU socket* interface from OsmoBTS. - -OsmoBTS in turn receives relevant configuration parameters from -OsmoBSC or the BSC component inside OsmoNITB. - -.Overview of Gb link establishment -["mscgen"] ----- -include::{srcdir}/gb/gb-startup.msc[] ----- - -[[ident]] -=== Identities - -The Gb interface identities of the PCU are configured via BSC -> -OsmoBTS -> PCU Socket. They consist of - -NSEI:: NS Equipment Identifier -NSVCI:: NS Virtual Connection Identifier -BVCI:: BSSGP Virtual Connection Identifier - -For an explanation of those identifiers and their use in the NS and -BSSGP protocols, please see the relevant 3GPP specifications for NS (TS 08.16) -and BSSGP (TS 08.18). - -In most cases, all above identities belong to different namespaces and -must be unique within their respective namespace and within the SGSN -they connect to. - -This means that typically each OsmoPCU has one unique set of NSEI, -NSVCI and BVCI in your network. - -include::{srcdir}/gb/ns.adoc[] - -include::{srcdir}/gb/bssgp.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoPCU/osmopcu-usermanual-docinfo.xml b/OsmoPCU/osmopcu-usermanual-docinfo.xml deleted file mode 100644 index ecc6742..0000000 --- a/OsmoPCU/osmopcu-usermanual-docinfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1 - February 13, 2016 - HW - - Initial version. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2013-2016 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoPCU/osmopcu-usermanual.adoc b/OsmoPCU/osmopcu-usermanual.adoc deleted file mode 100644 index bf25cfd..0000000 --- a/OsmoPCU/osmopcu-usermanual.adoc +++ /dev/null @@ -1,30 +0,0 @@ -:gfdl-enabled: - -OsmoPCU User Manual -=================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::{srcdir}/chapters/counters.adoc[] - -include::./common/chapters/gb.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoPCU/osmopcu-vty-reference.xml b/OsmoPCU/osmopcu-vty-reference.xml deleted file mode 100644 index f8c39ec..0000000 --- a/OsmoPCU/osmopcu-vty-reference.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - -]> - - - - - - v1 - 5th March 2014 - hf - Initial version for 0.2-307 - - - - OsmoPCU VTY Reference - - - 2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - diff --git a/OsmoPCU/vty/osmo-pcu_vty_additions.xml b/OsmoPCU/vty/osmo-pcu_vty_additions.xml deleted file mode 100644 index 55d75e4..0000000 --- a/OsmoPCU/vty/osmo-pcu_vty_additions.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - PCU Configuration Node - The main PCU configuration including the timeslot - assignment algorithm and other parameters. - - - diff --git a/OsmoPCU/vty/osmo-pcu_vty_reference.xml b/OsmoPCU/vty/osmo-pcu_vty_reference.xml deleted file mode 100644 index bf1532d..0000000 --- a/OsmoPCU/vty/osmo-pcu_vty_reference.xml +++ /dev/null @@ -1,941 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/configure.ac b/configure.ac index 69dc3c1..fff6a4f 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoPCU/Makefile OsmoSGSN/Makefile OsmoSIPConnector/Makefile OsmoSTP/Makefile -- To view, visit https://gerrit.osmocom.org/11966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2a1de294883491487aa270b1e30160d559ef063a Gerrit-Change-Number: 11966 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:40 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMGW files (now avail in osmo-mgw.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11965 ) Change subject: remove OsmoMGW files (now avail in osmo-mgw.git) ...................................................................... remove OsmoMGW files (now avail in osmo-mgw.git) Files were added in osmo-mgw.git Change-Id I504f05a49721f2dfe105b6c5fd1995c4e7a0be9c Depends: osmo-mgw.git Change-Id I504f05a49721f2dfe105b6c5fd1995c4e7a0be9c Related: OS#3385 Change-Id: I793a7150b676837cfa8591f7504872b04d4b1f7f --- M Makefile.am D OsmoMGW/Makefile.am D OsmoMGW/chapters/configuration.adoc D OsmoMGW/chapters/counters.adoc D OsmoMGW/chapters/counters_generated.adoc D OsmoMGW/chapters/mgcp_extensions.adoc D OsmoMGW/chapters/overview.adoc D OsmoMGW/chapters/running.adoc D OsmoMGW/osmomgw-usermanual-docinfo.xml D OsmoMGW/osmomgw-usermanual.adoc D OsmoMGW/osmomgw-vty-reference.xml D OsmoMGW/vty/mgw_vty_additions.xml D OsmoMGW/vty/mgw_vty_reference.xml M configure.ac 14 files changed, 0 insertions(+), 2,050 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index d13b2e1..f86e6fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,6 @@ SUBDIRS = tests \ OsmoGSMTester \ OsmoMGCP \ - OsmoMGW \ OsmoNAT \ OsmoNITB \ OsmoPCU \ diff --git a/OsmoMGW/Makefile.am b/OsmoMGW/Makefile.am deleted file mode 100644 index 4c0e469..0000000 --- a/OsmoMGW/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmomgw-usermanual.adoc \ - osmomgw-usermanual-docinfo.xml \ - osmomgw-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmomgw-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmomgw-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMGW/chapters/configuration.adoc b/OsmoMGW/chapters/configuration.adoc deleted file mode 100644 index c398f25..0000000 --- a/OsmoMGW/chapters/configuration.adoc +++ /dev/null @@ -1,57 +0,0 @@ -== Configuring OsmoMGW - -A basic configation of OsmoMGW mainly consists of specifying the IP address -and port on which to listen to MGCP commands, but changing the port range at -which the RTP streams terminate as well as limiting operation to a single call -agent can be done as well as changing the number of endpoints. - -=== Configuring MGCP - -By default OsmoMGW listens for MGCP on port 2427 on any IP address. If a call -agent address is configured then OsmoMGW will only answer MGCP commands from -that IP port 2727, otherwise all sources are handled. A domain can be -specified - -.Example: MGCP configuration ----- -OsmoMGW(config-mgcp)# bind ip 127.0.0.1 -OsmoMGW(config-mgcp)# bind port 2427 -OsmoMGW(config-mgcp)# call-agent ip 127.0.0.1 -OsmoMGW(config-mgcp)# domain mgw-bsc -OsmoMGW(config-mgcp)# local ip 127.0.0.1 ----- - -=== Configuring the trunk - -The first trunk (trunk 0) is considered a virtual trunk in OsmoMGW. All -endpoints of type "rtpbridge" are routed here. The virtual trunk is configured -in the config-mgcp context. - -All other trunks are configured in the config-mgcp-trunk context, but the -commands used are identical. Right now trunks are considered only for ds/e1 -type endpoints which are not yet implemented. Don't use trunks other than the -"virtual" trunk 0. - -.Example: MGCP trunk configuration ----- -OsmoMGW(config-mgcp)# number endpoints 63 <1> -OsmoMGW(config-mgcp)# rtp bind-ip 10.0.0.1 <2> -OsmoMGW(config-mgcp)# rtp port-range 12000-14000 <3> ----- -<1> Maximum number of endpoints that can be allocated at once -<2> Use this IP when binding RTP endpoints -<3> Use ports in this range when binding RTP endpoints - -There are some options to tweak how RTP forwarding behaves in OsmoMGW: - -.Example: MGCP trunk rtp options ----- -OsmoMGW(config-mgcp)# rtp keep-alive 30 <1> -OsmoMGW(config-mgcp)# rtp-patch ssrc <2> -OsmoMGW(config-mgcp)# rtp-patch timestamp <3> ----- -<1> Send dummy UDP packets periodically to RTP destination -<2> Hide SSRC changes -<3> Ensure RTP timestamp is aligned with frame duration - - diff --git a/OsmoMGW/chapters/counters.adoc b/OsmoMGW/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoMGW/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoMGW/chapters/counters_generated.adoc b/OsmoMGW/chapters/counters_generated.adoc deleted file mode 100644 index 20a4dec..0000000 --- a/OsmoMGW/chapters/counters_generated.adoc +++ /dev/null @@ -1,14 +0,0 @@ - -// autogenerated by show asciidoc counters -These counters and their description based on OsmoMGW 1.3.0.34-9cd52 (OsmoMGW). - -=== Rate Counters - -// generating tables for rate_ctr_group -== Osmo Stat Items - -// generating tables for osmo_stat_items -== Osmo Counters - -// generating tables for osmo_counters -// there are no ungrouped osmo_counters diff --git a/OsmoMGW/chapters/mgcp_extensions.adoc b/OsmoMGW/chapters/mgcp_extensions.adoc deleted file mode 100644 index 86ff643..0000000 --- a/OsmoMGW/chapters/mgcp_extensions.adoc +++ /dev/null @@ -1,68 +0,0 @@ -== MGCP Extensions - -The MGCP protocol is extendable. The following non-standard extensions are -understood by OsmoMGW. - -=== `X-Osmo-IGN` - -`X-Osmo-IGN` indicates to OsmoMGW that specific items of an endpoint should be -ignored, so that it is lenient on mismatching values that would normally -indicate collisions or configuration errors. - -==== `X-Osmo-IGN` Format - -The value part of X-Osmo-IGN must be one or more items separated by one or more -spaces. Each item consists of one or more non-whitespace characters. - -.Example: `X-Osmo-IGN` format with three ficticious items "X", "abc" and "123". ----- -X-Osmo-IGN: X abc 123 ----- - -`X-Osmo-IGN` must be issued in the MGCP section (typically as its last item), -before the SDP section starts. - -==== Supported `X-Osmo-IGN` Items - -Currently, the following `X-Osmo-IGN` items are supported: - -* `C`: ignore CallID mismatches, i.e. differing "C" values between connections - on the same endpoint. - -.Note: -`X-Osmo-IGN` does not support ignoring mismatches on the domain part of -an endpoint name, e.g. ignoring a mismatch on "example.com" in -`rtpbridge/123abc at example.com`. Instead, you may globally configure OsmoMGW -with `mgcp` / `domain *` to permit all domain parts. - -===== `X-Osmo-IGN: C` - -By default, OsmoMGW verifies that all CallIDs ("C" values) match for all -connections on any one given endpoint. To ignore CallID mismatches, pass a `C` -in the `X-Osmo-IGN` header, for the first or the second `CRCX` on an endpoint. -When the `X-Osmo-IGN: C` is sent for any one `CRCX` on an endpoint, CallID -mismatches will be ignored for that and all subsequent messages for that -endpoint. Hence this header only needs to be included once per endpoint, in any -`CRCX` message that precedes or coincides with a CallID mismatch. - -This is particularly useful for a BSC that is connected to an A/SCCPlite MSC, -where the BSC and MSC each are expected to configure their respective own -connection on a shared endpoint. For A/SCCPlite, it is impossible for the BSC -to know the CallID that the MSC will use, so CallID mismatches are inevitable. -See also OsmoBSC, which will by default pass the `X-Osmo-IGN: C` header for -endpoints associated with an A/SCCPlite MSC. - -.Example: `CRCX` message that instructs OsmoMGW to ignore CallID mismatches ----- -CRCX 2 rtpbridge/123abc at mgw MGCP 1.0 -M: recvonly -C: 2 -L: p:20 -X-Osmo-IGN: C - -v=0 -c=IN IP4 123.12.12.123 -m=audio 5904 RTP/AVP 97 -a=rtpmap:97 GSM-EFR/8000 -a=ptime:40 ----- diff --git a/OsmoMGW/chapters/overview.adoc b/OsmoMGW/chapters/overview.adoc deleted file mode 100644 index 6a8f3e3..0000000 --- a/OsmoMGW/chapters/overview.adoc +++ /dev/null @@ -1,100 +0,0 @@ -[[overview]] -== Overview - -This manual should help you getting started with OsmoMGW. It will cover -aspects of configuring and running the media gateway. - -[[intro_overview]] -=== About OsmoMGW - -OsmoMGW is the Osmocom implementation of a media gateway to handle user -plane (voice) traffic in cellular networks. It can connect and optionally -transcode RTP voice streams between different network elements such as BTSs -and external entities like SIP. It is typically co-located with both OsmoBSC -and OsmoMSC and controlled by them via MGCP, the Media Gateway Control -Protocol. - -[[fig-bsc]] -.OsmoMGW used with OsmoBSC -[graphviz] ----- -digraph G { - rankdir = LR; - OsmoBTS -> OsmoBSC [label="Abis/IP"]; - OsmoBSC -> OsmoMSC [label="3GPP AoIP"]; - OsmoBSC -> OsmoMGW [label="MGCP"]; - OsmoBTS -> OsmoMGW [label="RTP",dir=both]; - OsmoMGW -> OsmoMSC [label="RTP",dir=both]; - {rank=same OsmoBSC OsmoMGW} - OsmoMGW [color=red]; -} ----- - -[[fig-msc]] -.OsmoMGW used with OsmoMSC -[graphviz] ----- -digraph G { - rankdir = LR; - BTS -> BSC [label="Abis"]; - BSC -> OsmoMSC [label="3GPP AoIP"]; - OsmoMSC -> OsmoMGW [label="MGCP"]; - BSC -> OsmoMGW [label="RTP",dir=both]; - OsmoMSC -> OsmoSIP [label="MNCC"]; - OsmoSIP -> PBX [label="SIP Trunk"]; - OsmoMGW -> PBX [label="RTP",dir=both]; - {rank=same OsmoMSC OsmoMGW} - OsmoSIP [label="osmo-sip-connector"]; - OsmoMGW [color=red]; - - hNodeB -> OsmoHNBGW [label="Iuh"]; - OsmoHNBGW -> OsmoMSC [label="IuCS"]; - hNodeB -> OsmoMGW [label="RTP",dir=both]; -} ----- - -=== Software Components - -OsmoMGW contains a variety of different software components, which we?ll -quickly describe in this section. - -==== MGCP Implementation - -OsmoMGW brings its own MGCP implementation through which OsmoMGW is -controlled. - -The commands implemented are CRCX, MDCX, DLCX and RSIP. The command AUEP is -implemented as a stub and will simply respond with OK. - -==== RTP implementation - -Support for IuUP which is used in 3G cells is quite lacking at the moment. -3G<->3G and 2G<->2G calls should work, but 3G<->2G does not. - -==== Audio transcoder - -Transcoding is currently not supported in OsmoMGW. - -=== Limitations - -Osmux is not yet supported in OsmoMGW. - -At the moment (July 2018), OsmoMGW only implements RTP proxy / RTP bridge -type endpoints, to each of which two RTP connections can be established. -We are planning to add endpoint types for: - -- classic E1/T1 timeslots (64kBps alaw/ulaw) -- classic E1/T1 16k sub-slots with TRAU frames for classic BTS support -- announcement/playout end-points -- conference endpoints - -=== Additional resources - -You can find the OsmoMGW issue tracker and wiki online at - -- https://osmocom.org/projects/osmomgw -- https://osmocom.org/projects/osmomgw/wiki - -RFC 3435 for MGCP is located at - -- https://tools.ietf.org/html/rfc3435 diff --git a/OsmoMGW/chapters/running.adoc b/OsmoMGW/chapters/running.adoc deleted file mode 100644 index 8565ea5..0000000 --- a/OsmoMGW/chapters/running.adoc +++ /dev/null @@ -1,25 +0,0 @@ -== Running OsmoMGW - -The OsmoMGW executable (`osmo-mgw`) offers the following command-line -arguments: - -=== SYNOPSIS - -*osmo-mgw* [-h|-V] [-D] [-c 'CONFIGFILE'] [-s] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-mgw.cfg` in the current - working directory. -*-s, --disable-color*:: - Disable colors for logging to stderr. This has mostly been - deprecated by VTY based logging configuration, see <> - for more information. diff --git a/OsmoMGW/osmomgw-usermanual-docinfo.xml b/OsmoMGW/osmomgw-usermanual-docinfo.xml deleted file mode 100644 index d801c9b..0000000 --- a/OsmoMGW/osmomgw-usermanual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - July 24th, 2018 - DW - - Initial version - - - - - - - Daniel - Willmann - dwillmann at sysmocom.de - DW - - sysmocom - sysmocom - s.f.m.c. GmbH - - - - - - 2018 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - - diff --git a/OsmoMGW/osmomgw-usermanual.adoc b/OsmoMGW/osmomgw-usermanual.adoc deleted file mode 100644 index b0bc83d..0000000 --- a/OsmoMGW/osmomgw-usermanual.adoc +++ /dev/null @@ -1,33 +0,0 @@ -:gfdl-enabled: -:program-name: OsmoMGW - -OsmoMGW User Manual -==================== -Daniel Willmann - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::{srcdir}/chapters/mgcp_extensions.adoc[] - -//include::{srcdir}/chapters/counters.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - - diff --git a/OsmoMGW/osmomgw-vty-reference.xml b/OsmoMGW/osmomgw-vty-reference.xml deleted file mode 100644 index 334453e..0000000 --- a/OsmoMGW/osmomgw-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 12th December 2017 - pm - Initial - - - - OsmoMGW VTY Reference - - - 2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoMGW/vty/mgw_vty_additions.xml b/OsmoMGW/vty/mgw_vty_additions.xml deleted file mode 100644 index a4c675e..0000000 --- a/OsmoMGW/vty/mgw_vty_additions.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/OsmoMGW/vty/mgw_vty_reference.xml b/OsmoMGW/vty/mgw_vty_reference.xml deleted file mode 100644 index 834db04..0000000 --- a/OsmoMGW/vty/mgw_vty_reference.xml +++ /dev/null @@ -1,1645 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-mgcp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mgcp-trunk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index 74f3002..69dc3c1 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,6 @@ tests/Makefile OsmoGSMTester/Makefile OsmoMGCP/Makefile - OsmoMGW/Makefile OsmoNAT/Makefile OsmoNITB/Makefile OsmoPCU/Makefile -- To view, visit https://gerrit.osmocom.org/11965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I793a7150b676837cfa8591f7504872b04d4b1f7f Gerrit-Change-Number: 11965 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:41 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoHLR files (now avail in osmo-hlr.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11964 ) Change subject: remove OsmoHLR files (now avail in osmo-hlr.git) ...................................................................... remove OsmoHLR files (now avail in osmo-hlr.git) Files were added in osmo-hlr.git Change-Id I52b7b06fddd77c6dc272004f434e9e7651f6b349 Depends: osmo-hlr.git Change-Id I52b7b06fddd77c6dc272004f434e9e7651f6b349 Related: OS#3385 Change-Id: Ice3f24888deed8affec40d5d91d71d5e1f3827c8 --- M Makefile.am D OsmoHLR/Makefile.am D OsmoHLR/chapters/control.adoc D OsmoHLR/chapters/overview.adoc D OsmoHLR/chapters/running.adoc D OsmoHLR/chapters/subscribers.adoc D OsmoHLR/chapters/ussd.adoc D OsmoHLR/example_subscriber_add_update_delete.vty D OsmoHLR/example_subscriber_cs_ps_enabled.ctrl D OsmoHLR/example_subscriber_info.ctrl D OsmoHLR/osmohlr-usermanual-docinfo.xml D OsmoHLR/osmohlr-usermanual.adoc D OsmoHLR/osmohlr-vty-reference.xml D OsmoHLR/vty/hlr_vty_additions.xml D OsmoHLR/vty/hlr_vty_reference.xml M configure.ac 16 files changed, 0 insertions(+), 1,895 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index dec4024..d13b2e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,6 @@ EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) SUBDIRS = tests \ OsmoGSMTester \ - OsmoHLR \ OsmoMGCP \ OsmoMGW \ OsmoNAT \ diff --git a/OsmoHLR/Makefile.am b/OsmoHLR/Makefile.am deleted file mode 100644 index 25d782d..0000000 --- a/OsmoHLR/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = example_subscriber_add_update_delete.vty \ - example_subscriber_cs_ps_enabled.ctrl \ - example_subscriber_info.ctrl \ - osmohlr-usermanual.adoc \ - osmohlr-usermanual-docinfo.xml \ - osmohlr-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmohlr-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc $(srcdir)/*.vty $(srcdir)/*.ctrl -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmohlr-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc - -OSMO_HLR_PATH ?= ../../osmo-hlr -TMP_DB = generated/hlr.db - -update-examples: update-examples-ctrl update-examples-vty - -.PHONY: found-update-deps -found-update-deps: - @if [ ! -f "$(OSMO_HLR_PATH)/sql/hlr.sql" ]; then \ - echo "You need to define OSMO_HLR_PATH to point at an osmo-hlr.git"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo-hlr)" ]; then \ - echo "osmo-hlr needs to be installed / available in the PATH"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo_verify_transcript_ctrl.py)" ]; then \ - echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \ - exit 1; \ - fi - @if [ -z "$(shell which osmo_verify_transcript_vty.py)" ]; then \ - echo "You need to install git.osmocom.org/python/osmo-python-tests.git"; \ - exit 1; \ - fi - -update-examples-ctrl: found-update-deps - mkdir -p generated - rm -f "$(TMP_DB)" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/sql/hlr.sql" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/tests/test_subscriber.sql" - osmo_verify_transcript_ctrl.py \ - -r "osmo-hlr -l $(TMP_DB) -c /n/s/osmo/src/osmo-hlr/doc/examples/osmo-hlr.cfg" \ - -p 4259 --update *.ctrl - -update-examples-vty: found-update-deps - mkdir -p generated - rm -f "$(TMP_DB)" - sqlite3 "$(TMP_DB)" < "$(OSMO_HLR_PATH)/sql/hlr.sql" - osmo_verify_transcript_vty.py \ - -r "osmo-hlr -l $(TMP_DB) -c /n/s/osmo/src/osmo-hlr/doc/examples/osmo-hlr.cfg" \ - -p 4258 --update *.vty diff --git a/OsmoHLR/chapters/control.adoc b/OsmoHLR/chapters/control.adoc deleted file mode 100644 index 50fd314..0000000 --- a/OsmoHLR/chapters/control.adoc +++ /dev/null @@ -1,106 +0,0 @@ -[[hlr-ctrl]] -== Control interface - -The actual protocol is described in <>, the variables common -to all programs using it are described in <>. This section -describes the CTRL interface variables specific to OsmoHLR. - -All subscriber variables are available by different selectors, which are freely -interchangeable: - -.Subscriber selectors available on OsmoHLR's Control interface -[options="header",width="100%",cols="35%,65%"] -|=== -|Selector|Comment -|subscriber.*by-imsi-*'123456'.*|Subscriber selector by IMSI, replace "123456" with the actual IMSI -|subscriber.*by-msisdn-*'123456'.*|Subscriber selector by MSISDN -|subscriber.*by-id-*'123456'.*|Subscriber selector by database ID -|=== - -Each of the above selectors feature all of these control variables: - -.Subscriber variables available on OsmoHLR's Control interface -[options="header",width="100%",cols="35%,8%,8%,8%,41%"] -|=== -|Name|Access|Trap|Value|Comment -|subscriber.by-\*.*info*|R|No||List (short) subscriber information -|subscriber.by-\*.*info-aud*|R|No||List subscriber authentication tokens -|subscriber.by-\*.*info-all*|R|No||List both 'info' and 'info-aud' in one -|subscriber.by-\*.*cs-enabled*|RW|No|'1' or '0'|Enable/disable circuit-switched access -|subscriber.by-\*.*ps-enabled*|RW|No|'1' or '0'|Enable/disable packet-switched access -|=== - -=== subscriber.by-*.info, info-aud, info-all - -Query the HLR database and return current subscriber record, in multiple lines -of the format - ----- -namevalue ----- - -To keep the reply as short as possible, some values are omitted if they are -empty. These are the returned values and their presence -modalities; for their meaning, see <>: - -.Returned values by OsmoHLR's 'info', 'info-all' and 'info-aud' commands -[options="header",width="100%",cols="15%,15%,30%,40%"] -|=== -|Returned by 'info-all' and|Name|Format|Presence -|'info'|id|-9223372036854775808 .. 9223372036854775807 (usually not negative)|always -|'info'|imsi|6 to 15 decimal digits|always -|'info'|msisdn|1 to 15 decimal digits|when non-empty -|'info'|nam_cs|'1' if CS is enabled, or '0'|always -|'info'|nam_ps|'1' if PS is enabled, or '0'|always -|'info'|vlr_number|up to 15 decimal digits|when non-empty -|'info'|sgsn_number|up to 15 decimal digits|when non-empty -|'info'|sgsn_address||when non-empty -|'info'|ms_purged_cs|'1' if CS is purged, or '0'|always -|'info'|ms_purged_ps|'1' if PS is purged, or '0'|always -|'info'|periodic_lu_timer|0..4294967295|always -|'info'|periodic_rau_tau_timer|0..4294967295|always -|'info'|lmsi|8 hex digits|always -|'info-aud'|aud2g.algo|one of 'comp128v1', 'comp128v2', 'comp128v3' or 'xor'|when valid 2G auth data is set -|'info-aud'|aud2g.ki|32 hexadecimal digits|when valid 2G auth data is set -|'info-aud'|aud3g.algo|so far always 'milenage'|when valid 3G auth data is set -|'info-aud'|aud3g.k|32 hexadecimal digits|when valid 3G auth data is set -|'info-aud'|aud3g.op|32 hexadecimal digits|when valid 3G auth data is set, *not* when OPC is set -|'info-aud'|aud3g.opc|32 hexadecimal digits|when valid 3G auth data is set, *not* when OP is set -|'info-aud'|aud3g.ind_bitlen|0..28|when valid 3G auth data is set -|'info-aud'|aud3g.sqn|0 .. 18446744073709551615|when valid 3G auth data is set -|=== - -This is an example Control Interface transcript that illustrates the various -'info' commands: - ----- -include::../example_subscriber_info.ctrl[] ----- - -=== subscriber.by-*.ps-enabled, cs-enabled - -Disable or enable packet-/circuit-switched access for the given IMSI; - -* 'ps-enabled' switches access to GPRS or UMTS data services, -* 'cs-enabled' switches access to voice services. - -When disabled, the next time this subscriber attempts to do a Location Updating -GSUP operation for the given domain (i.e. from the SGSN for 'ps-enabled', from -the MSC/VLR for 'cs-enabled'), it will be rejected by OsmoHLR. Currently -connected GSUP clients will be notified via GSUP when a subscriber is being -disabled, so that the subscriber can be dropped in case it is currently -attached. - -The current 'ps-enabled'/'cs-enabled' status can be queried by 'GET' commands, -and also by looking at 'nam_ps' and 'nam_cs' in a 'subscriber.by-*.info' -response. - -A value of "1" indicates that the given domain is enabled, which is the -default; a value of "0" disables access. - -This is an example transcript that illustrates 'ps-enabled' and 'cs-enabled' -commands: - ----- -include::../example_subscriber_cs_ps_enabled.ctrl[] ----- diff --git a/OsmoHLR/chapters/overview.adoc b/OsmoHLR/chapters/overview.adoc deleted file mode 100644 index 45802ca..0000000 --- a/OsmoHLR/chapters/overview.adoc +++ /dev/null @@ -1,69 +0,0 @@ -[[overview]] -== Overview - -This manual should help you getting started with OsmoHLR. It will cover -aspects of configuring and running the OsmoHLR. - -[[intro_overview]] -=== About OsmoHLR - -OsmoHLR is Osmocom's minimal implementation of a Home Location Register (HLR) -for 2G and 3G GSM and UMTS mobile core networks. Its interfaces are: - -- GSUP, serving towards OsmoMSC and OsmoSGSN; -- A local SQLite database; -- The Osmocom typical telnet VTY and CTRL interfaces. - -Originally, the OpenBSC project's OsmoNITB all-in-one implementation had an -integrated HLR, managing subscribers and SMS in the same local database. Along -with the separate OsmoMSC and its new VLR component, OsmoHLR was implemented -from scratch to alleviate various shortcomings of the internal HLR: - -- The separate HLR allows using centralized subscriber management for both - circuit-switched and packet-switched domains (i.e. one OsmoHLR for both - OsmoMSC and OsmoSGSN). - -- VLR and HLR brought full UMTS AKA (Authentication and Key Agreement) support, - i.e. Milenage authentication in both the full 3G variant as well as the - backwards compatible 2G variant. - -- In contrast to the OsmoNITB, the specific way the new OsmoMSC's VLR accesses - OsmoHLR brings fully asynchronous subscriber database access. - -Find the OsmoHLR issue tracker and wiki online at - -- https://osmocom.org/projects/osmo-hlr -- https://osmocom.org/projects/osmo-hlr/wiki - - -[[fig-gsm]] -.Typical GSM network architecture used with OsmoHLR -[graphviz] ----- -digraph G { - rankdir=LR; - subgraph cluster_hlr { - label = "OsmoHLR"; - GSUP [label="GSUP server"] - DB [label="SQLite DB"] - GSUP->DB - DB->CTRL [dir="back"] - DB->VTY [dir="back"] - } - - Admin [label="Admin and\nMaintenance"] - SW [label="3rd party software\nintegration"] - VTY->Admin [dir="back"] - CTRL->SW [dir="back"] - - MSC [label="MSC/VLR"] - MSC->GSUP [label="GSUP"] - SGSN->GSUP [label="GSUP"] - - BSC->MSC - HNBGW->MSC - HNBGW->SGSN - PCU->SGSN -} ----- - diff --git a/OsmoHLR/chapters/running.adoc b/OsmoHLR/chapters/running.adoc deleted file mode 100644 index 5f24746..0000000 --- a/OsmoHLR/chapters/running.adoc +++ /dev/null @@ -1,80 +0,0 @@ -== Running OsmoHLR - -The OsmoHLR executable (`osmo-hlr`) offers the following command-line -arguments: - -=== SYNOPSIS - -*osmo-hlr* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE'] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-d, --debug 'DBGMASK','DBGLEVELS'*:: - Set the log subsystems and levels for logging to stderr. This - has mostly been superseded by VTY-based logging configuration, - see <> for further information. -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-hlr.cfg` in the current - working directory. -*-s, --disable-color*:: - Disable colors for logging to stderr. This has mostly been - deprecated by VTY based logging configuration, see <> - for more information. -*-T, --timestamp*:: - Enable time-stamping of log messages to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. -*-e, --log-level 'LOGLEVEL'*:: - Set the global log level for logging to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. -*-l, --database 'DATABASE'*:: - Specify the file name of the SQLite3 database to use as HLR/AUC - storage - -=== Bootstrap the Database - -If no database exists yet, OsmoHLR will automatically create and bootstrap a -database file with empty tables. If no `-l` command-line option is provided, -this database file will be created in the current working directory. - -Alternatively, you may use the `osmo-hlr-db-tool`, which is installed along -with `osmo-hlr`, to bootstrap an empty database, or to migrate subscriber data -from an old 'OsmoNITB' database. See `osmo-hlr-db-tool --help`. - -=== Multiple instances - -Running multiple instances of `osmo-hlr` on the same computer is possible if -all interfaces (VTY, CTRL) are separated using the appropriate configuration -options. The IP based interfaces are binding to local host by default. In order -to separate the processes, the user has to bind those services to specific but -different IP addresses and/or ports. - -The VTY and the Control interface can be bound to IP addresses from the loopback -address range, for example: - ----- -line vty - bind 127.0.0.2 -ctrl - bind 127.0.0.2 ----- - -The GSUP interface can be bound to a specific IP address by the following -configuration options: - ----- -hlr - gsup - bind ip 10.23.42.1 ----- - -NOTE: At the time of writing, OsmoHLR lacks a config option to change the GSUP -port, which is by default TCP port 4222. diff --git a/OsmoHLR/chapters/subscribers.adoc b/OsmoHLR/chapters/subscribers.adoc deleted file mode 100644 index bb57d24..0000000 --- a/OsmoHLR/chapters/subscribers.adoc +++ /dev/null @@ -1,69 +0,0 @@ -== Managing Subscribers - -Subscribers are kept in a local SQLite database file and can be managed via VTY -and CTRL interfaces. - -This section provides some examples; also refer to the OsmoHLR VTY reference -manual <> as well as the Control interface described in -<>. - -=== Example: Add/Update/Delete Subscriber via VTY - -The following telnet VTY session adds a subscriber complete with GSM (2G) and -UMTS (3G and 2G) authentication tokens, and finally removes the subscriber -again; it assumes that osmo-hlr is running and listening for telnet VTY -connections on localhost: - ----- -$ telnet localhost 4258 -include::../example_subscriber_add_update_delete.vty[] ----- - -[[subscriber-params]] -=== Subscriber Parameters - -The following parameters are managed for each subscriber of the HLR, modelled -roughly after 3GPP TS 23.008, version 13.3.0; note that not all of these -parameters are necessarily in active use. - -The `aud3g` table also applies to 2G networks: it provides UMTS AKA tokens for -Milenage authentication, which is available both on 3G and 2G networks. On 2G, -when both MS and network are R99 capable (like OsmoMSC and OsmoSGSN are), the -full UMTS AKA with Milenage keys from `aud_3g`, using AUTN and extended RES -tokens, is available. With pre-R99 MS or network configurations, the GSM AKA -compatible variant of Milenage, still using the Milenage keys from `aud_3g` but -transceiving only RAND and SRES, may be applicable. (See 3GPP TS 33.102, chapter -6.8.1, Authentication and key agreement of UMTS subscribers.) - -.OsmoHLR's subscriber parameters -[options="header",width="100%",cols="20%,20%,60%"] -|=== -|Name|Example|Description -|imsi|901700000014701|identity of the SIM/USIM, 3GPP TS 23.008 chapter 2.1.1.1 -|msisdn|2342123|number to dial to reach this subscriber (multiple MSISDNs can be stored per subscriber), 3GPP TS 23.008 chapter 2.1.2 -|imeisv|4234234234234275|identity of the mobile device and software version, 3GPP TS 23.008 chapter 2.2.3 -|aud2g.algo|comp128v3|Authentication algorithm ID for GSM AKA, corresponds to enum osmo_auth_algo -|aud2g.ki||Subscriber's secret key (128bit) -|aud3g.algo|milenage|Authentication algorithm ID for UMTS AKA (applies to both 3G and 2G networks), corresponds to enum osmo_auth_algo -|aud3g.k|(32 hexadecimal digits)|Subscriber's secret key (128bit) -|aud3g.op|(32 hexadecimal digits)|Operator's secret key (128bit) -|aud3g.opc|(32 hexadecimal digits)|Secret key derived from OP and K (128bit), alternative to using OP which does not disclose OP to subscribers -|aud3g.sqn|123|Sequence number of last used key (64bit unsigned) -|aud3g.ind_bitlen|5|Nr of index bits at lower SQN end -|apn|| -|vlr_number||3GPP TS 23.008 chapter 2.4.5 -|hlr_number||3GPP TS 23.008 chapter 2.4.6 -|sgsn_number||3GPP TS 23.008 chapter 2.4.8.1 -|sgsn_address||3GPP TS 23.008 chapter 2.13.10 -|ggsn_number||3GPP TS 23.008 chapter 2.4.8.2 -|gmlc_number||3GPP TS 23.008 chapter 2.4.9.2 -|smsc_number||3GPP TS 23.008 chapter 2.4.23 -|periodic_lu_tmr||3GPP TS 23.008 chapter 2.4.24 -|periodic_rau_tau_tmr||3GPP TS 23.008 chapter 2.13.115 -|nam_cs|1|Enable/disable voice access (3GPP TS 23.008 chapter 2.1.1.2: network access mode) -|nam_ps|0|Enable/disable data access (3GPP TS 23.008 chapter 2.1.1.2: network access mode) -|lmsi||3GPP TS 23.008 chapter 2.1.8 -|ms_purged_cs|0|3GPP TS 23.008 chapter 2.7.5 -|ms_purged_ps|1|3GPP TS 23.008 chapter 2.7.6 -|=== - diff --git a/OsmoHLR/chapters/ussd.adoc b/OsmoHLR/chapters/ussd.adoc deleted file mode 100644 index be463ac..0000000 --- a/OsmoHLR/chapters/ussd.adoc +++ /dev/null @@ -1,78 +0,0 @@ -[[ussd]] -== Unstructured Supplementary Services Data (USSD) - -The _Unstructured Supplementary Services Data (USSD)_ is one service within -2G/3G networks next to other services such as circuit-switched voice, packet-switched -data and SMS (Short Message Service). - -It is on an abstract level quite similar to SMS in that USSD can be used to send -textual messages. However, there are the following differences: - -* USSD is between the MS (phone) and an USSD application on the network, while - SMS is primarily between two subscribers identified by their MSISDN -* USSD is faster, as it doesn't suffer from the complicated three-layer CP/RP/TP - protocol stack of SMS with it's acknowledgement of the acknowledged acknowledgement. -* USSD is session-oriented, i.e. a dialogue/session between subscriber and application - can persist for the transfer of more than one message. The dedicated radio channel - on the RAN remains established throughout that dialogue. - -=== USSD in Osmocom - -Until August 2018, OsmoMSC contained some minimalistic internal USSD -handling with no -ability to attach/extend it with external USSD applications. - -From August 2018 onwards, OsmoMSC doesn't contain any internal USSD -handlers/applications anymore. Instead, all USSD is transported to/from -OsmoHLR via the GSUP protocol. - -OsmoHLR contains some intenal USSD handlers and can route USSD messages -to any number of external USSD entities (EUSEs). The EUSE also use GSUP -to communicate USSD from/to OsmoHLR. - -Each EUSE is identified by its name. The name consists of a single-word -string preceding a currently fixed ("-00-00-00-00-00-00") suffix. -There is no authentication between EUSE and OsmoHLR: Any client program -able to connect to the GSUP port of OsmoHLR can register as any EUSE -(name). - -NOTE:: We plan to remove the requirement for this suffix as soon as we -are done resolving all more important issues. - -=== USSD Configuration - -USSD configuration in OsmoHLR happens within the `hlr` VTY node. - -`euse foobar-00-00-00-00-00-00` defines an EUSE with the given name `foobar` - -`ussd route prefix *123 external foobar-00-00-00-00-00-00` installs a -prefix route to the named EUSE. All USSD short codes starting with *123 will be -routed to the named EUSE. - -`ussd route prefix *#100# internal own-msisdn` installs a prefix route -to the named internal USSD handler. There above command will restore -the old behavior, in which *#100# will return a text message containing -the subscribers own phone number. There is one other handler called -`own-imsi` which will return the IMSI instead of the MSISDN. - -`ussd default-route external foobar-00-00-00-00-00-00` installs a -default route to the named EUSE. This means that all USSD codes for -which no more specific route exists will be routed to the named EUSE. - -=== Example EUSE program - -We have provided an example EUSE developed in C language using existing -Osmocom libraries for GSUP protocol handling and USSD encoding/decoding. -It will register as `foobar` EUSE to OsmoHLR on localhost. You can run -it on a different machine by specifying e.g. `osmo-euse-demo 1.2.3.4 5678` -to make it connect to OsmoHLR on IP address 1.2.3.4 and GSUP/TCP port -5678. - -The idea is that you can use this as a template to develop your own USSD -applications, or any gateways to other protocols or interfaces. - -You can find it in `osmo-hlr/src/osmo-euse-demo.c` or online by -following the link to http://git.osmocom.org/osmo-hlr/tree/src/osmo-euse-demo.c - -This demonstration program will echo back any USSD message sent/routed -to it, quoted like _You sent "..."_. diff --git a/OsmoHLR/example_subscriber_add_update_delete.vty b/OsmoHLR/example_subscriber_add_update_delete.vty deleted file mode 100644 index ca14a65..0000000 --- a/OsmoHLR/example_subscriber_add_update_delete.vty +++ /dev/null @@ -1,34 +0,0 @@ -OsmoHLR> enable -OsmoHLR# subscriber imsi 123456789023000 create -% Created subscriber 123456789023000 - ID: 1 - IMSI: 123456789023000 - MSISDN: none - -OsmoHLR# subscriber imsi 123456789023000 update msisdn 423 -% Updated subscriber IMSI='123456789023000' to MSISDN='423' - -OsmoHLR# subscriber msisdn 423 update aud3g milenage k deaf0ff1ced0d0dabbedd1ced1cef00d opc cededeffacedacefacedbadfadedbeef -OsmoHLR# subscriber msisdn 423 show - ID: 1 - IMSI: 123456789023000 - MSISDN: 423 - 3G auth: MILENAGE - K=deaf0ff1ced0d0dabbedd1ced1cef00d - OPC=cededeffacedacefacedbadfadedbeef - IND-bitlen=5 - -OsmoHLR# subscriber msisdn 423 update aud2g comp128v3 ki beefedcafefaceacedaddeddecadefee -OsmoHLR# subscriber msisdn 423 show - ID: 1 - IMSI: 123456789023000 - MSISDN: 423 - 2G auth: COMP128v3 - KI=beefedcafefaceacedaddeddecadefee - 3G auth: MILENAGE - K=deaf0ff1ced0d0dabbedd1ced1cef00d - OPC=cededeffacedacefacedbadfadedbeef - IND-bitlen=5 - -OsmoHLR# subscriber imsi 123456789023000 delete -% Deleted subscriber for IMSI '123456789023000' diff --git a/OsmoHLR/example_subscriber_cs_ps_enabled.ctrl b/OsmoHLR/example_subscriber_cs_ps_enabled.ctrl deleted file mode 100644 index a103fb8..0000000 --- a/OsmoHLR/example_subscriber_cs_ps_enabled.ctrl +++ /dev/null @@ -1,71 +0,0 @@ -GET 1 subscriber.by-msisdn-103.info -GET_REPLY 1 subscriber.by-msisdn-103.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 1 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 - -GET 2 subscriber.by-msisdn-103.ps-enabled -GET_REPLY 2 subscriber.by-msisdn-103.ps-enabled 1 - -SET 3 subscriber.by-msisdn-103.ps-enabled 0 -SET_REPLY 3 subscriber.by-msisdn-103.ps-enabled OK - -GET 4 subscriber.by-msisdn-103.ps-enabled -GET_REPLY 4 subscriber.by-msisdn-103.ps-enabled 0 - -GET 5 subscriber.by-msisdn-103.info -GET_REPLY 5 subscriber.by-msisdn-103.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 0 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 - -SET 6 subscriber.by-msisdn-103.cs-enabled 0 -SET_REPLY 6 subscriber.by-msisdn-103.cs-enabled OK - -GET 7 subscriber.by-msisdn-103.cs-enabled -GET_REPLY 7 subscriber.by-msisdn-103.cs-enabled 0 - -GET 8 subscriber.by-msisdn-103.info -GET_REPLY 8 subscriber.by-msisdn-103.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 0 -nam_ps 0 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 - -SET 9 subscriber.by-msisdn-103.cs-enabled 1 -SET_REPLY 9 subscriber.by-msisdn-103.cs-enabled OK -SET 10 subscriber.by-msisdn-103.ps-enabled 1 -SET_REPLY 10 subscriber.by-msisdn-103.ps-enabled OK - -GET 11 subscriber.by-msisdn-103.info -GET_REPLY 11 subscriber.by-msisdn-103.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 1 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 diff --git a/OsmoHLR/example_subscriber_info.ctrl b/OsmoHLR/example_subscriber_info.ctrl deleted file mode 100644 index 1bdf00b..0000000 --- a/OsmoHLR/example_subscriber_info.ctrl +++ /dev/null @@ -1,42 +0,0 @@ -GET 1 subscriber.by-imsi-901990000000003.info -GET_REPLY 1 subscriber.by-imsi-901990000000003.info -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 1 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 - -GET 2 subscriber.by-msisdn-103.info-aud -GET_REPLY 2 subscriber.by-msisdn-103.info-aud -aud2g.algo COMP128v1 -aud2g.ki 000102030405060708090a0b0c0d0e0f -aud3g.algo MILENAGE -aud3g.k 000102030405060708090a0b0c0d0e0f -aud3g.opc 101112131415161718191a1b1c1d1e1f -aud3g.ind_bitlen 5 -aud3g.sqn 0 - -GET 3 subscriber.by-id-3.info-all -GET_REPLY 3 subscriber.by-id-3.info-all -id 3 -imsi 901990000000003 -msisdn 103 -nam_cs 1 -nam_ps 1 -ms_purged_cs 0 -ms_purged_ps 0 -periodic_lu_timer 0 -periodic_rau_tau_timer 0 -lmsi 00000000 -aud2g.algo COMP128v1 -aud2g.ki 000102030405060708090a0b0c0d0e0f -aud3g.algo MILENAGE -aud3g.k 000102030405060708090a0b0c0d0e0f -aud3g.opc 101112131415161718191a1b1c1d1e1f -aud3g.ind_bitlen 5 -aud3g.sqn 0 diff --git a/OsmoHLR/osmohlr-usermanual-docinfo.xml b/OsmoHLR/osmohlr-usermanual-docinfo.xml deleted file mode 100644 index d99bba7..0000000 --- a/OsmoHLR/osmohlr-usermanual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - September 18th, 2017 - NH - - Initial version; based on OsmoNITB manual version 2. - - - - - - - Neels - Hofmeyr - nhofmeyr at sysmocom.de - NH - - sysmocom - sysmocom - s.f.m.c. GmbH - Senior Developer - - - - - - 2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoHLR/osmohlr-usermanual.adoc b/OsmoHLR/osmohlr-usermanual.adoc deleted file mode 100644 index 7e709bd..0000000 --- a/OsmoHLR/osmohlr-usermanual.adoc +++ /dev/null @@ -1,36 +0,0 @@ -:gfdl-enabled: -:program-name: OsmoHLR - -OsmoHLR User Manual -==================== -Neels Hofmeyr - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::{srcdir}/chapters/subscribers.adoc[] - -include::{srcdir}/chapters/ussd.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::./common/chapters/gsup.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - diff --git a/OsmoHLR/osmohlr-vty-reference.xml b/OsmoHLR/osmohlr-vty-reference.xml deleted file mode 100644 index f2d06ef..0000000 --- a/OsmoHLR/osmohlr-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 18th September 2017 - nh - Initial - - - - OsmoHLR VTY Reference - - - 2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoHLR/vty/hlr_vty_additions.xml b/OsmoHLR/vty/hlr_vty_additions.xml deleted file mode 100644 index a4c675e..0000000 --- a/OsmoHLR/vty/hlr_vty_additions.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/OsmoHLR/vty/hlr_vty_reference.xml b/OsmoHLR/vty/hlr_vty_reference.xml deleted file mode 100644 index cc97dc4..0000000 --- a/OsmoHLR/vty/hlr_vty_reference.xml +++ /dev/null @@ -1,1162 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-hlr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-hlr-gsup - - - - - - - - - - config-hlr-euse - - diff --git a/configure.ac b/configure.ac index cef7115..74f3002 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,6 @@ Makefile tests/Makefile OsmoGSMTester/Makefile - OsmoHLR/Makefile OsmoMGCP/Makefile OsmoMGW/Makefile OsmoNAT/Makefile -- To view, visit https://gerrit.osmocom.org/11964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice3f24888deed8affec40d5d91d71d5e1f3827c8 Gerrit-Change-Number: 11964 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:41 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoGGSN files (now avail in osmo-ggsn.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11963 ) Change subject: remove OsmoGGSN files (now avail in osmo-ggsn.git) ...................................................................... remove OsmoGGSN files (now avail in osmo-ggsn.git) Files were added in osmo-ggsn.git Change-Id I14533676d5774ee0d0ee5054ba77d7dac32cff43 Depends: osmo-ggsn.git Change-Id I14533676d5774ee0d0ee5054ba77d7dac32cff43 Related: OS#3385 Change-Id: I4b9e2836a74b84bfc73ea7048a137ab5253d9045 --- M Makefile.am D OsmoGGSN/Makefile.am D OsmoGGSN/chapters/configuration.adoc D OsmoGGSN/chapters/overview.adoc D OsmoGGSN/chapters/running.adoc D OsmoGGSN/osmoggsn-usermanual-docinfo.xml D OsmoGGSN/osmoggsn-usermanual.adoc D OsmoGGSN/osmoggsn-vty-reference.xml D OsmoGGSN/vty/ggsn_vty_additions.xml D OsmoGGSN/vty/ggsn_vty_reference.xml M configure.ac 11 files changed, 0 insertions(+), 2,169 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index 1275358..dec4024 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) SUBDIRS = tests \ - OsmoGGSN \ OsmoGSMTester \ OsmoHLR \ OsmoMGCP \ diff --git a/OsmoGGSN/Makefile.am b/OsmoGGSN/Makefile.am deleted file mode 100644 index 4cbff6d..0000000 --- a/OsmoGGSN/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmoggsn-usermanual.adoc \ - osmoggsn-usermanual-docinfo.xml \ - osmoggsn-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmoggsn-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmoggsn-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGGSN/chapters/configuration.adoc b/OsmoGGSN/chapters/configuration.adoc deleted file mode 100644 index 657a014..0000000 --- a/OsmoGGSN/chapters/configuration.adoc +++ /dev/null @@ -1,335 +0,0 @@ -== Configuring OsmoGGSN - -All configuration of OsmoGGSN is performed using the VTY. For more -general information on the VTY interface, see <>. - -=== Configuring a virtual GGSN instance - -OsmoGGSN can run multiple GGSN instances inside one program/process. -Each GGSN instance binds to its own transport-layer GTP IP address and -has its own set of APNs and associated IP address pools + tun/gtp -devices. - -In most usage cases, yo will only have a single GGSN instance inside -your configuration file, like in below example: - -.Example: Single GGSN configuration section ----- -ggsn ggsn0 - gtp state-dir /tmp - gtp bind-ip 127.0.0.6 - apn internet - gtpu-mode tun - tun-device tun4 - type-support v4 - ip prefix dynamic 176.16.222.0/24 - ip dns 0 192.168.100.1 - ip dns 1 8.8.8.8 - ip ifconfig 176.16.222.0/24 - no shutdown ----- - - -==== Creating/Editing a GGSN instance - -Creating/Editing a GGSN instance can be done by the following sequence -of VTY commands: - ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# <4> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Create or edit the GGSN instance `ggsn0`. The name can be any ASCII - string, its significance is only to the local user. -<4> Your prompt is now in the `ggsn` config node, where you can - configure the properties of this GGSN instance. - -NOTE:: After creating a new GGSN instance, it is in `shutdown` mode. See -<> to take it out of shutdown, but make sure to configure it fully -before taking it out of shutdown. - -==== Configuring a GGSN instance - -The following two mandatory configuration statements have to be given -for every GGSN instance: - ----- -OsmoGGSN(config-ggsn)# gtp state-dir /var/lib/ggsn/ggsn0 <1> -OsmoGGSN(config-ggsn)# gtp bind-ip 127.0.0.6 <2> ----- -<1> Store the GSN restart state in the specified directory -<2> Bind the GGSN instance to the specified local IPv4 address - -There are some further configuration statements that can be used at the -GGSN node, some examples are given below. For a full list, see the -_OsmoGGSN VTY reference manual_ <>. - ----- -OsmoGGSN(config-ggsn)# default-apn foobar <1> ----- -<1> Configure a default APN to be used if the user-requested APN is not - found. The named APN must previously be configured - - -==== Deleting a GGSN instance - -A GGSN instance can be removed like this - -.Example: Deleting a GGSN instance ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# no ggsn ggsn0 <3> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Delete the GGSN instance - - -==== Taking a GGSN instance out of shutdown - -.Example: Taking a GGSN instance out of shutdown ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# no shutdown ggsn <4> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config ndoe of the GGSN instance `ggsn0` -<4> Take the GGSN instance out of shutdown - - -==== Shutting a GGSN instance down - -If you would like to take a GGSN instance out of service, you can -put it into shutdown mode. This will make the entire GGSN unavailable -to user traffic and permit you to e.g. reconfigure it before taking it -out of shutdown again. - -.Example: Shutting down a GGSN instance ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# shutdown ggsn <4> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config ndoe of the GGSN instance `ggsn0` -<4> Shut down the GGSN instance - - -=== Configuring an Access Point Name - -An Access Point Name (APN) represents a connection to an external packet -data network, such as the public Internet or private corporate networsk. - -APNs are selected by terminals (MS/UE) when establishing PDP contexts. - -Each OsmoGGSN GGSN instance can have any number of APNs configured. -Each APN is identified by a string name. - -==== Creating/Editing an APN - -.Example: Creating a new APN ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# apn internet <4> -OsmoGGSN(config-ggsn-apn)# <5> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config node of the GGSN instance `ggsn0` -<4> Create or Edit an APN called `internet` -<5> Your prompt is now in the `ggsn` config node, where you can - configure the properties of this GGSN instance. - -NOTE:: The newly-create APN is created in `shutdown` mode. See <> to take it -out of shutdown. - - -==== Configuring an APN - -.Example: Configuring an APN ----- -OsmoGGSN(config-ggsn-apn)# gtpu-mode tun <1> -OsmoGGSN(config-ggsn-apn)# type-support v4 <2> -OsmoGGSN(config-ggsn-apn)# ip prefix dynamic 176.16.222.0/24 <3> -OsmoGGSN(config-ggsn-apn)# ip dns 0 192.168.100.1 <4> -OsmoGGSN(config-ggsn-apn)# ip dns 1 8.8.8.8 <5> -OsmoGGSN(config-ggsn-apn)# ip ifconfig 176.16.222.0/24 <6> ----- -<1> Use the userspace GTP-U handling using a TUN device -<2> Support (only) IPv4 Addresses -<3> Specify the pool of dynamic IPv4 addresses to be allocated to PDP - contexts -<4> Specify the primary DNS server to be provided using IPCP/PCO -<5> Specify the secondary DNS server to be provided using IPCP/PCO -<6> Request OsmoGGSN to configure the `tun4` device network/netmask - -NOTE:: If you use the optional `ip ifconfig` command to set the network -device address/mask, OsmoGGSN must run with root or `CAP_NET_ADMIN` -support. It might be better to configure related tun devices at system -startup and run OsmoGGSN as non-privileged user. See <> for more -details. - - -==== Deleting an APN - -An APN configuration can be removed like this - -.Example: Deleting an APN ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# no apn internet <4> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config node of the GGSN instance `ggsn0` -<4> Delete the APN `internet` - -[[unshutdown_apn]] -==== Taking an APN out of shutdown - -In order to bring a deactived APN in `shutdown` state into active -operation, use the `no shutdown` command at the APN node as explained in -the following example: - -.Example: Taking an APN out of shutdown ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# apn internet <4> -OsmoGGSN(config-ggsn-apn)# no shutdown <5> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config ndoe of the GGSN instance `ggsn0` -<4> Enter the config ndoe of the APN `internet` -<5> Take the APN out of shutdown - - -==== Shutting an APN down - -If you would like to take an APN instance out of service, you can -put it into shutdown mode. This will make the APN unavailable -to user traffic and permit you to e.g. reconfigure it before taking it -out of shutdown again. - -.Example: Shutting down an APN ----- -OsmoGGSN> enable <1> -OsmoGGSN# configure terminal <2> -OsmoGGSN(config)# ggsn ggsn0 <3> -OsmoGGSN(config-ggsn)# apn internet <4> -OsmoGGSN(config-ggsn-apn)# shutdown <5> ----- -<1> Change into privileged mode -<2> Enter the interactive configuration mode -<3> Enter the config ndoe of the GGSN instance `ggsn0` -<4> Enter the config ndoe of the APN `internet` -<5> Shut down the APN - -[[ggsn_no_root]] -=== Configuring for running without root privileges - -It's possible to run OsmoGGSN without root privileges if the tun devices are already configured. - -The interface creation + configuration must then happen before osmo-ggsn starting up. This can be -achieved by means such as - -* a custom shell script run as root before starting osmo-ggsn (e.g. as init script) -* systemd .netdev and .network files, if your system is using systemd-networkd (see `networkctl status`). - -==== Manual TUN device creation / configuration - -If you chose to go for custom shell/init scripts, you may use the `ip` program which is the standard -tool for network interface configuration on Linux, part of the `iproute2` package. In order to -create a tun device, you must call it like this: - -.Example: iproute2 command to create a tun device ----- -# ip tuntap add dev apn0 mode tun user username group groupname ----- - -Where _username_ and _groupname_ correspond to the User and Group that will have ownership over the -device, i.e. the privileges which you intend to run osmo-ggsn under, and _apn0_ will be the -name of the network device created. After creating the interface, you can configure its addresses -using standard means like `ip addr add` or your distribution-specific utilities/tools -to match the `ip prefix dynamic` config item, and activate the link, for example: - ----- -# ip addr add 192.168.7.0/24 dev apn0 -# ip link set apn0 up ----- - -==== systemd based TUN device creation+configuration - -If you want to have systemd take care of creating and configuring a tun device for you, -you can use the below example config files. - -.Example: device config via systemd-networkd using apn0.netdev ----- -[NetDev] -Name=apn0 <1> -Kind=tun - -[Tun] -User=username <2> -Group=username <3> ----- -<1> The network interface name of the newly-created device -<2> The username under which you will run OsmoGGSN -<3> The group name under which you will run OsmoGGSN - -.Example: network settings via systemd-networkd using ggsn.network ----- -[Match] -Name=apn0 <1> - -[Network] -Address=192.168.7.1 <2> -IPMasquerade=yes <3> ----- -<1> The netowrk device name, which must match the one in the apn0.netdev unit file above -<2> The local IP address configured on the device -<3> Requesting systemd to configure IP masquerading for this interface. Depending on your needs, - You may not want this if you have proper end-to-end routing set up, and want to have transparent - inbound IP access to your GPRS-attached devices. - -==== Config Changes - -With the tun device pre-configured in one of the ways outlined above, the main -changes in your osmo-ggsn.cfg file are: - -* remove `ip ifconfig` directive, -* make sure that `no shutdown` is present in the `apn` section as well as - `no shutdown ggsn` in the `ggsn` section. - -.Example: using externally configured tun device `apn0` as non-root ----- -ggsn ggsn0 - gtp state-dir /tmp - gtp bind-ip 127.0.0.6 - apn internet - gtpu-mode tun - tun-device apn0 - type-support v4 - ip prefix dynamic 192.168.7.0/24 - ip dns 0 192.168.100.1 - ip dns 1 8.8.8.8 - no shutdown - default-apn internet - no shutdown ggsn ----- diff --git a/OsmoGGSN/chapters/overview.adoc b/OsmoGGSN/chapters/overview.adoc deleted file mode 100644 index 632db5e..0000000 --- a/OsmoGGSN/chapters/overview.adoc +++ /dev/null @@ -1,145 +0,0 @@ -[[chapter_introduction]] -== Overview - -[[intro_overview]] -=== About OsmoGGSN - -OsmoGGSN is a Free / Open Source Software implementation of the GPRS -GGSN (Gateway GPRS support node) element in side the packet switched -core network of 2G and 3G cellular networks. - -The GGSN function is the tunnel endpoint on the core network side, -from where the external (IP) packet data network - -=== Software Components - -==== GTP Implementation (libgtp) - -The OsmoGGSN source code includes a shared library implementation of -the GTP protocol used on the GGSN-SGSN interface. This library -and associated header files are installed system-wide and are -available to other programs/applications. - -In fact, libgtp is what the OsmoSGSN also uses for its use of GTP. - -==== sgsnemu - -In order to test OsmoGGSN without running a SGSN and other elements -of a cellular network, there is a small command-line utility called -*sgsnemu* which is able to simulate the customary operations of a SGSN -towards the GGSN, such as a PDP Context Activation. - -*sgsnemu* can even be used for testing against other GGSNs, as the GTP -protocol is standardized across implementations. - -==== osmo-ggsn - -*osmo-ggsn* is the actual name of the OsmoGGSN executable program. It -implements the GGSN functionality. All parameters are set using the -configuration file, by default located in *./osmo-ggsn.cfg* - -==== systemd service file - -In *contrib/osmo-ggsn.service* you can find a sample service file for -OsmoGGSN which can be used with systemd. - -==== init script - -In *contrib/osmo-ggsn.init* you can find a sample init script to be used -on systems with classic init process. - -=== Limitations - -OsmoGGSN supports both GTP0 (GSM 09.60) and GTP1 (3GPP 29.060). In the -following tables the support of each individual message type is -detailed. The numbers before each feature indicates the relevant -section in the standard. - -==== GSM 09.60 (GTPv0) - -[options="header",cols="50%,15%,15%,15%,5%"] -|=== -| Feature | gtplib | osmo-ggsn | sgsnemu | notes -5+<|*7.4 Path Management Messages* -|7.4.1 Echo Request |Supported |Supported |Supported | -|7.4.2 Echo Response |Supported |Supported |Supported | -|7.4.3 Version Not Supported |Supported |Supported |Supported | -5+<| *7.5 Tunnel Management Messages* -|7.5.1 Create PDP Context Request|Supported |Supported |Supported | -|7.5.2 Create PDP Context Response|Supported |Supported |Supported | -|7.5.3 Update PDP Context Request|Supported |Supported |Not | -|7.5.4 Update PDP Context Response|Supported |Supported |Not | -|7.5.5 Delete PDP Context Request|Supported |Supported |Supported | -|7.5.6 Delete PDP Context Response|Supported |Supported |Supported | -|7.5.7 Create AA PDP Context Request|Unsupported |Unsupported |Unsupported | -|7.5.8 Create AA PDP Response|Unsupported |Unsupported |Unsupported | -|7.5.9 Delete AA PDP Context Request|Unsupported |Unsupported |Unsupported | -|7.5.10 Delete AA PDP Context Response|Unsupported |Unsupported |Unsupported | -|7.5.11 Error Indication |Supported |Supported |Supported | -|7.5.12 PDU Notification Request|Unsupported |Unsupported |Unsupported | -|7.5.13 PDU Notification Response|Unsupported |Unsupported |Unsupported | -|7.5.14 PDU Notification Reject Request|Unsupported |Unsupported |Unsupported | -|7.5.15 PDU Notification Reject Response|Unsupported |Unsupported |Unsupported | -5+<| *7.6 Location Management Messages* -|7.6.1 Send Routeing Information for GPRS Request|Unsupported |Unsupported |Not applicable | -|7.6.2 Send Routeing Information for GPRS Response|Unsupported |Unsupported |Not applicable | -|7.6.3 Failure Report Request|Unsupported |Unsupported |Not applicable | -|7.6.3 Failure Report Response|Unsupported |Unsupported |Not applicable | -|7.6.5 Note MS GPRS Present Request|Unsupported |Unsupported |Not applicable| -|7.6.6 Note MS GPRS Present Response|Unsupported |Unsupported |Not applicable| -5+<| *7.5 Mobility Management Messages* -|7.5.1 Identification Request|Unsupported |Not applicable|Not applicable| -|7.5.2 Identification Response|Unsupported |Not applicable|Not applicable | -|7.5.3 SGSN Context Request|Unsupported |Not applicable|Not applicable| -|7.5.4 SGSN Context Response|Unsupported |Not applicable|Not applicable| -|7.5.5 SGSN Context Acknowledge|Unsupported |Not applicable|Not applicable| -|=== - -==== 3GPP 29.060 (GTPv1) - -[options="header",cols="50%,15%,15%,15%,5%"] -|=== -|Feature |gtplib |osmo-ggsn |sgsnemu |notes -5+<|*7.2 Path Management Messages* -|7.2.1 Echo Request |Supported |Supported |Supported | -|7.2.2 Echo Response |Supported |Supported |Supported | -|7.2.3 Version Not Supported|Supported |Supported |Supported | -|7.2.4 Extension Headers Notification|Supported |Supported |Supported | -5+<|*7.3 Tunnel Management Messages* -|7.3.1 Create PDP Context Request|Supported |Supported |Supported |1 -|7.3.2 Create PDP Context Response|Supported |Supported |Supported | -|7.3.3 Update PDP Context Request|Supported |Supported |Not applicable|1 -|7.3.4 Update PDP Context Response|Supported |Supported |Not applicable| -|7.3.5 Delete PDP Context Request|Supported |Supported |Supported | -|7.3.6 Delete PDP Context Response|Supported |Supported |Supported | -|7.3.7 Error Indication |Supported |Supported |Supported | -|7.3.8 PDU Notification Request|Unsupported |Unsupported |Unsupported | -|7.3.9 PDU Notification Response|Unsupported |Unsupported |Unsupported | -|7.3.10 PDU Notification Reject Request|Unsupported |Unsupported |Unsupported | -|7.3.10 PDU Notification Reject Response|Unsupported |Unsupported |Unsupported | -5+<|*7.4 Location Management Messages* -|7.4.1 Send Routeing Information for GPRS Request|Unsupported |Unsupported |Not applicable | -|7.4.2 Send Routeing Information for GPRS Response|Unsupported |Unsupported |Not applicable | -|7.4.3 Failure Report Request|Unsupported |Unsupported |Not applicable| -|7.4.3 Failure Report Response|Unsupported |Unsupported |Not applicable| -|7.4.5 Note MS GPRS Present Request|Unsupported |Unsupported |Not applicable| -|7.4.6 Note MS GPRS Present Response|Unsupported |Unsupported |Not applicable| -5+<|*7.5 Mobility Management Messages* -|7.5.1 Identification Request|Unsupported |Not applicable|Not applicable| -|7.5.2 Identification Response|Unsupported |Not applicable |Not applicable| -|7.5.3 SGSN Context Request|Unsupported |Not applicable|Not applicable| -|7.5.4 SGSN Context Response|Unsupported |Not applicable |Not applicable| -|7.5.5 SGSN Context Acknowledge|Unsupported |Not applicable|Not applicable| -|7.5.6 Forward Relocation Request|Unsupported |Not applicable|Not applicable| -|7.5.7 Forward Relocation Response|Unsupported |Not applicable|Not applicable| -|7.5.8 Forward Relocation Complete|Unsupported |Not applicable|Not applicable| -|7.5.9 Relocation Cancel Request|Unsupported |Not applicable|Not applicable| -|7.5.10 Relocation Cancel Response|Unsupported |Not applicable|Not applicable| -|7.5.11 Forward Relocation Complete |Unsupported |Not applicable |Not applicable | -|7.5.12 Forward SRNS Context Acknowledge|Unsupported |Not applicable|Not applicable| -|7.5.13 Forward SRNS Context|Unsupported |Not applicable|Not applicable| -|=== - -Notes - -1) The "Secondary PDP Context Activation Procedure" is not supported. diff --git a/OsmoGGSN/chapters/running.adoc b/OsmoGGSN/chapters/running.adoc deleted file mode 100644 index 83470e8..0000000 --- a/OsmoGGSN/chapters/running.adoc +++ /dev/null @@ -1,82 +0,0 @@ -== Running OsmoGGSN - -The OsmoGGSN executable (`osmo-ggsn`) offers the following command-line -arguments: - -=== SYNOPSIS - -*osmo-ggsn* [-h|-V] [-D] [-c 'CONFIGFILE'] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-ggsn.cfg` in the current - working directory. - -=== Routing - -Operating the OpenGGSN tun device naturally creates a network setup with -multiple interfaces. Consider: - -* Typical Linux setups prevent forwarding of packets between separate - interfaces by default. To let subscribers reach the internet uplink from the - tun device, it may be required to enable IP forwarding. - -* Having a locally defined address range assigned to the tun device requires - either sensible routing for this address range, or that masquerading is - enabled to allow your single uplink IP address to "proxy" for the tun. - -These are decisions to be made on a network administration level. - -In a trivial case where you have a single box serving GPRS to few subscribers -on an arbitrary IP address range not known in the larger network, the easiest -way to enable GPRS uplink would be to enable IP forwarding and masquerading. - -To manually enable IPv4 forwarding and masquerading ad-hoc, you can do: - ----- -sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward" -iptables -t nat -A POSTROUTING -o '*' -j MASQUERADE ----- - -(You may want to replace `*` with the network device name, like `-o eth0`) - -There are various ways to enable these settings persistently, please refer to -your distribution's documentation -- e.g. look for @net.ipv4.ip_forward=1@ in -@/etc/sysctl.d/@, and https://wiki.debian.org/iptables for masquerading. - -=== Multiple instances - -Running multiple instances of `osmo-ggsn` is possible if all GGSN instances -are binding to different local IP addresse and all other interfaces (VTY, -OML) are separated using the appropriate configuration options. The IP based -interfaces are binding to local host by default. In order to separate the -processes, the user has to bind those services to specific but different -IP addresses. - -The VTY and the control interface can be bound to IP addresses from the loopback -address range. - -.Example: Binding VTY and control interface to a specific ip-address ----- -line vty - bind 127.0.0.2 -ctrl - bind 127.0.0.2 ----- - -Also make sure to place each instance's GTP bind on a separate IP address (GTP -uses a port number that is fixed in the GTP specifications, so it will not be -possible to pick differing ports on the same IP address), like: - ----- -ggsn ggsn0 - gtp bind-ip 127.0.0.2 ----- diff --git a/OsmoGGSN/osmoggsn-usermanual-docinfo.xml b/OsmoGGSN/osmoggsn-usermanual-docinfo.xml deleted file mode 100644 index c93d5e1..0000000 --- a/OsmoGGSN/osmoggsn-usermanual-docinfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 1 - August 2017 - HW - - Initial version. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2013-2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoGGSN/osmoggsn-usermanual.adoc b/OsmoGGSN/osmoggsn-usermanual.adoc deleted file mode 100644 index 9bc3885..0000000 --- a/OsmoGGSN/osmoggsn-usermanual.adoc +++ /dev/null @@ -1,29 +0,0 @@ -OsmoGGSN User Manual -==================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -//include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - - -include::{srcdir}/chapters/configuration.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoGGSN/osmoggsn-vty-reference.xml b/OsmoGGSN/osmoggsn-vty-reference.xml deleted file mode 100644 index 3ad7e83..0000000 --- a/OsmoGGSN/osmoggsn-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 06th September 2017 - hw - Initial version as of OsmoGGSN v1.0.0 - - - - OsmoGGSN VTY Reference - - - 2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoGGSN/vty/ggsn_vty_additions.xml b/OsmoGGSN/vty/ggsn_vty_additions.xml deleted file mode 100644 index b0e8a39..0000000 --- a/OsmoGGSN/vty/ggsn_vty_additions.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - Telnet/VTY Configuration Node - - Configure parameters of the Telnet/VTY Interface, such as to which IP address it should bind/listen to. - - - - - CTRL Configuration Node - - Configure parameters of the CTRL Interface, such as to which IP address it should bind/listen to. - - - - - GGSN Instance Configuration Node - - Configure an Instance of a (virtual) GGSN - - - - - APN Configuration Node - - Configure an Access Point Name (APN) inside a GGSN Instance - - - diff --git a/OsmoGGSN/vty/ggsn_vty_reference.xml b/OsmoGGSN/vty/ggsn_vty_reference.xml deleted file mode 100644 index 7460026..0000000 --- a/OsmoGGSN/vty/ggsn_vty_reference.xml +++ /dev/null @@ -1,1447 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-ggsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-ggsn-apn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index 770df9e..cef7115 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,6 @@ osmo-gsm-manuals.pc Makefile tests/Makefile - OsmoGGSN/Makefile OsmoGSMTester/Makefile OsmoHLR/Makefile OsmoMGCP/Makefile -- To view, visit https://gerrit.osmocom.org/11963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b9e2836a74b84bfc73ea7048a137ab5253d9045 Gerrit-Change-Number: 11963 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:42 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoBTS files (now avail in osmo-bts.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11962 ) Change subject: remove OsmoBTS files (now avail in osmo-bts.git) ...................................................................... remove OsmoBTS files (now avail in osmo-bts.git) Files were added in osmo-bts.git Change-Id I728ebb56ade6dda079a0744c4e592284e1bea4f6 Depends: osmo-bts.git Change-Id I728ebb56ade6dda079a0744c4e592284e1bea4f6 Related: OS#3385 Change-Id: I34426309cb009229069e1472fac86efab38a2f6e --- M Makefile.am D OsmoBTS/Makefile.am D OsmoBTS/abis/abis-startup.msc D OsmoBTS/abis/dyn_ts_ipa_style1.msc D OsmoBTS/abis/dyn_ts_ipa_style2.msc D OsmoBTS/abis/dyn_ts_osmocom_style1.msc D OsmoBTS/abis/dyn_ts_osmocom_style2.msc D OsmoBTS/abis/ipa.adoc D OsmoBTS/abis/oml-mo-bts.msc D OsmoBTS/abis/oml-mo-carrier.msc D OsmoBTS/abis/oml-mo-channel.msc D OsmoBTS/abis/oml-mo-sitemgr.msc D OsmoBTS/abis/oml-mo-transceiver.msc D OsmoBTS/abis/oml-startup.msc D OsmoBTS/abis/oml-startup2.msc D OsmoBTS/abis/oml-startup3.msc D OsmoBTS/abis/oml.adoc D OsmoBTS/abis/rsl-startup-pri.msc D OsmoBTS/abis/rsl-startup-sec.msc D OsmoBTS/abis/rsl-tch-rtp.msc D OsmoBTS/abis/rsl.adoc D OsmoBTS/abis/rtp.adoc D OsmoBTS/chapters/architecture.adoc D OsmoBTS/chapters/bts-models.adoc D OsmoBTS/chapters/configuration.adoc D OsmoBTS/chapters/control.adoc D OsmoBTS/chapters/dynamic-timeslots.adoc D OsmoBTS/chapters/interfaces.adoc D OsmoBTS/chapters/overview.adoc D OsmoBTS/dtx.dot D OsmoBTS/osmobts-abis-docinfo.xml D OsmoBTS/osmobts-abis.adoc D OsmoBTS/osmobts-usermanual-docinfo.xml D OsmoBTS/osmobts-usermanual.adoc D OsmoBTS/osmobts-vty-reference.xml D OsmoBTS/rtp-amr-docinfo.xml D OsmoBTS/rtp-amr.adoc D OsmoBTS/vty/bts_vty_additions.xml D OsmoBTS/vty/bts_vty_reference.xml M configure.ac 40 files changed, 0 insertions(+), 7,054 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve -- To view, visit https://gerrit.osmocom.org/11962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I34426309cb009229069e1472fac86efab38a2f6e Gerrit-Change-Number: 11962 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:42 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoBSC files (now avail in osmo-bsc.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11961 ) Change subject: remove OsmoBSC files (now avail in osmo-bsc.git) ...................................................................... remove OsmoBSC files (now avail in osmo-bsc.git) Files were added in osmo-bsc.git Change-Id I92c0f771d4ffc2b0401d26e25cb0b3817e6f95ea Depends: osmo-bsc.git Change-Id I92c0f771d4ffc2b0401d26e25cb0b3817e6f95ea Related: OS#3385 Change-Id: Ib7e60990b59eeb1c5904fdcbd0c01d4a1f46fec6 --- M Makefile.am D OsmoBSC/Makefile.am D OsmoBSC/aoip-mgw-options-docinfo.xml D OsmoBSC/aoip-mgw-options.adoc D OsmoBSC/chapters/bts-examples.adoc D OsmoBSC/chapters/control.adoc D OsmoBSC/chapters/counters.adoc D OsmoBSC/chapters/counters_generated.adoc D OsmoBSC/chapters/handover.adoc D OsmoBSC/chapters/handover_inter_bsc.dot D OsmoBSC/chapters/handover_intra_bsc.dot D OsmoBSC/chapters/overview.adoc D OsmoBSC/chapters/running.adoc D OsmoBSC/message-sequences/mo_call-abis_a.msc D OsmoBSC/mgw/classic-bsc.msc D OsmoBSC/mgw/osmo-bsc-new-mgw-e1.msc D OsmoBSC/mgw/osmo-bsc-new-mgw.msc D OsmoBSC/mgw/osmo-bsc-old-sccplite.msc D OsmoBSC/om2000/README D OsmoBSC/om2000/om2k-bts.msc D OsmoBSC/om2000/om2k-mo-cf.msc D OsmoBSC/om2000/om2k-mo-is.msc D OsmoBSC/om2000/om2k-mo-rx.msc D OsmoBSC/om2000/om2k-mo-tf.msc D OsmoBSC/om2000/om2k-mo-trxc.msc D OsmoBSC/om2000/om2k-mo-ts.msc D OsmoBSC/om2000/om2k-mo-tx.msc D OsmoBSC/om2000/om2k-trx.msc D OsmoBSC/osmobsc-usermanual-docinfo.xml D OsmoBSC/osmobsc-usermanual.adoc D OsmoBSC/osmobsc-vty-reference.xml D OsmoBSC/osmux-reference-docinfo.xml D OsmoBSC/osmux-reference.adoc D OsmoBSC/vty/bsc_vty_additions.xml D OsmoBSC/vty/bsc_vty_reference.xml D OsmoBSC/vty/libbsc_vty_additions.xml M configure.ac 37 files changed, 0 insertions(+), 8,030 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve -- To view, visit https://gerrit.osmocom.org/11961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib7e60990b59eeb1c5904fdcbd0c01d4a1f46fec6 Gerrit-Change-Number: 11961 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:43 +0000 Subject: Change in osmo-gsm-manuals[master]: OsmoNITB: bsc_vty_additions.xml: replace symlink with copy In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11971 ) Change subject: OsmoNITB: bsc_vty_additions.xml: replace symlink with copy ...................................................................... OsmoNITB: bsc_vty_additions.xml: replace symlink with copy Replace the symlink that points to OsmoBSC/vty/bsc_vty_additions.xml with a copy of that file, so we can delete the OsmoBSC dir. Change-Id: Ifbffc90d56f0fa90d2da77dd7807cd0bb197c0d7 --- D OsmoNITB/vty/bsc_vty_additions.xml A OsmoNITB/vty/bsc_vty_additions.xml 2 files changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved diff --git a/OsmoNITB/vty/bsc_vty_additions.xml b/OsmoNITB/vty/bsc_vty_additions.xml deleted file mode 120000 index 5def5f1..0000000 --- a/OsmoNITB/vty/bsc_vty_additions.xml +++ /dev/null @@ -1 +0,0 @@ -../../OsmoBSC/vty/bsc_vty_additions.xml \ No newline at end of file diff --git a/OsmoNITB/vty/bsc_vty_additions.xml b/OsmoNITB/vty/bsc_vty_additions.xml new file mode 100644 index 0000000..f62f8b1 --- /dev/null +++ b/OsmoNITB/vty/bsc_vty_additions.xml @@ -0,0 +1,10 @@ + + + This node allows to configure the MSC connection related + settings. + + + This node allows to configure the BSC connection related + settings. + + -- To view, visit https://gerrit.osmocom.org/11971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifbffc90d56f0fa90d2da77dd7807cd0bb197c0d7 Gerrit-Change-Number: 11971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:57:46 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 13:57:46 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11976 Change subject: contrib/jenkins.sh: build manuals ...................................................................... contrib/jenkins.sh: build manuals Related: OS#3385 Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/76/11976/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 8dc0162..6160523 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -25,6 +25,7 @@ osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh osmo-gsm-manuals set +x echo @@ -36,7 +37,7 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror +./configure --enable-sanitize --enable-external-tests --enable-werror --enable-manuals $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh $MAKE distcheck || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 14:06:27 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 14:06:27 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build manuals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11976 to look at the new patch set (#2). Change subject: contrib/jenkins.sh: build manuals ...................................................................... contrib/jenkins.sh: build manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Related: OS#3385 Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 --- M contrib/jenkins.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/76/11976/2 -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed Nov 28 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 28 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#321?= Message-ID: <268610605.892.1543417807762.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed Nov 28 16:00:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 16:00:38 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: drop redundant assertation of stored msgb Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11977 Change subject: libmsc/gsm_09_11.c: drop redundant assertation of stored msgb ...................................................................... libmsc/gsm_09_11.c: drop redundant assertation of stored msgb It's already asserted at the beginning of handle_paging_event(). Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed --- M src/libmsc/gsm_09_11.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/11977/1 diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index b863ce8..63a1047 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -237,8 +237,6 @@ /* Send stored message */ ss_msg = transt->ss.msg; - OSMO_ASSERT(ss_msg); - gh = (struct gsm48_hdr *) msgb_push(ss_msg, sizeof(*gh)); gh->proto_discr = GSM48_PDISC_NC_SS; gh->proto_discr |= transt->transaction_id << 4; -- To view, visit https://gerrit.osmocom.org/11977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed Gerrit-Change-Number: 11977 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 16:16:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 16:16:37 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11978 Change subject: bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation ...................................................................... bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation It is moved prior to its user in the header file. Change-Id: I59f52401ba37b351ba3848e8e9ffb3b24c259496 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/11978/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 15158cd..4a8b7be 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -455,6 +455,18 @@ bsc_subscr_name(lchan && lchan->conn ? lchan->conn->bsub : NULL), \ ## args) +/* Iterate lchans that have an FSM allocated based based on explicit pchan kind + * (GSM_PCHAN_* constant). + * Remark: PDCH related lchans are not handled in BSC but in PCU, so trying to + * iterate through GSM_PCHAN_PDCH is considered a void loop. + */ +#define ts_as_pchan_for_each_lchan(lchan, ts, as_pchan) \ + for (lchan = (ts)->lchan; \ + ((lchan - (ts)->lchan) < ARRAY_SIZE((ts)->lchan)) \ + && lchan->fi \ + && lchan->nr < pchan_subslots(as_pchan); \ + lchan++) + /* usage: * struct gsm_lchan *lchan; * struct gsm_bts_trx_ts *ts = get_some_timeslot(); @@ -464,15 +476,6 @@ * Iterate only those lchans that have an FSM allocated. */ #define ts_for_each_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_is) -/* Same as ts_for_each_lchan() but with an explicit pchan kind (GSM_PCHAN_* constant). - * Iterate only those lchans that have an FSM allocated. */ -#define ts_as_pchan_for_each_lchan(lchan, ts, as_pchan) \ - for (lchan = (ts)->lchan; \ - ((lchan - (ts)->lchan) < ARRAY_SIZE((ts)->lchan)) \ - && lchan->fi \ - && lchan->nr < pchan_subslots(as_pchan); \ - lchan++) - enum lchan_activate_mode { FOR_NONE, FOR_MS_CHANNEL_REQUEST, -- To view, visit https://gerrit.osmocom.org/11978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I59f52401ba37b351ba3848e8e9ffb3b24c259496 Gerrit-Change-Number: 11978 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 16:16:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 16:16:37 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_for_each_lchan: Improve documentation Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11979 Change subject: bsc: ts_for_each_lchan: Improve documentation ...................................................................... bsc: ts_for_each_lchan: Improve documentation Change-Id: Id7c050087c14aae3f01c6d41d21cf861ff53621c --- M include/osmocom/bsc/gsm_data.h 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/11979/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4a8b7be..2f60e4d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -467,13 +467,15 @@ && lchan->nr < pchan_subslots(as_pchan); \ lchan++) -/* usage: +/* Iterate lchans that have an FSM allocated based on current PCHAN + * mode set in \ref ts. + * usage: * struct gsm_lchan *lchan; * struct gsm_bts_trx_ts *ts = get_some_timeslot(); * ts_for_each_lchan(lchan, ts) { * LOGPLCHAN(DMAIN, LOGL_DEBUG, "hello world\n"); * } - * Iterate only those lchans that have an FSM allocated. */ + */ #define ts_for_each_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_is) enum lchan_activate_mode { -- To view, visit https://gerrit.osmocom.org/11979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id7c050087c14aae3f01c6d41d21cf861ff53621c Gerrit-Change-Number: 11979 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 16:16:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 16:16:37 +0000 Subject: Change in osmo-bsc[master]: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11980 Change subject: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init ...................................................................... bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init It will be used further in follow-up patches. It also provides a place to document its (intrincate) logic around it and its possible uses. Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/timeslot_fsm.c 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/11980/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 2f60e4d..68b2289 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -478,6 +478,21 @@ */ #define ts_for_each_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_is) +/* Iterate over all possible lchans available that have an FSM allocated based + * on PCHAN \ref ts (dynamic) configuration. + * List of \ref lchan iterated through this loop is different than \ref + * ts_for_each_lchan only if \ref ts is configured as a dynamic timeslot. In + * this case, instead of using the currently set mode (among all + * possible in the dynamic group) the number of \ref lchan iterated is that of + * the channel mode in the dynamic mode group which supports the maximum amount + * of \ref lchan. + * This is useful in case dynamic timeslot \ref ts is in process of switching from + * configuration PDCH (no lchans) to TCH_F (1 lchan), where pchan_is is still + * set to PDCH but \ref ts may contain already an \ref lchan of type TCH_F which + * initiated the request to switch the \ts configuration. + */ +#define ts_for_each_lchan_slot(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_on_init) + enum lchan_activate_mode { FOR_NONE, FOR_MS_CHANNEL_REQUEST, diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 8351ff7..994d438 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -550,7 +550,7 @@ ts->pdch_act_allowed = true; /* For static TS, check validity. For dyn TS, figure out which PCHAN this should become. */ - ts_as_pchan_for_each_lchan(lchan, ts, ts->pchan_on_init) { + ts_for_each_lchan_slot(lchan, ts) { if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) continue; -- To view, visit https://gerrit.osmocom.org/11980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 Gerrit-Change-Number: 11980 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 16:16:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 16:16:38 +0000 Subject: Change in osmo-bsc[master]: bsc: timelost_fsm: Remove unneeded set of out variable on failure Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11981 Change subject: bsc: timelost_fsm: Remove unneeded set of out variable on failure ...................................................................... bsc: timelost_fsm: Remove unneeded set of out variable on failure Documentation of the function explicitly states that the out target_pchan param returns the "PCHAN waited for". If we return false, then no PCHAN is being waited for. The 2 callers of this function only use this out param if function returns true, so let's simplify the code. Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/11981/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 3ee2c5f..8bbb579 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -864,9 +864,6 @@ return true; } } - - if (target_pchan) - *target_pchan = ts->pchan_is; return false; } -- To view, visit https://gerrit.osmocom.org/11981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 Gerrit-Change-Number: 11981 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 16:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 16:23:06 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: drop redundant assertation of stored msgb In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11977 ) Change subject: libmsc/gsm_09_11.c: drop redundant assertation of stored msgb ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/11977/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11977/1//COMMIT_MSG at 7 PS1, Line 7: libmsc/gsm_09_11.c: drop redundant assertation of stored msgb assertion, right? -- To view, visit https://gerrit.osmocom.org/11977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed Gerrit-Change-Number: 11977 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 16:23:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 16:34:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 16:34:15 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_l... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11982 Change subject: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms ...................................................................... bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms If TS is in state changing from PDCH->TCH, the TCH lchan provoking the switch would be skipped and not terminated before this patch. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/11982/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 764c20c..25c6977 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -135,7 +135,7 @@ { struct gsm_lchan *lchan; - ts_for_each_lchan(lchan, ts) { + ts_for_each_lchan_slot(lchan, ts) { osmo_fsm_inst_term(lchan->fi, OSMO_FSM_TERM_REQUEST, NULL); } } -- To view, visit https://gerrit.osmocom.org/11982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 Gerrit-Change-Number: 11982 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 16:34:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 16:34:16 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix count in ts_lchans_waiting Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11983 Change subject: bsc: timeslot_fsm: Fix count in ts_lchans_waiting ...................................................................... bsc: timeslot_fsm: Fix count in ts_lchans_waiting Before this patch, TCH lchans waiting for dynamic TS to switch PDCH->TCH wouldn't be counted. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/11983/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 25c6977..e3327b7 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -144,7 +144,7 @@ { struct gsm_lchan *lchan; int count = 0; - ts_for_each_lchan(lchan, ts) + ts_for_each_lchan_slot(lchan, ts) if (lchan->fi->state == LCHAN_ST_WAIT_TS_READY) count++; return count; -- To view, visit https://gerrit.osmocom.org/11983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 Gerrit-Change-Number: 11983 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 17:01:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 17:01:18 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: drop redundant assertation of stored msgb In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11977 ) Change subject: libmsc/gsm_09_11.c: drop redundant assertation of stored msgb ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11977/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11977/1//COMMIT_MSG at 7 PS1, Line 7: libmsc/gsm_09_11.c: drop redundant assertation of stored msgb > assertion, right? Sure! Thanks! -- To view, visit https://gerrit.osmocom.org/11977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed Gerrit-Change-Number: 11977 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 28 Nov 2018 17:01:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 17:01:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 17:01:33 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: drop redundant assertion of stored msgb In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11977 to look at the new patch set (#2). Change subject: libmsc/gsm_09_11.c: drop redundant assertion of stored msgb ...................................................................... libmsc/gsm_09_11.c: drop redundant assertion of stored msgb It's already asserted at the beginning of handle_paging_event(). Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed --- M src/libmsc/gsm_09_11.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/11977/2 -- To view, visit https://gerrit.osmocom.org/11977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed Gerrit-Change-Number: 11977 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 17:05:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 17:05:20 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: drop redundant assertion of stored msgb In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11977 ) Change subject: libmsc/gsm_09_11.c: drop redundant assertion of stored msgb ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed Gerrit-Change-Number: 11977 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 28 Nov 2018 17:05:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 17:05:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 17:05:22 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: drop redundant assertion of stored msgb In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11977 ) Change subject: libmsc/gsm_09_11.c: drop redundant assertion of stored msgb ...................................................................... libmsc/gsm_09_11.c: drop redundant assertion of stored msgb It's already asserted at the beginning of handle_paging_event(). Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed --- M src/libmsc/gsm_09_11.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index b863ce8..63a1047 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -237,8 +237,6 @@ /* Send stored message */ ss_msg = transt->ss.msg; - OSMO_ASSERT(ss_msg); - gh = (struct gsm48_hdr *) msgb_push(ss_msg, sizeof(*gh)); gh->proto_discr = GSM48_PDISC_NC_SS; gh->proto_discr |= transt->transaction_id << 4; -- To view, visit https://gerrit.osmocom.org/11977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia558e11c6bde7bff130e4b76a4402ecc8068f1ed Gerrit-Change-Number: 11977 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 17:52:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 17:52:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11984 Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/11984/1 diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index f7902be..e32fa68 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -476,16 +476,16 @@ GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(imsi, sid, state, ss))); T.start; alt { - [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, exp_err_cause)) -> value ret { + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, exp_err_cause)) -> value ret { setverdict(pass); } - [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, ?)) -> value ret { setverdict(fail, "Unexpected PROC_SS ERROR Cause"); } [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, ?, ?)) -> value ret { setverdict(fail, "Unexpected PROC_SS.res for unknown IMSI"); } - [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, ?)) -> value ret { setverdict(fail, "Unexpected PROC_SS ERROR"); } [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, ?, ?)) -> value ret { @@ -511,7 +511,7 @@ } T.start; alt { - [] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + [] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, ?)) -> value ret { setverdict(fail, "Unexpected PROC_SS ERROR Cause"); } [not exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, omit)) -> value ret { diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 7680815..cadc6d8 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -692,24 +692,28 @@ template (value) GSUP_PDU ts_GSUP_PROC_SS_ERR( hexstring imsi, OCT4 sid, + GSUP_SessionState state, integer cause ) := ts_GSUP( OSMO_GSUP_MSGT_PROC_SS_ERROR, { valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_SessionState(state)), valueof(ts_GSUP_IE_Cause(cause)) } ); template GSUP_PDU tr_GSUP_PROC_SS_ERR( template hexstring imsi, template OCT4 sid := ?, + template GSUP_SessionState state := ?, template integer cause := ? ) := tr_GSUP( OSMO_GSUP_MSGT_PROC_SS_ERROR, { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_SessionState(state), tr_GSUP_IE_Cause(cause) } ); -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 17:52:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 17:52:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11985 Change subject: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout ...................................................................... MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout The idea of this test case is to verify SS session termination due to expiry of guard timeout. Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Depends-on: (OsmoMSC) Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Related: OS#3655 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/11985/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 2a6c034..ba1cafa 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2694,6 +2694,78 @@ vc_conn.done; } +/* LU followed by MO USSD request and MT Release due to timeout */ +private function f_tc_lu_and_ss_session_timeout(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + + /* Perform location update */ + f_perform_lu(); + + /* Send CM Service Request for SS/USSD */ + f_establish_fully(EST_TYPE_SS_ACT); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + var template OCTN facility_ms_req := f_USSD_FACILITY_IE_INVOKE( + invoke_id := 1, /* Initial request */ + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "#release_me"); + + /* Compose MO SS/REGISTER message with request */ + var template (value) PDU_ML3_MS_NW ussd_ms_req := ts_ML3_MO_SS_REGISTER( + tid := 1, /* We just need a single transaction */ + ti_flag := c_TIF_ORIG, /* Sent from the side that originates the TI */ + facility := valueof(facility_ms_req)); + + /* Compose expected MSC -> HLR message */ + var template GSUP_PDU gsup_ms_req := tr_GSUP_PROC_SS_REQ( + imsi := g_pars.imsi, + state := OSMO_GSUP_SESSION_STATE_BEGIN, + ss := valueof(facility_ms_req)); + + /* To be used for sending response with correct session ID */ + var GSUP_PDU gsup_ms_req_complete; + + /* Initiate a new SS transaction */ + BSSAP.send(ts_PDU_DTAP_MO(ussd_ms_req)); + /* Expect GSUP request with original Facility IE */ + gsup_ms_req_complete := f_expect_gsup_msg(gsup_ms_req); + + /* Don't respond, wait for timeout */ + f_sleep(3.0); + + var template PDU_ML3_NW_MS dtap_rel := tr_ML3_MT_SS_RELEASE_COMPLETE( + tid := 1, /* Should match the request's tid */ + ti_flag := c_TIF_REPL, /* Sent to the side that originates the TI */ + cause := *, /* TODO: expect some specific value */ + facility := omit); + + var template GSUP_PDU gsup_rel := tr_GSUP_PROC_SS_ERR( + imsi := g_pars.imsi, + sid := gsup_ms_req_complete.ies[1].val.session_id, + state := OSMO_GSUP_SESSION_STATE_END, + cause := ?); /* TODO: expect some specific value */ + + /* Expect release on both interfaces */ + interleave { + [] BSSAP.receive(tr_PDU_DTAP_MT(dtap_rel)) { }; + [] GSUP.receive(gsup_rel) { }; + } + + f_expect_clear(); + setverdict(pass); +} +testcase TC_lu_and_ss_session_timeout() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "msc", "ss-guard-timeout 3"); + vc_conn := f_start_handler(refers(f_tc_lu_and_ss_session_timeout), 51); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "ss-guard-timeout 0"); +} + /* TODO (SMS): * different user data lengths * SMPP transaction mode with unsuccessful delivery @@ -2780,6 +2852,7 @@ execute( TC_lu_and_mo_ussd_during_mt_call() ); execute( TC_lu_and_mt_ussd_during_mt_call() ); execute( TC_lu_and_mo_ussd_mo_release() ); + execute( TC_lu_and_ss_session_timeout() ); /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 8d9180f..4a9529e 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -68,6 +68,7 @@ + -- To view, visit https://gerrit.osmocom.org/11985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Gerrit-Change-Number: 11985 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 17:53:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 17:53:30 +0000 Subject: Change in osmo-gsm-tester[master]: Add and use compatible scenario when testing IPA dynts with nanoBTS Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11986 Change subject: Add and use compatible scenario when testing IPA dynts with nanoBTS ...................................................................... Add and use compatible scenario when testing IPA dynts with nanoBTS nanoBTS doesn't support SDCCH8 in TS!=1 according to osmo-bsc code. Let's use in this case TCH/H to make sure they are not used for the test (since we require osmo-bsc to use full rate codecs for the call). Change-Id: I37f3fe813d4074fbfe64ff3176048e7d25d470e2 --- M example/default-suites.conf A example/scenarios/mod-bts0-dynts67-ipa-compat-nanobts.conf 2 files changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/86/11986/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 07b8a5f..5ba36e1 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -106,7 +106,7 @@ - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-egprs - gprs:nanobts+band-1900+mod-bts0-dynts-ipa -- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa-compat-nanobts+cfg-codec-fr-any - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 @@ -121,7 +121,7 @@ - gprs:nanobts+band-900+mod-bts0-egprs - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:nanobts+band-900+mod-bts0-dynts67-ipa-compat-nanobts+cfg-codec-fr-any - nitb_smpp - smpp diff --git a/example/scenarios/mod-bts0-dynts67-ipa-compat-nanobts.conf b/example/scenarios/mod-bts0-dynts67-ipa-compat-nanobts.conf new file mode 100644 index 0000000..1eed05c --- /dev/null +++ b/example/scenarios/mod-bts0-dynts67-ipa-compat-nanobts.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' -- To view, visit https://gerrit.osmocom.org/11986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I37f3fe813d4074fbfe64ff3176048e7d25d470e2 Gerrit-Change-Number: 11986 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 17:57:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 17:57:04 +0000 Subject: Change in osmo-gsm-tester[master]: Add and use compatible scenario when testing IPA dynts with nanoBTS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11986 ) Change subject: Add and use compatible scenario when testing IPA dynts with nanoBTS ...................................................................... Patch Set 1: Still not useful because somehow it seems osmo-bsc prefers a TCH/H over a dyn TCH/F..... 20181128185013783 DAS <0012> fsm.c:299 assignment(conn3)[0x612000004a20]{WAIT_LCHAN_ACTIVE}: Allocated 20181128185013783 DAS <0012> fsm.c:329 assignment(conn3)[0x612000004a20]{WAIT_LCHAN_ACTIVE}: is child of SUBSCR_CONN(conn3)[0x612000004ea0] 20181128185013783 DRLL <0000> lchan_select.c:159 (bts=0) lchan_select_by_type(TCH_F) 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=0,pchan=CCCH+SDCCH4,state=IN_USE) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=1,pchan=SDCCH8,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=2,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=3,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=4,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=5,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=6,pchan_on_init=TCH/F_PDCH,pchan=PDCH,state=PDCH) is != TCH/F 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=7,pchan_on_init=TCH/F_PDCH,pchan=PDCH,state=PDCH) is != TCH/F 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/H: (bts=0,trx=0,ts=0,pchan=CCCH+SDCCH4,state=IN_USE) is != TCH/H 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/H: (bts=0,trx=0,ts=1,pchan=SDCCH8,state=UNUSED) is != TCH/H 20181128185013784 DRLL <0000> lchan_select.c:86 looking for lchan TCH/H: (bts=0,trx=0,ts=2,pchan=TCH/H,state=UNUSED) ss=0 is available 20181128185013784 DCHAN <0010> lchan_select.c:253 lchan(0-0-2-TCH_H-0)[0x6120000066a0]{UNUSED}: (type=TCH_H) Selected -- To view, visit https://gerrit.osmocom.org/11986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f3fe813d4074fbfe64ff3176048e7d25d470e2 Gerrit-Change-Number: 11986 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 17:57:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 18:10:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 18:10:03 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11987 Change subject: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested ...................................................................... bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested If BTS is configured to have only TCH/F_PDCH and TCH/H and a call is resolved to require TCH/F, don't return the TCH/H which have no use, but instead let it allocate the TCH/F_PDCH. Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 --- M src/osmo-bsc/lchan_select.c 1 file changed, 1 insertion(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11987/1 diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 742c7de..f70ad4a 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -182,13 +182,7 @@ break; case GSM_LCHAN_TCH_F: lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F); - /* If we don't have TCH/F available, fall-back to TCH/H */ - if (!lchan) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H); - if (lchan) - type = GSM_LCHAN_TCH_H; - } - /* If we don't have TCH/H either, try dynamic TCH/F_PDCH */ + /* If we don't have TCH/F available, try dynamic TCH/F_PDCH */ if (!lchan) { lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, GSM_PCHAN_TCH_F); @@ -206,14 +200,6 @@ if (lchan) type = GSM_LCHAN_TCH_F; } - /* ...and as TCH/H. */ - if (!lchan) { - lchan = _lc_dyn_find_bts(bts, - GSM_PCHAN_TCH_F_TCH_H_PDCH, - GSM_PCHAN_TCH_H); - if (lchan) - type = GSM_LCHAN_TCH_H; - } break; case GSM_LCHAN_TCH_H: lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H); @@ -257,4 +243,3 @@ return lchan; } - -- To view, visit https://gerrit.osmocom.org/11987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 Gerrit-Change-Number: 11987 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 18:10:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 18:10:22 +0000 Subject: Change in osmo-gsm-tester[master]: Add and use compatible scenario when testing IPA dynts with nanoBTS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11986 ) Change subject: Add and use compatible scenario when testing IPA dynts with nanoBTS ...................................................................... Patch Set 1: I submitted https://gerrit.osmocom.org/#/c/osmo-bsc/+/11987 to address the issue. -- To view, visit https://gerrit.osmocom.org/11986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f3fe813d4074fbfe64ff3176048e7d25d470e2 Gerrit-Change-Number: 11986 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 18:10:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 18:13:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 18:13:33 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/11987 ) Change subject: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested ...................................................................... bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested If BTS is configured to have only TCH/F_PDCH and TCH/H and a call is resolved to require TCH/F, don't return the TCH/H which have no use, but instead let it allocate the TCH/F_PDCH. 20181128185013783 DRLL <0000> lchan_select.c:159 (bts=0) lchan_select_by_type(TCH_F) 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=0,pchan=CCCH+SDCCH4,state=IN_USE) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=1,pchan=SDCCH8,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=2,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=3,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=4,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=5,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=6,pchan_on_init=TCH/F_PDCH,pchan=PDCH,state=PDCH) is != TCH/F 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=7,pchan_on_init=TCH/F_PDCH,pchan=PDCH,state=PDCH) is != TCH/F 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/H: (bts=0,trx=0,ts=0,pchan=CCCH+SDCCH4,state=IN_USE) is != TCH/H 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/H: (bts=0,trx=0,ts=1,pchan=SDCCH8,state=UNUSED) is != TCH/H 20181128185013784 DRLL <0000> lchan_select.c:86 looking for lchan TCH/H: (bts=0,trx=0,ts=2,pchan=TCH/H,state=UNUSED) ss=0 is available 20181128185013784 DCHAN <0010> lchan_select.c:253 lchan(0-0-2-TCH_H-0)[0x6120000066a0]{UNUSED}: (type=TCH_H) Selected Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 --- M src/osmo-bsc/lchan_select.c 1 file changed, 1 insertion(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/11987/2 -- To view, visit https://gerrit.osmocom.org/11987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 Gerrit-Change-Number: 11987 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 18:24:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 18:24:52 +0000 Subject: Change in osmo-gsm-tester[master]: Add and use compatible scenario when testing IPA dynts with nanoBTS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11986 ) Change subject: Add and use compatible scenario when testing IPA dynts with nanoBTS ...................................................................... Patch Set 1: After this patch and the other mentioned in prev comment are applied, I can run test in osmo-gsm-tester successfully: dynts:nanobts+band-1900+mod-bts0-dynts67-ipa-compat-nanobts+cfg-codec-fr-any -- To view, visit https://gerrit.osmocom.org/11986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f3fe813d4074fbfe64ff3176048e7d25d470e2 Gerrit-Change-Number: 11986 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 18:24:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 18:41:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 18:41:58 +0000 Subject: Change in libosmocore[master]: gsm0480: fix copy-pasted note for gsm0480_gen_return_error() Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11988 Change subject: gsm0480: fix copy-pasted note for gsm0480_gen_return_error() ...................................................................... gsm0480: fix copy-pasted note for gsm0480_gen_return_error() InvokeID is mandatory for ReturnError component. Change-Id: Ie1c7116d368c2029b9f524cb74ffa316e282ec83 --- M src/gsm/gsm0480.c 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/11988/1 diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 021db62..fab2087 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -847,9 +847,6 @@ * \param[in] invoke_id InvokeID of the request * \param[in] error_code Error code (section 4.5) * \return message buffer containing the Reject component - * - * Note: if InvokeID is not available, e.g. when message parsing failed, any incorrect vlue - * can be passed (0x00 > x > 0xff), so the universal NULL-tag (see table 3.6) will be used instead. */ struct msgb *gsm0480_gen_return_error(uint8_t invoke_id, uint8_t error_code) { -- To view, visit https://gerrit.osmocom.org/11988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1c7116d368c2029b9f524cb74ffa316e282ec83 Gerrit-Change-Number: 11988 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 18:53:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 18:53:16 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() helper Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11989 Change subject: gsupclient: add osmo_gsup_msg_enc_send() helper ...................................................................... gsupclient: add osmo_gsup_msg_enc_send() helper This change introduces a helper for encoding and sending GSUP messages using a given abstract 'osmo_gsup_message' structure. Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f --- M include/osmocom/gsupclient/gsup_client.h M src/gsupclient/gsup_client.c 2 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/89/11989/1 diff --git a/include/osmocom/gsupclient/gsup_client.h b/include/osmocom/gsupclient/gsup_client.h index 981751b..7a47f98 100644 --- a/include/osmocom/gsupclient/gsup_client.h +++ b/include/osmocom/gsupclient/gsup_client.h @@ -23,6 +23,7 @@ #include #include +#include /* a loss of GSUP between MSC and HLR is considered quite serious, let's try to recover as quickly as * possible. Even one new connection attempt per second should be quite acceptable until the link is @@ -61,5 +62,7 @@ void osmo_gsup_client_destroy(struct osmo_gsup_client *gsupc); int osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *msg); +int osmo_gsup_msg_enc_send(struct osmo_gsup_client *gsupc, + struct osmo_gsup_message *gsup_msg); struct msgb *osmo_gsup_client_msgb_alloc(void); diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index d34a22d..d54aa37 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -339,6 +339,41 @@ return 0; } +/* Helper for encoding and sending GSUP messages */ +int osmo_gsup_msg_enc_send(struct osmo_gsup_client *gsupc, + struct osmo_gsup_message *gsup_msg) +{ + struct msgb *gsup_msgb; + int rc; + + /* Allocate GSUP message buffer */ + gsup_msgb = osmo_gsup_client_msgb_alloc(); + if (!gsup_msgb) { + LOGP(DLGSUP, LOGL_ERROR, "Couldn't allocate GSUP message\n"); + return -ENOMEM; + } + + /* Encode GSUP message */ + rc = osmo_gsup_encode(gsup_msgb, gsup_msg); + if (rc) { + LOGP(DLGSUP, LOGL_ERROR, "Couldn't encode GSUP message\n"); + goto error; + } + + /* Finally send */ + rc = osmo_gsup_client_send(gsupc, gsup_msgb); + if (rc) { + LOGP(DLGSUP, LOGL_ERROR, "Couldn't send GSUP message\n"); + goto error; + } + + return 0; + +error: + talloc_free(gsup_msgb); + return rc; +} + struct msgb *osmo_gsup_client_msgb_alloc(void) { return msgb_alloc_headroom(4000, 64, __func__); -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 19:07:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 19:07:01 +0000 Subject: Change in libosmocore[master]: gsm0480: fix copy-pasted note for gsm0480_gen_return_error() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11988 ) Change subject: gsm0480: fix copy-pasted note for gsm0480_gen_return_error() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie1c7116d368c2029b9f524cb74ffa316e282ec83 Gerrit-Change-Number: 11988 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 28 Nov 2018 19:07:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 19:19:48 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 19:19:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11990 Change subject: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates ...................................................................... library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db --- M library/GSUP_Types.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/11990/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index cadc6d8..6329ebd 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -698,9 +698,9 @@ OSMO_GSUP_MSGT_PROC_SS_ERROR, { valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_Cause(cause)), valueof(ts_GSUP_IE_SessionId(sid)), - valueof(ts_GSUP_IE_SessionState(state)), - valueof(ts_GSUP_IE_Cause(cause)) + valueof(ts_GSUP_IE_SessionState(state)) } ); template GSUP_PDU tr_GSUP_PROC_SS_ERR( @@ -712,9 +712,9 @@ OSMO_GSUP_MSGT_PROC_SS_ERROR, { tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_Cause(cause), tr_GSUP_IE_SessionId(sid), - tr_GSUP_IE_SessionState(state), - tr_GSUP_IE_Cause(cause) + tr_GSUP_IE_SessionState(state) } ); -- To view, visit https://gerrit.osmocom.org/11990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db Gerrit-Change-Number: 11990 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 19:20:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 19:20:38 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11991 Change subject: libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE ...................................................................... libmsc/gsm_04_80.c: HACK: reimplement GSM 04.08 RELEASE COMPLETE The previous implementation of msc_send_ussd_release_complete() was based on libosmogsm's GSM 04.80 API, which doesn't allow to specify GSM 04.08 transaction identifier. Ideally, we need to deprecate the old GSM 04.80 API and introduce a proper implementation, but it would require much more efforts. So, let's avoid using the libosmogsm's API for now. Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 --- M include/osmocom/msc/gsm_04_80.h M src/libmsc/gsm_04_80.c M src/libmsc/msc_vty.c 3 files changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/91/11991/1 diff --git a/include/osmocom/msc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h index c448c91..b68655e 100644 --- a/include/osmocom/msc/gsm_04_80.h +++ b/include/osmocom/msc/gsm_04_80.h @@ -10,4 +10,5 @@ int msc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level, const char *text); -int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn); +int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn, + uint8_t transaction_id); diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index 81f2001..602d900 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -4,6 +4,7 @@ /* (C) 2008-2009 by Harald Welte * (C) 2008, 2009, 2010 by Holger Hans Peter Freyther * (C) 2009 by Mike Haben + * (C) 2018 by Vadim Yanitskiy * * All Rights Reserved * @@ -78,10 +79,21 @@ return msc_tx_dtap(conn, msg); } -int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn) +int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn, + uint8_t transaction_id) { - struct msgb *msg = gsm0480_create_ussd_release_complete(); + struct gsm48_hdr *gh; + struct msgb *msg; + + msg = gsm0480_msgb_alloc_name("TS 04.80 SS/USSD REL COMPL"); if (!msg) return -1; + + /* Push the L3 header */ + gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); + gh->proto_discr = GSM48_PDISC_NC_SS; + gh->proto_discr |= transaction_id << 4; + gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE; + return msc_tx_dtap(conn, msg); } diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index cdf3184..245a227 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1029,8 +1029,12 @@ return CMD_WARNING; } + /* NOTE: we don't allocate transaction here + * so we don't know GSM 04.08 transaction ID. + * NOTE: buggy libosmogsm's GSM 04.80 API + * hard-codes both TID and direction to 0. */ msc_send_ussd_notify(conn, level, text); - msc_send_ussd_release_complete(conn); + msc_send_ussd_release_complete(conn, 0); vlr_subscr_put(vsub); talloc_free(text); -- To view, visit https://gerrit.osmocom.org/11991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I89727354385b40e18732e8fd1d6c93f4463ade37 Gerrit-Change-Number: 11991 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 19:20:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 19:20:38 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for SS sessions Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/11992 Change subject: libmsc/gsm_09_11.c: implement guard timer for SS sessions ...................................................................... libmsc/gsm_09_11.c: implement guard timer for SS sessions It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or dropped message. In such cases, the corresponding transaction will remain unfreed forever. This change introduces a guard timer, that prevents keeping 'stalled' SS sessions forever. As soon as it expires, both sides (i.e. MS and ESME) are getting notified, and the transaction is being released. By default, the timer expires after 255 seconds. As soon as either the MS, or an ESME initiates any activity, the timer is being rescheduled. The timer can be configured from the VTY: msc ss-guard-timeout 255 or disabled by setting 0. Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Related Change-Id: (TTCN) I3e1791773d56617172ae27a46889a1ae4d400e2f Related: OS#3655 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_09_11.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c 5 files changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/11992/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 085248c..4e338c0 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -338,6 +338,8 @@ /* Global MNCC guard timer value */ int mncc_guard_timeout; + /* SS session guard timer value */ + int ss_guard_timeout; struct { struct mgcp_client_conf conf; diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index b7d7971..05fcba1 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -84,6 +84,8 @@ * a subscriber after successful Paging Response */ struct msgb *msg; + /* Time-out of inactivity when we will delete the session */ + struct osmo_timer_list timeout; } ss; }; diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index b863ce8..34c7248 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -52,6 +52,36 @@ /* FIXME: choose a proper range */ static uint32_t new_callref = 0x20000001; +/* SS/USSD session time-out handler */ +static void ss_session_timeout(void *_trans) +{ + struct gsm_trans *trans = (struct gsm_trans *) _trans; + struct osmo_gsup_message gsup_msg = { 0 }; + + LOGP(DMM, LOGL_NOTICE, "SS/USSD session (trans=%p, callref=%x) " + "timeout, destroying\n", trans, trans->callref); + + /* Release connection (if any) with subscriber */ + if (trans->conn != NULL) { + msc_send_ussd_release_complete(trans->conn, + trans->transaction_id); /* TODO: specify some cause! */ + } + + /* Notify EUSE (i.e. terminate GSUP session) + * FIXME: use a proper cause value */ + gsup_msg.message_type = OSMO_GSUP_MSGT_PROC_SS_ERROR; + OSMO_STRLCPY_ARRAY(gsup_msg.imsi, trans->vsub->imsi); + + gsup_msg.session_state = OSMO_GSUP_SESSION_STATE_END; + gsup_msg.session_id = trans->callref; + gsup_msg.cause = GMM_CAUSE_NET_FAIL; + + osmo_gsup_msg_enc_send(trans->net->vlr->gsup_client, &gsup_msg); + + /* Finally, release this transaction */ + trans_free(trans); +} + /* Entry point for call independent MO SS messages */ int gsm0911_rcv_nc_ss(struct gsm_subscriber_connection *conn, struct msgb *msg) { @@ -110,6 +140,9 @@ return -ENOMEM; } + /* Init self-destruction timer */ + osmo_timer_setup(&trans->ss.timeout, ss_session_timeout, trans); + /* Count active NC SS/USSD sessions */ osmo_counter_inc(conn->network->active_nc_ss); @@ -118,6 +151,12 @@ cm_service_request_concludes(conn, msg); } + /* (Re)schedule self-destruction timer */ + if (conn->network->ss_guard_timeout > 0) { + osmo_timer_schedule(&trans->ss.timeout, + conn->network->ss_guard_timeout, 0); + } + /* Attempt to extract Facility IE */ rc = gsm0480_extract_ie_by_tag(gh, msgb_l3len(msg), &facility_ie, &facility_ie_len, GSM0480_IE_FACILITY); @@ -235,6 +274,12 @@ transt->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS); transt->paging_request = NULL; + /* (Re)schedule self-destruction timer */ + if (conn->network->ss_guard_timeout > 0) { + osmo_timer_schedule(&transt->ss.timeout, + conn->network->ss_guard_timeout, 0); + } + /* Send stored message */ ss_msg = transt->ss.msg; OSMO_ASSERT(ss_msg); @@ -322,6 +367,9 @@ } trans->transaction_id = tid; + /* Init inactivity watchdog */ + osmo_timer_setup(&trans->ss.timeout, ss_session_timeout, trans); + /* Attempt to find connection */ conn = connection_for_subscr(vsub); if (conn) { @@ -375,6 +423,9 @@ if (trans->ss.msg != NULL) msgb_free(trans->ss.msg); + /* Stop self-destruction time-out */ + osmo_timer_del(&trans->ss.timeout); + /* One session less */ osmo_counter_dec(trans->net->active_nc_ss); } @@ -424,6 +475,12 @@ return 0; } + /* (Re)schedule self-destruction timer */ + if (net->ss_guard_timeout > 0) { + osmo_timer_schedule(&trans->ss.timeout, + net->ss_guard_timeout, 0); + } + /* Allocate and prepare a new MT message */ ss_msg = gsm48_msgb_alloc_name("GSM 04.08 SS/USSD"); gh = (struct gsm48_hdr *) msgb_push(ss_msg, sizeof(*gh)); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 245a227..c9abe1c 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -346,6 +346,16 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_ss_guard_timeout, + cfg_msc_ss_guard_timeout_cmd, + "ss-guard-timeout <0-255>", + "Set guard timer for SS/USSD session activity\n" + "guard timer value (sec.), or 0 to disable") +{ + gsmnet->ss_guard_timeout = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_msc_assign_tmsi, cfg_msc_assign_tmsi_cmd, "assign-tmsi", "Assign TMSI during Location Updating.\n") @@ -436,6 +446,8 @@ vty_out(vty, "msc%s", VTY_NEWLINE); vty_out(vty, " mncc-guard-timeout %i%s", gsmnet->mncc_guard_timeout, VTY_NEWLINE); + vty_out(vty, " ss-guard-timeout %i%s", + gsmnet->ss_guard_timeout, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->vlr->cfg.assign_tmsi? "" : "no ", VTY_NEWLINE); @@ -1448,6 +1460,7 @@ install_node(&msc_node, config_write_msc); install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd); + install_element(MSC_NODE, &cfg_msc_ss_guard_timeout_cmd); install_element(MSC_NODE, &cfg_msc_no_assign_tmsi_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_max_reuse_count_cmd); install_element(MSC_NODE, &cfg_msc_auth_tuple_reuse_on_error_cmd); diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index f2c84e6..bd9e96f 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -55,6 +55,7 @@ net->t3212 = 5; net->mncc_guard_timeout = 180; + net->ss_guard_timeout = 255; net->paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT; -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 19:20:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 19:20:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11985 ) Change subject: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Gerrit-Change-Number: 11985 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 28 Nov 2018 19:20:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 19:21:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 19:21:05 +0000 Subject: Change in osmo-hlr[master]: gsupclient: add osmo_gsup_msg_enc_send() helper In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11989 ) Change subject: gsupclient: add osmo_gsup_msg_enc_send() helper ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0589ff27933e9bca2bcf93b8259004935778db8f Gerrit-Change-Number: 11989 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Wed, 28 Nov 2018 19:21:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 19:36:15 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 19:36:15 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for SS sessions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11992 to look at the new patch set (#2). Change subject: libmsc/gsm_09_11.c: implement guard timer for SS sessions ...................................................................... libmsc/gsm_09_11.c: implement guard timer for SS sessions It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or dropped message. In such cases, the corresponding transaction will remain unfreed forever. This change introduces a guard timer, that prevents keeping 'stalled' SS sessions forever. As soon as it expires, both sides (i.e. MS and ESME) are getting notified, and the transaction is being released. By default, the timer expires after 255 seconds. As soon as either the MS, or an ESME initiates any activity, the timer is being rescheduled. The timer can be configured from the VTY: msc ss-guard-timeout 255 or disabled by setting 0. Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Depends Change-Id: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f Related Change-Id: (TTCN) I3e1791773d56617172ae27a46889a1ae4d400e2f Related: OS#3655 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_09_11.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c 5 files changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/11992/2 -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 20:31:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 20:31:14 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_rtp_fsm: Remove duplicate LCHAN_EV_RTP_RELEASED event Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11993 Change subject: bsc: lchan_rtp_fsm: Remove duplicate LCHAN_EV_RTP_RELEASED event ...................................................................... bsc: lchan_rtp_fsm: Remove duplicate LCHAN_EV_RTP_RELEASED event 20181128193707326 DAS <0012> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/assignment_fsm.c:127 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: (bts=0,trx=0,ts=6,ss=0) Assignment failed 20181128193707326 DAS <0012> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Terminating (cause = OSMO_FSM_TERM_ERROR) 20181128193707326 DAS <0012> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Removing from parent SUBSCR_CONN(conn4)[0x612000002920] 20181128193707326 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:1333 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Received Event LCHAN_RTP_EV_ROLLBACK 20181128193707326 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Terminating (cause = OSMO_FSM_TERM_REQUEST) 20181128193707326 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Removing from parent lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] 20181128193707326 DRSL <0003> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/mgw_endpoint_fsm.c:441 mgw-endpoint(conn4)[0x6120000021a0]{WAIT_MGW_RESPONSE}: (rtpbridge/*@mgw) CI[0] to-BTS: DLCX :0: notify=NULL 20181128193707326 DRSL <0003> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/mgw_endpoint_fsm.c:482 mgw-endpoint(conn4)[0x6120000021a0]{WAIT_MGW_RESPONSE}: (rtpbridge/*@mgw) CI[0] to-BTS: DLCX :0: Scheduling 20181128193707326 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:742 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707326 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Freeing instance 20181128193707327 DCHAN <0010> fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Deallocated 20181128193707327 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:193 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707330 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:1347 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: transition to state WAIT_RLL_RTP_RELEASED not permitted! 20181128193707330 DAS <0012> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Freeing instance 20181128193707330 DAS <0012> fsm.c:381 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Deallocated Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/11993/1 diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index aaba563..13b2c30 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -738,8 +738,6 @@ lchan->mgw_endpoint_ci_bts = NULL; } lchan->fi_rtp = NULL; - if (lchan->fi) - osmo_fsm_inst_dispatch(lchan->fi, LCHAN_EV_RTP_RELEASED, 0); } /* The mgw_endpoint was invalidated, just and simply forget the pointer without cleanup. */ -- To view, visit https://gerrit.osmocom.org/11993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 Gerrit-Change-Number: 11993 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 20:31:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 20:31:15 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RE... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11994 Change subject: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED ...................................................................... bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED 20181128193707326 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Freeing instance 20181128193707327 DCHAN <0010> fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Deallocated 20181128193707327 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:193 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707330 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:1347 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: transition to state WAIT_RLL_RTP_RELEASED not permitted! Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/11994/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5e99239..e557cf3 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1133,6 +1133,7 @@ .out_state_mask = 0 | S(LCHAN_ST_UNUSED) | S(LCHAN_ST_WAIT_ACTIV_ACK) + | S(LCHAN_ST_WAIT_RLL_RTP_RELEASED) , }, [LCHAN_ST_WAIT_ACTIV_ACK] = { -- To view, visit https://gerrit.osmocom.org/11994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 Gerrit-Change-Number: 11994 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 20:31:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 20:31:15 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Switch to error state before dispatching error eve... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11995 Change subject: bsc: timeslot_fsm: Switch to error state before dispatching error event to lchans ...................................................................... bsc: timeslot_fsm: Switch to error state before dispatching error event to lchans This way we receive tear down events such as TS_EV_CLHAN_UNUSED in a state prepared to handle them, as a result from dispatching LCHAN_EV_TS_ERROR previously. Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/11995/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index e3327b7..952df72 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -171,9 +171,10 @@ if (errmsg) LOG_TS(ts, LOGL_ERROR, "%s\n", errmsg); - ts_lchans_dispatch(ts, LCHAN_ST_WAIT_TS_READY, LCHAN_EV_TS_ERROR); if (fi->state != state_chg) osmo_fsm_inst_state_chg(fi, state_chg, 0, 0); + + ts_lchans_dispatch(ts, LCHAN_ST_WAIT_TS_READY, LCHAN_EV_TS_ERROR); } static void ts_fsm_err_ready_to_go_in_pdch(struct osmo_fsm_inst *fi, struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 20:31:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 28 Nov 2018 20:31:15 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Fix invalid duplicated transition Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11996 Change subject: bsc: lchan_fsm: Fix invalid duplicated transition ...................................................................... bsc: lchan_fsm: Fix invalid duplicated transition When we enter WAIT_RLL_RTP_RELEASED (lchan_fsm_wait_rll_rtp_released_onenter), we call lchan_do_release() which in turn dispatches LCHAN_RTP_EV_RELEASE to lchan_rtp_fsm.c, which will dispatch back an LCHAN_EV_RTP_RELEASED event, which will be handled by lchan_fsm_wait_rll_rtp_released(), which will change state to WAIT_BEFORE_RF_RELEASE. When going back the stack (return), we are still in lchan_fsm_wait_rll_rtp_released_onenter() which again triggers a change state to WAIT_BEFORE_RF_RELEASE because it checks same conditions than first one. 20181128203727051 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:1388 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{ESTABLISHED}: lchan detaches from conn SUBSCR_CONN(conn3)[0x612000002da0] 20181128203727051 DMSC <0007> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:1391 SUBSCR_CONN(conn3)[0x612000002da0]{CLEARING}: lchan lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] detaches from conn 20181128203727051 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:1359 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{ESTABLISHED}: state_chg to WAIT_RLL_RTP_RELEASED 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:959 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: (type=TCH_F) SAPI[0] = 1 20181128203727052 DRR <0002> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/gsm_04_08_rr.c:254 Sending Channel Release: Chan: Number: 0 Type: 2 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:945 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Received Event LCHAN_RTP_EV_RELEASE 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Removing from parent lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Freeing instance 20181128203727052 DCHAN <0010> fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Deallocated 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_rtp_fsm.c:572 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: Received Event LCHAN_EV_RTP_RELEASED 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:856 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: (type=TCH_F) Still active SAPIs: 0 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:1011 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: state_chg to WAIT_BEFORE_RF_RELEASE 20181128203727052 DRSL <0003> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/abis_rsl.c:633 (bts=0,trx=0,ts=6,ss=0) DEACTivate SACCH CMD 20181128203727052 DCHAN <0010> /home/pespin/dev/git/osmo-bsc/src/osmo-bsc/lchan_fsm.c:986 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_BEFORE_RF_RELEASE}: transition to state WAIT_BEFORE_RF_RELEASE not permitted! Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/11996/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e557cf3..c060435 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -958,6 +958,9 @@ if (lchan->sapis[sapi]) LOG_LCHAN(lchan, LOGL_DEBUG, "SAPI[%d] = %d\n", sapi, lchan->sapis[sapi]); + /* It could be that we receive LCHAN_EV_RTP_RELEASED synchronously and + as a result we may end up in state WAIT_BEFORE_RF_RELEASE after + lchan_do_release has returned */ lchan_do_release(lchan); sapis = 0; @@ -982,7 +985,7 @@ sapis = 0; } - if (!sapis && !lchan->fi_rtp) + if (!sapis && !lchan->fi_rtp && fi->state == LCHAN_ST_WAIT_RLL_RTP_RELEASED) lchan_fsm_state_chg(LCHAN_ST_WAIT_BEFORE_RF_RELEASE); } -- To view, visit https://gerrit.osmocom.org/11996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d Gerrit-Change-Number: 11996 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 21:22:38 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 28 Nov 2018 21:22:38 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11987 ) Change subject: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11987/2/src/osmo-bsc/lchan_select.c File src/osmo-bsc/lchan_select.c: https://gerrit.osmocom.org/#/c/11987/2/src/osmo-bsc/lchan_select.c at a260 PS2, Line 260: unrelated -- To view, visit https://gerrit.osmocom.org/11987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 Gerrit-Change-Number: 11987 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 28 Nov 2018 21:22:38 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 29 06:52:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 29 Nov 2018 06:52:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#204?= In-Reply-To: <198589099.889.1543387923010.JavaMail.jenkins@jenkins.osmocom.org> References: <198589099.889.1543387923010.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1361187826.904.1543474323161.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.05 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:42:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:42:33 +0000 Subject: Change in osmo-msc[master]: libmsc/transaction: introduce trans_find_by_sm_rp_mr() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11917 ) Change subject: libmsc/transaction: introduce trans_find_by_sm_rp_mr() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice47c37ecef4416e65ecee8931d946c915316791 Gerrit-Change-Number: 11917 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 08:42:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:45:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:45:45 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11978 ) Change subject: bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I59f52401ba37b351ba3848e8e9ffb3b24c259496 Gerrit-Change-Number: 11978 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 08:45:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:46:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:46:02 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_for_each_lchan: Improve documentation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11979 ) Change subject: bsc: ts_for_each_lchan: Improve documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id7c050087c14aae3f01c6d41d21cf861ff53621c Gerrit-Change-Number: 11979 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 08:46:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:46:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:46:18 +0000 Subject: Change in osmo-bsc[master]: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11980 ) Change subject: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 Gerrit-Change-Number: 11980 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 08:46:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:47:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:47:04 +0000 Subject: Change in osmo-bsc[master]: bsc: timelost_fsm: Remove unneeded set of out variable on failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11981 ) Change subject: bsc: timelost_fsm: Remove unneeded set of out variable on failure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 Gerrit-Change-Number: 11981 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 08:47:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:48:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:48:15 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix count in ts_lchans_waiting In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11983 ) Change subject: bsc: timeslot_fsm: Fix count in ts_lchans_waiting ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 Gerrit-Change-Number: 11983 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 08:48:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:48:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:48:21 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_l... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11982 ) Change subject: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 Gerrit-Change-Number: 11982 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 08:48:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:49:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:49:22 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RE... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11994 ) Change subject: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 Gerrit-Change-Number: 11994 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 08:49:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:50:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:50:06 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Switch to error state before dispatching error eve... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11995 ) Change subject: bsc: timeslot_fsm: Switch to error state before dispatching error event to lchans ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 08:50:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:50:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:50:43 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Fix invalid duplicated transition In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11996 ) Change subject: bsc: lchan_fsm: Fix invalid duplicated transition ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d Gerrit-Change-Number: 11996 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 08:50:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 08:51:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 08:51:40 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11987 ) Change subject: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 Gerrit-Change-Number: 11987 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 08:51:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 09:43:57 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 09:43:57 +0000 Subject: Change in osmo-gsm-tester[master]: doc/manuals: integrate into this repository Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11997 Change subject: doc/manuals: integrate into this repository ...................................................................... doc/manuals: integrate into this repository Update .gitignore and make the manuals build without a toplevel configure.ac file from autotools: $ cd doc/manuals $ make Related: OS#3385 Change-Id: I5916bc7e656b508fc74917e79841ce7e1ee4981b --- M .gitignore R doc/manuals/Makefile A doc/manuals/osmo-gsm-manuals-dir.sh 3 files changed, 39 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/11997/1 diff --git a/.gitignore b/.gitignore index a85b41a..47e9f86 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,14 @@ selftest/trial_test/ example/resources.conf ttcn3/resources.conf + +# manuals +doc/manuals/*.html +doc/manuals/*.svg +doc/manuals/*.pdf +doc/manuals/*__*.png +doc/manuals/*.check +doc/manuals/generated/ +doc/manuals/osmomsc-usermanual.xml +doc/manuals/common +doc/manuals/build diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile similarity index 60% rename from doc/manuals/Makefile.am rename to doc/manuals/Makefile index 4301ab9..0730411 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile @@ -1,7 +1,5 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmo-gsm-tester-manual.adoc \ - osmo-gsm-tester-manual-docinfo.xml \ - chapters +OSMO_GSM_MANUALS_DIR := $(shell ./osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) ASCIIDOC = osmo-gsm-tester-manual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/doc/manuals/osmo-gsm-manuals-dir.sh b/doc/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 0000000..f132eaa --- /dev/null +++ b/doc/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/11997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5916bc7e656b508fc74917e79841ce7e1ee4981b Gerrit-Change-Number: 11997 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 09:44:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 09:44:03 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11998 Change subject: doc/manuals: integrate into this repository ...................................................................... doc/manuals: integrate into this repository Update .gitignore and make the manuals build without a toplevel configure.ac file from autotools: $ cd doc/manuals $ make Related: OS#3385 Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 --- M .gitignore R doc/manuals/Makefile A doc/manuals/osmo-gsm-manuals-dir.sh 3 files changed, 38 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/98/11998/1 diff --git a/.gitignore b/.gitignore index 1a01c26..294aa84 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,13 @@ /.project /.settings/ +# manuals +doc/manuals/*.html +doc/manuals/*.svg +doc/manuals/*.pdf +doc/manuals/*__*.png +doc/manuals/*.check +doc/manuals/generated/ +doc/manuals/osmomsc-usermanual.xml +doc/manuals/common +doc/manuals/build diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile similarity index 61% rename from doc/manuals/Makefile.am rename to doc/manuals/Makefile index 61ccafa..603f4ba 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile @@ -1,7 +1,5 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmocombb-usermanual.adoc \ - osmocombb-usermanual-docinfo.xml \ - chapters +OSMO_GSM_MANUALS_DIR := $(shell ./osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) ASCIIDOC = osmocombb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/doc/manuals/osmo-gsm-manuals-dir.sh b/doc/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 0000000..f132eaa --- /dev/null +++ b/doc/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 09:44:12 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 09:44:12 +0000 Subject: Change in openbsc[master]: doc/manuals: integrate into this repository Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11999 Change subject: doc/manuals: integrate into this repository ...................................................................... doc/manuals: integrate into this repository Update .gitignore and make the manuals build without a toplevel configure.ac file from autotools: $ cd doc/manuals $ make Related: OS#3385 Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 --- M .gitignore R doc/manuals/Makefile A doc/manuals/osmo-gsm-manuals-dir.sh 3 files changed, 39 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/99/11999/1 diff --git a/.gitignore b/.gitignore index 89bf7df..0933d40 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,12 @@ debian/*.log + +# manuals +doc/manuals/*.html +doc/manuals/*.svg +doc/manuals/*.pdf +doc/manuals/*__*.png +doc/manuals/*.check +doc/manuals/generated/ +doc/manuals/osmomsc-usermanual.xml +doc/manuals/common +doc/manuals/build diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile similarity index 65% rename from doc/manuals/Makefile.am rename to doc/manuals/Makefile index 3735c5b..b7e2076 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile @@ -1,9 +1,5 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmonitb-usermanual.adoc \ - osmonitb-usermanual-docinfo.xml \ - osmonitb-vty-reference.xml \ - chapters \ - vty +OSMO_GSM_MANUALS_DIR := $(shell ./osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) ASCIIDOC = osmonitb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/doc/manuals/osmo-gsm-manuals-dir.sh b/doc/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 0000000..f132eaa --- /dev/null +++ b/doc/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/11999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 Gerrit-Change-Number: 11999 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 10:05:36 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 10:05:36 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoGSMTester files (now avail in osmo-gsm-tester.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12000 Change subject: remove OsmoGSMTester files (now avail in osmo-gsm-tester.git) ...................................................................... remove OsmoGSMTester files (now avail in osmo-gsm-tester.git) Files were added in osmo-gsm-tester.git Change-Id I8a34871948425ea40f40dbb11a59806905e4bed1 Depends: osmo-gsm-tester.git Change-Id I8a34871948425ea40f40dbb11a59806905e4bed1 Related: OS#3385 Change-Id: I89429a306d37e267fdb335d1c177c9ede3b64444 --- M Makefile.am D OsmoGSMTester/Makefile.am D OsmoGSMTester/chapters/config.adoc D OsmoGSMTester/chapters/debugging.adoc D OsmoGSMTester/chapters/install.adoc D OsmoGSMTester/chapters/intro.adoc D OsmoGSMTester/chapters/test_api.adoc D OsmoGSMTester/chapters/trial.adoc D OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml D OsmoGSMTester/osmo-gsm-tester-manual.adoc M configure.ac 11 files changed, 0 insertions(+), 1,543 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/00/12000/1 diff --git a/Makefile.am b/Makefile.am index fdafc0d..3552541 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) SUBDIRS = tests \ - OsmoGSMTester \ OsmoMGCP \ OsmoNAT \ OsmoNITB \ diff --git a/OsmoGSMTester/Makefile.am b/OsmoGSMTester/Makefile.am deleted file mode 100644 index 4301ab9..0000000 --- a/OsmoGSMTester/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmo-gsm-tester-manual.adoc \ - osmo-gsm-tester-manual-docinfo.xml \ - chapters - -ASCIIDOC = osmo-gsm-tester-manual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGSMTester/chapters/config.adoc b/OsmoGSMTester/chapters/config.adoc deleted file mode 100644 index 7e250e0..0000000 --- a/OsmoGSMTester/chapters/config.adoc +++ /dev/null @@ -1,361 +0,0 @@ -== Configuration - -[[config_paths]] -=== Config Paths - -The osmo-gsm-tester looks for configuration files in various standard -directories in this order: - -- '$HOME/.config/osmo-gsm-tester/' -- '/usr/local/etc/osmo-gsm-tester/' -- '/etc/osmo-gsm-tester/' - -The config location can also be set by an environment variable -'$OSMO_GSM_TESTER_CONF', which then overrides the above locations. - -The osmo-gsm-tester expects to find the following configuration files in a -configuration directory: - -- 'paths.conf' -- 'resources.conf' -- 'default-suites.conf' (optional) -- 'defaults.conf' (optional) - -These are described in detail in the following sections. - -=== Format: YAML, and its Drawbacks - -The general configuration format used is YAML. The stock python YAML parser -does have several drawbacks: too many complex possibilities and alternative -ways of formatting a configuration, but at the time of writing seems to be the -only widely used configuration format that offers a simple and human readable -formatting as well as nested structuring. It is recommended to use only the -exact YAML subset seen in this manual in case the osmo-gsm-tester should move -to a less bloated parser in the future. - -Careful: if a configuration item consists of digits and starts with a zero, you -need to quote it, or it may be interpreted as an octal notation integer! Please -avoid using the octal notation on purpose, it is not provided intentionally. - -[[paths_conf]] -=== 'paths.conf' - -The 'paths.conf' file defines where to store the global state (of reserved -resources) and where to find suite and scenario definitions. - -Any relative paths found in a 'paths.conf' file are interpreted as relative to -the directory of that 'paths.conf' file. - -Example: - ----- -state_dir: '/var/tmp/osmo-gsm-tester/state' -suites_dir: '/usr/local/src/osmo-gsm-tester/suites' -scenarios_dir: './scenarios' ----- - -[[state_dir]] -==== 'state_dir' - -It contains global or system-wide state for osmo-gsm-tester. In a typical state -dir you can find the following files: - -'last_used_msisdn.state':: - Contains last used msisdn number, which is automatically increased every - time osmo-gsm-tester needs to assign a new subscriber in a test. -'lock':: - Lock file used to implement a mutual exclusion zone around the - 'reserved_resources.state' file. -'reserved_resources.state':: - File containing a set of reserved resources by any number of - osmo-gsm-tester instances. Each osmo-gsm-tester instance is responsible - to clear its resources from the list once it is done using them and are - no longer reserved. - -If you would like to set up several separate configurations (not typical), note -that the 'state_dir' is used to reserve resources, which only works when all -configurations that share resources also use the same 'state_dir'. - -This way, several concurrent users of osmo-gsm-tester (ie. several -osmo-gsm-tester processes running in parallel) can run without interfering with -each other (e.g. using same ARFCN, same IP or same ofono modem path). - -[[suites_dir]] -==== 'suites_dir' - -Suites contain a set of tests which are designed to be run together to test a -set of features given a specific set of resources. As a result, resources are -allocated per suite and not per test. - -Tests for a given suite are located in the form of '.py' python scripts in the -same directory where the 'suite.conf' lays. - -[[scenarios_dir]] -==== 'scenarios_dir' - -This dir contains scenario configuration files. - -Scenarios define constraints to serve the resource requests of a 'suite.conf', -to select specific resources from the general resource pool specified in 'resources.conf'. - -All 'times' attributes are expanded before matching. For example, if a 'suite.conf' -requests two BTS, we may enforce that both BTS should be of type 'osmo-bts-sysmo' in -these ways: - ----- -resources: - bts: - - type: osmo-bts-sysmo - - type: osmo-bts-sysmo ----- - -or alternatively, - ----- -resources: - bts: - - times: 2 - type: osmo-bts-sysmo ----- - -If only one resource is specified in the scenario, then the resource allocator -assumes the restriction is to be applied to the first resource and that remaining -resources have no restrictions to be taken into consideration. - -To apply restrictions only on the second resource, the first element can be left -emtpy, like: - ----- -resources: - bts: - - {} - - type: osmo-bts-sysmo ----- - -On the 'osmo_gsm_tester.py' command line and the 'default_suites.conf', any number of -such scenario configurations can be combined in the form: - ----- -:[+[+...]] ----- - -e.g. - ----- -my_suite:sysmo+tch_f+amr ----- - -[[resources_conf]] -=== 'resources.conf' - -The 'resources.conf' file defines which hardware is connected to the main unit, -as well as which limited configuration items (like IP addresses or ARFCNs) -should be used. - -These resources are allocated dynamically and are not configured explicitly: - -- MSISDN: phone numbers are dealt out to test scripts in sequence on request. - -A 'resources.conf' is structured as a list of items for each resource type, -where each item has one or more settings -- for an example, see -<>. - -These kinds of resource are known: - -'ip_address':: - List of IP addresses to run osmo-nitb instances on. The main unit - typically has a limited number of such IP addresses configured, which - the connected BTS models can see on their network. - 'addr'::: - IPv4 address of the local interface. - -'bts':: - List of available BTS hardware. - 'label'::: - human readable label for your own reference - 'type'::: - which way to launch this BTS, one of - - 'osmo-bts-sysmo' - - 'osmo-bts-trx' - - 'osmo-bts-octphy' - - 'ipa-nanobts' - 'ipa_unit_id'::: - ip.access unit id to be used by the BTS, written into BTS and BSC config. - 'addr'::: - Remote IP address of the BTS for BTS like sysmoBTS, and local IP address - to bind to for locally run BTS such as osmo-bts-trx. - 'band'::: - GSM band that this BTS shoud use (*TODO*: allow multiple bands). One of: - - 'GSM-1800' - - 'GSM-1900' - - (*TODO*: more bands) - 'trx_list'::: - Specific TRX configurations for this BTS. There should be as many of - these as the BTS has TRXes. (*TODO*: a way to define >1 TRX without - special configuration for them.) - 'hw_addr':::: - Hardware (MAC) address of the TRX in the form of '11:22:33:44:55:66', - only used for osmo-bts-octphy. (*TODO*: and nanobts??) - 'net_device':::: - Local network device to reach the TRX's 'hw_addr' at, only used for - osmo-bts-octphy. Example: 'eth0'. - 'nominal_power':::: - Nominal power to be used by the TRX. - 'max_power_red':::: - Max power reduction to apply to the nominal power of the TRX. -'arfcn':: - List of ARFCNs to use for running BTSes, which defines the actual RF - frequency bands used. - 'arfcn'::: - ARFCN number, see e.g. - https://en.wikipedia.org/wiki/Absolute_radio-frequency_channel_number - (note that the resource type 'arfcn' contains an item trait also named - 'arfcn'). - 'band'::: - GSM band name to use this ARFCN for, same as for 'bts:band' above. - -'modem':: - List of modems reachable via ofono and information on the inserted SIM - card. (Note: the MSISDN is allocated dynamically in test scripts). - 'label'::: - Human readable label for your own reference, which also appears in logs. - 'path'::: - Ofono's path for this modem, like '/modemkind_99'. - 'imsi'::: - IMSI of the inserted SIM card, like '"123456789012345"'. - 'ki'::: - 16 byte authentication/encryption KI of the inserted SIM card, in - hexadecimal notation (32 characters) like + - '"00112233445566778899aabbccddeeff"'. - 'auth_algo'::: - Authentication algorithm to be used with the SIM card. One of: - - 'none' - - 'xor' - - 'comp128v1' - 'ciphers'::: - List of ciphers that this modem supports, used to match - requirements in suites or scenarios. Any combination of: - - 'a5_0' - - 'a5_1' - - 'a5_2' - - 'a5_3' - - 'a5_4' - - 'a5_5' - - 'a5_6' - - 'a5_7' - 'features'::: - List of features that this modem supports, used to match requirements in - suites or scenarios. Any combination of: - - 'sms' - - 'gprs' - - 'voice' - - 'ussd' - -Side note: at first sight it might make sense to the reader to rather structure -e.g. the 'ip_address' or 'arfcn' configuration as + -'"arfcn: GSM-1800: [512, 514, ...]"', + -but the more verbose format is chosen to stay consistent with the general -structure of resource configurations, which the resource allocation algorithm -uses to resolve required resources according to their traits. These -configurations look cumbersome because they exhibit only one trait / a trait -that is repeated numerous times. No special notation for these cases is -available (yet). - -[[default_suites]] -=== 'default-suites.conf' (optional) - -The 'default-suites.conf' file contains a list of 'suite:scenario+scenario+...' -combination strings as defined by the 'osmo-gsm-tester.py -s' commandline -option. If invoking the 'osmo-gsm-tester.py' without any suite definitions, the -'-s' arguments are taken from this file instead. Each of these suite + scenario -combinations is run in sequence. - -A suite name must match the name of a directory in the 'suites_dir' as defined -by 'paths.conf'. - -A scenario name must match the name of a configuration file in the -'scenarios_dir' as defined by 'paths.conf' (optionally without the '.conf' -suffix). - -For 'paths.conf', see <>. - -Example of a 'default-suites.conf' file: - ----- -- sms:sysmo -- voice:sysmo+tch_f -- voice:sysmo+tch_h -- voice:sysmo+dyn_ts -- sms:trx -- voice:trx+tch_f -- voice:trx+tch_h -- voice:trx+dyn_ts ----- - -=== 'defaults.conf' (optional) - -Each binary run by osmo-gsm-tester, e.g. 'osmo-nitb' or 'osmo-bts-sysmo', -typically has a configuration file template that is populated with values for a -trial run. - -Some of these values are provided by the 'resources.conf' from the allocated -resource(s), but not all values can be populated this way: some osmo-nitb -configuration values like the network name, encryption algorithm or timeslot -channel combinations are in fact not resources (only the nitb's interface -address is). These additional settings may be provided by the scenario -configurations, but in case the provided scenarios leave some values unset, -they are taken from this 'defaults.conf'. (A 'scenario.conf' or a -'resources.conf' providing a similar setting always has precedence over the -values given in a 'defaults.conf'). - -Example of a 'defaults.conf': - ----- -nitb: - net: - mcc: 901 - mnc: 70 - short_name: osmo-gsm-tester-nitb - long_name: osmo-gsm-tester-nitb - auth_policy: closed - encryption: a5_0 - -bsc: - net: - mcc: 901 - mnc: 70 - short_name: osmo-gsm-tester-msc - long_name: osmo-gsm-tester-msc - auth_policy: closed - encryption: a5_0 - authentication: optional - -msc: - net: - mcc: 901 - mnc: 70 - short_name: osmo-gsm-tester-msc - long_name: osmo-gsm-tester-msc - auth_policy: closed - encryption: a5_0 - authentication: optional - -bsc_bts: - location_area_code: 23 - base_station_id_code: 63 - stream_id: 255 - osmobsc_bts_type: sysmobts - trx_list: - - nominal_power: 23 - max_power_red: 0 - arfcn: 868 - timeslot_list: - - phys_chan_config: CCCH+SDCCH4 - - phys_chan_config: SDCCH8 - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH ----- diff --git a/OsmoGSMTester/chapters/debugging.adoc b/OsmoGSMTester/chapters/debugging.adoc deleted file mode 100644 index bea1e5c..0000000 --- a/OsmoGSMTester/chapters/debugging.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[debugging]] -== Debugging - -*TODO*: describe how to invoke 'ipdb3' and step into a suite's test script diff --git a/OsmoGSMTester/chapters/install.adoc b/OsmoGSMTester/chapters/install.adoc deleted file mode 100644 index d19f909..0000000 --- a/OsmoGSMTester/chapters/install.adoc +++ /dev/null @@ -1,664 +0,0 @@ -== Installation on Main Unit - -The main unit is a general purpose computer that orchestrates the tests. It -runs the core network components, controls the modems and so on. This can be -anything from a dedicated production rack unit to your laptop at home. - -This manual will assume that tests are run from a jenkins build slave, by a user -named 'jenkins' that belong to group 'osmo-gsm-tester'. The user configuration -for manual test runs and/or a different user name is identical, simply replace -the user name or group. - -=== Osmo-gsm-tester Dependencies - -On a Debian/Ubuntu based system, these commands install the packages needed to -run the osmo-gsm-tester.py code, i.e. install these on your main unit: - ----- -apt-get install \ - dbus \ - tcpdump \ - sqlite3 \ - python3 \ - python3-yaml \ - python3-mako \ - python3-gi \ - ofono \ - patchelf \ - sudo \ - libcap2-bin \ - python3-pip -pip3 install pydbus -pip3 install git+git://github.com/podshumok/python-smpplib.git ----- - -IMPORTANT: ofono may need to be installed from source to contain the most -recent fixes needed to operate your modems. This depends on the modem hardware -used and the tests run. Please see <>. - -To run osmo-bts-trx with a USRP attached, you may need to install a UHD driver. -Please refer to http://osmocom.org/projects/osmotrx/wiki/OsmoTRX#UHD for -details; the following is an example for the B200 family USRP devices: - ----- -apt-get install libuhd-dev uhd-host -/usr/lib/uhd/utils/uhd_images_downloader.py ----- - -[[jenkins_deps]] -==== Osmocom Build Dependencies - -Each of the jenkins builds requires individual dependencies. This is generally -the same as for building the software outside of osmo-gsm-tester and will not -be detailed here. For the Osmocom projects, refer to -http://osmocom.org/projects/cellular-infrastructure/wiki/Build_from_Source . Be -aware of specific requirements for BTS hardware: for example, the -osmo-bts-sysmo build needs the sysmoBTS SDK installed on the build slave, which -should match the installed sysmoBTS firmware. - - -[[configure_jenkins_slave]] -=== Jenkins Build and Run Slave - -==== Create 'jenkins' User on Main Unit - -On the main unit, create a jenkins user: - ----- -useradd -m jenkins ----- - -==== Install Java on Main Unit - -To be able to launch the Jenkins build slave, a Java RE must be available on -the main unit. For example: - ----- -apt-get install default-jdk ----- - -==== Allow SSH Access from Jenkins Master - -Create an SSH keypair to be used for login on the osmo-gsm-tester. This may be -entered on the jenkins web UI; alternatively, use the jenkins server's shell: - -Login on the main jenkins server shell and create an SSH keypair, for example: - ----- -# su jenkins -$ mkdir -p /usr/local/jenkins/keys -$ ssh-keygen -Generating public/private rsa key pair. -Enter file in which to save the key (/home/jenkins/.ssh/id_rsa): /usr/local/jenkins/keys/osmo-gsm-tester-rnd -Enter passphrase (empty for no passphrase): -Enter same passphrase again: -Your identification has been saved in /usr/local/jenkins/keys/osmo-gsm-tester-rnd -Your public key has been saved in /usr/local/jenkins/keys/osmo-gsm-tester-rnd.pub. -The key fingerprint is: -... ----- - -Copy the public key to the main unit, e.g. copy-paste: - ----- -cat /usr/local/jenkins/keys/osmo-gsm-tester-rnd.pub -# copy this public key ----- - -On the main unit: - ----- -mkdir ~jenkins/.ssh -cat > ~jenkins/.ssh/authorized_keys -# paste above public key and hit Ctrl-D -chown -R jenkins: ~jenkins/.ssh ----- - -Make sure that the user running the jenkins master accepts the main unit's host -identification. There must be an actual RSA host key available in the -known_hosts file for the jenkins master to be able to log in. Simply calling -ssh and accepting the host key as usual is not enough. Jenkins may continue to -say "Host key verification failed". - -To place an RSA host key in the jenkins' known_hosts file, you may do: - -On the Jenkins master: - ----- -main_unit_ip=10.9.8.7 -ssh-keyscan -H $main_unit_ip >> ~jenkins/.ssh/known_hosts -chown jenkins: ~jenkins/.ssh/known_hosts ----- - -Verify that the jenkins user on the Jenkins master has SSH access to the main -unit: - ----- -su jenkins -main_unit_ip=10.9.8.7 -ssh -i /usr/local/jenkins/keys/osmo-gsm-tester-rnd jenkins@$main_unit_ip -exit ----- - -[[install_add_jenkins_slave]] -==== Add Jenkins Slave - -In the jenkins web UI, add a new build slave for the osmo-gsm-tester: - -* 'Manage Jenkins' -** 'Manage Nodes' -*** 'New Node' -**** Enter a node name, e.g. "osmo-gsm-tester-1" + - (the "-1" is just some identification in case you'd like to add another - setup later). -**** 'Permanent Agent' - -Configure the node as: - -* '# of executors': 1 -* 'Remote root directory': "/home/jenkins" -* 'Labels': "osmo-gsm-tester" + - (This is a general label common to all osmo-gsm-tester build slaves you may set up in the future.) -* 'Usage': 'Only build jobs with label expressions matching this node' -* 'Launch method': 'Launch slave agents via SSH' -** 'Host': your main unit's IP address -** 'Credentials': choose 'Add' / 'Jenkins' -*** 'Domain': 'Global credentials (unrestricted)' -*** 'Kind': 'SSH Username with private key' -*** 'Scope': 'Global' -*** 'Username': "jenkins" + - (as created on the main unit above) -*** 'Private Key': 'From a file on Jenkins master' -**** 'File': "/usr/local/jenkins/keys/osmo-gsm-tester-rnd" -*** 'Passphrase': enter same passphrase as above -*** 'ID': "osmo-gsm-tester-1" -*** 'Name': "jenkins for SSH to osmo-gsm-tester-1" - -The build slave should be able to start now. - - -==== Add Build Jobs - -There are various jenkins-build-* scripts in osmo-gsm-tester/contrib/, which -can be called as jenkins build jobs to build and bundle binaries as artifacts, -to be run on the osmo-gsm-tester main unit and/or BTS hardware. - -Be aware of the dependencies, as hinted at in <>. - -While the various binaries could technically be built on the osmo-gsm-tester -main unit, it is recommended to use a separate build slave, to take load off -of the main unit. - -On your jenkins master, set up build jobs to call these scripts -- typically -one build job per script. Look in contrib/ and create one build job for each of -the BTS types you would like to test, as well as one for the 'build-osmo-nitb'. - -These are generic steps to configure a jenkins build -job for each of these build scripts, by example of the -jenkins-build-osmo-nitb.sh script; all that differs to the other scripts is the -"osmo-nitb" part: - -* 'Project name': "osmo-gsm-tester_build-osmo-nitb" + - (Replace 'osmo-nitb' according to which build script this is for) -* 'Discard old builds' + - Configure this to taste, for example: -** 'Max # of build to keep': "20" -* 'Restrict where this project can be run': Choose a build slave label that - matches the main unit's architecture and distribution, typically a Debian - system, e.g.: "linux_amd64_debian8" -* 'Source Code Management': -** 'Git' -*** 'Repository URL': "git://git.osmocom.org/osmo-gsm-tester" -*** 'Branch Specifier': "*/master" -*** 'Additional Behaviors' -**** 'Check out to a sub-directory': "osmo-gsm-tester" -* 'Build Triggers' + - The decision on when to build is complex. Here are some examples: -** Once per day: + - 'Build periodically': "H H * * *" -** For the Osmocom project, the purpose is to verify our software changes. - Hence we would like to test every time our code has changed: -*** We could add various git repositories to watch, and enable 'Poll SCM'. -*** On jenkins.osmocom.org, we have various jobs that build the master branches - of their respective git repositories when a new change was merged. Here, we - can thus trigger e.g. an osmo-nitb build for osmo-gsm-tester everytime the - master build has run: + - 'Build after other projects are built': "OpenBSC" -*** Note that most of the Osmocom projects also need to be re-tested when their - dependencies like libosmo* have changed. Triggering on all those changes - typically causes more jenkins runs than necessary: for example, it rebuilds - once per each dependency that has rebuilt due to one libosmocore change. - There is so far no trivial way known to avoid this. It is indeed safest to - rebuild more often. -* 'Build' -** 'Execute Shell' -+ ----- -#!/bin/sh -set -e -x -./osmo-gsm-tester/contrib/jenkins-build-osmo-nitb.sh ----- -+ -(Replace 'osmo-nitb' according to which build script this is for) - -* 'Post-build Actions' -** 'Archive the artifacts': "*.tgz, *.md5" + - (This step is important to be able to use the built binaries in the run job - below.) - - -TIP: When you've created one build job, it is convenient to create further -build jobs by copying the first and, e.g., simply replacing all "osmo-nitb" -with "osmo-bts-trx". - -==== Add Run Job - -This is the jenkins job that runs the tests on the GSM hardware: - -* It sources the artifacts from jenkins' build jobs. -* It runs on the osmo-gsm-tester main unit. - -Here is the configuration for the run job: - -* 'Project name': "osmo-gsm-tester_run" -* 'Discard old builds' + - Configure this to taste, for example: -** 'Max # of build to keep': "20" -* 'Restrict where this project can be run': "osmo-gsm-tester" + - (to match the 'Label' configured in <>). -* 'Source Code Management': -** 'Git' -*** 'Repository URL': "git://git.osmocom.org/osmo-gsm-tester" -*** 'Branch Specifier': "*/master" -*** 'Additional Behaviors' -**** 'Check out to a sub-directory': "osmo-gsm-tester" -**** 'Clean before checkout' -* 'Build Triggers' + - The decision on when to build is complex. For this run job, it is suggested - to rebuild: -** after each of above build jobs that produced new artifacts: + - 'Build after other projects are built': "osmo-gsm-tester_build-osmo-nitb, - osmo-gsm-tester_build-osmo-bts-sysmo, osmo-gsm-tester_build-osmo-bts-trx" + - (Add each build job name you configured above) -** as well as once per day: + - 'Build periodically': "H H * * *" -** and, in addition, whenever the osmo-gsm-tester scripts have been modified: + - 'Poll SCM': "H/5 * * * *" + - (i.e. look every five minutes whether the upstream git has changed) -* 'Build' -** Copy artifacts from each build job you have set up: -*** 'Copy artifacts from another project' -**** 'Project name': "osmo-gsm-tester_build-osmo-nitb" -**** 'Which build': 'Latest successful build' -**** enable 'Stable build only' -**** 'Artifacts to copy': "*.tgz, *.md5" -*** Add a separate similar 'Copy artifacts...' section for each build job you - have set up. -** 'Execute Shell' -+ ----- -#!/bin/sh -set -e -x - -# debug: provoke a failure -#export OSMO_GSM_TESTER_OPTS="-s debug -t fail" - -PATH="$PWD/osmo-gsm-tester/src:$PATH" \ - ./osmo-gsm-tester/contrib/jenkins-run.sh ----- -+ -Details: - -*** The 'jenkins-run.sh' script assumes to find the 'osmo-gsm-tester.py' in the - '$PATH'. To use the most recent osmo-gsm-tester code here, we direct - '$PATH' to the actual workspace checkout. This could also run from a sytem - wide install, in which case you could omit the explicit PATH to - "$PWD/osmo-gsm-tester/src". -*** This assumes that there are configuration files for osmo-gsm-tester placed - on the system (see <>). -*** If you'd like to check the behavior of test failures, you can uncomment the - line below "# debug" to produce a build failure on every run. Note that - this test typically produces a quite empty run result, since it launches no - NITB nor BTS. -* 'Post-build Actions' -** 'Archive the artifacts' -*** 'Files to archive': "*-run.tgz, *-bin.tgz" + - This stores the complete test report with config files, logs, stdout/stderr - output, pcaps as well as the binaries used for the test run in artifacts. - This allows analysis of older builds, instead of only the most recent build - (which cleans up the jenkins workspace every time). The 'trial-N-run.tgz' - and 'trial-N-bin.tgz' archives are produced by the 'jenkins-run.sh' script, - both for successful and failing runs. - -=== Install osmo-gsm-tester on Main Unit - -This assumes you have already created the jenkins user (see <>). - -==== User Permissions - -On the main unit, create a group for all users that should be allowed to use -the osmo-gsm-tester, and add users (here 'jenkins') to this group. - ----- -groupadd osmo-gsm-tester -gpasswd -a jenkins osmo-gsm-tester ----- - -NOTE: you may also need to add users to the 'usrp' group, see -<>. - -A user added to a group needs to re-login for the group permissions to take -effect. - -This group needs the following permissions: - -===== Paths - -Assuming that you are using the example config, prepare a system wide state -location in '/var/tmp': - ----- -mkdir -p /var/tmp/osmo-gsm-tester/state -chown -R :osmo-gsm-tester /var/tmp/osmo-gsm-tester -chmod -R g+rwxs /var/tmp/osmo-gsm-tester -setfacl -d -m group:osmo-gsm-tester:rwx /var/tmp/osmo-gsm-tester/state ----- - -IMPORTANT: the state directory needs to be shared between all users potentially -running the osmo-gsm-tester to resolve resource allocations. Above 'setfacl' -command sets the access control to keep all created files group writable. - -With the jenkins build as described here, the trials will live in the build -slave's workspace. Other modes of operation (a daemon scheduling concurrent -runs, *TODO*) may use a system wide directory to manage trials to run: - ----- -mkdir -p /var/tmp/osmo-gsm-tester/trials -chown -R :osmo-gsm-tester /var/tmp/osmo-gsm-tester -chmod -R g+rwxs /var/tmp/osmo-gsm-tester ----- - -===== Allow DBus Access to ofono - -Put a DBus configuration file in place that allows the 'osmo-gsm-tester' group -to access the org.ofono DBus path: - ----- -cat > /etc/dbus-1/system.d/osmo-gsm-tester.conf < - - - - - - - - - -END ----- - -(No restart of dbus nor ofono necessary.) - -[[install_capture_packets]] -===== Capture Packets - -In order to allow collecting pcap traces of the network communication for later -reference, allow the osmo-gsm-tester group to capture packets using the 'tcpdump' -program: - ----- -chgrp osmo-gsm-tester /usr/sbin/tcpdump -chmod 750 /usr/sbin/tcpdump -setcap cap_net_raw,cap_net_admin=eip /usr/sbin/tcpdump ----- - -Put 'tcpdump' in the '$PATH' -- assuming that 'tcpdump' is available for root: - ----- -ln -s `which tcpdump` /usr/local/bin/tcpdump ----- - -TIP: Why a symlink in '/usr/local/bin'? On Debian, 'tcpdump' lives in -'/usr/sbin', which is not part of the '$PATH' for non-root users. To avoid -hardcoding non-portable paths in the osmo-gsm-tester source, 'tcpdump' must be -available in the '$PATH'. There are various trivial ways to modify '$PATH' for -login shells, but the jenkins build slave typically runs in a *non-login* -shell; modifying non-login shell enviroments is not trivially possible without -also interfering with files installed from debian packages. Probably the -easiest way to allow all users and all shells to find the 'tcpdump' binary is -to actually place a symbolic link in a directory that is already part of the -non-login shell's '$PATH'. Above example places such in '/usr/local/bin'. - -Verify that a non-login shell can find 'tcpdump': - ----- -su jenkins -c 'which tcpdump' -# should print: "/usr/local/bin/tcpdump" ----- - -WARNING: When logged in via SSH on your main unit, running 'tcpdump' to capture -packets may result in a feedback loop: SSH activity to send tcpdump's output to -your terminal is in turn is picked up in the tcpdump trace, and so forth. When -testing 'tcpdump' access, make sure to have proper filter expressions in place. - -===== Allow Core Files - -In case a binary run for the test crashes, a core file of the crash should be -written. This requires a limit rule. Create a file with the required rule: - ----- -sudo -s -echo "@osmo-gsm-tester - core unlimited" > /etc/security/limits.d/osmo-gsm-tester_allow-core.conf ----- - -Re-login the user to make these changes take effect. - -Set the *kernel.core_pattern* sysctl to *core* (usually the default). For each -binary run by osmo-gsm-tester, a core file will then appear in the same dir that -contains stdout and stderr for that process (because this dir is set as CWD). - ----- -sysctl -w kernel.core_pattern=core ----- - -===== Allow Realtime Priority - -Certain binaries should be run with real-time priority, like 'osmo-bts-trx'. -Add this permission on the main unit: - ----- -sudo -s -echo "@osmo-gsm-tester - rtprio 99" > /etc/security/limits.d/osmo-gsm-tester_allow-rtprio.conf ----- - -Re-login the user to make these changes take effect. - -[[user_config_uhd]] -===== UHD - -Grant permission to use the UHD driver to run USRP devices for osmo-bts-trx, by -adding the jenkins user to the 'usrp' group: - ----- -gpasswd -a jenkins usrp ----- - -===== Allow CAP_NET_RAW capability - -Certain binaries require 'CAP_NET_RAW' to be set, like 'osmo-bts-octphy' as it -uses a 'AF_PACKET' socket. - -To be able to set the following capability without being root, osmo-gsm-tester -uses sudo to gain permissions to set the capability. - -This is the script that osmo-gsm-tester expects on the main unit: - ----- -echo /usr/local/bin/osmo-gsm-tester_setcap_net_raw.sh < /etc/sudoers.d/osmo-gsm-tester_setcap_net_raw -chmod 0440 /etc/sudoers.d/osmo-gsm-tester_setcap_net_raw ----- - -The script file name 'osmo-gsm-tester_setcap_net_raw.sh' is important, as -osmo-gsm-tester expects to find a script with this name in '$PATH' at run time. - - -==== Log Rotation - -To avoid clogging up /var/log, it makes sense to choose a sane maximum log size: - ----- -echo maxsize 10M > /etc/logrotate.d/maxsize ----- - -==== Install Scripts - -IMPORTANT: When using the jenkins build slave as configured above, *there is no -need to install the osmo-gsm-tester sources on the main unit*. The jenkins job -will do so implicitly by checking out the latest osmo-gsm-tester sources in the -workspace for every run. If you're using only the jenkins build slave, you may -skip this section. - -If you prefer to use a fixed installation of the osmo-gsm-tester sources -instead of the jenkins workspace, you can: - -. From the run job configured above, remove the line that says -+ ----- -PATH="$PWD/osmo-gsm-tester/src:$PATH" \ ----- -+ -so that this uses a system wide installation instead. - -. Install the sources e.g. in '/usr/local/src' as indicated below. - -On the main unit, to install the latest in '/usr/local/src': - ----- -apt-get install git -mkdir -p /usr/local/src -cd /usr/local/src -git clone git://git.osmocom.org/osmo-gsm-tester ----- - -To allow all users to run 'osmo-gsm-tester.py', from login as well as non-login -shells, the easiest solution is to place a symlink in '/usr/local/bin': - ----- -ln -s /usr/local/src/osmo-gsm-tester/src/osmo-gsm-tester.py /usr/local/bin/ ----- - -(See also the tip in <> for a more detailed -explanation.) - -The example configuration provided in the source is suitable for running as-is, -*if* your hardware setup matches (you could technically use that directly by a -symlink e.g. from '/usr/local/etc/osmo-gsm-tester' to the 'example' dir). If in -doubt, rather copy the example, point 'paths.conf' at the 'suites' dir, and -adjust your own configuration as needed. For example: - ----- -cd /etc -cp -R /usr/local/src/osmo-gsm-tester/example osmo-gsm-tester -sed -i 's#\.\./suites#/usr/local/src/osmo-gsm-tester/suites#' osmo-gsm-tester/paths.conf ----- - -NOTE: The configuration will be looked up in various places, see -<>. - - -== Hardware Choice and Configuration - -=== SysmoBTS - -To use the SysmoBTS in the osmo-gsm-tester, the following systemd services must -be disabled: - ----- -systemctl mask osmo-nitb osmo-bts-sysmo osmo-pcu sysmobts-mgr ----- - -This stops the stock setup keeping the BTS in operation and hence allows the -osmo-gsm-tester to install and launch its own versions of the SysmoBTS -software. - -==== IP Address - -To ensure that the SysmoBTS is always reachable at a fixed known IP address, -configure the eth0 to use a static IP address: - -Adjust '/etc/network/interfaces' and replace the line - ----- -iface eth0 inet dhcp ----- - -with - ----- -iface eth0 inet static - address 10.42.42.114 - netmask 255.255.255.0 - gateway 10.42.42.1 ----- - -You may set the name server in '/etc/resolve.conf' (most likely to the IP of -the gateway), but this is not really needed by the osmo-gsm-tester. - -==== Allow Core Files - -In case a binary run for the test crashes, a core file of the crash should be -written. This requires a limits rule. Append a line to /etc/limits like: - ----- -ssh root at 10.42.42.114 -echo "* C16384" >> /etc/limits ----- - -==== Reboot - -Reboot the BTS and make sure that the IP address for eth0 is now indeed -10.42.42.114, and that no osmo* programs are running. - ----- -ip a -ps w | grep osmo ----- - -==== SSH Access - -Make sure that the jenkins user on the main unit is able to login on the -sysmoBTS, possibly erasing outdated host keys after a new rootfs was loaded: - -On the main unit, for example do: - ----- -su - jenkins -ssh root at 10.42.42.114 ----- - -Fix any problems until you get a login on the sysmoBTS. - - -[[hardware_modems]] -=== Modems - -TODO: describe modem choices and how to run ofono - -[[hardware_trx]] -=== osmo-bts-trx - -TODO: describe B200 family diff --git a/OsmoGSMTester/chapters/intro.adoc b/OsmoGSMTester/chapters/intro.adoc deleted file mode 100644 index 14daba4..0000000 --- a/OsmoGSMTester/chapters/intro.adoc +++ /dev/null @@ -1,400 +0,0 @@ -== Introduction with Examples - -The osmo-gsm-tester is software to run automated tests of real GSM hardware, -foremost to verify that ongoing Osmocom software development continues to work -with various BTS models, while being flexibly configurable and extendable. - -A 'main unit' (general purpose computer) is connected via ethernet and/or USB to -any number of BTS models and to any number of GSM modems via USB. The modems -and BTS instances' RF transceivers are typically wired directly to each other -via RF distribution chambers to bypass the air medium and avoid disturbing real -production cellular networks. Furthermore, the setup may include adjustable RF -attenuators to model various distances between modems and base stations. - -The osmo-gsm-tester software runs on the main unit to orchestrate the various -GSM hardware and run predefined test scripts. It typically receives binary -packages from a jenkins build service. It then automatically configures and -launches an Osmocom core network on the main unit and sets up and runs BTS -models as well as modems to form a complete ad-hoc GSM network. On this setup, -predefined test suites, combined with various scenario definitions, are run to -verify stability of the system. - -The osmo-gsm-tester is implemented in Python (version 3). It uses the ofono -daemon to control the modems connected via USB. BTS software is either run -directly on the main unit (e.g. for osmo-bts-trx, osmo-bts-octphy), run via SSH -(e.g. for a sysmoBTS) or assumed to run on a connected BTS model (e.g. for -ip.access nanoBTS). - -.Typical osmo-gsm-tester setup -[graphviz] ----- -digraph G { - rankdir=LR; - jenkins - subgraph cluster_gsm_hardware { - label = "GSM Hardware"; - style=dotted - - modem0 [shape=box label="Modems..."] - modem1 [shape=box label="Modems..."] - osmo_bts_sysmo [label="sysmocom sysmoBTS\nrunning osmo-bts-sysmo" shape=box] - B200 [label="Ettus B200" shape=box] - sysmoCell5K [label="sysmocom sysmoCell5000" shape=box] - octphy [label="Octasic octphy BTS" shape=box] - nanoBTS [label="ip.access nanoBTS" shape=box] - rf_distribution [label="RF distribution"] - - {modem0 modem1 osmo_bts_sysmo B200 octphy nanoBTS sysmoCell5K}->rf_distribution [dir=both arrowhead="curve" arrowtail="curve"] - } - subgraph cluster_main_unit { - label = "Main Unit" - osmo_gsm_tester [label="Osmo-GSM-Tester\ntest suites\n& scenarios"] - subgraph { - rank=same - ofono [label="ofono daemon"] - osmo_trx [label="osmo-trx"] - osmo_bts_trx [label="osmo-bts-trx"] - osmo_bts_octphy [label="osmo-bts-octphy"] - OsmoNITB [label="BSC + Core Network\n(Osmo{NITB,MSC,BSC,HLR,...})"] - } - } - - - jenkins->osmo_gsm_tester [label="trial\n(binaries)"] - osmo_gsm_tester->jenkins [label="results"] - ofono->{modem0 modem1} [label="USB"] - osmo_gsm_tester->{OsmoNITB osmo_bts_trx osmo_bts_octphy} - osmo_gsm_tester->osmo_bts_sysmo [taillabel="SSH"] - osmo_gsm_tester->ofono [taillabel="DBus"] - osmo_trx->B200 [label="USB"] - osmo_bts_trx->{osmo_trx sysmoCell5K} [dir=both label="UDP"] - osmo_bts_octphy->octphy [label="raw eth"] - {osmo_bts_sysmo nanoBTS}->OsmoNITB [label="IP"] - {B200 octphy}->OsmoNITB [label="eth" style=invis] - {osmo_bts_trx osmo_bts_octphy}->OsmoNITB -} ----- - -.Example of how to select resources and configurations: scenarios may pick specific resources (here BTS and ARFCN), remaining requirements are picked as available (here two modems and a NITB interface) -[graphviz] ----- -digraph G { - rankdir=TB; - - suite_scenarios [label="Suite+Scenarios selection\nsms:sysmo+band1800"] - - subgraph { - rank=same; - suite - scenarios - } - - subgraph cluster_scenarios { - label = "Scenarios"; - u_sysmoBTS [label="Scenario: sysmo\nbts: type: osmo-bts-sysmo"] - u_trx [label="Scenario: trx\nbts: type: osmo-bts-trx"] - u_arfcn [label="Scenario: band1800\narfcn: band: GSM-1800"] - } - - subgraph cluster_suite { - label = "Suite: sms"; - requires [label="Requirements (suite.conf):\nmodem: times: 2\nbts\nip_address\narfcn"] - subgraph cluster_tests { - label = "Test Scripts (py)"; - mo_mt_sms - etc - } - } - - subgraph cluster_resources { - label = "Resources"; - rankdir=TB; - nitb_addr1 [label="NITB interface addr\n10.42.42.1"] - nitb_addr2 [label="NITB interface addr\n10.42.42.2"] - Modem0 - Modem1 - Modem2 - sysmoBTS [label="osmo-bts-sysmo"] - osmo_bts_trx [label="osmo-bts-trx"] - arfcn1 [label="arfcn: 512\nband: GSM-1800"] - arfcn2 [label="arfcn: 540\nband: GSM-1900"] - - arfcn1->arfcn2 [style=invis] - nitb_addr1->nitb_addr2 [style=invis] - Modem0 -> Modem1 -> Modem2 [style=invis] - sysmoBTS -> osmo_bts_trx [style=invis] - } - - suite_scenarios -> {suite scenarios} - scenarios -> { u_arfcn u_sysmoBTS } - - suite -> requires - requires -> Modem0 - requires -> Modem1 - requires -> sysmoBTS - requires -> arfcn1 - requires -> nitb_addr1 - - { u_sysmoBTS u_arfcn } -> requires [label="influences\nresource\nselection"] -} ----- - -.Example of a "trial" containing binaries built by a jenkins -[graphviz] ----- -digraph G { - subgraph cluster_trial { - label = "Trial (binaries)" - sysmo [label="osmo-bts-sysmo.build-23.tgz\n(osmo-bts-sysmo\n+ deps\ncompiled for sysmoBTS)"] - trx [label="osmo-bts.build-5.tgz\n(osmo-bts-octphy + osmo-bts-trx\n+ deps\ncompiled for main unit)"] - nitb [label="osmo-nitb.build-42.tgz\n(osmo-nitb\n+ deps\ncompiled for main unit)"] - checksums [label="checksums.md5"] - - checksums -> {sysmo trx nitb} - } -} ----- - -=== Typical Test Script - -A typical single test script (part of a suite) may look like this: - ----- -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -hlr = suite.hlr() -bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) -msc = suite.msc(hlr, mgcpgw) -bsc = suite.bsc(msc) -stp = suite.stp() -ms_mo = suite.modem() -ms_mt = suite.modem() - -hlr.start() -stp.start() -msc.start() -mgcpgw.start() - -bsc.bts_add(bts) -bsc.start() - -bts.start() - -hlr.subscriber_add(ms_mo) -hlr.subscriber_add(ms_mt) - -ms_mo.connect(msc.mcc_mnc()) -ms_mt.connect(msc.mcc_mnc()) - -ms_mo.log_info() -ms_mt.log_info() - -print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms_mo, ms_mt) - -sms = ms_mo.sms_send(ms_mt) -wait(ms_mt.sms_was_received, sms) ----- - -=== Resource Resolution - -- A global configuration 'resources.conf' defines which hardware is connected to the - osmo-gsm-tester main unit. -- Each suite contains a number of test scripts. The amount of resources a test - may use is defined by the test suite's 'suite.conf'. -- Which specific modems, BTS models, NITB IP addresses etc. are made available - to a test run is typically determined by 'suite.conf' and a combination of scenario - configurations -- or picked automatically if not. - -[[resources_conf_example]] -=== Typical 'resources.conf' - -A global configuration of hardware may look like below; for details, see -<>. - ----- -ip_address: -- addr: 10.42.42.2 -- addr: 10.42.42.3 -- addr: 10.42.42.4 -- addr: 10.42.42.5 -- addr: 10.42.42.6 - -bts: -- label: sysmoBTS 1002 - type: osmo-bts-sysmo - ipa_unit_id: 1 - addr: 10.42.42.114 - band: GSM-1800 - ciphers: - - a5_0 - - a5_1 - - a5_3 - -- label: Ettus B200 - type: osmo-bts-trx - ipa_unit_id: 6 - addr: 10.42.42.50 - band: GSM-1800 - launch_trx: true - ciphers: - - a5_0 - - a5_1 - -- label: sysmoCell 5000 - type: osmo-bts-trx - ipa_unit_id: 7 - addr: 10.42.42.51 - band: GSM-1800 - trx_remote_ip: 10.42.42.112 - ciphers: - - a5_0 - - a5_1 - -- label: OCTBTS 3500 - type: osmo-bts-octphy - ipa_unit_id: 8 - addr: 10.42.42.52 - band: GSM-1800 - trx_list: - - hw_addr: 00:0c:90:2e:80:1e - net_device: eth1 - - hw_addr: 00:0c:90:2e:87:52 - net_device: eth1 - -arfcn: - - arfcn: 512 - band: GSM-1800 - - arfcn: 514 - band: GSM-1800 - - arfcn: 516 - band: GSM-1800 - - arfcn: 546 - band: GSM-1900 - - arfcn: 548 - band: GSM-1900 - -modem: -- label: sierra_1 - path: '/sierra_1' - imsi: '901700000009031' - ki: '80A37E6FDEA931EAC92FFA5F671EFEAD' - auth_algo: 'xor' - ciphers: - - a5_0 - - a5_1 - features: - - 'sms' - - 'voice' - -- label: gobi_0 - path: '/gobi_0' - imsi: '901700000009030' - ki: 'BB70807226393CDBAC8DD3439FF54252' - auth_algo: 'xor' - ciphers: - - a5_0 - - a5_1 - features: - - 'sms' ----- - -=== Typical 'suites/*/suite.conf' - -The configuration that reserves a number of resources for a test suite may look -like this: - ----- -resources: - ip_address: - - times: 1 - bts: - - times: 1 - modem: - - times: 2 - features: - - sms ----- - -It may also request e.g. specific BTS models, but this is typically left to -scenario configurations. - -=== Typical 'scenarios/*.conf' - -For a suite as above run as-is, any available resources are picked. This may be -combined with any number of scenario definitions to constrain which specific -resources should be used, e.g.: - ----- -resources: - bts: - - type: osmo-bts-sysmo ----- - -Which 'ip_address' or 'modem' is used in particular doesn't really matter, so -it can be left up to the osmo-gsm-tester to pick these automatically. - -Any number of such scenario configurations can be combined in the form -':++...', e.g. 'my_suite:sysmo+tch_f+amr'. - -=== Typical Invocations - -Each invocation of osmo-gsm-tester deploys a set of pre-compiled binaries for -the Osmocom core network as well as for the Osmocom based BTS models. To create -such a set of binaries, see <>. - -Examples for launching test trials: - -- Run the default suites (see <>) on a given set of binaries: - ----- -osmo-gsm-tester.py path/to/my-trial ----- - -- Run an explicit choice of 'suite:scenario' combinations: - ----- -osmo-gsm-tester.py path/to/my-trial -s sms:sysmo -s sms:trx -s sms:nanobts ----- - -- Run one 'suite:scenario' combination, setting log level to 'debug' and - enabling logging of full python tracebacks, and also only run just the - 'mo_mt_sms.py' test from the suite, e.g. to investigate a test failure: - ----- -osmo-gsm-tester.py path/to/my-trial -s sms:sysmo -l dbg -T -t mo_mt ----- - -A test script may also be run step-by-step in a python debugger, see -<>. - -=== Resource Reservation for Concurrent Trials - -While a test suite runs, the used resources are noted in a global state -directory in a reserved-resources file. This way, any number of trials may be -run consecutively without resource conflicts. Any test trial will only use -resources that are currently not reserved by any other test suite. The -reservation state is human readable. - -The global state directory is protected by a file lock to allow access by -separate processes. - -Also, the binaries from a trial are never installed system-wide, but are run -with a specific 'LD_LIBRARY_PATH' pointing at the trial's 'inst', so that -several trials can run consecutively without conflicting binary versions. For -some specific binaries which require extra permissions (such as osmo-bts-octphy -requiring 'CAP_NET_RAW'), 'patchelf' program is used to modify the binary -'RPATH' field instead because the OS dynamic linker skips 'LD_LIBRARY_PATH' for -binaries with special permissions. - -Once a test suite run is complete, all its reserved resources are torn down (if -the test scripts have not done so already), and the reservations are released -automatically. - -If required resources are unavailable, the test trial fails. For consecutive -test trials, a test run needs to either wait for resources to become available, -or test suites need to be scheduled to make sense. (*<- TODO*) diff --git a/OsmoGSMTester/chapters/test_api.adoc b/OsmoGSMTester/chapters/test_api.adoc deleted file mode 100644 index f541231..0000000 --- a/OsmoGSMTester/chapters/test_api.adoc +++ /dev/null @@ -1,4 +0,0 @@ -== Test API - -*TODO* (in the meantime, look at src/osmo_gsm_tester/test.py, as well as -suite.py, which calls the test's setup() function to get an idea) diff --git a/OsmoGSMTester/chapters/trial.adoc b/OsmoGSMTester/chapters/trial.adoc deleted file mode 100644 index bc9fe05..0000000 --- a/OsmoGSMTester/chapters/trial.adoc +++ /dev/null @@ -1,31 +0,0 @@ -[[trials]] -== Trial: Binaries to be Tested - -A trial is a set of pre-built binaries to be tested. They are typically built -by jenkins using the build scripts found in osmo-gsm-tester's source in the -'contrib/' dir, see <>. - -A trial comes in the form of a directory containing a number of '*.tgz' tar -archives as well as a 'checksums.md5' file to verify the tar archives' -integrity. - -When the osmo-gsm-tester is invoked to run on such a trial directory, it will -create a sub directory named 'inst' and unpack the tar archives into it. - -For each test run on this trial, a new subdirectory in the trial dir is -created, named in the form of 'run.'. A symbolic link 'last-run' -will point at the most recently created run dir. This run dir will accumulate: - -* the rendered configuration files used to run the binaries -* stdout and stderr outputs of the binaries -* pcap files for processes doing relevant network communication -* a test log -* jenkins parsable XML (Junit) reports - -The script in 'contrib/jenkins-run.sh' takes care of related tasks such as - -* creating the dir structure, -* generating md5 sums for the various tar.gz containing software builds to be tested, -* cleaning up after the build, -* saving extra logs such as journalctl output from ofonod, -* generating a final .tar.gz file with all the logs and reports. diff --git a/OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml b/OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml deleted file mode 100644 index 923b8ad..0000000 --- a/OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - April 13, 2017 - NH - - Initial version. - - - - - - - Neels - Hofmeyr - nhofmeyr at sysmocom.de - NH - - sysmocom - sysmocom - s.f.m.c. GmbH - Senior Developer - - - - - - 2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoGSMTester/osmo-gsm-tester-manual.adoc b/OsmoGSMTester/osmo-gsm-tester-manual.adoc deleted file mode 100644 index 6f0edf7..0000000 --- a/OsmoGSMTester/osmo-gsm-tester-manual.adoc +++ /dev/null @@ -1,20 +0,0 @@ -Osmo-GSM-Tester Manual -====================== -Neels Hofmeyr - -== WARNING: Work in Progress - -*NOTE: The osmo-gsm-tester is still in pre-alpha stage: some parts are still -incomplete, and details will still change and move around.* - -include::{srcdir}/chapters/intro.adoc[] - -include::{srcdir}/chapters/install.adoc[] - -include::{srcdir}/chapters/config.adoc[] - -include::{srcdir}/chapters/trial.adoc[] - -include::{srcdir}/chapters/test_api.adoc[] - -include::{srcdir}/chapters/debugging.adoc[] diff --git a/configure.ac b/configure.ac index a6f29a0..5d94e54 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,6 @@ osmo-gsm-manuals.pc Makefile tests/Makefile - OsmoGSMTester/Makefile OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile -- To view, visit https://gerrit.osmocom.org/12000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I89429a306d37e267fdb335d1c177c9ede3b64444 Gerrit-Change-Number: 12000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 10:05:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 10:05:37 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoNITB files (now avail in openbsc.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12001 Change subject: remove OsmoNITB files (now avail in openbsc.git) ...................................................................... remove OsmoNITB files (now avail in openbsc.git) Files were added in openbsc.git Change-Id I4466d820cb3a5609a4a8534b1581684f891a04cd Depends: openbsc.git Change-Id I4466d820cb3a5609a4a8534b1581684f891a04cd Related: OS#3385 Change-Id: I2d4f4d6dc5a70e27de464921f4fe0aab4ca8ec72 --- M Makefile.am D OsmoNITB/Makefile.am D OsmoNITB/chapters/bts-examples.adoc D OsmoNITB/chapters/control.adoc D OsmoNITB/chapters/hlr.adoc D OsmoNITB/chapters/net.adoc D OsmoNITB/chapters/overview.adoc D OsmoNITB/chapters/running.adoc D OsmoNITB/osmonitb-usermanual-docinfo.xml D OsmoNITB/osmonitb-usermanual.adoc D OsmoNITB/osmonitb-vty-reference.xml D OsmoNITB/vty/bsc_vty_additions.xml D OsmoNITB/vty/nitb_vty_additions.xml D OsmoNITB/vty/nitb_vty_reference.xml M configure.ac 15 files changed, 0 insertions(+), 6,041 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/01/12001/1 -- To view, visit https://gerrit.osmocom.org/12001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2d4f4d6dc5a70e27de464921f4fe0aab4ca8ec72 Gerrit-Change-Number: 12001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 10:05:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 10:05:37 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmocomBB files (now avail in osmocom-bb.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12002 Change subject: remove OsmocomBB files (now avail in osmocom-bb.git) ...................................................................... remove OsmocomBB files (now avail in osmocom-bb.git) Files were added in osmocom-bb.git Change-Id I7d1226d3865da9595b730b716a8d4ba07be1e0d5 Depends: osmocom-bb.git Change-Id I7d1226d3865da9595b730b716a8d4ba07be1e0d5 Related: OS#3385 Change-Id: I5a4839be7a3122ab566023a3e7b3bc955db98ba4 --- M Makefile.am D OsmocomBB/Makefile.am D OsmocomBB/chapters/scripting.adoc D OsmocomBB/osmocombb-usermanual-docinfo.xml D OsmocomBB/osmocombb-usermanual.adoc M configure.ac 6 files changed, 2 insertions(+), 203 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/02/12002/1 diff --git a/Makefile.am b/Makefile.am index 26a06a3..64623af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,8 +7,7 @@ EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) SUBDIRS = tests \ OsmoMGCP \ - OsmoNAT \ - OsmocomBB + OsmoNAT $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am deleted file mode 100644 index 61ccafa..0000000 --- a/OsmocomBB/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmocombb-usermanual.adoc \ - osmocombb-usermanual-docinfo.xml \ - chapters - -ASCIIDOC = osmocombb-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmocomBB/chapters/scripting.adoc b/OsmocomBB/chapters/scripting.adoc deleted file mode 100644 index 8828a72..0000000 --- a/OsmocomBB/chapters/scripting.adoc +++ /dev/null @@ -1,111 +0,0 @@ -[[scripting]] -== Scripting using Lua - -The mobile application can be extended using the -https://www.lua.org/manual/5.3/[lua5.3 language]. -To use the scripting facility a script needs to be -configured through the VTY interface and will be -associated to a Mobile Station (MS). The script will -then be able to interact with the specific MS. - -An event based programming model is to be used. This -means that once the script has been loaded it should -register to the wanted events, configure timers and -return. When an event occurs the registered event -handler will be executed. - -The following describes the exported runtime services -to be used in the script. - -=== Logging - -The logging functions allow to generate log messages -for different levels. The log implementatiom is using -the standard Osmocom logging framework which allows to -have multiple log targets, e.g. syslog, file or through -the VTY. - -|======== -|Code |Return | Explanation -|print(...) |void | Print a message with log level 'debug' -|log_debug(...) |void | Print a message with log level 'debug' -|log_notice(...) |void | Print a message with log level 'notice' -|log_error(...) |void | Print a message with log level 'error' -|log_fatal(...) |void | Print a message with log level 'fatal' -|======== - -==== Examples - ----- -Code: -print("Log level 'debug'") -log_debug("Log level 'debug'") -log_notice("Log level 'notice'") -log_error("Log level 'error'") -log_fatal("Log level 'fatal'") - -Output: -\<0011> @script.lua:1 Log level 'debug' -\<0011> @script.lua:2 Log level 'debug' -\<0011> @script.lua:3 Log level 'notice' -\<0011> @script.lua:4 Log level 'error' -\<0011> @script.lua:5 Log level 'fatal' - ----- - -=== Timer class - -The timer allows to invoke a function once after the requested -timeout. The timer creation function will return immediately and -the callback will be called after the timeout and when no other -lua code is executing. The _osmo.timeout_ function should be used -to create a new time, a running timer can be canneled using the _cancel_ -method. - -|======== -|Code |Return |Explanation -|osmo.timeout(timeout, cb)|A new timer|Create a new non-recurring timer. Timeout should be in rounded seconds and cb should be a function. -|timer.cancel() |Void |Cancel the timer, the callback will not be called. -|======== - -==== Examples - ----- -Code: -local timer = osmo.timeout(timeout_in_seconds, call_back) -timer:cancel() ----- - ----- -Code: -local timer = osmo.timeout(3, function() - print("Timeout passed") -end) -print("Configured") - -Output: -\<0011> @script.lua:4 Configured -\<0011> @script.lua:2 Timeout passed ----- - -=== MS class - -The MS singletong provides access to the Mobile Station configuration -the script is associated with. This includes runtime information like -the IMSI, IMEI or functions like start/stop. - -|======== -|Code |Return |Explanation -|osmo.ms().imsi() |string |The IMSI. It might be invalid in case it has not been read from SIM card yet -|osmo.ms().imei() |string |The configured IMEI -|======== -==== Examples - ------ -Code: -local ms = osmo.ms() -print(ms.imei(), ms.imsi()) - -Output: -\<0011> @script.lua:2 126000000000000 ------ diff --git a/OsmocomBB/osmocombb-usermanual-docinfo.xml b/OsmocomBB/osmocombb-usermanual-docinfo.xml deleted file mode 100644 index 992a42e..0000000 --- a/OsmocomBB/osmocombb-usermanual-docinfo.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 1 - November 2017 - HHPF - - Initial version. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - Holger - Freyther - hfreyther at sysmocom.de - HHPF - - sysmocom - sysmocom - s.f.m.c. GmbH - Co-Founder - - - - - - 2013-2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmocomBB/osmocombb-usermanual.adoc b/OsmocomBB/osmocombb-usermanual.adoc deleted file mode 100644 index 024fc79..0000000 --- a/OsmocomBB/osmocombb-usermanual.adoc +++ /dev/null @@ -1,21 +0,0 @@ -OsmocomBB User Manual -===================== -Holger Hans Peter Freyther - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/scripting.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/configure.ac b/configure.ac index cfd2971..764da31 100644 --- a/configure.ac +++ b/configure.ac @@ -29,5 +29,4 @@ Makefile tests/Makefile OsmoMGCP/Makefile - OsmoNAT/Makefile - OsmocomBB/Makefile) + OsmoNAT/Makefile) -- To view, visit https://gerrit.osmocom.org/12002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5a4839be7a3122ab566023a3e7b3bc955db98ba4 Gerrit-Change-Number: 12002 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 10:45:48 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 10:45:48 +0000 Subject: Change in osmo-gsm-manuals[master]: INSTALL.txt: "make check" needs libxml2-utils Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12004 Change subject: INSTALL.txt: "make check" needs libxml2-utils ...................................................................... INSTALL.txt: "make check" needs libxml2-utils Change-Id: I6fba644cff833c912f6d83651a1ee27c1c4884d2 --- M INSTALL.txt 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/04/12004/1 diff --git a/INSTALL.txt b/INSTALL.txt index c3caefe..3166bfa 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -14,6 +14,10 @@ (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.) +Dependencies for "make check": + +apt-get install libxml2-utils + Prepare your build dir: autoreconf -fi ./configure -- To view, visit https://gerrit.osmocom.org/12004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6fba644cff833c912f6d83651a1ee27c1c4884d2 Gerrit-Change-Number: 12004 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 10:47:05 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 10:47:05 +0000 Subject: Change in osmo-ci[master]: Dockerfile: add dependencies for osmo-gsm-manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12005 Change subject: Dockerfile: add dependencies for osmo-gsm-manuals ...................................................................... Dockerfile: add dependencies for osmo-gsm-manuals Install all dependencies required for building PDF manuals inside the Docker container, so we can build projects with their manuals in the Gerrit build verification job. I ran the Docker container locally to confirm that this works, as described here: https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verification_jobs Related: OS#3385 Change-Id: I379ce02857353c097f79cf91af2c4c9dc14754ec --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/05/12005/1 diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 3acff70..81f46ca 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -36,6 +36,9 @@ # for osmo-python-tests RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip +# for osmo-gsm-manuals +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag libxml2-utils + # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc -- To view, visit https://gerrit.osmocom.org/12005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I379ce02857353c097f79cf91af2c4c9dc14754ec Gerrit-Change-Number: 12005 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 10:58:20 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 10:58:20 +0000 Subject: Change in osmo-ci[master]: Dockerfile: add dependencies for osmo-gsm-manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12005 ) Change subject: Dockerfile: add dependencies for osmo-gsm-manuals ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I379ce02857353c097f79cf91af2c4c9dc14754ec Gerrit-Change-Number: 12005 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Nov 2018 10:58:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 11:24:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 11:24:04 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for SS sessions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11992 to look at the new patch set (#3). Change subject: libmsc/gsm_09_11.c: implement guard timer for SS sessions ...................................................................... libmsc/gsm_09_11.c: implement guard timer for SS sessions It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or dropped message. In such cases, the corresponding transaction will remain unfreed forever. This change introduces a guard timer, that prevents keeping 'stalled' SS sessions forever. As soon as it expires, both sides (i.e. MS and ESME) are getting notified, and the transaction is being released. By default, the timer expires after 120 seconds. As soon as either the MS, or an ESME initiates any activity, the timer is being rescheduled. The timer can be configured from the VTY: msc ss-guard-timeout 120 or disabled by setting 0. Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Depends Change-Id: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f Related Change-Id: (TTCN) I3e1791773d56617172ae27a46889a1ae4d400e2f Related: OS#3655 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_09_11.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c 5 files changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/11992/3 -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 11:24:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 11:24:53 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11987 ) Change subject: bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested ...................................................................... bsc: lchan_select: Avoid returning a TCH/H lchan when TCH/F is requested If BTS is configured to have only TCH/F_PDCH and TCH/H and a call is resolved to require TCH/F, don't return the TCH/H which have no use, but instead let it allocate the TCH/F_PDCH. 20181128185013783 DRLL <0000> lchan_select.c:159 (bts=0) lchan_select_by_type(TCH_F) 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=0,pchan=CCCH+SDCCH4,state=IN_USE) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=1,pchan=SDCCH8,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=2,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=3,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=4,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=5,pchan=TCH/H,state=UNUSED) is != TCH/F 20181128185013783 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=6,pchan_on_init=TCH/F_PDCH,pchan=PDCH,state=PDCH) is != TCH/F 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/F: (bts=0,trx=0,ts=7,pchan_on_init=TCH/F_PDCH,pchan=PDCH,state=PDCH) is != TCH/F 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/H: (bts=0,trx=0,ts=0,pchan=CCCH+SDCCH4,state=IN_USE) is != TCH/H 20181128185013784 DRLL <0000> lchan_select.c:71 looking for lchan TCH/H: (bts=0,trx=0,ts=1,pchan=SDCCH8,state=UNUSED) is != TCH/H 20181128185013784 DRLL <0000> lchan_select.c:86 looking for lchan TCH/H: (bts=0,trx=0,ts=2,pchan=TCH/H,state=UNUSED) ss=0 is available 20181128185013784 DCHAN <0010> lchan_select.c:253 lchan(0-0-2-TCH_H-0)[0x6120000066a0]{UNUSED}: (type=TCH_H) Selected Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 --- M src/osmo-bsc/lchan_select.c 1 file changed, 1 insertion(+), 16 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 742c7de..f70ad4a 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -182,13 +182,7 @@ break; case GSM_LCHAN_TCH_F: lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F); - /* If we don't have TCH/F available, fall-back to TCH/H */ - if (!lchan) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H); - if (lchan) - type = GSM_LCHAN_TCH_H; - } - /* If we don't have TCH/H either, try dynamic TCH/F_PDCH */ + /* If we don't have TCH/F available, try dynamic TCH/F_PDCH */ if (!lchan) { lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, GSM_PCHAN_TCH_F); @@ -206,14 +200,6 @@ if (lchan) type = GSM_LCHAN_TCH_F; } - /* ...and as TCH/H. */ - if (!lchan) { - lchan = _lc_dyn_find_bts(bts, - GSM_PCHAN_TCH_F_TCH_H_PDCH, - GSM_PCHAN_TCH_H); - if (lchan) - type = GSM_LCHAN_TCH_H; - } break; case GSM_LCHAN_TCH_H: lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H); @@ -257,4 +243,3 @@ return lchan; } - -- To view, visit https://gerrit.osmocom.org/11987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9a73beb0432fab16d5430e5b40d470694e09b189 Gerrit-Change-Number: 11987 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 11:32:53 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 11:32:53 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: refactor MT SMS message handling In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11916 ) Change subject: libmsc/gsm_04_11.c: refactor MT SMS message handling ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 Gerrit-Change-Number: 11916 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 11:32:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 11:33:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 11:33:03 +0000 Subject: Change in osmo-msc[master]: libmsc/transaction: introduce trans_find_by_sm_rp_mr() In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11917 ) Change subject: libmsc/transaction: introduce trans_find_by_sm_rp_mr() ...................................................................... libmsc/transaction: introduce trans_find_by_sm_rp_mr() According to GSM TS 04.11, section 8.2.3, the RP Message Reference is a mandatory field for all messages on the SM-RL (SM Relay Layer), that is used to link an RP-ACK or RP-ERROR message to the associated (preceding) RP-DATA or RP-SMMA message transfer attempt. This change extends the transaction state structure with SM-RP-MR, and introduces a new function for matching transactions within a given connection by this reference. Change-Id: Ice47c37ecef4416e65ecee8931d946c915316791 --- M include/osmocom/msc/transaction.h M src/libmsc/transaction.c 2 files changed, 27 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index b7d7971..762eeea 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -76,6 +76,9 @@ struct gsm411_smc_inst smc_inst; struct gsm411_smr_inst smr_inst; + /* SM-RP-MR, Message Reference (see GSM TS 04.11, section 8.2.3) */ + uint8_t sm_rp_mr; + struct gsm_sms *sms; } sms; struct { @@ -99,6 +102,8 @@ uint8_t proto, uint8_t trans_id); struct gsm_trans *trans_find_by_callref(struct gsm_network *net, uint32_t callref); +struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn, + uint8_t sm_rp_mr); struct gsm_trans *trans_alloc(struct gsm_network *net, struct vlr_subscr *vsub, diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 680d7f3..cffbe0d 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -73,6 +73,28 @@ return NULL; } +/*! Find a transaction by SM-RP-MR (RP Message Reference) + * \param[in] conn Connection in which we want to find transaction + * \param[in] sm_rp_mr RP Message Reference (see GSM TS 04.11, section 8.2.3) + * \returns Matching transaction, NULL otherwise + */ +struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn, + uint8_t sm_rp_mr) +{ + struct gsm_network *net = conn->network; + struct vlr_subscr *vsub = conn->vsub; + struct gsm_trans *trans; + + llist_for_each_entry(trans, &net->trans_list, entry) { + if (trans->vsub == vsub && + trans->protocol == GSM48_PDISC_SMS && + trans->sms.sm_rp_mr == sm_rp_mr) + return trans; + } + + return NULL; +} + /*! Allocate a new transaction and add it to network list * \param[in] net Netwokr in which we allocate transaction * \param[in] subscr Subscriber for which we allocate transaction -- To view, visit https://gerrit.osmocom.org/11917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice47c37ecef4416e65ecee8931d946c915316791 Gerrit-Change-Number: 11917 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 11:33:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 11:33:04 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: refactor MT SMS message handling In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11916 ) Change subject: libmsc/gsm_04_11.c: refactor MT SMS message handling ...................................................................... libmsc/gsm_04_11.c: refactor MT SMS message handling According to GSM TS 04.11, the SMC (Short Message Control) state machine is a part of CM-sublayer of L3, that is responsible for connection management (establisment and releasing), and SM-RP (Relay Protocol) message delivery. For some reason, the connection establisment request from SMC (GSM411_MMSMS_EST_REQ) was not handled properly - it was always assumed that connection is already established. This is why the code initiating a MT (Mobile Terminated) SMS transfer had to establish a radio connection with subscriber manually. Let's benefit from having the SMC state machine, and offload connection establishment to it. This change makes the local implementation closer to GSM TS 04.11, and facilitates the further integration of GSUP transport. NOTE: the expected unit test output is changed, because now we always allocate a transaction first, and then establish a connection, not vice versa. Change-Id: I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 --- M include/osmocom/msc/gsm_04_11.h M src/libmsc/gsm_04_11.c M src/libmsc/msc_vty.c M src/libmsc/smpp_openbsc.c M src/libmsc/sms_queue.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 12 files changed, 337 insertions(+), 291 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index 0b9639f..a368d46 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -27,6 +27,7 @@ uint8_t *smsc; }; +struct gsm_network; struct msgb; int gsm0411_rcv_sms(struct gsm_subscriber_connection *conn, struct msgb *msg); @@ -37,9 +38,8 @@ const char *sender_msisdn, int dcs, const char *text); -int gsm411_send_sms_subscr(struct vlr_subscr *vsub, - struct gsm_sms *sms); -int gsm411_send_sms(struct gsm_subscriber_connection *conn, +int gsm411_send_sms(struct gsm_network *net, + struct vlr_subscr *vsub, struct gsm_sms *sms); void gsm411_sapi_n_reject(struct gsm_subscriber_connection *conn); diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 14f9f57..88dc433 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -127,6 +127,87 @@ return msc_tx_dtap(conn, msg); } +/* Paging callback for MT SMS (Paging is triggered by SMC) */ +static int paging_cb_mmsms_est_req(unsigned int hooknum, unsigned int event, + struct msgb *msg, void *_conn, void *_trans) +{ + struct gsm_subscriber_connection *conn = _conn; + struct gsm_trans *trans = _trans; + struct gsm_sms *sms = trans->sms.sms; + int rc = 0; + + DEBUGP(DLSMS, "paging_cb_mmsms_est_req(hooknum=%u, event=%u, " + "conn=%p, trans=%p)\n", hooknum, event, conn, trans); + + if (hooknum != GSM_HOOK_RR_PAGING) + return -EINVAL; + + /* Paging procedure has finished */ + trans->paging_request = NULL; + + switch (event) { + case GSM_PAGING_SUCCEEDED: + /* Associate transaction with established connection */ + trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + /* FIXME: specify SACCH in case we already have active TCH */ + trans->dlci = 0x03; + /* Confirm successful connection establishment */ + gsm411_smc_recv(&trans->sms.smc_inst, + GSM411_MMSMS_EST_CNF, NULL, 0); + break; + case GSM_PAGING_EXPIRED: + case GSM_PAGING_BUSY: + /* Inform SMC about channel establishment failure */ + gsm411_smc_recv(&trans->sms.smc_inst, + GSM411_MMSMS_REL_IND, NULL, 0); + + /* Notify the SMSqueue and free stored SMS */ + send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, event); + trans->sms.sms = NULL; + sms_free(sms); + + /* Destroy this transaction */ + trans_free(trans); + rc = -ETIMEDOUT; + break; + default: + LOGP(DLSMS, LOGL_ERROR, "Unhandled paging event: %d\n", event); + } + + return rc; +} + +static int gsm411_mmsms_est_req(struct gsm_trans *trans) +{ + /* Subscriber's data shall be associated */ + OSMO_ASSERT(trans->vsub != NULL); + + /* Check if connection is already established */ + if (trans->conn != NULL) { + LOGP(DLSMS, LOGL_DEBUG, "Using an existing connection " + "for %s\n", vlr_subscr_name(trans->vsub)); + return gsm411_smc_recv(&trans->sms.smc_inst, + GSM411_MMSMS_EST_CNF, NULL, 0); + } + + /* Initiate Paging procedure */ + LOGP(DLSMS, LOGL_DEBUG, "Initiating Paging procedure " + "for %s due to MMSMS_EST_REQ\n", vlr_subscr_name(trans->vsub)); + trans->paging_request = subscr_request_conn(trans->vsub, + paging_cb_mmsms_est_req, trans, "MT SMS"); + if (!trans->paging_request) { + LOGP(DLSMS, LOGL_ERROR, "Failed to initiate Paging " + "procedure for %s\n", vlr_subscr_name(trans->vsub)); + /* Inform SMC about channel establishment failure */ + gsm411_smc_recv(&trans->sms.smc_inst, + GSM411_MMSMS_REL_IND, NULL, 0); + trans_free(trans); + return -EIO; + } + + return 0; +} + /* Prefix msg with a 04.08/04.11 CP header */ static int gsm411_cp_sendmsg(struct msgb *msg, struct gsm_trans *trans, uint8_t msg_type) @@ -154,8 +235,7 @@ switch (msg_type) { case GSM411_MMSMS_EST_REQ: - /* recycle msg */ - rc = gsm411_smc_recv(inst, GSM411_MMSMS_EST_CNF, msg, 0); + rc = gsm411_mmsms_est_req(trans); msgb_free(msg); /* upper layer does not free msg */ break; case GSM411_MMSMS_DATA_REQ: @@ -899,6 +979,120 @@ return rc; } +static struct gsm_trans *gsm411_alloc_mt_trans(struct gsm_network *net, + struct vlr_subscr *vsub) +{ + struct gsm_subscriber_connection *conn; + struct gsm_trans *trans; + int tid; + + LOGP(DLSMS, LOGL_INFO, "Going to send a MT SMS\n"); + + /* Generate a new transaction ID */ + tid = trans_assign_trans_id(net, vsub, GSM48_PDISC_SMS, 0); + if (tid == -1) { + LOGP(DLSMS, LOGL_ERROR, "No available transaction IDs\n"); + return NULL; + } + + /* Allocate a new transaction */ + trans = trans_alloc(net, vsub, GSM48_PDISC_SMS, tid, new_callref++); + if (!trans) { + LOGP(DLSMS, LOGL_ERROR, "No memory for trans\n"); + return NULL; + } + + /* Init both SMC and SMR state machines */ + gsm411_smc_init(&trans->sms.smc_inst, 0, 1, + gsm411_mn_recv, gsm411_mm_send); + gsm411_smr_init(&trans->sms.smr_inst, 0, 1, + gsm411_rl_recv, gsm411_mn_send); + + /* Attempt to find an existing connection */ + conn = connection_for_subscr(vsub); + if (conn) { + /* Associate transaction with connection */ + trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + /* Generate unique RP Message Reference */ + trans->sms.sm_rp_mr = conn->next_rp_ref++; + } + + return trans; +} + +/* High-level function to send an SMS to a given subscriber */ +int gsm411_send_sms(struct gsm_network *net, + struct vlr_subscr *vsub, + struct gsm_sms *sms) +{ + uint8_t *data, *rp_ud_len; + struct gsm_trans *trans; + struct msgb *msg; + int rc; + + /* Allocate a new transaction for MT SMS */ + trans = gsm411_alloc_mt_trans(net, vsub); + if (!trans) { + send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, 0); + sms_free(sms); + return -ENOMEM; + } + + /* Allocate a message buffer for to be encoded SMS */ + msg = gsm411_msgb_alloc(); + if (!msg) { + send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, 0); + trans_free(trans); + sms_free(sms); + return -ENOMEM; + } + + /* Hardcode SMSC Originating Address for now */ + data = (uint8_t *)msgb_put(msg, 8); + data[0] = 0x07; /* originator length == 7 */ + data[1] = 0x91; /* type of number: international, ISDN */ + data[2] = 0x44; /* 447785016005 */ + data[3] = 0x77; + data[4] = 0x58; + data[5] = 0x10; + data[6] = 0x06; + data[7] = 0x50; + + /* Hardcoded Destination Address */ + data = (uint8_t *)msgb_put(msg, 1); + data[0] = 0; /* destination length == 0 */ + + /* obtain a pointer for the rp_ud_len, so we can fill it later */ + rp_ud_len = (uint8_t *)msgb_put(msg, 1); + + if (sms->is_report) { + /* generate the 03.40 SMS-STATUS-REPORT TPDU */ + rc = gsm340_gen_sms_status_report_tpdu(msg, sms); + } else { + /* generate the 03.40 SMS-DELIVER TPDU */ + rc = gsm340_gen_sms_deliver_tpdu(msg, sms); + } + if (rc < 0) { + send_signal(S_SMS_UNKNOWN_ERROR, trans, sms, 0); + sms_free(sms); + trans_free(trans); + msgb_free(msg); + return rc; + } + + *rp_ud_len = rc; + + /* Store a pointer to abstract SMS representation */ + trans->sms.sms = sms; + + rate_ctr_inc(&net->msc_ctrs->ctr[MSC_CTR_SMS_DELIVERED]); + db_sms_inc_deliver_attempts(trans->sms.sms); + + return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, + GSM411_MT_RP_DATA_MT, trans->sms.sm_rp_mr, + GSM411_SM_RL_DATA_REQ); +} + /* Entry point for incoming GSM48_PDISC_SMS from abis_rsl.c */ int gsm0411_rcv_sms(struct gsm_subscriber_connection *conn, struct msgb *msg) @@ -985,159 +1179,6 @@ return rc; } -/* Take a SMS in gsm_sms structure and send it through an already - * existing conn. We also assume that the caller ensured this conn already - * has a SAPI3 RLL connection! */ -int gsm411_send_sms(struct gsm_subscriber_connection *conn, struct gsm_sms *sms) -{ - struct msgb *msg = gsm411_msgb_alloc(); - struct gsm_trans *trans; - uint8_t *data, *rp_ud_len; - uint8_t msg_ref = conn->next_rp_ref++; - int transaction_id; - int rc; - - transaction_id = - trans_assign_trans_id(conn->network, conn->vsub, - GSM48_PDISC_SMS, 0); - if (transaction_id == -1) { - LOGP(DLSMS, LOGL_ERROR, "No available transaction ids\n"); - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, 0); - sms_free(sms); - msgb_free(msg); - return -EBUSY; - } - - DEBUGP(DLSMS, "%s()\n", __func__); - - /* FIXME: allocate transaction with message reference */ - trans = trans_alloc(conn->network, conn->vsub, - GSM48_PDISC_SMS, - transaction_id, new_callref++); - if (!trans) { - LOGP(DLSMS, LOGL_ERROR, "No memory for trans\n"); - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, 0); - sms_free(sms); - msgb_free(msg); - /* FIXME: send some error message */ - return -ENOMEM; - } - gsm411_smc_init(&trans->sms.smc_inst, sms->id, 1, - gsm411_mn_recv, gsm411_mm_send); - gsm411_smr_init(&trans->sms.smr_inst, sms->id, 1, - gsm411_rl_recv, gsm411_mn_send); - trans->sms.sms = sms; - - trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_SMS); - trans->dlci = 0x03; - /* FIXME: specify SACCH in case we already have active TCH */ - - /* Hardcode SMSC Originating Address for now */ - data = (uint8_t *)msgb_put(msg, 8); - data[0] = 0x07; /* originator length == 7 */ - data[1] = 0x91; /* type of number: international, ISDN */ - data[2] = 0x44; /* 447785016005 */ - data[3] = 0x77; - data[4] = 0x58; - data[5] = 0x10; - data[6] = 0x06; - data[7] = 0x50; - - /* Hardcoded Destination Address */ - data = (uint8_t *)msgb_put(msg, 1); - data[0] = 0; /* destination length == 0 */ - - /* obtain a pointer for the rp_ud_len, so we can fill it later */ - rp_ud_len = (uint8_t *)msgb_put(msg, 1); - - if (sms->is_report) { - /* generate the 03.40 SMS-STATUS-REPORT TPDU */ - rc = gsm340_gen_sms_status_report_tpdu(msg, sms); - } else { - /* generate the 03.40 SMS-DELIVER TPDU */ - rc = gsm340_gen_sms_deliver_tpdu(msg, sms); - } - if (rc < 0) { - send_signal(S_SMS_UNKNOWN_ERROR, trans, sms, 0); - sms_free(sms); - trans->sms.sms = NULL; - trans_free(trans); - msgb_free(msg); - return rc; - } - - *rp_ud_len = rc; - - DEBUGP(DLSMS, "TX: SMS DELIVER\n"); - - rate_ctr_inc(&conn->network->msc_ctrs->ctr[MSC_CTR_SMS_DELIVERED]); - db_sms_inc_deliver_attempts(trans->sms.sms); - - return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, - GSM411_MT_RP_DATA_MT, msg_ref, GSM411_SM_RL_DATA_REQ); -} - -/* paging callback. Here we get called if paging a subscriber has - * succeeded or failed. */ -static int paging_cb_send_sms(unsigned int hooknum, unsigned int event, - struct msgb *msg, void *_conn, void *_sms) -{ - struct gsm_subscriber_connection *conn = _conn; - struct gsm_sms *sms = _sms; - int rc = 0; - - DEBUGP(DLSMS, "paging_cb_send_sms(hooknum=%u, event=%u, msg=%p," - "conn=%p, sms=%p/id: %llu)\n", hooknum, event, msg, conn, sms, sms->id); - - if (hooknum != GSM_HOOK_RR_PAGING) - return -EINVAL; - - switch (event) { - case GSM_PAGING_SUCCEEDED: - gsm411_send_sms(conn, sms); - break; - case GSM_PAGING_EXPIRED: - case GSM_PAGING_BUSY: - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, event); - sms_free(sms); - rc = -ETIMEDOUT; - break; - default: - LOGP(DLSMS, LOGL_ERROR, "Unhandled paging event: %d\n", event); - } - - return rc; -} - -/* high-level function to send a SMS to a given subscriber. The function - * will take care of paging the subscriber, establishing the RLL SAPI3 - * connection, etc. */ -int gsm411_send_sms_subscr(struct vlr_subscr *vsub, - struct gsm_sms *sms) -{ - struct gsm_subscriber_connection *conn; - void *res; - - /* check if we already have an open conn to the subscriber. - * if yes, send the SMS this way */ - conn = connection_for_subscr(vsub); - if (conn) { - LOGP(DLSMS, LOGL_DEBUG, "Sending SMS via already open connection %p to %s\n", - conn, vlr_subscr_name(vsub)); - return gsm411_send_sms(conn, sms); - } - - /* if not, we have to start paging */ - LOGP(DLSMS, LOGL_DEBUG, "Sending SMS: no connection open, start paging %s\n", - vlr_subscr_name(vsub)); - res = subscr_request_conn(vsub, paging_cb_send_sms, sms, "send SMS"); - if (!res) { - send_signal(S_SMS_UNKNOWN_ERROR, NULL, sms, GSM_PAGING_BUSY); - sms_free(sms); - } - return 0; -} - void _gsm411_sms_trans_free(struct gsm_trans *trans) { /* cleanup SMS instance */ diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index cdf3184..4f3ac04 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -680,7 +680,7 @@ break; if (sms->receiver) - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(gsmnet, sms->receiver, sms); sms_id = sms->id + 1; } @@ -819,7 +819,7 @@ sms = db_sms_get_unsent_for_subscr(vsub, UINT_MAX); if (sms) - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(gsmnet, sms->receiver, sms); vlr_subscr_put(vsub); diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index c12db5f..051372c 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -268,7 +268,7 @@ LOGP(DLSMS, LOGL_DEBUG, "SMPP SUBMIT-SM: Forwarding in " "real time (Transaction/Forward mode)\n"); sms->smpp.transaction_mode = 1; - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(net, sms->receiver, sms); rc = 1; /* don't send any response yet */ break; } diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 252e529..9907f4f 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -186,7 +186,7 @@ sms_queue_trigger(smsq); } else { pending->resend = 0; - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(smsq->network, sms->receiver, sms); } } } @@ -311,7 +311,7 @@ attempted += 1; smsq->pending += 1; llist_add_tail(&pending->entry, &smsq->pending_sms); - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(smsq->network, sms->receiver, sms); } while (attempted < attempts && rounds < 1000); LOGP(DLSMS, LOGL_DEBUG, "SMSqueue added %d messages in %d rounds\n", attempted, rounds); @@ -349,7 +349,7 @@ smsq->pending += 1; llist_add_tail(&pending->entry, &smsq->pending_sms); - gsm411_send_sms_subscr(sms->receiver, sms); + gsm411_send_sms(smsq->network, sms->receiver, sms); return; no_pending_sms: @@ -398,7 +398,6 @@ { struct gsm_sms *sms; struct gsm_sms_pending *pending; - struct gsm_subscriber_connection *conn; /* * The code used to be very clever and tried to submit @@ -423,15 +422,12 @@ return 0; } - conn = connection_for_subscr(vsub); - if (!conn) - return -1; - /* Now try to deliver any pending SMS to this sub */ sms = db_sms_get_unsent_for_subscr(vsub, UINT_MAX); if (!sms) return -1; - gsm411_send_sms(conn, sms); + + gsm411_send_sms(net, vsub, sms); return 0; } diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 51f7367..fc701b2 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -275,18 +275,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -299,8 +301,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -311,7 +313,7 @@ - sending GSM Auth Request for MSISDN:46071: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:46071: MSC conn use - compl_l3 == 0 (0x0: ) @@ -356,8 +358,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 5 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -762,18 +762,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response using TMSI, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -786,8 +788,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:50462976){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -798,7 +800,7 @@ - sending GSM Auth Request for MSISDN:46071: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:46071: MSC conn use - compl_l3 == 0 (0x0: ) @@ -843,8 +845,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 5 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -1873,18 +1873,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000003) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -1897,8 +1899,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth (no Ciph) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000010650){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -1909,7 +1911,7 @@ - sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x3 and... - ...rand=efa9c29a9742148d5c9070348716e1bb - ...expecting sres=69d5f9fb -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -1954,8 +1956,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000003) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index cc8659c..9cc6387 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -303,18 +303,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -327,8 +329,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -339,7 +341,7 @@ - sending GSM Auth Request for MSISDN:46071: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:46071: MSC conn use - compl_l3 == 0 (0x0: ) @@ -409,8 +411,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 5 DREF MSISDN:46071: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -843,18 +843,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response using TMSI, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -867,8 +869,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:50462976){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -879,7 +881,7 @@ - sending GSM Auth Request for MSISDN:46071: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:46071: MSC conn use - compl_l3 == 0 (0x0: ) @@ -949,8 +951,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 5 DREF MSISDN:46071: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -2069,18 +2069,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000003) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends *UMTS AKA* Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -2093,8 +2095,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000010650){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -2106,7 +2108,7 @@ - ...rand=54d8f19778056666b41c8c25e52eb60c - ...autn=53f3e5632b3d00008865dd54d49663f2 - ...expecting res=86e848a9e7ad8cd5 -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -2165,8 +2167,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000003) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -2559,18 +2559,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000004) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -2583,8 +2585,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -2595,7 +2597,7 @@ - sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -2665,8 +2667,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000004) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -3059,18 +3059,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000005) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -3083,8 +3085,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -3095,7 +3097,7 @@ - sending GSM Auth Request for MSISDN:42342: tuple use_count=1 key_seq=2 auth_types=0x1 and... - ...rand=e7c03ba7cf0e2fde82b2dc4d63077d42 - ...expecting sres=a29514ae -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -3104,8 +3106,8 @@ auth_request_sent == 1 --- - Fake a situation where Classmark 2 is unknown during proc_arq_fsm -DREF VLR subscr MSISDN:42342 usage increases to: 5 -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 6 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 - MS sends Authen Response, VLR accepts and requests Ciphering - MS sends Authen Response, VLR accepts and requests Ciphering. Normally, we'd know Classmark 3, but this test removed it. Hence a Classmark Request is generated. MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP @@ -3156,8 +3158,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000005) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index d2b7ef3..4874f93 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -471,32 +471,38 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - time passes and no paging result is received - Total time passed: 9.000000 s - the paging timeout has not yet expired paging_stopped == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 vsub->cs.is_paging == 1 - another request is added to the list but does not cause another paging -DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 +DCC (ti 01 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 7 DMM Subscriber MSISDN:46071 already paged. llist_count(&vsub->cs.requests) == 2 -DREF VLR subscr MSISDN:46071 usage decreases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 6 paging_sent == 0 - the paging timeout expires, the paging as well as the requests are canceled - Total time passed: 11.000000 s DPAG Paging failure for MSISDN:46071 (event=1) DPAG Calling paging cbfn. -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 5 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 DPAG Calling paging cbfn. +DREF VLR subscr MSISDN:46071 usage decreases to: 3 DREF VLR subscr MSISDN:46071 usage decreases to: 2 DREF VLR subscr MSISDN:46071 usage decreases to: 1 paging_stopped == 1 @@ -506,12 +512,14 @@ --- - Now that the timeout has expired, another Paging is sent on request DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000003) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 --- @@ -522,10 +530,11 @@ DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1) DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 DMM IMSI DETACH for MSISDN:46071 DPAG Paging failure for MSISDN:46071 (event=1) DPAG Calling paging cbfn. +DREF VLR subscr MSISDN:46071 usage decreases to: 4 DREF VLR subscr MSISDN:46071 usage decreases to: 3 DREF VLR subscr MSISDN:46071 usage decreases to: 2 DREF VLR subscr MSISDN:46071 usage increases to: 3 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index fb0582b..e8c2927 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -187,18 +187,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response, we deliver the SMS MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -211,8 +213,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -226,8 +228,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -546,18 +546,20 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23 paging_expecting_tmsi == 0x03020100 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 - MS replies with Paging Response using TMSI, we deliver the SMS MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -570,8 +572,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:50462976) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:50462976){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -585,8 +587,6 @@ DMM Subscr_Conn(PAGING_RESP:50462976){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 0a964ac..cf90a1c 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1260,12 +1260,14 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - MS replies with Paging Response, we deliver the SMS @@ -1280,8 +1282,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -1295,8 +1297,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000001) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -1487,12 +1487,14 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - MS replies with Paging Response, we deliver the SMS @@ -1507,8 +1509,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -1522,8 +1524,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000002) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -1734,12 +1734,14 @@ DREF VLR subscr MSISDN:46071 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:46071 usage increases to: 3 +DCC (ti 00 sub MSISDN:46071 callref 40000003) New transaction +DREF VLR subscr MSISDN:46071 usage increases to: 4 DMM Subscriber MSISDN:46071 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:46071 usage decreases to: 3 +DREF VLR subscr MSISDN:46071 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - MS replies with Paging Response, we deliver the SMS @@ -1754,8 +1756,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000004620) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:46071 usage increases to: 4 DREF VLR subscr MSISDN:46071 usage increases to: 5 +DREF VLR subscr MSISDN:46071 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000004620){PR_ARQ_S_INIT}: _proc_arq_vlr_node2_post_ciph() @@ -1769,8 +1771,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:46071 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:46071 callref 40000003) New transaction -DREF VLR subscr MSISDN:46071 usage increases to: 6 DREF MSISDN:46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms) DMSC msc_tx 91 bytes to MSISDN:46071 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index 538a3d9..fdd3b0c 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -288,18 +288,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000001) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -312,8 +314,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=GERAN Auth (no Ciph) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000010650){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -325,7 +327,7 @@ - ...rand=efa9c29a9742148d5c9070348716e1bb - ...autn=f9375e6d41e1000096e7fe4ff1c27e39 - ...expecting res=706f996719ba609c -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -370,8 +372,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000001) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_GERAN_A - DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 @@ -778,18 +778,20 @@ DREF VLR subscr MSISDN:42342 usage increases to: 2 llist_count(&vsub->cs.requests) == 0 DREF VLR subscr MSISDN:42342 usage increases to: 3 +DCC (ti 00 sub MSISDN:42342 callref 40000002) New transaction +DREF VLR subscr MSISDN:42342 usage increases to: 4 DMM Subscriber MSISDN:42342 not paged yet, start paging. RAN_UTRAN_IU sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23 strcmp(paging_expecting_imsi, imsi) == 0 -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 paging_sent == 1 paging_stopped == 0 - the subscriber and its pending request should remain -DREF VLR subscr MSISDN:42342 usage increases to: 4 +DREF VLR subscr MSISDN:42342 usage increases to: 5 llist_count(&vsub->cs.requests) == 1 -DREF VLR subscr MSISDN:42342 usage decreases to: 3 +DREF VLR subscr MSISDN:42342 usage decreases to: 4 - MS replies with Paging Response, and VLR sends Auth Request with third key MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_RR_PAG_RESP new conn @@ -802,8 +804,8 @@ DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: is child of Subscr_Conn(PAGING_RESP:901700000010650) DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: rev=R99 net=UTRAN Auth+Ciph DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DREF VLR subscr MSISDN:42342 usage increases to: 4 DREF VLR subscr MSISDN:42342 usage increases to: 5 +DREF VLR subscr MSISDN:42342 usage increases to: 6 DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: proc_arq_vlr_fn_post_imsi() DVLR Process_Access_Request_VLR(PAGING_RESP:901700000010650){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_WAIT_AUTH DVLR VLR_Authenticate(PAGING_RESP:901700000010650){VLR_SUB_AS_NEEDS_AUTH}: Allocated @@ -815,7 +817,7 @@ - ...rand=efa9c29a9742148d5c9070348716e1bb - ...autn=f9375e6d41e1000096e7fe4ff1c27e39 - ...expecting res=706f996719ba609c -DREF VLR subscr MSISDN:42342 usage decreases to: 4 +DREF VLR subscr MSISDN:42342 usage decreases to: 5 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH DREF MSISDN:42342: MSC conn use - compl_l3 == 0 (0x0: ) @@ -875,8 +877,6 @@ DMM Subscr_Conn(PAGING_RESP:901700000010650){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED DPAG Paging success for MSISDN:42342 (event=0) DPAG Calling paging cbfn. -DCC (ti 00 sub MSISDN:42342 callref 40000002) New transaction -DREF VLR subscr MSISDN:42342 usage increases to: 5 DREF MSISDN:42342: MSC conn use + trans_sms == 1 (0x20: trans_sms) DMSC msc_tx 91 bytes to MSISDN:42342 via RAN_UTRAN_IU - DTAP --RAN_UTRAN_IU--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 6cf927c..01f5974 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -319,7 +319,7 @@ char *str) { struct gsm_sms *sms = sms_from_text(receiver, sender->msisdn, 0, str); - gsm411_send_sms_subscr(receiver, sms); + gsm411_send_sms(net, receiver, sms); } unsigned char next_rand_byte = 0; -- To view, visit https://gerrit.osmocom.org/11916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 Gerrit-Change-Number: 11916 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 11:51:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 11:51:23 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 3: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/11932/3/src/osmo-bts-trx/l1_if.c File src/osmo-bts-trx/l1_if.c: https://gerrit.osmocom.org/#/c/11932/3/src/osmo-bts-trx/l1_if.c at 160 PS3, Line 160: ws https://gerrit.osmocom.org/#/c/11932/3/src/osmo-bts-trx/l1_if.c at 163 PS3, Line 163: PRIu8 AFAIK, we usually use '%u' for uint8_t. Not critical though. https://gerrit.osmocom.org/#/c/11932/3/src/osmo-bts-trx/l1_if.c at 169 PS3, Line 169: ws -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 11:51:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:22:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:22:18 +0000 Subject: Change in osmo-trx[master]: lms: User correct scale factor for transmit samples Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12006 Change subject: lms: User correct scale factor for transmit samples ...................................................................... lms: User correct scale factor for transmit samples Due to (I believe) a copy+paste mistake from the USRP1 code, we were using only a scale range of up to 9830 when transmitting samples, rather than the full 16 bit signed integer range up to 32767. As a result, we were loosing almost two bits (MSBs) of resolution as well as a lot of transmit power. This changes the scale factor to 0.707 (1/sqrt(2)). Please note that the much higher DAC output level means that the analog gain should be reduced. The theoretic range of up to 73dB should not be used, but Lime Microsystems suggest a value of 61..67 dB. This can be achieved by using a "osmotrx tx-attenuation" value of 6..12 inside the osmo-bts-trx configuration file. Change-Id: I71702feaa11f53e7614a6938a984dd748405474a --- M Transceiver52M/device/lms/LMSDevice.h 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/06/12006/1 diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index 349efbb..6635c13 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -28,7 +28,14 @@ #include #include -#define LIMESDR_TX_AMPL 0.3 +/* Definition of LIMESDR_TX_AMPL limits maximum amplitude of I and Q + * channels separately. Hence LIMESDR_TX_AMPL value must be 1/sqrt(2) = + * 0.7071.... to get an amplitude of 1 of the complex signal: + * A^2 = I^2 + Q^2 + * A^2 = (1/sqrt(2))^2 + (1/sqrt(2))^2 + * A^2 = 1/2 + 1/2 + * A^2 = 1 */ +#define LIMESDR_TX_AMPL 0.707 /** A class to handle a LimeSuite supported device */ class LMSDevice:public RadioDevice { -- To view, visit https://gerrit.osmocom.org/12006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I71702feaa11f53e7614a6938a984dd748405474a Gerrit-Change-Number: 12006 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:22:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:22:18 +0000 Subject: Change in osmo-trx[master]: lms: Set Rx gain to midpoint, as comment suggests. Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12007 Change subject: lms: Set Rx gain to midpoint, as comment suggests. ...................................................................... lms: Set Rx gain to midpoint, as comment suggests. So far, the Rx gain was set to 34 dB, wile the comment stated it would be set to half-point, which is 73/2=36dB. Let's adjust the code to match the comment. Change-Id: Idc646def53b83faf4e6c011fb595fa436e223b32 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/07/12007/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 0a6c4a2..1cda4f9 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -223,7 +223,7 @@ // Set gains to midpoint setTxGain((minTxGain() + maxTxGain()) / 2, i); - setRxGain(34.0, i); + setRxGain((minRxGain() + maxRxGain()) / 2, i); m_lms_stream_rx[i] = {}; m_lms_stream_rx[i].isTx = false; -- To view, visit https://gerrit.osmocom.org/12007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idc646def53b83faf4e6c011fb595fa436e223b32 Gerrit-Change-Number: 12007 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:22:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:22:19 +0000 Subject: Change in osmo-trx[master]: lms: Use a default Tx gain value of 64 dB. Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12008 Change subject: lms: Use a default Tx gain value of 64 dB. ...................................................................... lms: Use a default Tx gain value of 64 dB. As recommended by Lime Microsystems, the Tx gain should be around 61..66 dB when using 16 bit signed integer samples to full scale (which we do since Change-Id I71702feaa11f53e7614a6938a984dd748405474a) This default value is used only as long as osmo-bts-trx doesn't change it using a 'osmotrx tx-attenuation' override setting. So the safe default configuration should be to use osmo-trx after this patch with no 'osmotrx tx-attenuation' setting in osmo-bts-trx configuration. Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/08/12008/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 1cda4f9..25b8198 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -221,8 +221,9 @@ if (LMS_EnableChannel(m_lms_dev, LMS_CH_TX, i, true) < 0) return false; - // Set gains to midpoint - setTxGain((minTxGain() + maxTxGain()) / 2, i); + /* use a magic value recommended by Lime Microsystems (61..66 dB) */ + setTxGain(64.0); + // Set Rx gain to midpoint setRxGain((minRxGain() + maxRxGain()) / 2, i); m_lms_stream_rx[i] = {}; -- To view, visit https://gerrit.osmocom.org/12008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 Gerrit-Change-Number: 12008 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:27:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:27:05 +0000 Subject: Change in osmo-trx[master]: lms: User correct scale factor for transmit samples In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12006 to look at the new patch set (#2). Change subject: lms: User correct scale factor for transmit samples ...................................................................... lms: User correct scale factor for transmit samples Due to (I believe) a copy+paste mistake from the USRP1 code, we were using only a scale range of up to 9830 when transmitting samples, rather than the full 16 bit signed integer range up to 32767. As a result, we were loosing almost two bits (MSBs) of resolution as well as a lot of transmit power. This changes the scale factor to 0.707 (1/sqrt(2)). Please note that the much higher DAC output level means that the analog gain should be reduced. The theoretic range of up to 73dB should not be used, but Lime Microsystems suggest a value of 61..67 dB. This can be achieved by using a "osmotrx tx-attenuation" value of 6..12 inside the osmo-bts-trx configuration file. Related: OS#3341 Related: OS#3342 Change-Id: I71702feaa11f53e7614a6938a984dd748405474a --- M Transceiver52M/device/lms/LMSDevice.h 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/06/12006/2 -- To view, visit https://gerrit.osmocom.org/12006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I71702feaa11f53e7614a6938a984dd748405474a Gerrit-Change-Number: 12006 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:27:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:27:05 +0000 Subject: Change in osmo-trx[master]: lms: Set Rx gain to midpoint, as comment suggests. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12007 to look at the new patch set (#2). Change subject: lms: Set Rx gain to midpoint, as comment suggests. ...................................................................... lms: Set Rx gain to midpoint, as comment suggests. So far, the Rx gain was set to 34 dB, wile the comment stated it would be set to half-point, which is 73/2=36dB. Let's adjust the code to match the comment. Change-Id: Idc646def53b83faf4e6c011fb595fa436e223b32 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/07/12007/2 -- To view, visit https://gerrit.osmocom.org/12007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idc646def53b83faf4e6c011fb595fa436e223b32 Gerrit-Change-Number: 12007 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:27:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:27:05 +0000 Subject: Change in osmo-trx[master]: lms: Use a default Tx gain value of 64 dB. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12008 to look at the new patch set (#2). Change subject: lms: Use a default Tx gain value of 64 dB. ...................................................................... lms: Use a default Tx gain value of 64 dB. As recommended by Lime Microsystems, the Tx gain should be around 61..66 dB when using 16 bit signed integer samples to full scale (which we do since Change-Id I71702feaa11f53e7614a6938a984dd748405474a) This default value is used only as long as osmo-bts-trx doesn't change it using a 'osmotrx tx-attenuation' override setting. So the safe default configuration should be to use osmo-trx after this patch with no 'osmotrx tx-attenuation' setting in osmo-bts-trx configuration. Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/08/12008/2 -- To view, visit https://gerrit.osmocom.org/12008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 Gerrit-Change-Number: 12008 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:40:55 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 12:40:55 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11976 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 12:40:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:43:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 29 Nov 2018 12:43:52 +0000 Subject: Change in osmo-pcu[master]: EDGE: fix wrong encoding of LH bits In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/3991 ) Change subject: EDGE: fix wrong encoding of LH bits ...................................................................... Patch Set 3: Note to self: re-test after https://osmocom.org/issues/3014 is resolved. -- To view, visit https://gerrit.osmocom.org/3991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I75dd5bebc74eea85edf9582607c774d0bba0d2a6 Gerrit-Change-Number: 3991 Gerrit-PatchSet: 3 Gerrit-Owner: Minh-Quang Nguyen Gerrit-Assignee: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Minh-Quang Nguyen Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 12:43:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:44:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:44:58 +0000 Subject: Change in osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/12009 Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY ...................................................................... gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY When a MS MM state is READY the exakt location is known (PCU). T3141 set the MM state to STANDBY, where only the RA is known. Introduce a second set of timer variables, because state timer can run while another packet state timer is timing out. Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gmm.c M src/gprs/gprs_sgsn.c 3 files changed, 100 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/09/12009/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index cf78766..c9933e4 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -225,6 +225,10 @@ unsigned int T; /* Txxxx number */ unsigned int num_T_exp; /* number of consecutive T expirations */ + /* timer for pmm state */ + struct osmo_timer_list state_timer; + unsigned int state_T; /* Txxxx number but only used for pmm_states */ + enum gprs_t3350_mode t3350_mode; uint8_t t3370_id_type; uint8_t pending_req; /* the request's message type */ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index cc6ea4a..53de36d 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -115,6 +115,12 @@ static int gsm48_gmm_authorize(struct sgsn_mm_ctx *ctx); +static void mmctx_state_timer_cb(void *_mm); +static void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T, int seconds); +static void mmctx_state_timer_stop(struct sgsn_mm_ctx *mm, unsigned int T); + +static void msgid2mmctx(struct sgsn_mm_ctx *mm, const struct msgb *msg); + static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) { struct sgsn_pdp_ctx *pdp; @@ -165,9 +171,79 @@ get_value_string(gprs_pmm_state_names, ctx->pmm_state), get_value_string(gprs_pmm_state_names, state)); + switch (state) { + case MM_READY: + /* T3314 change state to MM_STANDBY */ + mmctx_state_timer_start(ctx, 3314, sgsn->cfg.timers.T3314); + break; + case MM_IDLE: + mmctx_state_timer_stop(ctx, 3314); + break; + case MM_STANDBY: + mmctx_state_timer_stop(ctx, 3314); + break; + default: + /* when changing to state != MM_READY */ + break; + } + ctx->pmm_state = state; } +void mmctx_recv_pdu(struct sgsn_mm_ctx *ctx, struct msgb *msg) +{ + msgid2mmctx(ctx, msg); + + if (ctx->ran_type != MM_CTX_T_GERAN_Gb) + return; + + switch (ctx->pmm_state) { + case MM_STANDBY: + mmctx_set_mm_state(ctx, MM_READY); + break; + case MM_READY: /* the timer is started when switching to READY */ + mmctx_state_timer_start(ctx, 3314, sgsn->cfg.timers.T3314); + break; + default: + break; + } +} + +static void mmctx_state_timer_cb(void *_mm) +{ + struct sgsn_mm_ctx *mm = _mm; + + if (mm->ran_type != MM_CTX_T_GERAN_Gb) + return; + + switch (mm->state_T) { + case 3314: + if (mm->pmm_state == MM_READY) + mmctx_set_mm_state(mm, MM_STANDBY); + break; + default: + LOGMMCTXP(LOGL_ERROR, mm, "state timer expired in unknown mode %u\n", + mm->state_T); + break; + } +} + +static void mmctx_state_timer_start(struct sgsn_mm_ctx *mm, unsigned int T, int seconds) +{ + mm->state_T = T; + mm->state_timer.data = mm; + mm->state_timer.cb = &mmctx_state_timer_cb; + + osmo_timer_schedule(&mm->state_timer, seconds, 0); +} + +static void mmctx_state_timer_stop(struct sgsn_mm_ctx *mm, unsigned int T) +{ + if (mm->state_T == T) + osmo_timer_del(&mm->state_timer); +} + + #ifdef BUILD_IU int sgsn_ranap_rab_ass_resp(struct sgsn_mm_ctx *ctx, RANAP_RAB_SetupOrModifiedItemIEs_t *setup_ies); int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data) @@ -2895,6 +2971,21 @@ return rc; } +/* Update the MM context, called also for other PDUs than MM PDU from Gb */ +void gsm0408_gprs_notify_pdu_gb(struct msgb *msg) +{ + struct sgsn_mm_ctx *mmctx; + struct gprs_ra_id ra_id; + + bssgp_parse_cell_id(&ra_id, msgb_bcid(msg)); + mmctx = sgsn_mm_ctx_by_tlli(msgb_tlli(msg), &ra_id); + if (!mmctx) { + return; + } + + mmctx_recv_pdu(mmctx, msg); +} + /* Main entry point for incoming 04.08 GPRS messages from Gb */ int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable) diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 01f039a..fe089e4 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -342,6 +342,11 @@ osmo_timer_del(&mm->timer); } + if (osmo_timer_pending(&mm->state_timer)) { + LOGMMCTXP(LOGL_INFO, mm, "Cancelling MM timer %u\n", mm->state_T); + osmo_timer_del(&mm->state_timer); + } + memset(&sig_data, 0, sizeof(sig_data)); sig_data.mm = mm; osmo_signal_dispatch(SS_SGSN, S_SGSN_MM_FREE, &sig_data); -- To view, visit https://gerrit.osmocom.org/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:46:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:46:04 +0000 Subject: Change in openbsc[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/1762 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY ...................................................................... Patch Set 2: for some reason when I re-based this patch, gerrit created a new patchset at 12009 rather than re-using this old one :/ -- To view, visit https://gerrit.osmocom.org/1762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 1762 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 29 Nov 2018 12:46:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:46:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:46:14 +0000 Subject: Change in openbsc[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/1762 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY ...................................................................... Abandoned for some reason when I re-based this patch, gerrit created a new patchset at 12009 rather than re-using this old one :/ -- To view, visit https://gerrit.osmocom.org/1762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 1762 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:48:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:48:10 +0000 Subject: Change in libosmocore[master]: WIP: CRC and FSM for IuUP (user plane) as used in 3G RTP data In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/6357 to look at the new patch set (#3). Change subject: WIP: CRC and FSM for IuUP (user plane) as used in 3G RTP data ...................................................................... WIP: CRC and FSM for IuUP (user plane) as used in 3G RTP data Change-Id: Ibe356fa7b1abaca0091e368db8478e79c09c6cb0 --- M include/Makefile.am M include/osmocom/gsm/prim.h A include/osmocom/gsm/protocol/gsm_25_415.h M src/gsm/Makefile.am A src/gsm/iu_up.c A src/gsm/iuup_crc.c 6 files changed, 814 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/57/6357/3 -- To view, visit https://gerrit.osmocom.org/6357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibe356fa7b1abaca0091e368db8478e79c09c6cb0 Gerrit-Change-Number: 6357 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:48:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:48:56 +0000 Subject: Change in osmo-bsc[master]: pcu_sock: reorganize calculation of paging group In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/6204 ) Change subject: pcu_sock: reorganize calculation of paging group ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/6204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Iee8926d5bc017d912912916e4898e968bf4dd29b Gerrit-Change-Number: 6204 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:57:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:57:32 +0000 Subject: Change in libosmocore[master]: configure.ac: check clock_gettime for glib < 2.17 In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2) to the change originally created by lynxis lazus. ( https://gerrit.osmocom.org/7907 ) Change subject: configure.ac: check clock_gettime for glib < 2.17 ...................................................................... configure.ac: check clock_gettime for glib < 2.17 glib < 2.17 doesn't support clock_gettime directly, it is available via librt. Change-Id: Ice853d85ffe859b1d4df48b91b050c24d85c861b --- M configure.ac M src/Makefile.am 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/7907/2 -- To view, visit https://gerrit.osmocom.org/7907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice853d85ffe859b1d4df48b91b050c24d85c861b Gerrit-Change-Number: 7907 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 12:57:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 12:57:46 +0000 Subject: Change in libosmocore[master]: configure.ac: check clock_gettime for glib < 2.17 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7907 ) Change subject: configure.ac: check clock_gettime for glib < 2.17 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/7907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice853d85ffe859b1d4df48b91b050c24d85c861b Gerrit-Change-Number: 7907 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 29 Nov 2018 12:57:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 13:18:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 13:18:05 +0000 Subject: Change in osmo-trx[master]: lms: Use a default Tx gain value of 64 dB. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12008 ) Change subject: lms: Use a default Tx gain value of 64 dB. ...................................................................... Patch Set 2: It seems default (having no "tx-attenuation" line in osmo-bts VTY) ends up setting TxGain to 73Db with this patch applied: -- Transceiver active with 1 channel(s) Thu Nov 29 14:09:49 2018 DMAIN <0000> Transceiver.cpp:724 [tid=139633425098496] command is POWEROFF Thu Nov 29 14:09:49 2018 DMAIN <0000> Transceiver.cpp:724 [tid=139633425098496] command is RXTUNE 1782200 Thu Nov 29 14:09:50 2018 DMAIN <0000> Transceiver.cpp:724 [tid=139633425098496] command is TXTUNE 1877200 Thu Nov 29 14:09:50 2018 DMAIN <0000> Transceiver.cpp:724 [tid=139633425098496] command is SETTSC 7 Thu Nov 29 14:09:50 2018 DMAIN <0000> Transceiver.cpp:826 [tid=139633425098496] Changing TSC from 0 to 7 Thu Nov 29 14:09:50 2018 DMAIN <0000> Transceiver.cpp:724 [tid=139633425098496] command is POWERON Thu Nov 29 14:09:50 2018 DMAIN <0000> Transceiver.cpp:253 [tid=139633425098496] Starting the transceiver Thu Nov 29 14:09:50 2018 DMAIN <0000> radioInterface.cpp:169 [tid=139633425098496] Starting radio device Thu Nov 29 14:09:50 2018 DDEV <0001> LMSDevice.cpp:212 [tid=139633425098496] starting LMS... Thu Nov 29 14:09:50 2018 DDEV <0001> LMSDevice.cpp:316 [tid=139633425098496] Setting TX gain to 64 dB. Thu Nov 29 14:09:50 2018 DDEV <0001> LMSDevice.cpp:336 [tid=139633425098496] Setting RX gain to 36.5 dB. Thu Nov 29 14:09:50 2018 DDEV <0001> LMSDevice.cpp:383 [tid=139633425098496] Initial timestamp 27500 Thu Nov 29 14:09:50 2018 DMAIN <0000> radioInterface.cpp:190 [tid=139633425098496] Radio started Thu Nov 29 14:09:50 2018 DMAIN <0000> Threads.cpp:116 [tid=139633422538496] Thread 139633422538496 (task 1885) set name: TxLower Thu Nov 29 14:09:50 2018 DMAIN <0000> Threads.cpp:116 [tid=139633422444288] Thread 139633422444288 (task 1886) set name: RxLower Thu Nov 29 14:09:50 2018 DMAIN <0000> Threads.cpp:116 [tid=139633422284544] Thread 139633422284544 (task 1887) set name: RxUpper0 Thu Nov 29 14:09:50 2018 DMAIN <0000> Threads.cpp:116 [tid=139633422157568] Thread 139633422157568 (task 1888) set name: TxUpper0 Thu Nov 29 14:09:50 2018 DMAIN <0000> Transceiver.cpp:724 [tid=139633425098496] command is SETRXGAIN 1 Thu Nov 29 14:09:50 2018 DDEV <0001> LMSDevice.cpp:336 [tid=139633425098496] Setting RX gain to 1 dB. Thu Nov 29 14:09:50 2018 DMAIN <0000> Transceiver.cpp:724 [tid=139633425098496] command is SETPOWER 0 Thu Nov 29 14:09:50 2018 DDEV <0001> LMSDevice.cpp:316 [tid=139633425098496] Setting TX gain to 73 dB. So basically SETPOWER 0 means apply 0 attenuation, which gets passed this way: rfGain = mRadio->setTxGain(mRadio->maxTxGain() - (double) atten, chan); So I think we should set maxTxGain() to 64dB instead of 73dB for it to be applied nicely. -- To view, visit https://gerrit.osmocom.org/12008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 Gerrit-Change-Number: 12008 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 13:18:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 13:18:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 13:18:44 +0000 Subject: Change in osmo-trx[master]: lms: Use a default Tx gain value of 64 dB. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12008 ) Change subject: lms: Use a default Tx gain value of 64 dB. ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/12008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 Gerrit-Change-Number: 12008 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 13:18:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 13:25:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 13:25:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11984 ) Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 13:25:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 13:27:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 13:27:09 +0000 Subject: Change in osmo-trx[master]: lms: Use a default Tx gain value of 64 dB. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12008 ) Change subject: lms: Use a default Tx gain value of 64 dB. ...................................................................... Patch Set 2: Oh I got the description wrong. So actuallt the default is "tx-attenuation oml" when no option is set, which means attenuation is set by BSC: "Use NM_ATT_RF_MAXPOWR_R (max power reduction) from BSC via OML". However, there is a "no osmotrx tx-attenuation" explicit option, so I'm not sure whether you mean that one or simply putting no setting in the config. I guess you actually referenced the "no osmotrx tx-attenuation" but put the quote character after the "no" keyword, thus it's confusing. -- To view, visit https://gerrit.osmocom.org/12008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 Gerrit-Change-Number: 12008 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 13:27:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 13:32:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 13:32:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11984 ) Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11984/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/#/c/11984/1/hlr/HLR_Tests.ttcn at 479 PS1, Line 479: [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, exp_err_cause)) -> value ret { IIUC now HLR_Tests requires presence of the added IE. (because ? expects something, * would be "don't care") This change should be mentioned in the commit log -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 13:32:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 13:32:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 13:32:58 +0000 Subject: Change in osmo-trx[master]: lms: Use a default Tx gain value of 64 dB. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12008 ) Change subject: lms: Use a default Tx gain value of 64 dB. ...................................................................... Patch Set 2: To me it still looks like a better idea to rely on default "osmotrx tx-attenuation oml" and then have MaxTxGain() to 64 or 66 dB. -- To view, visit https://gerrit.osmocom.org/12008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 Gerrit-Change-Number: 12008 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 13:32:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 13:50:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 13:50:19 +0000 Subject: Change in libosmocore[master]: configure.ac: check clock_gettime for glib < 2.17 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/7907 ) Change subject: configure.ac: check clock_gettime for glib < 2.17 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice853d85ffe859b1d4df48b91b050c24d85c861b Gerrit-Change-Number: 7907 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Assignee: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 29 Nov 2018 13:50:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 14:00:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11984 to look at the new patch set (#2). Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR Both session state and session ID IEs are always being encoded together by libosmocore's GSUP implementation. So, if a message contains a session ID IE, session state IE shall also be there. For some reason, the session state IE was missing in both ts_GSUP_PROC_SS_ERR and tr_GSUP_PROC_SS_ERR templates. This could led to incorrect matching in our test cases. This change fixes both templates by adding the missing IE. Since tr_GSUP_PROC_SS_ERR templete is used in HLR_Tests.ttcn, all the affected matching statements were also corrected. Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/11984/2 -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 14:00:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11990 to look at the new patch set (#2). Change subject: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates ...................................................................... library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In general, the order of IEs in a GSUP message doesn't matter. Despite libosmocore's GSUP API encodes IEs in a fixed order, it is capable to decode them in any arbitary order. Meanwhile, in the current TTCN-3 definitions (i.e. templates) the order makes sense, because the 'GSUP_IEs' type is a record, that according to the TTCN-3 documentation represents an *ordered* sequence of elements. Let's reorder the IEs of both t{r|s}_GSUP_PROC_SS_ERR templates in a way that is used by the libosmocore's GSUP encoder. Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db --- M library/GSUP_Types.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/11990/2 -- To view, visit https://gerrit.osmocom.org/11990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db Gerrit-Change-Number: 11990 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 14:00:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11985 to look at the new patch set (#3). Change subject: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout ...................................................................... MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout The idea of this test case is to verify SS session termination due to expiry of guard timeout. Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Depends-on: (OsmoMSC) Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Related: OS#3655 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/11985/3 -- To view, visit https://gerrit.osmocom.org/11985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Gerrit-Change-Number: 11985 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:05:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:05:46 +0000 Subject: Change in osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY ...................................................................... Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12009/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12009/1//COMMIT_MSG at 9 PS1, Line 9: When a MS MM state is READY the exakt location is known (PCU). typo: exact. https://gerrit.osmocom.org/#/c/12009/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12009/1/include/osmocom/sgsn/gprs_sgsn.h at 230 PS1, Line 230: unsigned int state_T; /* Txxxx number but only used for pmm_states */ Is this really needed? Are there more than one timer going to be handled by state_timer? Can we rename state_timer to T3314 maybe? https://gerrit.osmocom.org/#/c/12009/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: https://gerrit.osmocom.org/#/c/12009/1/src/gprs/gprs_gmm.c at 2975 PS1, Line 2975: void gsm0408_gprs_notify_pdu_gb(struct msgb *msg) This newly added function seems to be never called anywhere, and as a result newly added function mmctx_recv_pdu is neither called. -- To view, visit https://gerrit.osmocom.org/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 29 Nov 2018 14:05:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:07:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:07:19 +0000 Subject: Change in osmo-gsm-tester[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11997 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5916bc7e656b508fc74917e79841ce7e1ee4981b Gerrit-Change-Number: 11997 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:07:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:07:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:07:22 +0000 Subject: Change in osmo-gsm-tester[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Pau Espin Pedrol has removed a vote on this change. Change subject: doc/manuals: integrate into this repository ...................................................................... Removed Verified+1 by Pau Espin Pedrol -- To view, visit https://gerrit.osmocom.org/11997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I5916bc7e656b508fc74917e79841ce7e1ee4981b Gerrit-Change-Number: 11997 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:08:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:08:14 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11998 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 14:08:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:08:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 14:08:39 +0000 Subject: Change in osmo-gsm-tester[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11997 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/11997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5916bc7e656b508fc74917e79841ce7e1ee4981b Gerrit-Change-Number: 11997 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Nov 2018 14:08:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:08:42 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 14:08:42 +0000 Subject: Change in osmo-gsm-tester[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11997 ) Change subject: doc/manuals: integrate into this repository ...................................................................... doc/manuals: integrate into this repository Update .gitignore and make the manuals build without a toplevel configure.ac file from autotools: $ cd doc/manuals $ make Related: OS#3385 Change-Id: I5916bc7e656b508fc74917e79841ce7e1ee4981b --- M .gitignore R doc/manuals/Makefile A doc/manuals/osmo-gsm-manuals-dir.sh 3 files changed, 39 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/.gitignore b/.gitignore index a85b41a..47e9f86 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,14 @@ selftest/trial_test/ example/resources.conf ttcn3/resources.conf + +# manuals +doc/manuals/*.html +doc/manuals/*.svg +doc/manuals/*.pdf +doc/manuals/*__*.png +doc/manuals/*.check +doc/manuals/generated/ +doc/manuals/osmomsc-usermanual.xml +doc/manuals/common +doc/manuals/build diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile similarity index 60% rename from doc/manuals/Makefile.am rename to doc/manuals/Makefile index 4301ab9..0730411 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile @@ -1,7 +1,5 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmo-gsm-tester-manual.adoc \ - osmo-gsm-tester-manual-docinfo.xml \ - chapters +OSMO_GSM_MANUALS_DIR := $(shell ./osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) ASCIIDOC = osmo-gsm-tester-manual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/doc/manuals/osmo-gsm-manuals-dir.sh b/doc/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 0000000..f132eaa --- /dev/null +++ b/doc/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/11997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5916bc7e656b508fc74917e79841ce7e1ee4981b Gerrit-Change-Number: 11997 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:09:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:09:44 +0000 Subject: Change in openbsc[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11999 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 1: Code-Review-1 We do have a configure.ac under openbsc/ dir, we should be using that one. See any build script for openbsc, we use "openbsc/openbsc/" as path instead of for instance "osmo-bsc/" or "osmo-bts/". At least explain in the commit log why you don't use that configure.ac script. -- To view, visit https://gerrit.osmocom.org/11999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 Gerrit-Change-Number: 11999 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:09:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:10:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:10:17 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoGSMTester files (now avail in osmo-gsm-tester.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12000 ) Change subject: remove OsmoGSMTester files (now avail in osmo-gsm-tester.git) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I89429a306d37e267fdb335d1c177c9ede3b64444 Gerrit-Change-Number: 12000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:10:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:10:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:10:29 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoNITB files (now avail in openbsc.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12001 ) Change subject: remove OsmoNITB files (now avail in openbsc.git) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d4f4d6dc5a70e27de464921f4fe0aab4ca8ec72 Gerrit-Change-Number: 12001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:10:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:12:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:12:02 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmocomBB files (now avail in osmocom-bb.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12002 ) Change subject: remove OsmocomBB files (now avail in osmocom-bb.git) ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/12002/1/Makefile.am File Makefile.am: https://gerrit.osmocom.org/#/c/12002/1/Makefile.am at 10 PS1, Line 10: OsmoNAT fyi: OsmoNAT should be moved to openbsc.git, the code is there (osmo-bsc_nat) and it's together with osmo-bsc-sccplite and osmobsc_mgcp the only still maintained software. -- To view, visit https://gerrit.osmocom.org/12002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5a4839be7a3122ab566023a3e7b3bc955db98ba4 Gerrit-Change-Number: 12002 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:12:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:12:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 14:12:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11984 ) Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/11984/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11984/2//COMMIT_MSG at 19 PS2, Line 19: affected matching statements were also corrected. I still need to know whether this affects the test runs somehow. Did they fail before and work now? No changes? ...? Surely, changing the expected IEs must have *some* effect on the test runs? -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 14:12:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:12:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:12:55 +0000 Subject: Change in osmo-gsm-manuals[master]: remove obsolete project files and leftovers In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12003 ) Change subject: remove obsolete project files and leftovers ...................................................................... Patch Set 1: fyi: OsmoNAT should be moved to openbsc.git, the code is there (osmo-bsc_nat) and it's together with osmo-bsc-sccplite and osmobsc_mgcp the only still maintained software. -- To view, visit https://gerrit.osmocom.org/12003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8716c41b03b09250e61e6a29fe9589454258fe03 Gerrit-Change-Number: 12003 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:12:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:14:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 14:14:21 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoGSMTester files (now avail in osmo-gsm-tester.git) In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12000 ) Change subject: remove OsmoGSMTester files (now avail in osmo-gsm-tester.git) ...................................................................... remove OsmoGSMTester files (now avail in osmo-gsm-tester.git) Files were added in osmo-gsm-tester.git Change-Id I8a34871948425ea40f40dbb11a59806905e4bed1 Depends: osmo-gsm-tester.git Change-Id I8a34871948425ea40f40dbb11a59806905e4bed1 Related: OS#3385 Change-Id: I89429a306d37e267fdb335d1c177c9ede3b64444 --- M Makefile.am D OsmoGSMTester/Makefile.am D OsmoGSMTester/chapters/config.adoc D OsmoGSMTester/chapters/debugging.adoc D OsmoGSMTester/chapters/install.adoc D OsmoGSMTester/chapters/intro.adoc D OsmoGSMTester/chapters/test_api.adoc D OsmoGSMTester/chapters/trial.adoc D OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml D OsmoGSMTester/osmo-gsm-tester-manual.adoc M configure.ac 11 files changed, 0 insertions(+), 1,543 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index fdafc0d..3552541 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) SUBDIRS = tests \ - OsmoGSMTester \ OsmoMGCP \ OsmoNAT \ OsmoNITB \ diff --git a/OsmoGSMTester/Makefile.am b/OsmoGSMTester/Makefile.am deleted file mode 100644 index 4301ab9..0000000 --- a/OsmoGSMTester/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmo-gsm-tester-manual.adoc \ - osmo-gsm-tester-manual-docinfo.xml \ - chapters - -ASCIIDOC = osmo-gsm-tester-manual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoGSMTester/chapters/config.adoc b/OsmoGSMTester/chapters/config.adoc deleted file mode 100644 index 7e250e0..0000000 --- a/OsmoGSMTester/chapters/config.adoc +++ /dev/null @@ -1,361 +0,0 @@ -== Configuration - -[[config_paths]] -=== Config Paths - -The osmo-gsm-tester looks for configuration files in various standard -directories in this order: - -- '$HOME/.config/osmo-gsm-tester/' -- '/usr/local/etc/osmo-gsm-tester/' -- '/etc/osmo-gsm-tester/' - -The config location can also be set by an environment variable -'$OSMO_GSM_TESTER_CONF', which then overrides the above locations. - -The osmo-gsm-tester expects to find the following configuration files in a -configuration directory: - -- 'paths.conf' -- 'resources.conf' -- 'default-suites.conf' (optional) -- 'defaults.conf' (optional) - -These are described in detail in the following sections. - -=== Format: YAML, and its Drawbacks - -The general configuration format used is YAML. The stock python YAML parser -does have several drawbacks: too many complex possibilities and alternative -ways of formatting a configuration, but at the time of writing seems to be the -only widely used configuration format that offers a simple and human readable -formatting as well as nested structuring. It is recommended to use only the -exact YAML subset seen in this manual in case the osmo-gsm-tester should move -to a less bloated parser in the future. - -Careful: if a configuration item consists of digits and starts with a zero, you -need to quote it, or it may be interpreted as an octal notation integer! Please -avoid using the octal notation on purpose, it is not provided intentionally. - -[[paths_conf]] -=== 'paths.conf' - -The 'paths.conf' file defines where to store the global state (of reserved -resources) and where to find suite and scenario definitions. - -Any relative paths found in a 'paths.conf' file are interpreted as relative to -the directory of that 'paths.conf' file. - -Example: - ----- -state_dir: '/var/tmp/osmo-gsm-tester/state' -suites_dir: '/usr/local/src/osmo-gsm-tester/suites' -scenarios_dir: './scenarios' ----- - -[[state_dir]] -==== 'state_dir' - -It contains global or system-wide state for osmo-gsm-tester. In a typical state -dir you can find the following files: - -'last_used_msisdn.state':: - Contains last used msisdn number, which is automatically increased every - time osmo-gsm-tester needs to assign a new subscriber in a test. -'lock':: - Lock file used to implement a mutual exclusion zone around the - 'reserved_resources.state' file. -'reserved_resources.state':: - File containing a set of reserved resources by any number of - osmo-gsm-tester instances. Each osmo-gsm-tester instance is responsible - to clear its resources from the list once it is done using them and are - no longer reserved. - -If you would like to set up several separate configurations (not typical), note -that the 'state_dir' is used to reserve resources, which only works when all -configurations that share resources also use the same 'state_dir'. - -This way, several concurrent users of osmo-gsm-tester (ie. several -osmo-gsm-tester processes running in parallel) can run without interfering with -each other (e.g. using same ARFCN, same IP or same ofono modem path). - -[[suites_dir]] -==== 'suites_dir' - -Suites contain a set of tests which are designed to be run together to test a -set of features given a specific set of resources. As a result, resources are -allocated per suite and not per test. - -Tests for a given suite are located in the form of '.py' python scripts in the -same directory where the 'suite.conf' lays. - -[[scenarios_dir]] -==== 'scenarios_dir' - -This dir contains scenario configuration files. - -Scenarios define constraints to serve the resource requests of a 'suite.conf', -to select specific resources from the general resource pool specified in 'resources.conf'. - -All 'times' attributes are expanded before matching. For example, if a 'suite.conf' -requests two BTS, we may enforce that both BTS should be of type 'osmo-bts-sysmo' in -these ways: - ----- -resources: - bts: - - type: osmo-bts-sysmo - - type: osmo-bts-sysmo ----- - -or alternatively, - ----- -resources: - bts: - - times: 2 - type: osmo-bts-sysmo ----- - -If only one resource is specified in the scenario, then the resource allocator -assumes the restriction is to be applied to the first resource and that remaining -resources have no restrictions to be taken into consideration. - -To apply restrictions only on the second resource, the first element can be left -emtpy, like: - ----- -resources: - bts: - - {} - - type: osmo-bts-sysmo ----- - -On the 'osmo_gsm_tester.py' command line and the 'default_suites.conf', any number of -such scenario configurations can be combined in the form: - ----- -:[+[+...]] ----- - -e.g. - ----- -my_suite:sysmo+tch_f+amr ----- - -[[resources_conf]] -=== 'resources.conf' - -The 'resources.conf' file defines which hardware is connected to the main unit, -as well as which limited configuration items (like IP addresses or ARFCNs) -should be used. - -These resources are allocated dynamically and are not configured explicitly: - -- MSISDN: phone numbers are dealt out to test scripts in sequence on request. - -A 'resources.conf' is structured as a list of items for each resource type, -where each item has one or more settings -- for an example, see -<>. - -These kinds of resource are known: - -'ip_address':: - List of IP addresses to run osmo-nitb instances on. The main unit - typically has a limited number of such IP addresses configured, which - the connected BTS models can see on their network. - 'addr'::: - IPv4 address of the local interface. - -'bts':: - List of available BTS hardware. - 'label'::: - human readable label for your own reference - 'type'::: - which way to launch this BTS, one of - - 'osmo-bts-sysmo' - - 'osmo-bts-trx' - - 'osmo-bts-octphy' - - 'ipa-nanobts' - 'ipa_unit_id'::: - ip.access unit id to be used by the BTS, written into BTS and BSC config. - 'addr'::: - Remote IP address of the BTS for BTS like sysmoBTS, and local IP address - to bind to for locally run BTS such as osmo-bts-trx. - 'band'::: - GSM band that this BTS shoud use (*TODO*: allow multiple bands). One of: - - 'GSM-1800' - - 'GSM-1900' - - (*TODO*: more bands) - 'trx_list'::: - Specific TRX configurations for this BTS. There should be as many of - these as the BTS has TRXes. (*TODO*: a way to define >1 TRX without - special configuration for them.) - 'hw_addr':::: - Hardware (MAC) address of the TRX in the form of '11:22:33:44:55:66', - only used for osmo-bts-octphy. (*TODO*: and nanobts??) - 'net_device':::: - Local network device to reach the TRX's 'hw_addr' at, only used for - osmo-bts-octphy. Example: 'eth0'. - 'nominal_power':::: - Nominal power to be used by the TRX. - 'max_power_red':::: - Max power reduction to apply to the nominal power of the TRX. -'arfcn':: - List of ARFCNs to use for running BTSes, which defines the actual RF - frequency bands used. - 'arfcn'::: - ARFCN number, see e.g. - https://en.wikipedia.org/wiki/Absolute_radio-frequency_channel_number - (note that the resource type 'arfcn' contains an item trait also named - 'arfcn'). - 'band'::: - GSM band name to use this ARFCN for, same as for 'bts:band' above. - -'modem':: - List of modems reachable via ofono and information on the inserted SIM - card. (Note: the MSISDN is allocated dynamically in test scripts). - 'label'::: - Human readable label for your own reference, which also appears in logs. - 'path'::: - Ofono's path for this modem, like '/modemkind_99'. - 'imsi'::: - IMSI of the inserted SIM card, like '"123456789012345"'. - 'ki'::: - 16 byte authentication/encryption KI of the inserted SIM card, in - hexadecimal notation (32 characters) like + - '"00112233445566778899aabbccddeeff"'. - 'auth_algo'::: - Authentication algorithm to be used with the SIM card. One of: - - 'none' - - 'xor' - - 'comp128v1' - 'ciphers'::: - List of ciphers that this modem supports, used to match - requirements in suites or scenarios. Any combination of: - - 'a5_0' - - 'a5_1' - - 'a5_2' - - 'a5_3' - - 'a5_4' - - 'a5_5' - - 'a5_6' - - 'a5_7' - 'features'::: - List of features that this modem supports, used to match requirements in - suites or scenarios. Any combination of: - - 'sms' - - 'gprs' - - 'voice' - - 'ussd' - -Side note: at first sight it might make sense to the reader to rather structure -e.g. the 'ip_address' or 'arfcn' configuration as + -'"arfcn: GSM-1800: [512, 514, ...]"', + -but the more verbose format is chosen to stay consistent with the general -structure of resource configurations, which the resource allocation algorithm -uses to resolve required resources according to their traits. These -configurations look cumbersome because they exhibit only one trait / a trait -that is repeated numerous times. No special notation for these cases is -available (yet). - -[[default_suites]] -=== 'default-suites.conf' (optional) - -The 'default-suites.conf' file contains a list of 'suite:scenario+scenario+...' -combination strings as defined by the 'osmo-gsm-tester.py -s' commandline -option. If invoking the 'osmo-gsm-tester.py' without any suite definitions, the -'-s' arguments are taken from this file instead. Each of these suite + scenario -combinations is run in sequence. - -A suite name must match the name of a directory in the 'suites_dir' as defined -by 'paths.conf'. - -A scenario name must match the name of a configuration file in the -'scenarios_dir' as defined by 'paths.conf' (optionally without the '.conf' -suffix). - -For 'paths.conf', see <>. - -Example of a 'default-suites.conf' file: - ----- -- sms:sysmo -- voice:sysmo+tch_f -- voice:sysmo+tch_h -- voice:sysmo+dyn_ts -- sms:trx -- voice:trx+tch_f -- voice:trx+tch_h -- voice:trx+dyn_ts ----- - -=== 'defaults.conf' (optional) - -Each binary run by osmo-gsm-tester, e.g. 'osmo-nitb' or 'osmo-bts-sysmo', -typically has a configuration file template that is populated with values for a -trial run. - -Some of these values are provided by the 'resources.conf' from the allocated -resource(s), but not all values can be populated this way: some osmo-nitb -configuration values like the network name, encryption algorithm or timeslot -channel combinations are in fact not resources (only the nitb's interface -address is). These additional settings may be provided by the scenario -configurations, but in case the provided scenarios leave some values unset, -they are taken from this 'defaults.conf'. (A 'scenario.conf' or a -'resources.conf' providing a similar setting always has precedence over the -values given in a 'defaults.conf'). - -Example of a 'defaults.conf': - ----- -nitb: - net: - mcc: 901 - mnc: 70 - short_name: osmo-gsm-tester-nitb - long_name: osmo-gsm-tester-nitb - auth_policy: closed - encryption: a5_0 - -bsc: - net: - mcc: 901 - mnc: 70 - short_name: osmo-gsm-tester-msc - long_name: osmo-gsm-tester-msc - auth_policy: closed - encryption: a5_0 - authentication: optional - -msc: - net: - mcc: 901 - mnc: 70 - short_name: osmo-gsm-tester-msc - long_name: osmo-gsm-tester-msc - auth_policy: closed - encryption: a5_0 - authentication: optional - -bsc_bts: - location_area_code: 23 - base_station_id_code: 63 - stream_id: 255 - osmobsc_bts_type: sysmobts - trx_list: - - nominal_power: 23 - max_power_red: 0 - arfcn: 868 - timeslot_list: - - phys_chan_config: CCCH+SDCCH4 - - phys_chan_config: SDCCH8 - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH - - phys_chan_config: TCH/F_TCH/H_PDCH ----- diff --git a/OsmoGSMTester/chapters/debugging.adoc b/OsmoGSMTester/chapters/debugging.adoc deleted file mode 100644 index bea1e5c..0000000 --- a/OsmoGSMTester/chapters/debugging.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[debugging]] -== Debugging - -*TODO*: describe how to invoke 'ipdb3' and step into a suite's test script diff --git a/OsmoGSMTester/chapters/install.adoc b/OsmoGSMTester/chapters/install.adoc deleted file mode 100644 index d19f909..0000000 --- a/OsmoGSMTester/chapters/install.adoc +++ /dev/null @@ -1,664 +0,0 @@ -== Installation on Main Unit - -The main unit is a general purpose computer that orchestrates the tests. It -runs the core network components, controls the modems and so on. This can be -anything from a dedicated production rack unit to your laptop at home. - -This manual will assume that tests are run from a jenkins build slave, by a user -named 'jenkins' that belong to group 'osmo-gsm-tester'. The user configuration -for manual test runs and/or a different user name is identical, simply replace -the user name or group. - -=== Osmo-gsm-tester Dependencies - -On a Debian/Ubuntu based system, these commands install the packages needed to -run the osmo-gsm-tester.py code, i.e. install these on your main unit: - ----- -apt-get install \ - dbus \ - tcpdump \ - sqlite3 \ - python3 \ - python3-yaml \ - python3-mako \ - python3-gi \ - ofono \ - patchelf \ - sudo \ - libcap2-bin \ - python3-pip -pip3 install pydbus -pip3 install git+git://github.com/podshumok/python-smpplib.git ----- - -IMPORTANT: ofono may need to be installed from source to contain the most -recent fixes needed to operate your modems. This depends on the modem hardware -used and the tests run. Please see <>. - -To run osmo-bts-trx with a USRP attached, you may need to install a UHD driver. -Please refer to http://osmocom.org/projects/osmotrx/wiki/OsmoTRX#UHD for -details; the following is an example for the B200 family USRP devices: - ----- -apt-get install libuhd-dev uhd-host -/usr/lib/uhd/utils/uhd_images_downloader.py ----- - -[[jenkins_deps]] -==== Osmocom Build Dependencies - -Each of the jenkins builds requires individual dependencies. This is generally -the same as for building the software outside of osmo-gsm-tester and will not -be detailed here. For the Osmocom projects, refer to -http://osmocom.org/projects/cellular-infrastructure/wiki/Build_from_Source . Be -aware of specific requirements for BTS hardware: for example, the -osmo-bts-sysmo build needs the sysmoBTS SDK installed on the build slave, which -should match the installed sysmoBTS firmware. - - -[[configure_jenkins_slave]] -=== Jenkins Build and Run Slave - -==== Create 'jenkins' User on Main Unit - -On the main unit, create a jenkins user: - ----- -useradd -m jenkins ----- - -==== Install Java on Main Unit - -To be able to launch the Jenkins build slave, a Java RE must be available on -the main unit. For example: - ----- -apt-get install default-jdk ----- - -==== Allow SSH Access from Jenkins Master - -Create an SSH keypair to be used for login on the osmo-gsm-tester. This may be -entered on the jenkins web UI; alternatively, use the jenkins server's shell: - -Login on the main jenkins server shell and create an SSH keypair, for example: - ----- -# su jenkins -$ mkdir -p /usr/local/jenkins/keys -$ ssh-keygen -Generating public/private rsa key pair. -Enter file in which to save the key (/home/jenkins/.ssh/id_rsa): /usr/local/jenkins/keys/osmo-gsm-tester-rnd -Enter passphrase (empty for no passphrase): -Enter same passphrase again: -Your identification has been saved in /usr/local/jenkins/keys/osmo-gsm-tester-rnd -Your public key has been saved in /usr/local/jenkins/keys/osmo-gsm-tester-rnd.pub. -The key fingerprint is: -... ----- - -Copy the public key to the main unit, e.g. copy-paste: - ----- -cat /usr/local/jenkins/keys/osmo-gsm-tester-rnd.pub -# copy this public key ----- - -On the main unit: - ----- -mkdir ~jenkins/.ssh -cat > ~jenkins/.ssh/authorized_keys -# paste above public key and hit Ctrl-D -chown -R jenkins: ~jenkins/.ssh ----- - -Make sure that the user running the jenkins master accepts the main unit's host -identification. There must be an actual RSA host key available in the -known_hosts file for the jenkins master to be able to log in. Simply calling -ssh and accepting the host key as usual is not enough. Jenkins may continue to -say "Host key verification failed". - -To place an RSA host key in the jenkins' known_hosts file, you may do: - -On the Jenkins master: - ----- -main_unit_ip=10.9.8.7 -ssh-keyscan -H $main_unit_ip >> ~jenkins/.ssh/known_hosts -chown jenkins: ~jenkins/.ssh/known_hosts ----- - -Verify that the jenkins user on the Jenkins master has SSH access to the main -unit: - ----- -su jenkins -main_unit_ip=10.9.8.7 -ssh -i /usr/local/jenkins/keys/osmo-gsm-tester-rnd jenkins@$main_unit_ip -exit ----- - -[[install_add_jenkins_slave]] -==== Add Jenkins Slave - -In the jenkins web UI, add a new build slave for the osmo-gsm-tester: - -* 'Manage Jenkins' -** 'Manage Nodes' -*** 'New Node' -**** Enter a node name, e.g. "osmo-gsm-tester-1" + - (the "-1" is just some identification in case you'd like to add another - setup later). -**** 'Permanent Agent' - -Configure the node as: - -* '# of executors': 1 -* 'Remote root directory': "/home/jenkins" -* 'Labels': "osmo-gsm-tester" + - (This is a general label common to all osmo-gsm-tester build slaves you may set up in the future.) -* 'Usage': 'Only build jobs with label expressions matching this node' -* 'Launch method': 'Launch slave agents via SSH' -** 'Host': your main unit's IP address -** 'Credentials': choose 'Add' / 'Jenkins' -*** 'Domain': 'Global credentials (unrestricted)' -*** 'Kind': 'SSH Username with private key' -*** 'Scope': 'Global' -*** 'Username': "jenkins" + - (as created on the main unit above) -*** 'Private Key': 'From a file on Jenkins master' -**** 'File': "/usr/local/jenkins/keys/osmo-gsm-tester-rnd" -*** 'Passphrase': enter same passphrase as above -*** 'ID': "osmo-gsm-tester-1" -*** 'Name': "jenkins for SSH to osmo-gsm-tester-1" - -The build slave should be able to start now. - - -==== Add Build Jobs - -There are various jenkins-build-* scripts in osmo-gsm-tester/contrib/, which -can be called as jenkins build jobs to build and bundle binaries as artifacts, -to be run on the osmo-gsm-tester main unit and/or BTS hardware. - -Be aware of the dependencies, as hinted at in <>. - -While the various binaries could technically be built on the osmo-gsm-tester -main unit, it is recommended to use a separate build slave, to take load off -of the main unit. - -On your jenkins master, set up build jobs to call these scripts -- typically -one build job per script. Look in contrib/ and create one build job for each of -the BTS types you would like to test, as well as one for the 'build-osmo-nitb'. - -These are generic steps to configure a jenkins build -job for each of these build scripts, by example of the -jenkins-build-osmo-nitb.sh script; all that differs to the other scripts is the -"osmo-nitb" part: - -* 'Project name': "osmo-gsm-tester_build-osmo-nitb" + - (Replace 'osmo-nitb' according to which build script this is for) -* 'Discard old builds' + - Configure this to taste, for example: -** 'Max # of build to keep': "20" -* 'Restrict where this project can be run': Choose a build slave label that - matches the main unit's architecture and distribution, typically a Debian - system, e.g.: "linux_amd64_debian8" -* 'Source Code Management': -** 'Git' -*** 'Repository URL': "git://git.osmocom.org/osmo-gsm-tester" -*** 'Branch Specifier': "*/master" -*** 'Additional Behaviors' -**** 'Check out to a sub-directory': "osmo-gsm-tester" -* 'Build Triggers' + - The decision on when to build is complex. Here are some examples: -** Once per day: + - 'Build periodically': "H H * * *" -** For the Osmocom project, the purpose is to verify our software changes. - Hence we would like to test every time our code has changed: -*** We could add various git repositories to watch, and enable 'Poll SCM'. -*** On jenkins.osmocom.org, we have various jobs that build the master branches - of their respective git repositories when a new change was merged. Here, we - can thus trigger e.g. an osmo-nitb build for osmo-gsm-tester everytime the - master build has run: + - 'Build after other projects are built': "OpenBSC" -*** Note that most of the Osmocom projects also need to be re-tested when their - dependencies like libosmo* have changed. Triggering on all those changes - typically causes more jenkins runs than necessary: for example, it rebuilds - once per each dependency that has rebuilt due to one libosmocore change. - There is so far no trivial way known to avoid this. It is indeed safest to - rebuild more often. -* 'Build' -** 'Execute Shell' -+ ----- -#!/bin/sh -set -e -x -./osmo-gsm-tester/contrib/jenkins-build-osmo-nitb.sh ----- -+ -(Replace 'osmo-nitb' according to which build script this is for) - -* 'Post-build Actions' -** 'Archive the artifacts': "*.tgz, *.md5" + - (This step is important to be able to use the built binaries in the run job - below.) - - -TIP: When you've created one build job, it is convenient to create further -build jobs by copying the first and, e.g., simply replacing all "osmo-nitb" -with "osmo-bts-trx". - -==== Add Run Job - -This is the jenkins job that runs the tests on the GSM hardware: - -* It sources the artifacts from jenkins' build jobs. -* It runs on the osmo-gsm-tester main unit. - -Here is the configuration for the run job: - -* 'Project name': "osmo-gsm-tester_run" -* 'Discard old builds' + - Configure this to taste, for example: -** 'Max # of build to keep': "20" -* 'Restrict where this project can be run': "osmo-gsm-tester" + - (to match the 'Label' configured in <>). -* 'Source Code Management': -** 'Git' -*** 'Repository URL': "git://git.osmocom.org/osmo-gsm-tester" -*** 'Branch Specifier': "*/master" -*** 'Additional Behaviors' -**** 'Check out to a sub-directory': "osmo-gsm-tester" -**** 'Clean before checkout' -* 'Build Triggers' + - The decision on when to build is complex. For this run job, it is suggested - to rebuild: -** after each of above build jobs that produced new artifacts: + - 'Build after other projects are built': "osmo-gsm-tester_build-osmo-nitb, - osmo-gsm-tester_build-osmo-bts-sysmo, osmo-gsm-tester_build-osmo-bts-trx" + - (Add each build job name you configured above) -** as well as once per day: + - 'Build periodically': "H H * * *" -** and, in addition, whenever the osmo-gsm-tester scripts have been modified: + - 'Poll SCM': "H/5 * * * *" + - (i.e. look every five minutes whether the upstream git has changed) -* 'Build' -** Copy artifacts from each build job you have set up: -*** 'Copy artifacts from another project' -**** 'Project name': "osmo-gsm-tester_build-osmo-nitb" -**** 'Which build': 'Latest successful build' -**** enable 'Stable build only' -**** 'Artifacts to copy': "*.tgz, *.md5" -*** Add a separate similar 'Copy artifacts...' section for each build job you - have set up. -** 'Execute Shell' -+ ----- -#!/bin/sh -set -e -x - -# debug: provoke a failure -#export OSMO_GSM_TESTER_OPTS="-s debug -t fail" - -PATH="$PWD/osmo-gsm-tester/src:$PATH" \ - ./osmo-gsm-tester/contrib/jenkins-run.sh ----- -+ -Details: - -*** The 'jenkins-run.sh' script assumes to find the 'osmo-gsm-tester.py' in the - '$PATH'. To use the most recent osmo-gsm-tester code here, we direct - '$PATH' to the actual workspace checkout. This could also run from a sytem - wide install, in which case you could omit the explicit PATH to - "$PWD/osmo-gsm-tester/src". -*** This assumes that there are configuration files for osmo-gsm-tester placed - on the system (see <>). -*** If you'd like to check the behavior of test failures, you can uncomment the - line below "# debug" to produce a build failure on every run. Note that - this test typically produces a quite empty run result, since it launches no - NITB nor BTS. -* 'Post-build Actions' -** 'Archive the artifacts' -*** 'Files to archive': "*-run.tgz, *-bin.tgz" + - This stores the complete test report with config files, logs, stdout/stderr - output, pcaps as well as the binaries used for the test run in artifacts. - This allows analysis of older builds, instead of only the most recent build - (which cleans up the jenkins workspace every time). The 'trial-N-run.tgz' - and 'trial-N-bin.tgz' archives are produced by the 'jenkins-run.sh' script, - both for successful and failing runs. - -=== Install osmo-gsm-tester on Main Unit - -This assumes you have already created the jenkins user (see <>). - -==== User Permissions - -On the main unit, create a group for all users that should be allowed to use -the osmo-gsm-tester, and add users (here 'jenkins') to this group. - ----- -groupadd osmo-gsm-tester -gpasswd -a jenkins osmo-gsm-tester ----- - -NOTE: you may also need to add users to the 'usrp' group, see -<>. - -A user added to a group needs to re-login for the group permissions to take -effect. - -This group needs the following permissions: - -===== Paths - -Assuming that you are using the example config, prepare a system wide state -location in '/var/tmp': - ----- -mkdir -p /var/tmp/osmo-gsm-tester/state -chown -R :osmo-gsm-tester /var/tmp/osmo-gsm-tester -chmod -R g+rwxs /var/tmp/osmo-gsm-tester -setfacl -d -m group:osmo-gsm-tester:rwx /var/tmp/osmo-gsm-tester/state ----- - -IMPORTANT: the state directory needs to be shared between all users potentially -running the osmo-gsm-tester to resolve resource allocations. Above 'setfacl' -command sets the access control to keep all created files group writable. - -With the jenkins build as described here, the trials will live in the build -slave's workspace. Other modes of operation (a daemon scheduling concurrent -runs, *TODO*) may use a system wide directory to manage trials to run: - ----- -mkdir -p /var/tmp/osmo-gsm-tester/trials -chown -R :osmo-gsm-tester /var/tmp/osmo-gsm-tester -chmod -R g+rwxs /var/tmp/osmo-gsm-tester ----- - -===== Allow DBus Access to ofono - -Put a DBus configuration file in place that allows the 'osmo-gsm-tester' group -to access the org.ofono DBus path: - ----- -cat > /etc/dbus-1/system.d/osmo-gsm-tester.conf < - - - - - - - - - -END ----- - -(No restart of dbus nor ofono necessary.) - -[[install_capture_packets]] -===== Capture Packets - -In order to allow collecting pcap traces of the network communication for later -reference, allow the osmo-gsm-tester group to capture packets using the 'tcpdump' -program: - ----- -chgrp osmo-gsm-tester /usr/sbin/tcpdump -chmod 750 /usr/sbin/tcpdump -setcap cap_net_raw,cap_net_admin=eip /usr/sbin/tcpdump ----- - -Put 'tcpdump' in the '$PATH' -- assuming that 'tcpdump' is available for root: - ----- -ln -s `which tcpdump` /usr/local/bin/tcpdump ----- - -TIP: Why a symlink in '/usr/local/bin'? On Debian, 'tcpdump' lives in -'/usr/sbin', which is not part of the '$PATH' for non-root users. To avoid -hardcoding non-portable paths in the osmo-gsm-tester source, 'tcpdump' must be -available in the '$PATH'. There are various trivial ways to modify '$PATH' for -login shells, but the jenkins build slave typically runs in a *non-login* -shell; modifying non-login shell enviroments is not trivially possible without -also interfering with files installed from debian packages. Probably the -easiest way to allow all users and all shells to find the 'tcpdump' binary is -to actually place a symbolic link in a directory that is already part of the -non-login shell's '$PATH'. Above example places such in '/usr/local/bin'. - -Verify that a non-login shell can find 'tcpdump': - ----- -su jenkins -c 'which tcpdump' -# should print: "/usr/local/bin/tcpdump" ----- - -WARNING: When logged in via SSH on your main unit, running 'tcpdump' to capture -packets may result in a feedback loop: SSH activity to send tcpdump's output to -your terminal is in turn is picked up in the tcpdump trace, and so forth. When -testing 'tcpdump' access, make sure to have proper filter expressions in place. - -===== Allow Core Files - -In case a binary run for the test crashes, a core file of the crash should be -written. This requires a limit rule. Create a file with the required rule: - ----- -sudo -s -echo "@osmo-gsm-tester - core unlimited" > /etc/security/limits.d/osmo-gsm-tester_allow-core.conf ----- - -Re-login the user to make these changes take effect. - -Set the *kernel.core_pattern* sysctl to *core* (usually the default). For each -binary run by osmo-gsm-tester, a core file will then appear in the same dir that -contains stdout and stderr for that process (because this dir is set as CWD). - ----- -sysctl -w kernel.core_pattern=core ----- - -===== Allow Realtime Priority - -Certain binaries should be run with real-time priority, like 'osmo-bts-trx'. -Add this permission on the main unit: - ----- -sudo -s -echo "@osmo-gsm-tester - rtprio 99" > /etc/security/limits.d/osmo-gsm-tester_allow-rtprio.conf ----- - -Re-login the user to make these changes take effect. - -[[user_config_uhd]] -===== UHD - -Grant permission to use the UHD driver to run USRP devices for osmo-bts-trx, by -adding the jenkins user to the 'usrp' group: - ----- -gpasswd -a jenkins usrp ----- - -===== Allow CAP_NET_RAW capability - -Certain binaries require 'CAP_NET_RAW' to be set, like 'osmo-bts-octphy' as it -uses a 'AF_PACKET' socket. - -To be able to set the following capability without being root, osmo-gsm-tester -uses sudo to gain permissions to set the capability. - -This is the script that osmo-gsm-tester expects on the main unit: - ----- -echo /usr/local/bin/osmo-gsm-tester_setcap_net_raw.sh < /etc/sudoers.d/osmo-gsm-tester_setcap_net_raw -chmod 0440 /etc/sudoers.d/osmo-gsm-tester_setcap_net_raw ----- - -The script file name 'osmo-gsm-tester_setcap_net_raw.sh' is important, as -osmo-gsm-tester expects to find a script with this name in '$PATH' at run time. - - -==== Log Rotation - -To avoid clogging up /var/log, it makes sense to choose a sane maximum log size: - ----- -echo maxsize 10M > /etc/logrotate.d/maxsize ----- - -==== Install Scripts - -IMPORTANT: When using the jenkins build slave as configured above, *there is no -need to install the osmo-gsm-tester sources on the main unit*. The jenkins job -will do so implicitly by checking out the latest osmo-gsm-tester sources in the -workspace for every run. If you're using only the jenkins build slave, you may -skip this section. - -If you prefer to use a fixed installation of the osmo-gsm-tester sources -instead of the jenkins workspace, you can: - -. From the run job configured above, remove the line that says -+ ----- -PATH="$PWD/osmo-gsm-tester/src:$PATH" \ ----- -+ -so that this uses a system wide installation instead. - -. Install the sources e.g. in '/usr/local/src' as indicated below. - -On the main unit, to install the latest in '/usr/local/src': - ----- -apt-get install git -mkdir -p /usr/local/src -cd /usr/local/src -git clone git://git.osmocom.org/osmo-gsm-tester ----- - -To allow all users to run 'osmo-gsm-tester.py', from login as well as non-login -shells, the easiest solution is to place a symlink in '/usr/local/bin': - ----- -ln -s /usr/local/src/osmo-gsm-tester/src/osmo-gsm-tester.py /usr/local/bin/ ----- - -(See also the tip in <> for a more detailed -explanation.) - -The example configuration provided in the source is suitable for running as-is, -*if* your hardware setup matches (you could technically use that directly by a -symlink e.g. from '/usr/local/etc/osmo-gsm-tester' to the 'example' dir). If in -doubt, rather copy the example, point 'paths.conf' at the 'suites' dir, and -adjust your own configuration as needed. For example: - ----- -cd /etc -cp -R /usr/local/src/osmo-gsm-tester/example osmo-gsm-tester -sed -i 's#\.\./suites#/usr/local/src/osmo-gsm-tester/suites#' osmo-gsm-tester/paths.conf ----- - -NOTE: The configuration will be looked up in various places, see -<>. - - -== Hardware Choice and Configuration - -=== SysmoBTS - -To use the SysmoBTS in the osmo-gsm-tester, the following systemd services must -be disabled: - ----- -systemctl mask osmo-nitb osmo-bts-sysmo osmo-pcu sysmobts-mgr ----- - -This stops the stock setup keeping the BTS in operation and hence allows the -osmo-gsm-tester to install and launch its own versions of the SysmoBTS -software. - -==== IP Address - -To ensure that the SysmoBTS is always reachable at a fixed known IP address, -configure the eth0 to use a static IP address: - -Adjust '/etc/network/interfaces' and replace the line - ----- -iface eth0 inet dhcp ----- - -with - ----- -iface eth0 inet static - address 10.42.42.114 - netmask 255.255.255.0 - gateway 10.42.42.1 ----- - -You may set the name server in '/etc/resolve.conf' (most likely to the IP of -the gateway), but this is not really needed by the osmo-gsm-tester. - -==== Allow Core Files - -In case a binary run for the test crashes, a core file of the crash should be -written. This requires a limits rule. Append a line to /etc/limits like: - ----- -ssh root at 10.42.42.114 -echo "* C16384" >> /etc/limits ----- - -==== Reboot - -Reboot the BTS and make sure that the IP address for eth0 is now indeed -10.42.42.114, and that no osmo* programs are running. - ----- -ip a -ps w | grep osmo ----- - -==== SSH Access - -Make sure that the jenkins user on the main unit is able to login on the -sysmoBTS, possibly erasing outdated host keys after a new rootfs was loaded: - -On the main unit, for example do: - ----- -su - jenkins -ssh root at 10.42.42.114 ----- - -Fix any problems until you get a login on the sysmoBTS. - - -[[hardware_modems]] -=== Modems - -TODO: describe modem choices and how to run ofono - -[[hardware_trx]] -=== osmo-bts-trx - -TODO: describe B200 family diff --git a/OsmoGSMTester/chapters/intro.adoc b/OsmoGSMTester/chapters/intro.adoc deleted file mode 100644 index 14daba4..0000000 --- a/OsmoGSMTester/chapters/intro.adoc +++ /dev/null @@ -1,400 +0,0 @@ -== Introduction with Examples - -The osmo-gsm-tester is software to run automated tests of real GSM hardware, -foremost to verify that ongoing Osmocom software development continues to work -with various BTS models, while being flexibly configurable and extendable. - -A 'main unit' (general purpose computer) is connected via ethernet and/or USB to -any number of BTS models and to any number of GSM modems via USB. The modems -and BTS instances' RF transceivers are typically wired directly to each other -via RF distribution chambers to bypass the air medium and avoid disturbing real -production cellular networks. Furthermore, the setup may include adjustable RF -attenuators to model various distances between modems and base stations. - -The osmo-gsm-tester software runs on the main unit to orchestrate the various -GSM hardware and run predefined test scripts. It typically receives binary -packages from a jenkins build service. It then automatically configures and -launches an Osmocom core network on the main unit and sets up and runs BTS -models as well as modems to form a complete ad-hoc GSM network. On this setup, -predefined test suites, combined with various scenario definitions, are run to -verify stability of the system. - -The osmo-gsm-tester is implemented in Python (version 3). It uses the ofono -daemon to control the modems connected via USB. BTS software is either run -directly on the main unit (e.g. for osmo-bts-trx, osmo-bts-octphy), run via SSH -(e.g. for a sysmoBTS) or assumed to run on a connected BTS model (e.g. for -ip.access nanoBTS). - -.Typical osmo-gsm-tester setup -[graphviz] ----- -digraph G { - rankdir=LR; - jenkins - subgraph cluster_gsm_hardware { - label = "GSM Hardware"; - style=dotted - - modem0 [shape=box label="Modems..."] - modem1 [shape=box label="Modems..."] - osmo_bts_sysmo [label="sysmocom sysmoBTS\nrunning osmo-bts-sysmo" shape=box] - B200 [label="Ettus B200" shape=box] - sysmoCell5K [label="sysmocom sysmoCell5000" shape=box] - octphy [label="Octasic octphy BTS" shape=box] - nanoBTS [label="ip.access nanoBTS" shape=box] - rf_distribution [label="RF distribution"] - - {modem0 modem1 osmo_bts_sysmo B200 octphy nanoBTS sysmoCell5K}->rf_distribution [dir=both arrowhead="curve" arrowtail="curve"] - } - subgraph cluster_main_unit { - label = "Main Unit" - osmo_gsm_tester [label="Osmo-GSM-Tester\ntest suites\n& scenarios"] - subgraph { - rank=same - ofono [label="ofono daemon"] - osmo_trx [label="osmo-trx"] - osmo_bts_trx [label="osmo-bts-trx"] - osmo_bts_octphy [label="osmo-bts-octphy"] - OsmoNITB [label="BSC + Core Network\n(Osmo{NITB,MSC,BSC,HLR,...})"] - } - } - - - jenkins->osmo_gsm_tester [label="trial\n(binaries)"] - osmo_gsm_tester->jenkins [label="results"] - ofono->{modem0 modem1} [label="USB"] - osmo_gsm_tester->{OsmoNITB osmo_bts_trx osmo_bts_octphy} - osmo_gsm_tester->osmo_bts_sysmo [taillabel="SSH"] - osmo_gsm_tester->ofono [taillabel="DBus"] - osmo_trx->B200 [label="USB"] - osmo_bts_trx->{osmo_trx sysmoCell5K} [dir=both label="UDP"] - osmo_bts_octphy->octphy [label="raw eth"] - {osmo_bts_sysmo nanoBTS}->OsmoNITB [label="IP"] - {B200 octphy}->OsmoNITB [label="eth" style=invis] - {osmo_bts_trx osmo_bts_octphy}->OsmoNITB -} ----- - -.Example of how to select resources and configurations: scenarios may pick specific resources (here BTS and ARFCN), remaining requirements are picked as available (here two modems and a NITB interface) -[graphviz] ----- -digraph G { - rankdir=TB; - - suite_scenarios [label="Suite+Scenarios selection\nsms:sysmo+band1800"] - - subgraph { - rank=same; - suite - scenarios - } - - subgraph cluster_scenarios { - label = "Scenarios"; - u_sysmoBTS [label="Scenario: sysmo\nbts: type: osmo-bts-sysmo"] - u_trx [label="Scenario: trx\nbts: type: osmo-bts-trx"] - u_arfcn [label="Scenario: band1800\narfcn: band: GSM-1800"] - } - - subgraph cluster_suite { - label = "Suite: sms"; - requires [label="Requirements (suite.conf):\nmodem: times: 2\nbts\nip_address\narfcn"] - subgraph cluster_tests { - label = "Test Scripts (py)"; - mo_mt_sms - etc - } - } - - subgraph cluster_resources { - label = "Resources"; - rankdir=TB; - nitb_addr1 [label="NITB interface addr\n10.42.42.1"] - nitb_addr2 [label="NITB interface addr\n10.42.42.2"] - Modem0 - Modem1 - Modem2 - sysmoBTS [label="osmo-bts-sysmo"] - osmo_bts_trx [label="osmo-bts-trx"] - arfcn1 [label="arfcn: 512\nband: GSM-1800"] - arfcn2 [label="arfcn: 540\nband: GSM-1900"] - - arfcn1->arfcn2 [style=invis] - nitb_addr1->nitb_addr2 [style=invis] - Modem0 -> Modem1 -> Modem2 [style=invis] - sysmoBTS -> osmo_bts_trx [style=invis] - } - - suite_scenarios -> {suite scenarios} - scenarios -> { u_arfcn u_sysmoBTS } - - suite -> requires - requires -> Modem0 - requires -> Modem1 - requires -> sysmoBTS - requires -> arfcn1 - requires -> nitb_addr1 - - { u_sysmoBTS u_arfcn } -> requires [label="influences\nresource\nselection"] -} ----- - -.Example of a "trial" containing binaries built by a jenkins -[graphviz] ----- -digraph G { - subgraph cluster_trial { - label = "Trial (binaries)" - sysmo [label="osmo-bts-sysmo.build-23.tgz\n(osmo-bts-sysmo\n+ deps\ncompiled for sysmoBTS)"] - trx [label="osmo-bts.build-5.tgz\n(osmo-bts-octphy + osmo-bts-trx\n+ deps\ncompiled for main unit)"] - nitb [label="osmo-nitb.build-42.tgz\n(osmo-nitb\n+ deps\ncompiled for main unit)"] - checksums [label="checksums.md5"] - - checksums -> {sysmo trx nitb} - } -} ----- - -=== Typical Test Script - -A typical single test script (part of a suite) may look like this: - ----- -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * - -hlr = suite.hlr() -bts = suite.bts() -mgcpgw = suite.mgcpgw(bts_ip=bts.remote_addr()) -msc = suite.msc(hlr, mgcpgw) -bsc = suite.bsc(msc) -stp = suite.stp() -ms_mo = suite.modem() -ms_mt = suite.modem() - -hlr.start() -stp.start() -msc.start() -mgcpgw.start() - -bsc.bts_add(bts) -bsc.start() - -bts.start() - -hlr.subscriber_add(ms_mo) -hlr.subscriber_add(ms_mt) - -ms_mo.connect(msc.mcc_mnc()) -ms_mt.connect(msc.mcc_mnc()) - -ms_mo.log_info() -ms_mt.log_info() - -print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms_mo, ms_mt) - -sms = ms_mo.sms_send(ms_mt) -wait(ms_mt.sms_was_received, sms) ----- - -=== Resource Resolution - -- A global configuration 'resources.conf' defines which hardware is connected to the - osmo-gsm-tester main unit. -- Each suite contains a number of test scripts. The amount of resources a test - may use is defined by the test suite's 'suite.conf'. -- Which specific modems, BTS models, NITB IP addresses etc. are made available - to a test run is typically determined by 'suite.conf' and a combination of scenario - configurations -- or picked automatically if not. - -[[resources_conf_example]] -=== Typical 'resources.conf' - -A global configuration of hardware may look like below; for details, see -<>. - ----- -ip_address: -- addr: 10.42.42.2 -- addr: 10.42.42.3 -- addr: 10.42.42.4 -- addr: 10.42.42.5 -- addr: 10.42.42.6 - -bts: -- label: sysmoBTS 1002 - type: osmo-bts-sysmo - ipa_unit_id: 1 - addr: 10.42.42.114 - band: GSM-1800 - ciphers: - - a5_0 - - a5_1 - - a5_3 - -- label: Ettus B200 - type: osmo-bts-trx - ipa_unit_id: 6 - addr: 10.42.42.50 - band: GSM-1800 - launch_trx: true - ciphers: - - a5_0 - - a5_1 - -- label: sysmoCell 5000 - type: osmo-bts-trx - ipa_unit_id: 7 - addr: 10.42.42.51 - band: GSM-1800 - trx_remote_ip: 10.42.42.112 - ciphers: - - a5_0 - - a5_1 - -- label: OCTBTS 3500 - type: osmo-bts-octphy - ipa_unit_id: 8 - addr: 10.42.42.52 - band: GSM-1800 - trx_list: - - hw_addr: 00:0c:90:2e:80:1e - net_device: eth1 - - hw_addr: 00:0c:90:2e:87:52 - net_device: eth1 - -arfcn: - - arfcn: 512 - band: GSM-1800 - - arfcn: 514 - band: GSM-1800 - - arfcn: 516 - band: GSM-1800 - - arfcn: 546 - band: GSM-1900 - - arfcn: 548 - band: GSM-1900 - -modem: -- label: sierra_1 - path: '/sierra_1' - imsi: '901700000009031' - ki: '80A37E6FDEA931EAC92FFA5F671EFEAD' - auth_algo: 'xor' - ciphers: - - a5_0 - - a5_1 - features: - - 'sms' - - 'voice' - -- label: gobi_0 - path: '/gobi_0' - imsi: '901700000009030' - ki: 'BB70807226393CDBAC8DD3439FF54252' - auth_algo: 'xor' - ciphers: - - a5_0 - - a5_1 - features: - - 'sms' ----- - -=== Typical 'suites/*/suite.conf' - -The configuration that reserves a number of resources for a test suite may look -like this: - ----- -resources: - ip_address: - - times: 1 - bts: - - times: 1 - modem: - - times: 2 - features: - - sms ----- - -It may also request e.g. specific BTS models, but this is typically left to -scenario configurations. - -=== Typical 'scenarios/*.conf' - -For a suite as above run as-is, any available resources are picked. This may be -combined with any number of scenario definitions to constrain which specific -resources should be used, e.g.: - ----- -resources: - bts: - - type: osmo-bts-sysmo ----- - -Which 'ip_address' or 'modem' is used in particular doesn't really matter, so -it can be left up to the osmo-gsm-tester to pick these automatically. - -Any number of such scenario configurations can be combined in the form -':++...', e.g. 'my_suite:sysmo+tch_f+amr'. - -=== Typical Invocations - -Each invocation of osmo-gsm-tester deploys a set of pre-compiled binaries for -the Osmocom core network as well as for the Osmocom based BTS models. To create -such a set of binaries, see <>. - -Examples for launching test trials: - -- Run the default suites (see <>) on a given set of binaries: - ----- -osmo-gsm-tester.py path/to/my-trial ----- - -- Run an explicit choice of 'suite:scenario' combinations: - ----- -osmo-gsm-tester.py path/to/my-trial -s sms:sysmo -s sms:trx -s sms:nanobts ----- - -- Run one 'suite:scenario' combination, setting log level to 'debug' and - enabling logging of full python tracebacks, and also only run just the - 'mo_mt_sms.py' test from the suite, e.g. to investigate a test failure: - ----- -osmo-gsm-tester.py path/to/my-trial -s sms:sysmo -l dbg -T -t mo_mt ----- - -A test script may also be run step-by-step in a python debugger, see -<>. - -=== Resource Reservation for Concurrent Trials - -While a test suite runs, the used resources are noted in a global state -directory in a reserved-resources file. This way, any number of trials may be -run consecutively without resource conflicts. Any test trial will only use -resources that are currently not reserved by any other test suite. The -reservation state is human readable. - -The global state directory is protected by a file lock to allow access by -separate processes. - -Also, the binaries from a trial are never installed system-wide, but are run -with a specific 'LD_LIBRARY_PATH' pointing at the trial's 'inst', so that -several trials can run consecutively without conflicting binary versions. For -some specific binaries which require extra permissions (such as osmo-bts-octphy -requiring 'CAP_NET_RAW'), 'patchelf' program is used to modify the binary -'RPATH' field instead because the OS dynamic linker skips 'LD_LIBRARY_PATH' for -binaries with special permissions. - -Once a test suite run is complete, all its reserved resources are torn down (if -the test scripts have not done so already), and the reservations are released -automatically. - -If required resources are unavailable, the test trial fails. For consecutive -test trials, a test run needs to either wait for resources to become available, -or test suites need to be scheduled to make sense. (*<- TODO*) diff --git a/OsmoGSMTester/chapters/test_api.adoc b/OsmoGSMTester/chapters/test_api.adoc deleted file mode 100644 index f541231..0000000 --- a/OsmoGSMTester/chapters/test_api.adoc +++ /dev/null @@ -1,4 +0,0 @@ -== Test API - -*TODO* (in the meantime, look at src/osmo_gsm_tester/test.py, as well as -suite.py, which calls the test's setup() function to get an idea) diff --git a/OsmoGSMTester/chapters/trial.adoc b/OsmoGSMTester/chapters/trial.adoc deleted file mode 100644 index bc9fe05..0000000 --- a/OsmoGSMTester/chapters/trial.adoc +++ /dev/null @@ -1,31 +0,0 @@ -[[trials]] -== Trial: Binaries to be Tested - -A trial is a set of pre-built binaries to be tested. They are typically built -by jenkins using the build scripts found in osmo-gsm-tester's source in the -'contrib/' dir, see <>. - -A trial comes in the form of a directory containing a number of '*.tgz' tar -archives as well as a 'checksums.md5' file to verify the tar archives' -integrity. - -When the osmo-gsm-tester is invoked to run on such a trial directory, it will -create a sub directory named 'inst' and unpack the tar archives into it. - -For each test run on this trial, a new subdirectory in the trial dir is -created, named in the form of 'run.'. A symbolic link 'last-run' -will point at the most recently created run dir. This run dir will accumulate: - -* the rendered configuration files used to run the binaries -* stdout and stderr outputs of the binaries -* pcap files for processes doing relevant network communication -* a test log -* jenkins parsable XML (Junit) reports - -The script in 'contrib/jenkins-run.sh' takes care of related tasks such as - -* creating the dir structure, -* generating md5 sums for the various tar.gz containing software builds to be tested, -* cleaning up after the build, -* saving extra logs such as journalctl output from ofonod, -* generating a final .tar.gz file with all the logs and reports. diff --git a/OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml b/OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml deleted file mode 100644 index 923b8ad..0000000 --- a/OsmoGSMTester/osmo-gsm-tester-manual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - April 13, 2017 - NH - - Initial version. - - - - - - - Neels - Hofmeyr - nhofmeyr at sysmocom.de - NH - - sysmocom - sysmocom - s.f.m.c. GmbH - Senior Developer - - - - - - 2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoGSMTester/osmo-gsm-tester-manual.adoc b/OsmoGSMTester/osmo-gsm-tester-manual.adoc deleted file mode 100644 index 6f0edf7..0000000 --- a/OsmoGSMTester/osmo-gsm-tester-manual.adoc +++ /dev/null @@ -1,20 +0,0 @@ -Osmo-GSM-Tester Manual -====================== -Neels Hofmeyr - -== WARNING: Work in Progress - -*NOTE: The osmo-gsm-tester is still in pre-alpha stage: some parts are still -incomplete, and details will still change and move around.* - -include::{srcdir}/chapters/intro.adoc[] - -include::{srcdir}/chapters/install.adoc[] - -include::{srcdir}/chapters/config.adoc[] - -include::{srcdir}/chapters/trial.adoc[] - -include::{srcdir}/chapters/test_api.adoc[] - -include::{srcdir}/chapters/debugging.adoc[] diff --git a/configure.ac b/configure.ac index a6f29a0..5d94e54 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,6 @@ osmo-gsm-manuals.pc Makefile tests/Makefile - OsmoGSMTester/Makefile OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile -- To view, visit https://gerrit.osmocom.org/12000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I89429a306d37e267fdb335d1c177c9ede3b64444 Gerrit-Change-Number: 12000 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:14:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 14:14:22 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoNITB files (now avail in openbsc.git) In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12001 ) Change subject: remove OsmoNITB files (now avail in openbsc.git) ...................................................................... remove OsmoNITB files (now avail in openbsc.git) Files were added in openbsc.git Change-Id I4466d820cb3a5609a4a8534b1581684f891a04cd Depends: openbsc.git Change-Id I4466d820cb3a5609a4a8534b1581684f891a04cd Related: OS#3385 Change-Id: I2d4f4d6dc5a70e27de464921f4fe0aab4ca8ec72 --- M Makefile.am D OsmoNITB/Makefile.am D OsmoNITB/chapters/bts-examples.adoc D OsmoNITB/chapters/control.adoc D OsmoNITB/chapters/hlr.adoc D OsmoNITB/chapters/net.adoc D OsmoNITB/chapters/overview.adoc D OsmoNITB/chapters/running.adoc D OsmoNITB/osmonitb-usermanual-docinfo.xml D OsmoNITB/osmonitb-usermanual.adoc D OsmoNITB/osmonitb-vty-reference.xml D OsmoNITB/vty/bsc_vty_additions.xml D OsmoNITB/vty/nitb_vty_additions.xml D OsmoNITB/vty/nitb_vty_reference.xml M configure.ac 15 files changed, 0 insertions(+), 6,041 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/12001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2d4f4d6dc5a70e27de464921f4fe0aab4ca8ec72 Gerrit-Change-Number: 12001 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:14:22 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 14:14:22 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmocomBB files (now avail in osmocom-bb.git) In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12002 ) Change subject: remove OsmocomBB files (now avail in osmocom-bb.git) ...................................................................... remove OsmocomBB files (now avail in osmocom-bb.git) Files were added in osmocom-bb.git Change-Id I7d1226d3865da9595b730b716a8d4ba07be1e0d5 Depends: osmocom-bb.git Change-Id I7d1226d3865da9595b730b716a8d4ba07be1e0d5 Related: OS#3385 Change-Id: I5a4839be7a3122ab566023a3e7b3bc955db98ba4 --- M Makefile.am D OsmocomBB/Makefile.am D OsmocomBB/chapters/scripting.adoc D OsmocomBB/osmocombb-usermanual-docinfo.xml D OsmocomBB/osmocombb-usermanual.adoc M configure.ac 6 files changed, 2 insertions(+), 203 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 26a06a3..64623af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,8 +7,7 @@ EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) SUBDIRS = tests \ OsmoMGCP \ - OsmoNAT \ - OsmocomBB + OsmoNAT $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ diff --git a/OsmocomBB/Makefile.am b/OsmocomBB/Makefile.am deleted file mode 100644 index 61ccafa..0000000 --- a/OsmocomBB/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmocombb-usermanual.adoc \ - osmocombb-usermanual-docinfo.xml \ - chapters - -ASCIIDOC = osmocombb-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmocomBB/chapters/scripting.adoc b/OsmocomBB/chapters/scripting.adoc deleted file mode 100644 index 8828a72..0000000 --- a/OsmocomBB/chapters/scripting.adoc +++ /dev/null @@ -1,111 +0,0 @@ -[[scripting]] -== Scripting using Lua - -The mobile application can be extended using the -https://www.lua.org/manual/5.3/[lua5.3 language]. -To use the scripting facility a script needs to be -configured through the VTY interface and will be -associated to a Mobile Station (MS). The script will -then be able to interact with the specific MS. - -An event based programming model is to be used. This -means that once the script has been loaded it should -register to the wanted events, configure timers and -return. When an event occurs the registered event -handler will be executed. - -The following describes the exported runtime services -to be used in the script. - -=== Logging - -The logging functions allow to generate log messages -for different levels. The log implementatiom is using -the standard Osmocom logging framework which allows to -have multiple log targets, e.g. syslog, file or through -the VTY. - -|======== -|Code |Return | Explanation -|print(...) |void | Print a message with log level 'debug' -|log_debug(...) |void | Print a message with log level 'debug' -|log_notice(...) |void | Print a message with log level 'notice' -|log_error(...) |void | Print a message with log level 'error' -|log_fatal(...) |void | Print a message with log level 'fatal' -|======== - -==== Examples - ----- -Code: -print("Log level 'debug'") -log_debug("Log level 'debug'") -log_notice("Log level 'notice'") -log_error("Log level 'error'") -log_fatal("Log level 'fatal'") - -Output: -\<0011> @script.lua:1 Log level 'debug' -\<0011> @script.lua:2 Log level 'debug' -\<0011> @script.lua:3 Log level 'notice' -\<0011> @script.lua:4 Log level 'error' -\<0011> @script.lua:5 Log level 'fatal' - ----- - -=== Timer class - -The timer allows to invoke a function once after the requested -timeout. The timer creation function will return immediately and -the callback will be called after the timeout and when no other -lua code is executing. The _osmo.timeout_ function should be used -to create a new time, a running timer can be canneled using the _cancel_ -method. - -|======== -|Code |Return |Explanation -|osmo.timeout(timeout, cb)|A new timer|Create a new non-recurring timer. Timeout should be in rounded seconds and cb should be a function. -|timer.cancel() |Void |Cancel the timer, the callback will not be called. -|======== - -==== Examples - ----- -Code: -local timer = osmo.timeout(timeout_in_seconds, call_back) -timer:cancel() ----- - ----- -Code: -local timer = osmo.timeout(3, function() - print("Timeout passed") -end) -print("Configured") - -Output: -\<0011> @script.lua:4 Configured -\<0011> @script.lua:2 Timeout passed ----- - -=== MS class - -The MS singletong provides access to the Mobile Station configuration -the script is associated with. This includes runtime information like -the IMSI, IMEI or functions like start/stop. - -|======== -|Code |Return |Explanation -|osmo.ms().imsi() |string |The IMSI. It might be invalid in case it has not been read from SIM card yet -|osmo.ms().imei() |string |The configured IMEI -|======== -==== Examples - ------ -Code: -local ms = osmo.ms() -print(ms.imei(), ms.imsi()) - -Output: -\<0011> @script.lua:2 126000000000000 ------ diff --git a/OsmocomBB/osmocombb-usermanual-docinfo.xml b/OsmocomBB/osmocombb-usermanual-docinfo.xml deleted file mode 100644 index 992a42e..0000000 --- a/OsmocomBB/osmocombb-usermanual-docinfo.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 1 - November 2017 - HHPF - - Initial version. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - Holger - Freyther - hfreyther at sysmocom.de - HHPF - - sysmocom - sysmocom - s.f.m.c. GmbH - Co-Founder - - - - - - 2013-2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmocomBB/osmocombb-usermanual.adoc b/OsmocomBB/osmocombb-usermanual.adoc deleted file mode 100644 index 024fc79..0000000 --- a/OsmocomBB/osmocombb-usermanual.adoc +++ /dev/null @@ -1,21 +0,0 @@ -OsmocomBB User Manual -===================== -Holger Hans Peter Freyther - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/scripting.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/configure.ac b/configure.ac index cfd2971..764da31 100644 --- a/configure.ac +++ b/configure.ac @@ -29,5 +29,4 @@ Makefile tests/Makefile OsmoMGCP/Makefile - OsmoNAT/Makefile - OsmocomBB/Makefile) + OsmoNAT/Makefile) -- To view, visit https://gerrit.osmocom.org/12002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5a4839be7a3122ab566023a3e7b3bc955db98ba4 Gerrit-Change-Number: 12002 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:19:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 14:19:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11985 ) Change subject: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout ...................................................................... Patch Set 3: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/11985/3/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11985/3/msc/MSC_Tests.ttcn at 2718 PS3, Line 2718: tid := 1, /* We just need a single transaction */ re comment: tid is an ID, not a count, right? https://gerrit.osmocom.org/#/c/11985/3/msc/MSC_Tests.ttcn at 2742 PS3, Line 2742: cause := *, /* TODO: expect some specific value */ If a value shall be sent and you don't yet care which, then maybe '?' would be better. ('*' also matches if no cause is sent.) If there should be no cause because it was successful or something, instead use 'omit'. https://gerrit.osmocom.org/#/c/11985/3/msc/MSC_Tests.ttcn at 2749 PS3, Line 2749: cause := ?); /* TODO: expect some specific value */ aha! :) -- To view, visit https://gerrit.osmocom.org/11985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Gerrit-Change-Number: 11985 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 14:19:42 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:20:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:20:19 +0000 Subject: Change in osmo-trx[master]: lms: User correct scale factor for transmit samples In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12006 ) Change subject: lms: User correct scale factor for transmit samples ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12006/2/Transceiver52M/device/lms/LMSDevice.h File Transceiver52M/device/lms/LMSDevice.h: https://gerrit.osmocom.org/#/c/12006/2/Transceiver52M/device/lms/LMSDevice.h at 38 PS2, Line 38: #define LIMESDR_TX_AMPL 0.707 I cannot really say I know enough about the topic to really say whether this good or wrong, but whoever did it seems to know it well :-P -- To view, visit https://gerrit.osmocom.org/12006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71702feaa11f53e7614a6938a984dd748405474a Gerrit-Change-Number: 12006 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:20:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:21:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 14:21:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11990 ) Change subject: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/11990/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11990/2//COMMIT_MSG at 14 PS2, Line 14: the order makes sense, because the 'GSUP_IEs' type is a record, "the order makes a difference" https://gerrit.osmocom.org/#/c/11990/2//COMMIT_MSG at 19 PS2, Line 19: in a way that is used by the libosmocore's GSUP encoder. and again, does this affect the outcome of any tests? -- To view, visit https://gerrit.osmocom.org/11990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db Gerrit-Change-Number: 11990 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 14:21:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:21:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:21:23 +0000 Subject: Change in osmo-trx[master]: lms: Set Rx gain to midpoint, as comment suggests. In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12007 ) Change subject: lms: Set Rx gain to midpoint, as comment suggests. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc646def53b83faf4e6c011fb595fa436e223b32 Gerrit-Change-Number: 12007 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:21:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:22:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:22:10 +0000 Subject: Change in osmo-gsm-manuals[master]: INSTALL.txt: "make check" needs libxml2-utils In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12004 ) Change subject: INSTALL.txt: "make check" needs libxml2-utils ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6fba644cff833c912f6d83651a1ee27c1c4884d2 Gerrit-Change-Number: 12004 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 14:22:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:22:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 14:22:45 +0000 Subject: Change in osmo-ci[master]: Dockerfile: add dependencies for osmo-gsm-manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12005 ) Change subject: Dockerfile: add dependencies for osmo-gsm-manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I379ce02857353c097f79cf91af2c4c9dc14754ec Gerrit-Change-Number: 12005 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Nov 2018 14:22:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:23:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 14:23:07 +0000 Subject: Change in osmo-ci[master]: Dockerfile: add dependencies for osmo-gsm-manuals In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12005 ) Change subject: Dockerfile: add dependencies for osmo-gsm-manuals ...................................................................... Dockerfile: add dependencies for osmo-gsm-manuals Install all dependencies required for building PDF manuals inside the Docker container, so we can build projects with their manuals in the Gerrit build verification job. I ran the Docker container locally to confirm that this works, as described here: https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verification_jobs Related: OS#3385 Change-Id: I379ce02857353c097f79cf91af2c4c9dc14754ec --- M docker/Dockerfile_osmocom_jenkins.amd64 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved osmith: Verified diff --git a/docker/Dockerfile_osmocom_jenkins.amd64 b/docker/Dockerfile_osmocom_jenkins.amd64 index 3acff70..81f46ca 100644 --- a/docker/Dockerfile_osmocom_jenkins.amd64 +++ b/docker/Dockerfile_osmocom_jenkins.amd64 @@ -36,6 +36,9 @@ # for osmo-python-tests RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends python3-setuptools python-setuptools python3-pip python-pip +# for osmo-gsm-manuals +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xsltproc dblatex docbook5-xml graphviz python-pychart python-nwdiag libxml2-utils + # Linux kernel RUN DEBIAN_FRONTEND=noninteractive apt-get install -y bc -- To view, visit https://gerrit.osmocom.org/12005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I379ce02857353c097f79cf91af2c4c9dc14754ec Gerrit-Change-Number: 12005 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:23:18 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 14:23:18 +0000 Subject: Change in osmo-gsm-manuals[master]: INSTALL.txt: "make check" needs libxml2-utils In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12004 ) Change subject: INSTALL.txt: "make check" needs libxml2-utils ...................................................................... INSTALL.txt: "make check" needs libxml2-utils Change-Id: I6fba644cff833c912f6d83651a1ee27c1c4884d2 --- M INSTALL.txt 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/INSTALL.txt b/INSTALL.txt index c3caefe..3166bfa 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -14,6 +14,10 @@ (Note that asciidoc-dblatex is required from debian 9 on and did not exist before.) +Dependencies for "make check": + +apt-get install libxml2-utils + Prepare your build dir: autoreconf -fi ./configure -- To view, visit https://gerrit.osmocom.org/12004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6fba644cff833c912f6d83651a1ee27c1c4884d2 Gerrit-Change-Number: 12004 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:23:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 14:23:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11984 ) Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11984/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11984/2//COMMIT_MSG at 19 PS2, Line 19: affected matching statements were also corrected. > I still need to know whether this affects the test runs somehow. [?] They didn't fail. This change doesn't affect successful test case executions. But *if* something would go wrong on the HLR side, the matching statements wouldn't match the expected PROC_SS_ERR messages, then hang for some time, and finally fail due to the guard timeout... I can also point this out in the commit message. -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 14:23:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:34:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 14:34:11 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_rtp_fsm: Remove duplicate LCHAN_EV_RTP_RELEASED event In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11993 ) Change subject: bsc: lchan_rtp_fsm: Remove duplicate LCHAN_EV_RTP_RELEASED event ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/11993/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11993/1//COMMIT_MSG at 23 PS1, Line 23: 20181128193707330 DAS <0012> fsm.c:381 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Deallocated you *could* make this a bit more readable next time :) https://gerrit.osmocom.org/#/c/11993/1/src/osmo-bsc/lchan_rtp_fsm.c File src/osmo-bsc/lchan_rtp_fsm.c: https://gerrit.osmocom.org/#/c/11993/1/src/osmo-bsc/lchan_rtp_fsm.c at a742 PS1, Line 742: while it is true that this is normally a duplicate event, it does make sure that in case the RTP hits a cleanup for any odd reason, we will notify the lchan of it. Say something went wrong during MGCP or RTP delivery, or the lchan_rtp fi gets terminated out of the blue... (If the lchan_rtp FSM gets deallocated, the lchan must be *guaranteed* to no longer reference the lchan_rtp fi pointer.) Maybe rather something like make this conditional on the current lchan state, or some flag that tells us whether we've already told the lchan that RTP was released? Or see whether the lchan still points at this fi? Simplest is to just keep the duplicate event? It's not harmful... -- To view, visit https://gerrit.osmocom.org/11993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 Gerrit-Change-Number: 11993 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 14:34:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:38:03 2018 From: gerrit-no-reply at lists.osmocom.org (roh) Date: Thu, 29 Nov 2018 14:38:03 +0000 Subject: Change in osmo-trx[master]: change scaling factor from .3 to .7 for lms sdr devices to improve th... In-Reply-To: References: Message-ID: roh has abandoned this change. ( https://gerrit.osmocom.org/11949 ) Change subject: change scaling factor from .3 to .7 for lms sdr devices to improve the signal slope ...................................................................... Abandoned superseeded by I71702feaa11f53e7614a6938a984dd748405474a -- To view, visit https://gerrit.osmocom.org/11949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2d1ba5cbd4ba98f912eb2e3e9f5383b69b28ff5b Gerrit-Change-Number: 11949 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:58:34 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 29 Nov 2018 14:58:34 +0000 Subject: Change in osmo-sgsn[master]: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/12009 ) Change subject: gprs/gprs_gmm: implement T3314. Timeout to reset MM state to STANDBY ...................................................................... Patch Set 1: (1 comment) @laforge: Should this implement with osmo-fsm or not? https://gerrit.osmocom.org/#/c/12009/1/include/osmocom/sgsn/gprs_sgsn.h File include/osmocom/sgsn/gprs_sgsn.h: https://gerrit.osmocom.org/#/c/12009/1/include/osmocom/sgsn/gprs_sgsn.h at 230 PS1, Line 230: unsigned int state_T; /* Txxxx number but only used for pmm_states */ > Is this really needed? Are there more than one timer going to be handled by state_timer? Can we rena [?] yes, it's needed, because of concurrent timers. i've to looked the states up, maybe there are more timers other when in ready state. -- To view, visit https://gerrit.osmocom.org/12009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4ce23ebe50d141076c20c9c56990b7103cd25e55 Gerrit-Change-Number: 12009 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 29 Nov 2018 14:58:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 14:59:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 14:59:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11985 ) Change subject: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout ...................................................................... Patch Set 3: (2 comments) https://gerrit.osmocom.org/#/c/11985/3/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/11985/3/msc/MSC_Tests.ttcn at 2742 PS3, Line 2742: cause := *, /* TODO: expect some specific value */ > If a value shall be sent and you don't yet care which, then maybe '?' would be better. [?] The problem is that libosmogsm's buggy GSM 04.80 API doesn't allow one to encode optional cause TLV, so it's omitted for now. As soon as we improve the API, it would be possible to encode some specific value. But this is not the only problem. See below. https://gerrit.osmocom.org/#/c/11985/3/msc/MSC_Tests.ttcn at 2749 PS3, Line 2749: cause := ?); /* TODO: expect some specific value */ > aha! :) It's not clean (yet) which cause value should be used in case of session timeout expiry. The session timeout is a specific feature of *our GSM 09.11 implementation* => it isn't not covered by the specs. Moreover, due to historical reasons, the generic cause IE in GSUP is not generic at all - it's limited by 'gsm48_gmm_cause' enum. After all, the main idea of this test case is to verify if OsmoMSC is capable to terminate SS/USSD transactions due to timeout expiry, and the exact cause values are not that important for now. -- To view, visit https://gerrit.osmocom.org/11985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Gerrit-Change-Number: 11985 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 14:59:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu Nov 29 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 29 Nov 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#322?= In-Reply-To: <268610605.892.1543417807762.JavaMail.jenkins@jenkins.osmocom.org> References: <268610605.892.1543417807762.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1905133029.907.1543504207578.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.81 KB...] checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y flex -s -p -Cem -Pasn1p_ -olex.yy.c asn1p_l.l if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi %option yylineno entails a performance penalty ONLY on rules that can match newline characters REJECT entails a large performance penalty asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] sed '/^#/ s|lex.yy\.c|asn1p_l.c|' lex.yy.c >asn1p_l.c rm -f lex.yy.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:26:52 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 15:26:52 +0000 Subject: Change in openbsc[master]: manuals/OsmoNITB: integrate into this repository In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11999 to look at the new patch set (#2). Change subject: manuals/OsmoNITB: integrate into this repository ...................................................................... manuals/OsmoNITB: integrate into this repository Move from doc/manuals to manuals/OsmoNITB as we have two more manuals (OsmoMGCP and OsmoNAT) that need to be moved to manuals/. Make the manuals build without a toplevel configure.ac file from autotools: $ cd manuals/OsmoNITB $ make openbsc/configure.ac is not used to integrate the manuals, as it would be extra effort to integrate all three of the manuals there. This is not worth it for the legacy codebase. Related: OS#3385 Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 --- A manuals/.gitignore R manuals/OsmoNITB/Makefile R manuals/OsmoNITB/chapters/bts-examples.adoc R manuals/OsmoNITB/chapters/control.adoc R manuals/OsmoNITB/chapters/hlr.adoc R manuals/OsmoNITB/chapters/net.adoc R manuals/OsmoNITB/chapters/overview.adoc R manuals/OsmoNITB/chapters/running.adoc R manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml R manuals/OsmoNITB/osmonitb-usermanual.adoc R manuals/OsmoNITB/osmonitb-vty-reference.xml R manuals/OsmoNITB/vty/bsc_vty_additions.xml R manuals/OsmoNITB/vty/nitb_vty_additions.xml R manuals/OsmoNITB/vty/nitb_vty_reference.xml A manuals/osmo-gsm-manuals-dir.sh 15 files changed, 36 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/99/11999/2 -- To view, visit https://gerrit.osmocom.org/11999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 Gerrit-Change-Number: 11999 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:32:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 15:32:11 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_rtp_fsm: Remove duplicate LCHAN_EV_RTP_RELEASED event In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11993 ) Change subject: bsc: lchan_rtp_fsm: Remove duplicate LCHAN_EV_RTP_RELEASED event ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/11993/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11993/1//COMMIT_MSG at 23 PS1, Line 23: 20181128193707330 DAS <0012> fsm.c:381 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Deallocated > you *could* make this a bit more readable next time :) My bad, I kept using same steps as in previous commits, but I was already using another BSC binary compiled which outputs tese long file paths. I'll fix it in next version of the patch. https://gerrit.osmocom.org/#/c/11993/1/src/osmo-bsc/lchan_rtp_fsm.c File src/osmo-bsc/lchan_rtp_fsm.c: https://gerrit.osmocom.org/#/c/11993/1/src/osmo-bsc/lchan_rtp_fsm.c at a742 PS1, Line 742: > while it is true that this is normally a duplicate event, it does make sure that in case the RTP hit [?] I'm not sure yo get your point ntirely, let's see if I understand (after looking at the code again). See _osmo_fsm_inst_term in fsm.c, in here we can see how the code path goes: """ /* delete ourselves from the parent */ parent = fi->proc.parent; if (parent) { LOGPFSMSRC(fi, file, line, "Removing from parent %s\n", osmo_fsm_inst_name(parent)); llist_del(&fi->proc.child); } /* call destructor / clean-up function */ if (fi->fsm->cleanup) fi->fsm->cleanup(fi, cause); LOGPFSMSRC(fi, file, line, "Freeing instance\n"); /* Fetch parent again in case it has changed. */ parent = fi->proc.parent; osmo_fsm_inst_free(fi); /* indicate our termination to the parent */ if (parent && cause != OSMO_FSM_TERM_PARENT) _osmo_fsm_inst_dispatch(parent, parent_term_event, data, file, line); """ It's seems quite clear to me that after cleanup it immediatelly follows the osmo_fsm_inst_dispatch(). BUT (I saw that now), only if cause != OSMO_FSM_TERM_PARENT, which means if lchan fsm calls "osmo_fsm_inst_term()", then it will call "osmo_fsm_inst_term_children(fi, OSMO_FSM_TERM_PARENT,...)" and then this one is needed. So I think instead of dropping it, I should change the if condition to: if (lchan->fi && cause == OSMO_FSM_TERM_PARENT) agree? -- To view, visit https://gerrit.osmocom.org/11993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 Gerrit-Change-Number: 11993 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 15:32:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:32:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 15:32:54 +0000 Subject: Change in osmo-pcu[master]: UL TBF: Actually raise V(Q) in raise_v_q() method In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/9164 ) Change subject: UL TBF: Actually raise V(Q) in raise_v_q() method ...................................................................... Abandoned I was missing the fact that there are multiple raise_v_q() methods and there's one inline version that takes an int. -- To view, visit https://gerrit.osmocom.org/9164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I699ebf6d1fceec655585e430711f59648b525728 Gerrit-Change-Number: 9164 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:33:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 15:33:41 +0000 Subject: Change in osmo-gsm-manuals[master]: remove leftovers from manuals move In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12003 to look at the new patch set (#2). Change subject: remove leftovers from manuals move ...................................................................... remove leftovers from manuals move Remove leftover OsmoMSC/Makefile.am, which should have been deleted already in Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc ("remove OsmoMSC files (now avail in osmo-msc.git)"). Remove the upload taget in Makefile.am, as there are not project specific files anymore. Related: OS#3385 Change-Id: I8716c41b03b09250e61e6a29fe9589454258fe03 --- M Makefile.am D OsmoMSC/Makefile.am 2 files changed, 0 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/03/12003/2 -- To view, visit https://gerrit.osmocom.org/12003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8716c41b03b09250e61e6a29fe9589454258fe03 Gerrit-Change-Number: 12003 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:36:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 15:36:57 +0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMGCP, OsmoNAT files (now avail in openbsc.git) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12011 ) Change subject: remove OsmoMGCP, OsmoNAT files (now avail in openbsc.git) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icdbdc4518b049135f18ac4a569ff5ffe4f3d5a86 Gerrit-Change-Number: 12011 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 15:36:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:36:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 15:36:59 +0000 Subject: Change in osmo-gsm-manuals[master]: remove leftovers from manuals move In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12003 ) Change subject: remove leftovers from manuals move ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8716c41b03b09250e61e6a29fe9589454258fe03 Gerrit-Change-Number: 12003 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 15:36:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:39:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 15:39:02 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11978 ) Change subject: bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation ...................................................................... bsc: ts_as_pchan_for_each_lchan: reorder and improve documentation It is moved prior to its user in the header file. Change-Id: I59f52401ba37b351ba3848e8e9ffb3b24c259496 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 12 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 15158cd..4a8b7be 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -455,6 +455,18 @@ bsc_subscr_name(lchan && lchan->conn ? lchan->conn->bsub : NULL), \ ## args) +/* Iterate lchans that have an FSM allocated based based on explicit pchan kind + * (GSM_PCHAN_* constant). + * Remark: PDCH related lchans are not handled in BSC but in PCU, so trying to + * iterate through GSM_PCHAN_PDCH is considered a void loop. + */ +#define ts_as_pchan_for_each_lchan(lchan, ts, as_pchan) \ + for (lchan = (ts)->lchan; \ + ((lchan - (ts)->lchan) < ARRAY_SIZE((ts)->lchan)) \ + && lchan->fi \ + && lchan->nr < pchan_subslots(as_pchan); \ + lchan++) + /* usage: * struct gsm_lchan *lchan; * struct gsm_bts_trx_ts *ts = get_some_timeslot(); @@ -464,15 +476,6 @@ * Iterate only those lchans that have an FSM allocated. */ #define ts_for_each_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_is) -/* Same as ts_for_each_lchan() but with an explicit pchan kind (GSM_PCHAN_* constant). - * Iterate only those lchans that have an FSM allocated. */ -#define ts_as_pchan_for_each_lchan(lchan, ts, as_pchan) \ - for (lchan = (ts)->lchan; \ - ((lchan - (ts)->lchan) < ARRAY_SIZE((ts)->lchan)) \ - && lchan->fi \ - && lchan->nr < pchan_subslots(as_pchan); \ - lchan++) - enum lchan_activate_mode { FOR_NONE, FOR_MS_CHANNEL_REQUEST, -- To view, visit https://gerrit.osmocom.org/11978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I59f52401ba37b351ba3848e8e9ffb3b24c259496 Gerrit-Change-Number: 11978 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:39:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 15:39:03 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_for_each_lchan: Improve documentation In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11979 ) Change subject: bsc: ts_for_each_lchan: Improve documentation ...................................................................... bsc: ts_for_each_lchan: Improve documentation Change-Id: Id7c050087c14aae3f01c6d41d21cf861ff53621c --- M include/osmocom/bsc/gsm_data.h 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4a8b7be..2f60e4d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -467,13 +467,15 @@ && lchan->nr < pchan_subslots(as_pchan); \ lchan++) -/* usage: +/* Iterate lchans that have an FSM allocated based on current PCHAN + * mode set in \ref ts. + * usage: * struct gsm_lchan *lchan; * struct gsm_bts_trx_ts *ts = get_some_timeslot(); * ts_for_each_lchan(lchan, ts) { * LOGPLCHAN(DMAIN, LOGL_DEBUG, "hello world\n"); * } - * Iterate only those lchans that have an FSM allocated. */ + */ #define ts_for_each_lchan(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_is) enum lchan_activate_mode { -- To view, visit https://gerrit.osmocom.org/11979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id7c050087c14aae3f01c6d41d21cf861ff53621c Gerrit-Change-Number: 11979 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:49:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 15:49:52 +0000 Subject: Change in osmo-msc[master]: msc_main: Set copyright description field statically In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/9636 ) Change subject: msc_main: Set copyright description field statically ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/9636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I432990624e7c375e29ef57998691327bffc89227 Gerrit-Change-Number: 9636 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:52:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 15:52:39 +0000 Subject: Change in libosmocore[master]: cosmetic: logging: simplify logging level VTY cmd doc composition In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/5488 ) Change subject: cosmetic: logging: simplify logging level VTY cmd doc composition ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/5488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ib818e2d524c750f07bea2aa585011f40e3ee82e8 Gerrit-Change-Number: 5488 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:04:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 16:04:02 +0000 Subject: Change in osmo-ci[master]: master-builds: use jenkins.sh --publish Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12012 Change subject: master-builds: use jenkins.sh --publish ...................................................................... master-builds: use jenkins.sh --publish Add --publish to the contrib/jenkins.sh calls for each Osmocom project, where PDF manuals should be published. As this parameter is only passed to jenkins.sh from the master-builds job, not from the gerrit-verification job, we can add logic to upload the generated PDFs when getting triggered because of changes in master. Related: OS#3385 Change-Id: I3cc01dbc57213b6d6cdc9b394a516510d045f1ae --- M jobs/master-builds.yml 1 file changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/12/12012/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 6b07694..67a9b80 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -16,7 +16,7 @@ a3: !!python/tuple [default] combination_filter: '' sequential: false - # most common build invocation + # most common build invocation (--publish is added to publish manual PDFs) cmd: ./contrib/jenkins.sh wrappers: [] trigger: @@ -82,6 +82,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn + cmd: ./contrib/jenkins.sh --publish - libosmocore: a1_name: arch @@ -174,7 +175,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh + osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-bts: a1_name: FIRMWARE_VERSION @@ -190,12 +191,12 @@ (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") - cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL" --publish' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh + cmd: GTP="$GTP" ./contrib/jenkins.sh --publish trigger: master-osmo-sgsn - osmo-gmr: @@ -207,7 +208,8 @@ # keep first line with less indent to preserve newlines ./contrib/jenkins.sh - - osmo-hlr + - osmo-hlr: + cmd: ./contrib/jenkins.sh --publish - osmo-iuh: # Full triggers would be: @@ -233,7 +235,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh + osmocom:amd64 /build/contrib/jenkins.sh --publish trigger: master-osmo-msc, master-osmo-bsc - osmo-msc: @@ -256,7 +258,7 @@ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ - osmocom:amd64 /build/contrib/jenkins.sh + osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-pcap @@ -279,6 +281,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") + cmd: ./contrib/jenkins.sh --publish - osmo-sgsn: a1_name: IU @@ -295,10 +298,11 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh + osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-sip-connector: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de + cmd: ./contrib/jenkins.sh --publish - osmo-tetra: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com @@ -309,6 +313,7 @@ # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] concurrent: true + cmd: ./contrib/jenkins.sh --publish - osmocom-bb - osmo-sysmon -- To view, visit https://gerrit.osmocom.org/12012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3cc01dbc57213b6d6cdc9b394a516510d045f1ae Gerrit-Change-Number: 12012 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:05:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 16:05:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11984 to look at the new patch set (#3). Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR Both session state and session ID IEs are always being encoded together by libosmocore's GSUP implementation. So, if a message contains a session ID IE, session state IE shall also be there. For some reason, the session state IE was missing in both ts_GSUP_PROC_SS_ERR and tr_GSUP_PROC_SS_ERR templates. This could led to incorrect matching in our test cases. This change fixes both templates by adding the missing IE. Since tr_GSUP_PROC_SS_ERR templete is used in HLR_Tests.ttcn, all the affected matching statements were also corrected. This correction doesn't affect successful test case executions, because we don't test possible problematic situations yet. But if something went wrong on the HLR side (i.e. SUT), the matching statements wouldn't match the PROC_SS_ERR message correctly and continue to wait until the guard timer is expired. Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/11984/3 -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:05:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 16:05:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11990 to look at the new patch set (#3). Change subject: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates ...................................................................... library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In general, the order of IEs in a GSUP message doesn't matter. Despite libosmocore's GSUP API encodes IEs in a fixed order, it is capable to decode them in any arbitary order. Meanwhile, in the current TTCN-3 definitions (i.e. templates) the order makes a difference, because the 'GSUP_IEs' type is a record, that according to the TTCN-3 documentation represents an *ordered* sequence of elements. Let's reorder the IEs of both t{r|s}_GSUP_PROC_SS_ERR templates in a way that is used by the libosmocore's GSUP encoder. This correction doesn't affect successful test case executions, because we don't test possible problematic situations yet. But if something went wrong on the HLR side (i.e. SUT), the matching statements wouldn't match the PROC_SS_ERR message correctly and continue to wait until the guard timer is expired. Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db --- M library/GSUP_Types.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/11990/3 -- To view, visit https://gerrit.osmocom.org/11990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db Gerrit-Change-Number: 11990 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:05:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 16:05:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11985 to look at the new patch set (#4). Change subject: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout ...................................................................... MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout The idea of this test case is to verify SS session termination due to expiry of its guard timeout. The timeout value is intentionally set to a few seconds in order to speedup test case execution (we don't want to wait 2 minutes). We expect OsmoMSC to inform both session entities (MS and EUSE) about timeout expiry before releasing the transaction. The MS should receive GSM 04.80 RELEASE COMPLETE message with optional cause, while the EUSE should receive OSMO_GSUP_MSGT_PROC_SS_ERROR. At the moment, it's not clean which cause values should be used: - for GSM 04.80 RELEASE COMPLETE the cause IE is optional, and possible values are defined in GSM TS 04.08, annex G-H. The H.6.7 Cause No. 102 "recovery on timer expiry" seems to be suitable; - for OSMO_GSUP_MSGT_PROC_SS_ERROR the generic cause IE could be used, but actually this IE is not generic at all, and limited by 'gsm48_gmm_cause' enum; so we temporarily expect arbitrary cause values in both messages. Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Depends-on: (OsmoMSC) Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Related: OS#3655 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/11985/4 -- To view, visit https://gerrit.osmocom.org/11985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Gerrit-Change-Number: 11985 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:11:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 16:11:08 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: add SETFH CTRL command support In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10827 ) Change subject: trxcon/trx_if.c: add SETFH CTRL command support ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id3d44e6a2796f1ce8523a49dedd5d484052a5c7f Gerrit-Change-Number: 10827 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 16:11:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:11:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 16:11:12 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: handle hopping channels from L1CTL_DM_EST_REQ In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10828 ) Change subject: trxcon/l1ctl.c: handle hopping channels from L1CTL_DM_EST_REQ ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8617b5808748bc4df3d7cc9862ed8cf12613f270 Gerrit-Change-Number: 10828 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Thu, 29 Nov 2018 16:11:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:11:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 16:11:27 +0000 Subject: Change in osmocom-bb[master]: trxcon/trx_if.c: add SETFH CTRL command support In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10827 ) Change subject: trxcon/trx_if.c: add SETFH CTRL command support ...................................................................... trxcon/trx_if.c: add SETFH CTRL command support The idea of SETFH command is to instruct transceiver to enable frequency hopping mode using the following parameters: CMD SETFH [... ] Note: since the length of a CTRL command is limited to 128 symbols (BTW: why?), the amount of channels is also limited. Change-Id: Id3d44e6a2796f1ce8523a49dedd5d484052a5c7f --- M src/host/trxcon/trx_if.c M src/host/trxcon/trx_if.h 2 files changed, 46 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c index b8bbace..982fb40 100644 --- a/src/host/trxcon/trx_if.c +++ b/src/host/trxcon/trx_if.c @@ -391,6 +391,50 @@ return trx_ctrl_cmd(trx, 0, "SETTA", "%d", ta); } +/* + * Frequency Hopping parameters indication + * + * SETFH instructs transceiver to enable frequency + * hopping mode using the given parameters. + * CMD SETFH [... ] + */ + +int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn, + uint8_t maio, uint16_t *ma, size_t ma_len) +{ + char ma_buf[100]; + char *ptr; + int i, rc; + + /* No channels, WTF?!? */ + if (!ma_len) + return -EINVAL; + + /** + * Compose a sequence of channels (mobile allocation) + * FIXME: the length of a CTRL command is limited to 128 symbols, + * so we may have some problems if there are many channels... + */ + for (i = 0, ptr = ma_buf; i < ma_len; i++) { + /* Append a channel */ + rc = snprintf(ptr, ma_buf + sizeof(ma_buf) - ptr, "%u ", ma[i]); + if (rc < 0) + return rc; + + /* Move pointer */ + ptr += rc; + + /* Prevent buffer overflow */ + if (ptr >= (ma_buf + 100)) + return -EIO; + } + + /* Overwrite the last space */ + *(ptr - 1) = '\0'; + + return trx_ctrl_cmd(trx, 1, "SETFH", "%u %u %s", hsn, maio, ma_buf); +} + /* Get response from CTRL socket */ static int trx_ctrl_read_cb(struct osmo_fd *ofd, unsigned int what) { diff --git a/src/host/trxcon/trx_if.h b/src/host/trxcon/trx_if.h index be0d41a..d551252 100644 --- a/src/host/trxcon/trx_if.h +++ b/src/host/trxcon/trx_if.h @@ -67,6 +67,8 @@ int trx_if_cmd_txtune(struct trx_instance *trx, uint16_t band_arfcn); int trx_if_cmd_setslot(struct trx_instance *trx, uint8_t tn, uint8_t type); +int trx_if_cmd_setfh(struct trx_instance *trx, uint8_t hsn, + uint8_t maio, uint16_t *ma, size_t ma_len); int trx_if_cmd_measure(struct trx_instance *trx, uint16_t band_arfcn_start, uint16_t band_arfcn_stop); -- To view, visit https://gerrit.osmocom.org/10827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id3d44e6a2796f1ce8523a49dedd5d484052a5c7f Gerrit-Change-Number: 10827 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:11:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 16:11:28 +0000 Subject: Change in osmocom-bb[master]: trxcon/l1ctl.c: handle hopping channels from L1CTL_DM_EST_REQ In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/10828 ) Change subject: trxcon/l1ctl.c: handle hopping channels from L1CTL_DM_EST_REQ ...................................................................... trxcon/l1ctl.c: handle hopping channels from L1CTL_DM_EST_REQ Change-Id: I8617b5808748bc4df3d7cc9862ed8cf12613f270 --- M src/host/trxcon/l1ctl.c 1 file changed, 62 insertions(+), 21 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index f239b30..02aa3fa 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -554,43 +554,84 @@ return rc; } +static int l1ctl_proc_est_req_h0(struct trx_instance *trx, struct l1ctl_h0 *h) +{ + uint16_t band_arfcn; + int rc = 0; + + band_arfcn = ntohs(h->band_arfcn); + + LOGP(DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a single " + "ARFCN=%u channel\n", band_arfcn &~ ARFCN_FLAG_MASK); + + /* Do we need to retune? */ + if (trx->band_arfcn == band_arfcn) + return 0; + + /* Tune transceiver to required ARFCN */ + rc |= trx_if_cmd_rxtune(trx, band_arfcn); + rc |= trx_if_cmd_txtune(trx, band_arfcn); + if (rc) + return rc; + + /* Update current ARFCN */ + trx->band_arfcn = band_arfcn; + + return 0; +} + +static int l1ctl_proc_est_req_h1(struct trx_instance *trx, struct l1ctl_h1 *h) +{ + int rc; + + LOGP(DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a Frequency " + "Hopping (hsn=%u, maio=%u, chans=%u) channel\n", + h->hsn, h->maio, h->n); + + /* No channels?!? */ + if (!h->n) { + LOGP(DL1C, LOGL_ERROR, "No channels in mobile allocation?!?\n"); + return -EINVAL; + } + + /* Forward hopping parameters to TRX */ + rc = trx_if_cmd_setfh(trx, h->hsn, h->maio, h->ma, h->n); + if (rc) + return rc; + + /** + * TODO: update the state of trx_instance somehow + * in order to indicate that it is in hopping mode... + */ + return 0; +} + static int l1ctl_rx_dm_est_req(struct l1ctl_link *l1l, struct msgb *msg) { enum gsm_phys_chan_config config; struct l1ctl_dm_est_req *est_req; struct l1ctl_info_ul *ul; struct trx_ts *ts; - uint16_t band_arfcn; uint8_t chan_nr, tn; - int rc = 0; + int rc; ul = (struct l1ctl_info_ul *) msg->l1h; est_req = (struct l1ctl_dm_est_req *) ul->payload; - band_arfcn = ntohs(est_req->h0.band_arfcn); chan_nr = ul->chan_nr; tn = chan_nr & 0x07; - LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ (arfcn=%u, " - "tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", - (band_arfcn &~ ARFCN_FLAG_MASK), tn, chan_nr, - est_req->tsc, est_req->tch_mode); + LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ " + "(tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", + tn, chan_nr, est_req->tsc, est_req->tch_mode); - if (est_req->h) { - LOGP(DL1C, LOGL_ERROR, "FHSS is not supported\n"); - rc = -ENOTSUP; + /* Frequency hopping? */ + if (est_req->h) + rc = l1ctl_proc_est_req_h1(l1l->trx, &est_req->h1); + else /* Single ARFCN */ + rc = l1ctl_proc_est_req_h0(l1l->trx, &est_req->h0); + if (rc) goto exit; - } - - /* Only if the current ARFCN differs */ - if (l1l->trx->band_arfcn != band_arfcn) { - /* Update current ARFCN */ - l1l->trx->band_arfcn = band_arfcn; - - /* Tune transceiver to required ARFCN */ - trx_if_cmd_rxtune(l1l->trx, band_arfcn); - trx_if_cmd_txtune(l1l->trx, band_arfcn); - } /* Update TSC (Training Sequence Code) */ l1l->trx->tsc = est_req->tsc; -- To view, visit https://gerrit.osmocom.org/10828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8617b5808748bc4df3d7cc9862ed8cf12613f270 Gerrit-Change-Number: 10828 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:13:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 16:13:21 +0000 Subject: Change in osmo-bsc[master]: jenkins.sh: add --enable-werror to configure flags In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/7109 ) Change subject: jenkins.sh: add --enable-werror to configure flags ...................................................................... Abandoned Meanwhile implemented by Change-Id Ife9ca2a5b835dfd6d03c981dcf0e48265eb861eb -- To view, visit https://gerrit.osmocom.org/7109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2294151ab91522231095006a0599bea02e07c259 Gerrit-Change-Number: 7109 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:15:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 16:15:59 +0000 Subject: Change in osmo-gsm-tester[master]: nanobts: Use -G parameter of ipaccess-config to avoid need to restart... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11750 ) Change subject: nanobts: Use -G parameter of ipaccess-config to avoid need to restart nanoBTS ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2871dee3de11512250445127f0b807a8990fd4c6 Gerrit-Change-Number: 11750 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 16:15:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:16:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 16:16:24 +0000 Subject: Change in osmo-ci[master]: master-builds: use jenkins.sh --publish In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12012 ) Change subject: master-builds: use jenkins.sh --publish ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cc01dbc57213b6d6cdc9b394a516510d045f1ae Gerrit-Change-Number: 12012 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Thu, 29 Nov 2018 16:16:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:17:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 16:17:27 +0000 Subject: Change in openbsc[master]: manuals/OsmoNITB: integrate into this repository In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11999 ) Change subject: manuals/OsmoNITB: integrate into this repository ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 Gerrit-Change-Number: 11999 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 16:17:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:18:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 16:18:20 +0000 Subject: Change in openbsc[master]: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12010 ) Change subject: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 Gerrit-Change-Number: 12010 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 16:18:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:18:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 16:18:54 +0000 Subject: Change in openbsc[master]: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12010 ) Change subject: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git ...................................................................... Patch Set 1: Code-Review+1 may be unrelated if it's already called this way in the original code. However, it's osmo-bsc-nat or OsmoBSCNAT, not just OsmoNAT. Might be worth following up in a separate change after the move? Or do it before the move? Either way, I'm noticing naming inconsistency here. -- To view, visit https://gerrit.osmocom.org/12010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 Gerrit-Change-Number: 12010 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 16:18:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:18:59 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 16:18:59 +0000 Subject: Change in osmo-ci[master]: master-builds: use jenkins.sh --publish In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12012 ) Change subject: master-builds: use jenkins.sh --publish ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/12012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cc01dbc57213b6d6cdc9b394a516510d045f1ae Gerrit-Change-Number: 12012 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Nov 2018 16:18:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:19:02 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 16:19:02 +0000 Subject: Change in osmo-ci[master]: master-builds: use jenkins.sh --publish In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12012 ) Change subject: master-builds: use jenkins.sh --publish ...................................................................... master-builds: use jenkins.sh --publish Add --publish to the contrib/jenkins.sh calls for each Osmocom project, where PDF manuals should be published. As this parameter is only passed to jenkins.sh from the master-builds job, not from the gerrit-verification job, we can add logic to upload the generated PDFs when getting triggered because of changes in master. Related: OS#3385 Change-Id: I3cc01dbc57213b6d6cdc9b394a516510d045f1ae --- M jobs/master-builds.yml 1 file changed, 13 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved osmith: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 6b07694..67a9b80 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -16,7 +16,7 @@ a3: !!python/tuple [default] combination_filter: '' sequential: false - # most common build invocation + # most common build invocation (--publish is added to publish manual PDFs) cmd: ./contrib/jenkins.sh wrappers: [] trigger: @@ -82,6 +82,7 @@ master-osmo-iuh, master-osmo-msc, master-osmo-sgsn + cmd: ./contrib/jenkins.sh --publish - libosmocore: a1_name: arch @@ -174,7 +175,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh + osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-bts: a1_name: FIRMWARE_VERSION @@ -190,12 +191,12 @@ (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") - cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' + cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL" --publish' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh + cmd: GTP="$GTP" ./contrib/jenkins.sh --publish trigger: master-osmo-sgsn - osmo-gmr: @@ -207,7 +208,8 @@ # keep first line with less indent to preserve newlines ./contrib/jenkins.sh - - osmo-hlr + - osmo-hlr: + cmd: ./contrib/jenkins.sh --publish - osmo-iuh: # Full triggers would be: @@ -233,7 +235,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh + osmocom:amd64 /build/contrib/jenkins.sh --publish trigger: master-osmo-msc, master-osmo-bsc - osmo-msc: @@ -256,7 +258,7 @@ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ - osmocom:amd64 /build/contrib/jenkins.sh + osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-pcap @@ -279,6 +281,7 @@ (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") + cmd: ./contrib/jenkins.sh --publish - osmo-sgsn: a1_name: IU @@ -295,10 +298,11 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh + osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-sip-connector: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de + cmd: ./contrib/jenkins.sh --publish - osmo-tetra: email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com @@ -309,6 +313,7 @@ # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] concurrent: true + cmd: ./contrib/jenkins.sh --publish - osmocom-bb - osmo-sysmon -- To view, visit https://gerrit.osmocom.org/12012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3cc01dbc57213b6d6cdc9b394a516510d045f1ae Gerrit-Change-Number: 12012 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:19:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 16:19:23 +0000 Subject: Change in osmo-gsm-manuals[master]: remove leftovers from manuals move In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12003 ) Change subject: remove leftovers from manuals move ...................................................................... remove leftovers from manuals move Remove leftover OsmoMSC/Makefile.am, which should have been deleted already in Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc ("remove OsmoMSC files (now avail in osmo-msc.git)"). Remove the upload taget in Makefile.am, as there are not project specific files anymore. Related: OS#3385 Change-Id: I8716c41b03b09250e61e6a29fe9589454258fe03 --- M Makefile.am D OsmoMSC/Makefile.am 2 files changed, 0 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 5386b5f..2a7b881 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,8 +28,3 @@ uninstall-local: rm -rv "$(share_path)" "$(DESTDIR)$(prefix)/bin/osmo-gsm-manuals-check-depends" - -upload: - for i in Osmo*; do \ - $(MAKE) -C "$$i" upload || exit 1; \ - done diff --git a/OsmoMSC/Makefile.am b/OsmoMSC/Makefile.am deleted file mode 100644 index 0fcd1ff..0000000 --- a/OsmoMSC/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmomsc-usermanual.adoc \ - osmomsc-usermanual-docinfo.xml \ - osmomsc-vty-reference.xml \ - chapters \ - images \ - vty - -ASCIIDOC = osmomsc-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmomsc-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc -- To view, visit https://gerrit.osmocom.org/12003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8716c41b03b09250e61e6a29fe9589454258fe03 Gerrit-Change-Number: 12003 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:19:44 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 16:19:44 +0000 Subject: Change in openbsc[master]: manuals/OsmoNITB: integrate into this repository In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11999 ) Change subject: manuals/OsmoNITB: integrate into this repository ...................................................................... manuals/OsmoNITB: integrate into this repository Move from doc/manuals to manuals/OsmoNITB as we have two more manuals (OsmoMGCP and OsmoNAT) that need to be moved to manuals/. Make the manuals build without a toplevel configure.ac file from autotools: $ cd manuals/OsmoNITB $ make openbsc/configure.ac is not used to integrate the manuals, as it would be extra effort to integrate all three of the manuals there. This is not worth it for the legacy codebase. Related: OS#3385 Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 --- A manuals/.gitignore R manuals/OsmoNITB/Makefile R manuals/OsmoNITB/chapters/bts-examples.adoc R manuals/OsmoNITB/chapters/control.adoc R manuals/OsmoNITB/chapters/hlr.adoc R manuals/OsmoNITB/chapters/net.adoc R manuals/OsmoNITB/chapters/overview.adoc R manuals/OsmoNITB/chapters/running.adoc R manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml R manuals/OsmoNITB/osmonitb-usermanual.adoc R manuals/OsmoNITB/osmonitb-vty-reference.xml R manuals/OsmoNITB/vty/bsc_vty_additions.xml R manuals/OsmoNITB/vty/nitb_vty_additions.xml R manuals/OsmoNITB/vty/nitb_vty_reference.xml A manuals/osmo-gsm-manuals-dir.sh 15 files changed, 36 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/manuals/.gitignore b/manuals/.gitignore new file mode 100644 index 0000000..565590f --- /dev/null +++ b/manuals/.gitignore @@ -0,0 +1,8 @@ +*.html +*.svg +*.pdf +*__*.png +*.check +generated +common +build diff --git a/doc/manuals/Makefile.am b/manuals/OsmoNITB/Makefile similarity index 65% rename from doc/manuals/Makefile.am rename to manuals/OsmoNITB/Makefile index 3735c5b..9f28305 100644 --- a/doc/manuals/Makefile.am +++ b/manuals/OsmoNITB/Makefile @@ -1,9 +1,5 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmonitb-usermanual.adoc \ - osmonitb-usermanual-docinfo.xml \ - osmonitb-vty-reference.xml \ - chapters \ - vty +OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) ASCIIDOC = osmonitb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/doc/manuals/chapters/bts-examples.adoc b/manuals/OsmoNITB/chapters/bts-examples.adoc similarity index 100% rename from doc/manuals/chapters/bts-examples.adoc rename to manuals/OsmoNITB/chapters/bts-examples.adoc diff --git a/doc/manuals/chapters/control.adoc b/manuals/OsmoNITB/chapters/control.adoc similarity index 100% rename from doc/manuals/chapters/control.adoc rename to manuals/OsmoNITB/chapters/control.adoc diff --git a/doc/manuals/chapters/hlr.adoc b/manuals/OsmoNITB/chapters/hlr.adoc similarity index 100% rename from doc/manuals/chapters/hlr.adoc rename to manuals/OsmoNITB/chapters/hlr.adoc diff --git a/doc/manuals/chapters/net.adoc b/manuals/OsmoNITB/chapters/net.adoc similarity index 100% rename from doc/manuals/chapters/net.adoc rename to manuals/OsmoNITB/chapters/net.adoc diff --git a/doc/manuals/chapters/overview.adoc b/manuals/OsmoNITB/chapters/overview.adoc similarity index 100% rename from doc/manuals/chapters/overview.adoc rename to manuals/OsmoNITB/chapters/overview.adoc diff --git a/doc/manuals/chapters/running.adoc b/manuals/OsmoNITB/chapters/running.adoc similarity index 100% rename from doc/manuals/chapters/running.adoc rename to manuals/OsmoNITB/chapters/running.adoc diff --git a/doc/manuals/osmonitb-usermanual-docinfo.xml b/manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml similarity index 100% rename from doc/manuals/osmonitb-usermanual-docinfo.xml rename to manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml diff --git a/doc/manuals/osmonitb-usermanual.adoc b/manuals/OsmoNITB/osmonitb-usermanual.adoc similarity index 100% rename from doc/manuals/osmonitb-usermanual.adoc rename to manuals/OsmoNITB/osmonitb-usermanual.adoc diff --git a/doc/manuals/osmonitb-vty-reference.xml b/manuals/OsmoNITB/osmonitb-vty-reference.xml similarity index 100% rename from doc/manuals/osmonitb-vty-reference.xml rename to manuals/OsmoNITB/osmonitb-vty-reference.xml diff --git a/doc/manuals/vty/bsc_vty_additions.xml b/manuals/OsmoNITB/vty/bsc_vty_additions.xml similarity index 100% rename from doc/manuals/vty/bsc_vty_additions.xml rename to manuals/OsmoNITB/vty/bsc_vty_additions.xml diff --git a/doc/manuals/vty/nitb_vty_additions.xml b/manuals/OsmoNITB/vty/nitb_vty_additions.xml similarity index 100% rename from doc/manuals/vty/nitb_vty_additions.xml rename to manuals/OsmoNITB/vty/nitb_vty_additions.xml diff --git a/doc/manuals/vty/nitb_vty_reference.xml b/manuals/OsmoNITB/vty/nitb_vty_reference.xml similarity index 100% rename from doc/manuals/vty/nitb_vty_reference.xml rename to manuals/OsmoNITB/vty/nitb_vty_reference.xml diff --git a/manuals/osmo-gsm-manuals-dir.sh b/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 0000000..d080bc7 --- /dev/null +++ b/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/11999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 Gerrit-Change-Number: 11999 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:19:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 16:19:49 +0000 Subject: Change in openbsc[master]: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12010 ) Change subject: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git ...................................................................... Patch Set 1: Good point. I think it can be done in a follow-up patch. -- To view, visit https://gerrit.osmocom.org/12010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 Gerrit-Change-Number: 12010 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Nov 2018 16:19:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:20:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 16:20:03 +0000 Subject: Change in osmo-gsm-tester[master]: nanobts: Use -G parameter of ipaccess-config to avoid need to restart... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11750 ) Change subject: nanobts: Use -G parameter of ipaccess-config to avoid need to restart nanoBTS ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2871dee3de11512250445127f0b807a8990fd4c6 Gerrit-Change-Number: 11750 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 16:20:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:23:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 16:23:45 +0000 Subject: Change in openbsc[master]: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12010 ) Change subject: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git ...................................................................... Patch Set 1: > may be unrelated if it's already called this way in the original code. However, it's osmo-bsc-nat or OsmoBSCNAT, not just OsmoNAT. Might be worth following up in a separate change after the move? Or do it before the move? Either way, I'm noticing naming inconsistency here. Yes, I can do this in a follow-up patch. Does the same count for OsmoMGCP -> OsmoBSCMGCP? -- To view, visit https://gerrit.osmocom.org/12010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 Gerrit-Change-Number: 12010 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Nov 2018 16:23:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:24:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 16:24:04 +0000 Subject: Change in osmo-trx[master]: lms: Use a default Tx gain value of 64 dB. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12008 ) Change subject: lms: Use a default Tx gain value of 64 dB. ...................................................................... Patch Set 2: > Oh I got the description wrong. So actuallt the default is > "tx-attenuation oml" when no option is set, which means attenuation > is set by BSC: "Use NM_ATT_RF_MAXPOWR_R (max power reduction) from > BSC via OML". I've always thought of this as rather ugly. There is a mixture of different concepts here. The base gain setting (64..66 dB) is a property of the SDR hardware, as recommended by the hardware manufacturer in order to reach the maximum possible output level without going into saturation. This "maximum clean transmit output power" is called "nominal transmit power". The NM_ATT_RF_MAXPOWR_R is a 3GPP specified value which is operator configuration as to how manyy steps of 2dB the BTS should transmit *below* that nominal value. So the correct processing is to always use both, and subtract them. Default: Use 64..66 dBm value as base line, and substact the NM_ATT_RF_MAXPWR_R User override: specify a lower/higher base gain value instead of 64..66. -- To view, visit https://gerrit.osmocom.org/12008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id018b27b1d8a2f48d60b29e688583c9a5ac49a81 Gerrit-Change-Number: 12008 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 16:24:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:24:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 16:24:28 +0000 Subject: Change in osmo-trx[master]: lms: User correct scale factor for transmit samples In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12006 ) Change subject: lms: User correct scale factor for transmit samples ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71702feaa11f53e7614a6938a984dd748405474a Gerrit-Change-Number: 12006 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 16:24:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:26:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 16:26:44 +0000 Subject: Change in openbsc[master]: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12010 ) Change subject: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git ...................................................................... Patch Set 1: > > may be unrelated if it's already called this way in the original > code. However, it's osmo-bsc-nat or OsmoBSCNAT, not just OsmoNAT. > Might be worth following up in a separate change after the move? Or > do it before the move? Either way, I'm noticing naming > inconsistency here. > > Yes, I can do this in a follow-up patch. Does the same count for > OsmoMGCP -> OsmoBSCMGCP? Yes, otherwise it sounds like MGCP generic to me, and the binary in openbs.git is really attached to osmo-bsc-sccplite (and osmo-bsc-nat). -- To view, visit https://gerrit.osmocom.org/12010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 Gerrit-Change-Number: 12010 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Nov 2018 16:26:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:51:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 16:51:29 +0000 Subject: Change in osmo-bsc[master]: Fix ts_for_each_lchan iteration for dynamic TS in process of being PD... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11957 ) Change subject: Fix ts_for_each_lchan iteration for dynamic TS in process of being PDCH deactivated ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 Gerrit-Change-Number: 11957 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 16:51:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:51:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 16:51:48 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 16:51:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:52:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 16:52:22 +0000 Subject: Change in osmo-bsc[master]: bsc: trx_count_free_ts: Fix counting of GSM_PCHAN_PDCH In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/11956 ) Change subject: bsc: trx_count_free_ts: Fix counting of GSM_PCHAN_PDCH ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/11956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I7a785b70fd0a34a52504e9a46b4b27889463f67e Gerrit-Change-Number: 11956 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 17:07:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 17:07:43 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11993 to look at the new patch set (#2). Change subject: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event ...................................................................... bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event When lchan_rtp_fsm instance is allcoated with osmo_fsm_inst_alloc_child(..., LCHAN_EV_RTP_RELEASED) we already let fsm code to take care of sending that event ito the parent when the fsm is terminated (but only if freeing cause is not OSMO_FSM_TERM_PARENT). The lchan_rtp_fsm cleanup() callback, which is called immediatelly before sending to the parent the event defined during osmo_gsm_install_alloc_child(), currently also sends that same event, which ends up in a duplicated event being sent as shown in log files below. Let's only send the event in cleanup() if we are in the cause=OSMO_FSM_TERM_PARENT scenario, to make sure parent always receives the event, but only once. 20181128193707326 DAS <0012> osmo-bsc/assignment_fsm.c:127 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: (bts=0,trx=0,ts=6,ss=0) Assignment failed 20181128193707326 DAS <0012> osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Terminating (cause = OSMO_FSM_TERM_ERROR) 20181128193707326 DAS <0012> osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Removing from parent SUBSCR_CONN(conn4)[0x612000002920] 20181128193707326 DCHAN <0010> osmo-bsc/lchan_fsm.c:1333 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Received Event LCHAN_RTP_EV_ROLLBACK 20181128193707326 DCHAN <0010> osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Terminating (cause = OSMO_FSM_TERM_REQUEST) 20181128193707326 DCHAN <0010> osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Removing from parent lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] 20181128193707326 DRSL <0003> osmo-bsc/mgw_endpoint_fsm.c:441 mgw-endpoint(conn4)[0x6120000021a0]{WAIT_MGW_RESPONSE}: (rtpbridge/*@mgw) CI[0] to-BTS: DLCX :0: notify=NULL 20181128193707326 DRSL <0003> osmo-bsc/mgw_endpoint_fsm.c:482 mgw-endpoint(conn4)[0x6120000021a0]{WAIT_MGW_RESPONSE}: (rtpbridge/*@mgw) CI[0] to-BTS: DLCX :0: Scheduling 20181128193707326 DCHAN <0010> osmo-bsc/lchan_rtp_fsm.c:742 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707326 DCHAN <0010> osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Freeing instance 20181128193707327 DCHAN <0010> fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Deallocated 20181128193707327 DCHAN <0010> osmo-bsc/lchan_rtp_fsm.c:193 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707330 DCHAN <0010> osmo-bsc/lchan_fsm.c:1347 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: transition to state WAIT_RLL_RTP_RELEASED not permitted! 20181128193707330 DAS <0012> osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Freeing instance 20181128193707330 DAS <0012> fsm.c:381 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Deallocated Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/11993/2 -- To view, visit https://gerrit.osmocom.org/11993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 Gerrit-Change-Number: 11993 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 17:17:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 17:17:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11984 ) Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 17:17:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 17:18:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 17:18:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11990 ) Change subject: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db Gerrit-Change-Number: 11990 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 17:18:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 17:19:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 17:19:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11990 ) Change subject: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates ...................................................................... Patch Set 3: We basically follow pretty much what most 3GPP/GSM specs do: Have a TLV like structure, but still the specs mandate a fixed order of IEs. All of the osmocom receivers can receive the IEs in any order, though. If one wanted to make the receive templates accept arbitrary order, one could use a different construct such as "set of" rather than "record of". But I think it's best to proceed like here, i.e. expect and accept one given order of IEs only. -- To view, visit https://gerrit.osmocom.org/11990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db Gerrit-Change-Number: 11990 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 17:19:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 17:21:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 29 Nov 2018 17:21:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11985 ) Change subject: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Gerrit-Change-Number: 11985 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 17:21:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 18:03:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 18:03:03 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11932/3/src/osmo-bts-trx/l1_if.c File src/osmo-bts-trx/l1_if.c: https://gerrit.osmocom.org/#/c/11932/3/src/osmo-bts-trx/l1_if.c at 163 PS3, Line 163: PRIu8 > AFAIK, we usually use '%u' for uint8_t. Not critical though. I think it's more clear to use PRIu8 when using uint8_t. -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 18:03:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 18:05:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 29 Nov 2018 18:05:31 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11932 to look at the new patch set (#4). Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT Before this patch, PDCH DEACT was (n)acked to the BSC without taking into account if TRX succeeded or failed to set the TS: 20181123044720655 DRLL <0002> rsl.c:2523 (bts=0,trx=0,ts=0,ss=0) Rx RLL DATA_REQ Abis -> LAPDm 20181123044720700 DRSL <0000> rsl.c:2805 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) ss=0 Rx RSL IPAC_PDCH_DEACT 20181123044720700 DRSL <0000> rsl.c:2205 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still active 20181123044720700 DRSL <0000> rsl.c:2131 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT NACK (cause = 0x0f) 20181123044720700 DPCU <0009> pcu_sock.c:124 Sending info 20181123044720700 DPCU <0009> pcu_sock.c:139 BTS is up 20181123044720700 DPCU <0009> pcu_sock.c:232 trx=0 ts=7: available (tsc=7 arfcn=868) 20181123044720703 DPCU <0009> pcu_sock.c:608 Deactivate request received: TRX=0 TX=6 20181123044720703 DL1C <0006> l1sap.c:1519 deactivating channel chan_nr=TCH/F on TS6 trx=0 20181123044720703 DTRX <000b> trx_if.c:242 Enqueuing TRX control command 'CMD NOHANDOVER 6 0' 20181123044720703 DL1C <0006> l1sap.c:648 deactivate confirm chan_nr=TCH/F on TS6 trx=0 20181123044720703 DRSL <0000> rsl.c:714 (bts=0,trx=0,ts=6,ss=0) not sending REL ACK 20181123044720703 DRSL <0000> rsl.c:2264 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: channel disconnected, will reconnect as TCH 20181123044720703 DL1C <0006> scheduler.c:593 Configuring multiframe with TCH/F+SACCH trx=0 ts=6 20181123044720703 DTRX <000b> trx_if.c:242 Enqueuing TRX control command 'CMD SETSLOT 6 1' 20181123044720703 DL1C <0006> l1_if.c:780 (bts=0,trx=0,ts=6) bts_model_ts_connect(as_pchan=TCH/F) success, calling cb_ts_connected() 20181123044720703 DRSL <0000> rsl.c:2339 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: timeslot connected as TCH/F 20181123044720703 DRSL <0000> rsl.c:2440 (bts=0,trx=0,ts=6,ss=0) TCH/F_PDCH switched to TCH/F mode (ts->flags == 0) 20181123044720703 DRSL <0000> rsl.c:2103 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT ACK 20181123044720704 DTRX <000b> trx_if.c:492 Response message: 'RSP NOHANDOVER 0 6' 20181123044720705 DTRX <000b> trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 3 files changed, 81 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/11932/4 -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 18:27:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 18:27:58 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Switch to error state before dispatching error eve... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11995 ) Change subject: bsc: timeslot_fsm: Switch to error state before dispatching error event to lchans ...................................................................... Patch Set 2: Code-Review-1 (2 comments) please bear with my scepticism, as the way the FSMs interact can become quite complex and I want to understand the implications before I approve. https://gerrit.osmocom.org/#/c/11995/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11995/2//COMMIT_MSG at 10 PS2, Line 10: to handle them, as a result from dispatching LCHAN_EV_TS_ERROR previously. I don't understand: which state is unable to handle TS_EV_LCHAN_UNUSED? If it should be able to, then let's make it handle that event properly? https://gerrit.osmocom.org/#/c/11995/2/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11995/2/src/osmo-bsc/timeslot_fsm.c at 177 PS2, Line 177: ts_lchans_dispatch(ts, LCHAN_ST_WAIT_TS_READY, LCHAN_EV_TS_ERROR); Sorry, I'm not convinced: - my premise is that the lchan should be able to handle a TS_ERROR independently from the timeslot's state. - when a timeslot changes its state, it might trigger immediate other actions, maybe also affecting lchans. I'm imagining an lchan being put up for more activity before it was even told that there was some problem before... I'm sure you've seen an example that shows that this makes sense; instead I'm arguing from the angle of the ideas and premises I had in mind when writing the way the FSMs interact, trying to cover all (un)thinkable situations. -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 18:27:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 18:48:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 18:48:02 +0000 Subject: Change in osmo-bsc[master]: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11980 ) Change subject: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init ...................................................................... Patch Set 2: Code-Review+1 (5 comments) https://gerrit.osmocom.org/#/c/11980/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11980/2//COMMIT_MSG at 10 PS2, Line 10: to document its (intrincate) logic around it and its possible uses. intricate https://gerrit.osmocom.org/#/c/11980/2/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/#/c/11980/2/include/osmocom/bsc/gsm_data.h at 482 PS2, Line 482: * on PCHAN \ref ts (dynamic) configuration. (is that doxygen notation in a non-doxygen comment in a project that doesn't generate doxygen api docs?) Can you rephrase "based on PCHAN ts (dynamic) config"? https://gerrit.osmocom.org/#/c/11980/2/include/osmocom/bsc/gsm_data.h at 488 PS2, Line 488: * of \ref lchan. Maybe rather... "Iterate all lchan instances set up by this timeslot type, including those lchans currently disabled (e.g. due to dynamic timeslot in switchover). Compare ts_for_each_lchan(), which iterates only the enabled lchans." https://gerrit.osmocom.org/#/c/11980/2/include/osmocom/bsc/gsm_data.h at 490 PS2, Line 490: * configuration PDCH (no lchans) to TCH_F (1 lchan), where pchan_is is still To name all possibilities, you'd have to name both dyn TS kinds, all TCH targets, as well as TCH/F_TCH/H_PDCH in unused mode when GPRS is disabled, or ones switching between TCH/F and TCH/H, ... So maybe rather start with "For example,..." https://gerrit.osmocom.org/#/c/11980/2/include/osmocom/bsc/gsm_data.h at 494 PS2, Line 494: #define ts_for_each_lchan_slot(lchan, ts) ts_as_pchan_for_each_lchan(lchan, ts, (ts)->pchan_on_init) IMHO "slot" is a general term not describing what sets this macro apart from ts_for_each_lchan(). Can't think of a better name either... ts_for_each_potential_lchan()?? -- To view, visit https://gerrit.osmocom.org/11980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 Gerrit-Change-Number: 11980 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 18:48:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:00:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:00:23 +0000 Subject: Change in osmo-bsc[master]: Fix ts_for_each_lchan iteration for dynamic TS in process of being PD... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11957 ) Change subject: Fix ts_for_each_lchan iteration for dynamic TS in process of being PDCH deactivated ...................................................................... Patch Set 3: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/11957/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11957/3//COMMIT_MSG at 7 PS3, Line 7: Fix ts_for_each_lchan iteration for dynamic TS in process of being PDCH deactivated (ideas to make it shorter... 'fix lchan iteration for dyn TS during PDCH Deact') https://gerrit.osmocom.org/#/c/11957/3//COMMIT_MSG at 9 PS3, Line 9: In general PDCH channels are not handled as lchans in BTS (lchan_fsm.c), "BTS (lchan_fsm.c)"??? https://gerrit.osmocom.org/#/c/11957/3//COMMIT_MSG at 11 PS3, Line 11: being used. I believe this commit log message has 'I wrote a long letter because I didn't have the time to make it shorter' syndrome. "To make sure that a dyn TS error signals an error to all waiting lchans, make sure to iterate all potential lchans even if pchan_is == GSM_PCHAN_PDCH and no lchans are really enabled yet. For example, previously, a PDCH Deact NACK failed to signal waiting lchans, as ts_for_each_lchan() iterates only lchans that make sense with the current pchan mode." That's all of it, right? -- To view, visit https://gerrit.osmocom.org/11957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 Gerrit-Change-Number: 11957 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 19:00:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:02:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:02:57 +0000 Subject: Change in osmo-bsc[master]: bsc: timelost_fsm: Remove unneeded set of out variable on failure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11981 ) Change subject: bsc: timelost_fsm: Remove unneeded set of out variable on failure ...................................................................... Patch Set 2: (1 comment) I'd rather omit this patch, because... https://gerrit.osmocom.org/#/c/11981/2/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11981/2/src/osmo-bsc/timeslot_fsm.c at 867 PS2, Line 867: return false; my idea here was to avoid leaving a value in an uninitialized state. I always try to initialize out-arguments in all code paths, usually with NULL, but here if no lchan is waiting it makes sense to remain in the current pchan_is. -- To view, visit https://gerrit.osmocom.org/11981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 Gerrit-Change-Number: 11981 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 19:02:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:06:58 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:06:58 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/11954/5/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11954/5/src/osmo-bsc/timeslot_fsm.c at 894 PS5, Line 894: return true; Don't drop below 'case'. Imagine an lchan requested to be set up, then the conn failed or what, and the lchan is gone again. Then the TS is already busy switching, and must complete that dance. It will likely go right back to PDCH once it reached the unused state, but so far it is actually switching to NONE. It's an obscure case, but don't assume that it never happens. -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 19:06:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:08:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:08:14 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_l... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11982 ) Change subject: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 Gerrit-Change-Number: 11982 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 19:08:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:14:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:14:37 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11993 ) Change subject: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event ...................................................................... Patch Set 2: Code-Review+2 (1 comment) true. I actually forgot about the parent/child FSM relation that already takes care of a term event... https://gerrit.osmocom.org/#/c/11993/2/src/osmo-bsc/lchan_rtp_fsm.c File src/osmo-bsc/lchan_rtp_fsm.c: https://gerrit.osmocom.org/#/c/11993/2/src/osmo-bsc/lchan_rtp_fsm.c at 743 PS2, Line 743: * configured at osmo_fsm_inst_alloc_child() time immediatelly after (immediately) -- To view, visit https://gerrit.osmocom.org/11993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 Gerrit-Change-Number: 11993 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 19:14:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:15:04 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix count in ts_lchans_waiting In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11983 ) Change subject: bsc: timeslot_fsm: Fix count in ts_lchans_waiting ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 Gerrit-Change-Number: 11983 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 19:15:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:20:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:20:33 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Fix invalid duplicated transition In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11996 ) Change subject: bsc: lchan_fsm: Fix invalid duplicated transition ...................................................................... Patch Set 2: Code-Review+2 (1 comment) These are the reverberating release event avalanches that one typically gets when N components plugged together each need to tell all other components to tear down in case anything goes wrong. When writing, I merely was interested in being sure that each component *does* signal a release to the others and that a repeated event is not harmful. If you figured out how, then fine with me to make the log a bit shorter, too. https://gerrit.osmocom.org/#/c/11996/2/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/#/c/11996/2/src/osmo-bsc/lchan_fsm.c at 988 PS2, Line 988: if (!sapis && !lchan->fi_rtp && fi->state == LCHAN_ST_WAIT_RLL_RTP_RELEASED) maybe rather "&& fi->state != LCHAN_ST_WAIT_BEFORE_RF_RELEASE"? ok, thinking, if it already went to some error state for whatever weird reasons we shouldn't transition back... yeah ok. (I often have a desire to trigger a state transition only if it differs from the current state. Was thinking to add osmo_fsm_ API for this) -- To view, visit https://gerrit.osmocom.org/11996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d Gerrit-Change-Number: 11996 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 19:20:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:26:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:26:45 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RE... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11994 ) Change subject: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED ...................................................................... Patch Set 2: Code-Review+2 ok, trying to figure out whether it makes sense: In earlier code, the lchan started RTP only after the TS was ready. Later on I tried to make it quicker to reduce a handover gap. So now I see it already fires up the CRCX even before we know that an lchan has been activated. So ok, yes, it makes sense to go to wait-for-RTP-release from wait_ts_ready. -- To view, visit https://gerrit.osmocom.org/11994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 Gerrit-Change-Number: 11994 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 19:26:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:32:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:32:57 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 4: Code-Review+1 (2 comments) (I won't pretend to know this code) https://gerrit.osmocom.org/#/c/11932/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11932/4//COMMIT_MSG at 10 PS4, Line 10: into account if TRX succeeded or failed to set the TS: are we talking bootstrapping the BTS in the beginning? https://gerrit.osmocom.org/#/c/11932/4//COMMIT_MSG at 32 PS4, Line 32: 20181123044720705 DTRX <000b> trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' since you're posting a lot of logging in commit logs lately... how about dropping the timestamp and the category-hex, instead adding the loglevel as explicit string, and either omitting the src line or putting it in the end? logging print level 1 logging print category 1 logging print category-hex 0 logging print file basename last (timestamp can be dropped by editor, like Ctrl-V in vim) -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 19:32:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:38:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:38:14 +0000 Subject: Change in osmo-bsc[master]: bsc: timelost_fsm: Remove unneeded set of out variable on failure In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11981 ) Change subject: bsc: timelost_fsm: Remove unneeded set of out variable on failure ...................................................................... Patch Set 2: This patch isn't harmful even though I dislike it, and it's more like a personal preference. so I can't decide on a vote. In my heart, I want to vote -1. -- To view, visit https://gerrit.osmocom.org/11981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 Gerrit-Change-Number: 11981 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Thu, 29 Nov 2018 19:38:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:41:37 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:41:37 +0000 Subject: Change in cellmgr-ng[master]: jenkins: use common osmo-build-dep.sh and osmo-clean-workspace.sh In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/4588 ) Change subject: jenkins: use common osmo-build-dep.sh and osmo-clean-workspace.sh ...................................................................... Abandoned obsoleted by a patch from pau, already merged -- To view, visit https://gerrit.osmocom.org/4588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: cellmgr-ng Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4f5c2346f3b811c1550bf114e1692d33321118cc Gerrit-Change-Number: 4588 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 19:43:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 19:43:44 +0000 Subject: Change in osmo-bsc[master]: follow-up: logging tweak for Immediate Assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11942 ) Change subject: follow-up: logging tweak for Immediate Assignment ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/11942/1/src/osmo-bsc/lchan_fsm.c File src/osmo-bsc/lchan_fsm.c: https://gerrit.osmocom.org/#/c/11942/1/src/osmo-bsc/lchan_fsm.c at 107 PS1, Line 107: * (Timeout?) was already logged elsewhere. Just tear down the lchan. */ > You talk about tearing down the lchan here, but I don't see any code doing that? it's implicit after _lchan_on_activation_failure(). I mean, continue with the normal tear down stuff happening anyway, without sending some other message or logging. -- To view, visit https://gerrit.osmocom.org/11942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 Gerrit-Change-Number: 11942 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 19:43:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 21:32:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 21:32:39 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscr_conn->mncc_rtp_bridge Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12013 Change subject: drop unused gsm_subscr_conn->mncc_rtp_bridge ...................................................................... drop unused gsm_subscr_conn->mncc_rtp_bridge Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/13/12013/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 085248c..4d3a2e4 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -118,9 +118,6 @@ /* Are we part of a special "silent" call */ int silent_call; - /* MNCC rtp bridge markers */ - int mncc_rtp_bridge; - /* back pointers */ struct gsm_network *network; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index f9888d7..c9dffe3 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1723,8 +1723,6 @@ return 0; } - trans->conn->mncc_rtp_bridge = 1; - /* When we call msc_mgcp_call_assignment() we will trigger, depending * on the RAN type the call assignment on the A or Iu interface. * msc_mgcp_call_assignment() also takes care about sending the CRCX -- To view, visit https://gerrit.osmocom.org/12013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba Gerrit-Change-Number: 12013 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:05:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 22:05:35 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_network->handover.active Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12014 Change subject: drop unused gsm_network->handover.active ...................................................................... drop unused gsm_network->handover.active gsm_network contains an int handover.active which is always zero. Drop it. There is real handover code coming up soon, one part of this is to avoid confusion. The internal MNCC code queried it to decide whether to MNCC_BRIDGE or proxy RTP (MNCC_FRAME_RECV). Since RTP is being handled by osmo-mgw since forever, drop that entire condition from mncc_builtin. Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 --- M include/osmocom/msc/gsm_data.h M src/libmsc/mncc_builtin.c 2 files changed, 1 insertion(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/12014/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 4d3a2e4..94a6ffd 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -283,9 +283,6 @@ uint8_t a5_encryption_mask; bool authentication_required; int send_mm_info; - struct { - int active; - } handover; struct rate_ctr_group *msc_ctrs; struct osmo_counter *active_calls; diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c index d6f3e3d..2efab1f 100644 --- a/src/libmsc/mncc_builtin.c +++ b/src/libmsc/mncc_builtin.c @@ -189,21 +189,7 @@ bridge.callref[1] = call->remote_ref; DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref); - /* proxy mode */ - if (!net->handover.active) { - /* in the no-handover case, we can bridge, i.e. use - * the old RTP proxy code */ - return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge); - } else { - /* in case of handover, we need to re-write the RTP - * SSRC, sequence and timestamp values and thus - * need to enable RTP receive for both directions */ - memset(&frame_recv, 0, sizeof(struct gsm_mncc)); - frame_recv.callref = call->callref; - mncc_tx_to_cc(call->net, MNCC_FRAME_RECV, &frame_recv); - frame_recv.callref = call->remote_ref; - return mncc_tx_to_cc(call->net, MNCC_FRAME_RECV, &frame_recv); - } + return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge); } static int mncc_disc_ind(struct gsm_call *call, int msg_type, -- To view, visit https://gerrit.osmocom.org/12014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 Gerrit-Change-Number: 12014 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:05:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 22:05:36 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12015 Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... rename gsm_subscriber_connection to ran_conn In preparation for inter-BSC and inter-MSC handover, we need to separate the subscriber management logic from the actual RAN connections. What better time to finally rename gsm_subscriber_connection. * Name choice: In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it "bss_conn": in 3G a BSS is called RNS, IIUC. The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network. * Rationale: A subscriber in the MSC so far has only one RAN connection, but e.g. for inter-BSC handover, a second one needs to be created to handover to. Most of the items in the former gsm_subscriber_connection are actually related to the RAN, with only a few MM and RTP related items. So, as a first step, just rename it to ran_conn, to cosmetically prepare for moving the not strictly RAN related items away later. Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_14.h M include/osmocom/msc/gsm_04_80.h M include/osmocom/msc/gsm_09_11.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_ifaces.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/signal.h M include/osmocom/msc/silent_call.h M include/osmocom/msc/transaction.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 39 files changed, 285 insertions(+), 285 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12015/1 diff --git a/include/osmocom/msc/a_iface.h b/include/osmocom/msc/a_iface.h index 9a758d3..f66324e 100644 --- a/include/osmocom/msc/a_iface.h +++ b/include/osmocom/msc/a_iface.h @@ -66,7 +66,7 @@ int a_iface_tx_dtap(struct msgb *msg); /* Send Cipher mode command via A-interface */ -int a_iface_tx_cipher_mode(const struct gsm_subscriber_connection *conn, +int a_iface_tx_cipher_mode(const struct ran_conn *conn, struct gsm0808_encrypt_info *ei, int include_imeisv); /* Page a subscriber via A-interface */ @@ -76,9 +76,9 @@ int a_iface_tx_assignment(const struct gsm_trans *trans); /* Send clear command via A-interface */ -int a_iface_tx_clear_cmd(struct gsm_subscriber_connection *conn); +int a_iface_tx_clear_cmd(struct ran_conn *conn); -int a_iface_tx_classmark_request(const struct gsm_subscriber_connection *conn); +int a_iface_tx_classmark_request(const struct ran_conn *conn); /* Clear all subscriber connections on a specified BSC * (Helper function for a_iface_bssap.c) */ diff --git a/include/osmocom/msc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h index 8767070..b93a4b4 100644 --- a/include/osmocom/msc/gsm_04_08.h +++ b/include/osmocom/msc/gsm_04_08.h @@ -9,7 +9,7 @@ struct gsm_bts; struct gsm_network; struct gsm_trans; -struct gsm_subscriber_connection; +struct ran_conn; struct amr_multirate_conf; struct amr_mode; @@ -22,30 +22,30 @@ name); } -void cm_service_request_concludes(struct gsm_subscriber_connection *conn, +void cm_service_request_concludes(struct ran_conn *conn, struct msgb *msg); /* config options controlling the behaviour of the lower leves */ void gsm0408_allow_everyone(int allow); void gsm0408_clear_all_trans(struct gsm_network *net, int protocol); -int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg); +int gsm0408_dispatch(struct ran_conn *conn, struct msgb *msg); int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id); /* don't use "enum gsm_chreq_reason_t" to avoid circular dependency */ void gsm_net_update_ctype(struct gsm_network *net); -int gsm48_tx_simple(struct gsm_subscriber_connection *conn, +int gsm48_tx_simple(struct ran_conn *conn, uint8_t pdisc, uint8_t msg_type); -int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn); -int gsm48_tx_mm_auth_req(struct gsm_subscriber_connection *conn, uint8_t *rand, +int gsm48_tx_mm_info(struct ran_conn *conn); +int gsm48_tx_mm_auth_req(struct ran_conn *conn, uint8_t *rand, uint8_t *autn, int key_seq); -int gsm48_tx_mm_auth_rej(struct gsm_subscriber_connection *conn); -int gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn); -int gsm48_tx_mm_serv_rej(struct gsm_subscriber_connection *conn, +int gsm48_tx_mm_auth_rej(struct ran_conn *conn); +int gsm48_tx_mm_serv_ack(struct ran_conn *conn); +int gsm48_tx_mm_serv_rej(struct ran_conn *conn, enum gsm48_reject_value value); int gsm48_send_rr_release(struct gsm_lchan *lchan); int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv); -int gsm48_send_rr_app_info(struct gsm_subscriber_connection *conn, uint8_t apdu_id, +int gsm48_send_rr_app_info(struct ran_conn *conn, uint8_t apdu_id, uint8_t apdu_len, const uint8_t *apdu); int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, uint8_t power_class); int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, @@ -71,12 +71,12 @@ void gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan); -void release_security_operation(struct gsm_subscriber_connection *conn); -void allocate_security_operation(struct gsm_subscriber_connection *conn); +void release_security_operation(struct ran_conn *conn); +void allocate_security_operation(struct ran_conn *conn); int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, const struct amr_mode *modes); int gsm48_tch_rtp_create(struct gsm_trans *trans); -int gsm48_conn_sendmsg(struct msgb *msg, struct gsm_subscriber_connection *conn, struct gsm_trans *trans); +int gsm48_conn_sendmsg(struct msgb *msg, struct ran_conn *conn, struct gsm_trans *trans); #endif diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h index a368d46..95098c9 100644 --- a/include/osmocom/msc/gsm_04_11.h +++ b/include/osmocom/msc/gsm_04_11.h @@ -4,7 +4,7 @@ #include struct vlr_subscr; -struct gsm_subscriber_connection; +struct ran_conn; struct gsm_trans; #define UM_SAPI_SMS 3 /* See GSM 04.05/04.06 */ @@ -30,7 +30,7 @@ struct gsm_network; struct msgb; -int gsm0411_rcv_sms(struct gsm_subscriber_connection *conn, struct msgb *msg); +int gsm0411_rcv_sms(struct ran_conn *conn, struct msgb *msg); struct gsm_sms *sms_alloc(void); void sms_free(struct gsm_sms *sms); @@ -41,7 +41,7 @@ int gsm411_send_sms(struct gsm_network *net, struct vlr_subscr *vsub, struct gsm_sms *sms); -void gsm411_sapi_n_reject(struct gsm_subscriber_connection *conn); +void gsm411_sapi_n_reject(struct ran_conn *conn); int gsm411_send_rp_ack(struct gsm_trans *trans, uint8_t msg_ref); int gsm411_send_rp_error(struct gsm_trans *trans, uint8_t msg_ref, diff --git a/include/osmocom/msc/gsm_04_14.h b/include/osmocom/msc/gsm_04_14.h index 3cdbe04..a6bafce 100644 --- a/include/osmocom/msc/gsm_04_14.h +++ b/include/osmocom/msc/gsm_04_14.h @@ -2,14 +2,14 @@ #include -int gsm0414_tx_close_tch_loop_cmd(struct gsm_subscriber_connection *conn, +int gsm0414_tx_close_tch_loop_cmd(struct ran_conn *conn, enum gsm414_tch_loop_mode loop_mode); -int gsm0414_tx_open_loop_cmd(struct gsm_subscriber_connection *conn); -int gsm0414_tx_act_emmi_cmd(struct gsm_subscriber_connection *conn); -int gsm0414_tx_test_interface(struct gsm_subscriber_connection *conn, +int gsm0414_tx_open_loop_cmd(struct ran_conn *conn); +int gsm0414_tx_act_emmi_cmd(struct ran_conn *conn); +int gsm0414_tx_test_interface(struct ran_conn *conn, uint8_t tested_devs); -int gsm0414_tx_reset_ms_pos_store(struct gsm_subscriber_connection *conn, +int gsm0414_tx_reset_ms_pos_store(struct ran_conn *conn, uint8_t technology); -int gsm0414_rcv_test(struct gsm_subscriber_connection *conn, +int gsm0414_rcv_test(struct ran_conn *conn, struct msgb *msg); diff --git a/include/osmocom/msc/gsm_04_80.h b/include/osmocom/msc/gsm_04_80.h index c448c91..29b800b 100644 --- a/include/osmocom/msc/gsm_04_80.h +++ b/include/osmocom/msc/gsm_04_80.h @@ -2,12 +2,12 @@ #include -struct gsm_subscriber_connection; +struct ran_conn; -int msc_send_ussd_reject(struct gsm_subscriber_connection *conn, +int msc_send_ussd_reject(struct ran_conn *conn, uint8_t transaction_id, int invoke_id, uint8_t problem_tag, uint8_t problem_code); -int msc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level, +int msc_send_ussd_notify(struct ran_conn *conn, int level, const char *text); -int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn); +int msc_send_ussd_release_complete(struct ran_conn *conn); diff --git a/include/osmocom/msc/gsm_09_11.h b/include/osmocom/msc/gsm_09_11.h index 5e689fb..8fbe41b 100644 --- a/include/osmocom/msc/gsm_09_11.h +++ b/include/osmocom/msc/gsm_09_11.h @@ -3,5 +3,5 @@ #include #include -int gsm0911_rcv_nc_ss(struct gsm_subscriber_connection *conn, struct msgb *msg); +int gsm0911_rcv_nc_ss(struct ran_conn *conn, struct msgb *msg); int gsm0911_gsup_handler(struct vlr_subscr *vsub, struct osmo_gsup_message *gsup); diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 94a6ffd..5c167e1 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -90,7 +90,7 @@ } /* active radio connection of a mobile subscriber */ -struct gsm_subscriber_connection { +struct ran_conn { /* global linked list of subscriber_connections */ struct llist_head entry; diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index 01d9c58..ec2d3a4 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -58,13 +58,13 @@ void subscr_remove_request(struct subscr_request *req); int subscr_rx_paging_response(struct msgb *msg, - struct gsm_subscriber_connection *conn); + struct ran_conn *conn); void subscr_paging_cancel(struct vlr_subscr *vsub, enum gsm_paging_event event); int subscr_paging_dispatch(unsigned int hooknum, unsigned int event, struct msgb *msg, void *data, void *param); /* Find an allocated channel for a specified subscriber */ -struct gsm_subscriber_connection *connection_for_subscr(struct vlr_subscr *vsub); +struct ran_conn *connection_for_subscr(struct vlr_subscr *vsub); #endif /* _GSM_SUBSCR_H */ diff --git a/include/osmocom/msc/iucs.h b/include/osmocom/msc/iucs.h index 8b22104..baedc0e 100644 --- a/include/osmocom/msc/iucs.h +++ b/include/osmocom/msc/iucs.h @@ -5,7 +5,7 @@ int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg, uint16_t *lac); -struct gsm_subscriber_connection *subscr_conn_lookup_iu(struct gsm_network *network, +struct ran_conn *subscr_conn_lookup_iu(struct gsm_network *network, struct ranap_ue_conn_ctx *ue); int iu_rab_act_cs(struct gsm_trans *trans); diff --git a/include/osmocom/msc/msc_ifaces.h b/include/osmocom/msc/msc_ifaces.h index ca25e9d..94423ca 100644 --- a/include/osmocom/msc/msc_ifaces.h +++ b/include/osmocom/msc/msc_ifaces.h @@ -29,11 +29,11 @@ /* Each main linkage must implement this function (see comment above). */ extern int iu_tx(struct msgb *msg, uint8_t sapi); -int msc_tx_dtap(struct gsm_subscriber_connection *conn, +int msc_tx_dtap(struct ran_conn *conn, struct msgb *msg); -int msc_gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn); -int msc_gsm48_tx_mm_serv_rej(struct gsm_subscriber_connection *conn, +int msc_gsm48_tx_mm_serv_ack(struct ran_conn *conn); +int msc_gsm48_tx_mm_serv_rej(struct ran_conn *conn, enum gsm48_reject_value value); -int msc_tx_common_id(struct gsm_subscriber_connection *conn); +int msc_tx_common_id(struct ran_conn *conn); diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index 3c4bc62..957f363 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -26,7 +26,7 @@ /* MGCP state handler context. This context information stores all information * to handle the direction of the RTP streams via MGCP. There is one instance * of this context struct per subscriber connection. - * (see also struct gsm_subscriber_connection) */ + * (see also struct ran_conn) */ struct mgcp_ctx { /* FSM instance, which handles the connection switching procedure */ struct osmo_fsm_inst *fsm; @@ -56,6 +56,6 @@ }; int msc_mgcp_call_assignment(struct gsm_trans *trans); -int msc_mgcp_ass_complete(struct gsm_subscriber_connection *conn, uint16_t port, char *addr); +int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr); int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr); int msc_mgcp_call_release(struct gsm_trans *trans); diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index a757a99..399236e 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -47,46 +47,46 @@ MSC_CONN_REJECT = 1, }; -struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network *network, +struct ran_conn *msc_subscr_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac); -void msc_subscr_conn_update_id(struct gsm_subscriber_connection *conn, +void msc_subscr_conn_update_id(struct ran_conn *conn, enum complete_layer3_type from, const char *id); -char *msc_subscr_conn_get_conn_id(struct gsm_subscriber_connection *conn); +char *msc_subscr_conn_get_conn_id(struct ran_conn *conn); -void msc_subscr_conn_complete_layer_3(struct gsm_subscriber_connection *conn); +void msc_subscr_conn_complete_layer_3(struct ran_conn *conn); int msc_vlr_alloc(struct gsm_network *net); int msc_vlr_start(struct gsm_network *net); -void msc_sapi_n_reject(struct gsm_subscriber_connection *conn, int dlci); -int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause); -int msc_compl_l3(struct gsm_subscriber_connection *conn, +void msc_sapi_n_reject(struct ran_conn *conn, int dlci); +int msc_clear_request(struct ran_conn *conn, uint32_t cause); +int msc_compl_l3(struct ran_conn *conn, struct msgb *msg, uint16_t chosen_channel); -void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg); -int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, +void msc_dtap(struct ran_conn *conn, struct msgb *msg); +int msc_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); -int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); -void msc_cipher_mode_compl(struct gsm_subscriber_connection *conn, +int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); +void msc_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id); -void msc_rx_sec_mode_compl(struct gsm_subscriber_connection *conn); -void msc_classmark_chg(struct gsm_subscriber_connection *conn, +void msc_rx_sec_mode_compl(struct ran_conn *conn); +void msc_classmark_chg(struct ran_conn *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); -void msc_assign_fail(struct gsm_subscriber_connection *conn, +void msc_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause); void msc_subscr_conn_init(void); -bool msc_subscr_conn_is_accepted(const struct gsm_subscriber_connection *conn); -bool msc_subscr_conn_is_establishing_auth_ciph(const struct gsm_subscriber_connection *conn); -void msc_subscr_conn_communicating(struct gsm_subscriber_connection *conn); -void msc_subscr_conn_close(struct gsm_subscriber_connection *conn, +bool msc_subscr_conn_is_accepted(const struct ran_conn *conn); +bool msc_subscr_conn_is_establishing_auth_ciph(const struct ran_conn *conn); +void msc_subscr_conn_communicating(struct ran_conn *conn); +void msc_subscr_conn_close(struct ran_conn *conn, uint32_t cause); -void msc_subscr_conn_mo_close(struct gsm_subscriber_connection *conn, uint32_t cause); -bool msc_subscr_conn_in_release(struct gsm_subscriber_connection *conn); +void msc_subscr_conn_mo_close(struct ran_conn *conn, uint32_t cause); +bool msc_subscr_conn_in_release(struct ran_conn *conn); -void msc_subscr_conn_rx_bssmap_clear_complete(struct gsm_subscriber_connection *conn); -void msc_subscr_conn_rx_iu_release_complete(struct gsm_subscriber_connection *conn); +void msc_subscr_conn_rx_bssmap_clear_complete(struct ran_conn *conn); +void msc_subscr_conn_rx_iu_release_complete(struct ran_conn *conn); enum msc_subscr_conn_use { MSC_CONN_USE_UNTRACKED = -1, @@ -109,14 +109,14 @@ _msc_subscr_conn_get(conn, balance_token, __FILE__, __LINE__) #define msc_subscr_conn_put(conn, balance_token) \ _msc_subscr_conn_put(conn, balance_token, __FILE__, __LINE__) -struct gsm_subscriber_connection * -_msc_subscr_conn_get(struct gsm_subscriber_connection *conn, +struct ran_conn * +_msc_subscr_conn_get(struct ran_conn *conn, enum msc_subscr_conn_use balance_token, const char *file, int line); -void _msc_subscr_conn_put(struct gsm_subscriber_connection *conn, +void _msc_subscr_conn_put(struct ran_conn *conn, enum msc_subscr_conn_use balance_token, const char *file, int line); -bool msc_subscr_conn_used_by(struct gsm_subscriber_connection *conn, +bool msc_subscr_conn_used_by(struct ran_conn *conn, enum msc_subscr_conn_use token); void msc_stop_paging(struct vlr_subscr *vsub); diff --git a/include/osmocom/msc/signal.h b/include/osmocom/msc/signal.h index f630b27..5126976 100644 --- a/include/osmocom/msc/signal.h +++ b/include/osmocom/msc/signal.h @@ -83,11 +83,11 @@ int paging_result; /* NULL in case the paging didn't work */ - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; }; struct scall_signal_data { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; void *data; }; struct sms_signal_data { diff --git a/include/osmocom/msc/silent_call.h b/include/osmocom/msc/silent_call.h index 5fec77b..70324e5 100644 --- a/include/osmocom/msc/silent_call.h +++ b/include/osmocom/msc/silent_call.h @@ -1,15 +1,15 @@ #ifndef _SILENT_CALL_H #define _SILENT_CALL_H -struct gsm_subscriber_connection; +struct ran_conn; extern int gsm_silent_call_start(struct vlr_subscr *vsub, void *data, int type); extern int gsm_silent_call_stop(struct vlr_subscr *vsub); #if 0 -extern int silent_call_rx(struct gsm_subscriber_connection *conn, struct msgb *msg); -extern int silent_call_reroute(struct gsm_subscriber_connection *conn, struct msgb *msg); +extern int silent_call_rx(struct ran_conn *conn, struct msgb *msg); +extern int silent_call_reroute(struct ran_conn *conn, struct msgb *msg); #endif #endif /* _SILENT_CALL_H */ diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 762eeea..0760c07 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -38,7 +38,7 @@ struct vlr_subscr *vsub; /* The associated connection we are using to transmit messages */ - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; /* reference from MNCC or other application */ uint32_t callref; @@ -98,11 +98,11 @@ -struct gsm_trans *trans_find_by_id(struct gsm_subscriber_connection *conn, +struct gsm_trans *trans_find_by_id(struct ran_conn *conn, uint8_t proto, uint8_t trans_id); struct gsm_trans *trans_find_by_callref(struct gsm_network *net, uint32_t callref); -struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn, +struct gsm_trans *trans_find_by_sm_rp_mr(struct ran_conn *conn, uint8_t sm_rp_mr); struct gsm_trans *trans_alloc(struct gsm_network *net, @@ -113,7 +113,7 @@ int trans_assign_trans_id(struct gsm_network *net, struct vlr_subscr *vsub, uint8_t protocol, uint8_t ti_flag); -struct gsm_trans *trans_has_conn(const struct gsm_subscriber_connection *conn); -void trans_conn_closed(struct gsm_subscriber_connection *conn); +struct gsm_trans *trans_has_conn(const struct ran_conn *conn); +void trans_conn_closed(struct ran_conn *conn); #endif diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index bd9b890..2829a39 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -142,12 +142,12 @@ /* Send DTAP message via A-interface, take ownership of msg */ int a_iface_tx_dtap(struct msgb *msg) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct msgb *msg_resp; uint8_t link_id = OMSC_LINKID_CB(msg); OSMO_ASSERT(msg); - conn = (struct gsm_subscriber_connection *)msg->dst; + conn = (struct ran_conn *)msg->dst; OSMO_ASSERT(conn); OSMO_ASSERT(conn->a.scu); @@ -171,7 +171,7 @@ } /* Send Cipher mode command via A-interface */ -int a_iface_tx_cipher_mode(const struct gsm_subscriber_connection *conn, +int a_iface_tx_cipher_mode(const struct ran_conn *conn, struct gsm0808_encrypt_info *ei, int include_imeisv) { /* TODO generalize for A- and Iu interfaces, don't name after 08.08 */ @@ -358,7 +358,7 @@ /* Send assignment request via A-interface */ int a_iface_tx_assignment(const struct gsm_trans *trans) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct gsm0808_channel_type ct; struct gsm0808_speech_codec_list scl; uint32_t *ci_ptr = NULL; @@ -412,7 +412,7 @@ } /* Send clear command via A-interface */ -int a_iface_tx_clear_cmd(struct gsm_subscriber_connection *conn) +int a_iface_tx_clear_cmd(struct ran_conn *conn) { struct msgb *msg; @@ -422,7 +422,7 @@ return osmo_sccp_tx_data_msg(conn->a.scu, conn->a.conn_id, msg); } -int a_iface_tx_classmark_request(const struct gsm_subscriber_connection *conn) +int a_iface_tx_classmark_request(const struct ran_conn *conn) { struct msgb *msg; @@ -615,8 +615,8 @@ /* Clear all subscriber connections on a specified BSC */ void a_clear_all(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *bsc_addr) { - struct gsm_subscriber_connection *conn; - struct gsm_subscriber_connection *conn_temp; + struct ran_conn *conn; + struct ran_conn *conn_temp; struct gsm_network *network = gsm_network; OSMO_ASSERT(scu); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 9a2333d..78a8c03 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -46,11 +46,11 @@ */ /* Allocate a new subscriber connection */ -static struct gsm_subscriber_connection *subscr_conn_allocate_a(const struct a_conn_info *a_conn_info, +static struct ran_conn *subscr_conn_allocate_a(const struct a_conn_info *a_conn_info, struct gsm_network *network, uint16_t lac, struct osmo_sccp_user *scu, int conn_id) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; LOGP(DMSC, LOGL_DEBUG, "Allocating A-Interface subscriber conn: lac %i, conn_id %i\n", lac, conn_id); @@ -71,9 +71,9 @@ /* Return an existing A subscriber connection record for the given * connection IDs, or return NULL if not found. */ -static struct gsm_subscriber_connection *subscr_conn_lookup_a(const struct gsm_network *network, int conn_id) +static struct ran_conn *subscr_conn_lookup_a(const struct gsm_network *network, int conn_id) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; OSMO_ASSERT(network); @@ -213,7 +213,7 @@ */ /* Endpoint to handle BSSMAP clear request */ -static int bssmap_rx_clear_rqst(struct gsm_subscriber_connection *conn, +static int bssmap_rx_clear_rqst(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { uint8_t cause; @@ -234,7 +234,7 @@ /* Endpoint to handle BSSMAP clear complete */ static int bssmap_rx_clear_complete(struct osmo_sccp_user *scu, const struct a_conn_info *a_conn_info, - struct gsm_subscriber_connection *conn) + struct ran_conn *conn) { int rc; @@ -263,7 +263,7 @@ int rc; struct gsm_network *network = a_conn_info->network; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; LOGP(DBSSAP, LOGL_INFO, "Rx BSSMAP COMPLETE L3 INFO (conn_id=%i)\n", a_conn_info->conn_id); @@ -359,7 +359,7 @@ } /* Endpoint to handle BSSMAP classmark update */ -static int bssmap_rx_classmark_upd(struct gsm_subscriber_connection *conn, struct msgb *msg, +static int bssmap_rx_classmark_upd(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { const uint8_t *cm2 = NULL; @@ -389,7 +389,7 @@ } /* Endpoint to handle BSSMAP cipher mode complete */ -static int bssmap_rx_ciph_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, +static int bssmap_rx_ciph_compl(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { /* FIXME: The field GSM0808_IE_LAYER_3_MESSAGE_CONTENTS is optional by @@ -424,7 +424,7 @@ } /* Endpoint to handle BSSMAP cipher mode reject, 3GPP TS 08.08 ?3.2.1.48 */ -static int bssmap_rx_ciph_rej(struct gsm_subscriber_connection *conn, +static int bssmap_rx_ciph_rej(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { int rc; @@ -451,7 +451,7 @@ } /* Endpoint to handle BSSMAP assignment failure */ -static int bssmap_rx_ass_fail(struct gsm_subscriber_connection *conn, struct msgb *msg, +static int bssmap_rx_ass_fail(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { uint8_t cause; @@ -484,7 +484,7 @@ } /* Endpoint to handle sapi "n" reject */ -static int bssmap_rx_sapi_n_rej(struct gsm_subscriber_connection *conn, struct msgb *msg, +static int bssmap_rx_sapi_n_rej(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { uint8_t dlci; @@ -549,7 +549,7 @@ } /* Endpoint to handle assignment complete */ -static int bssmap_rx_ass_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, +static int bssmap_rx_ass_compl(struct ran_conn *conn, struct msgb *msg, struct tlv_parsed *tp) { struct sockaddr_storage rtp_addr; @@ -601,7 +601,7 @@ /* Handle incoming connection oriented BSSMAP messages */ static int rx_bssmap(struct osmo_sccp_user *scu, const struct a_conn_info *a_conn_info, struct msgb *msg) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct tlv_parsed tp; int rc; uint8_t msg_type; @@ -671,7 +671,7 @@ static int rx_dtap(const struct osmo_sccp_user *scu, const struct a_conn_info *a_conn_info, struct msgb *msg) { struct gsm_network *network = a_conn_info->network; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct dtap_header *dtap = (struct dtap_header *) msg->l2h; conn = subscr_conn_lookup_a(network, a_conn_info->conn_id); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index d5cc212..0a52b45 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -77,7 +77,7 @@ void *tall_locop_ctx; void *tall_authciphop_ctx; -static int gsm0408_loc_upd_acc(struct gsm_subscriber_connection *conn, +static int gsm0408_loc_upd_acc(struct ran_conn *conn, uint32_t send_tmsi); /*! Send a simple GSM 04.08 message without any payload @@ -86,7 +86,7 @@ * \param[in] msg_type Message type * \return result of \ref gsm48_conn_sendmsg */ -int gsm48_tx_simple(struct gsm_subscriber_connection *conn, +int gsm48_tx_simple(struct ran_conn *conn, uint8_t pdisc, uint8_t msg_type) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 TX SIMPLE"); @@ -176,7 +176,7 @@ } } -int gsm48_conn_sendmsg(struct msgb *msg, struct gsm_subscriber_connection *conn, struct gsm_trans *trans) +int gsm48_conn_sendmsg(struct msgb *msg, struct ran_conn *conn, struct gsm_trans *trans) { struct gsm48_hdr *gh = (struct gsm48_hdr *) msg->data; @@ -206,7 +206,7 @@ } /* Chapter 9.2.14 : Send LOCATION UPDATING REJECT */ -static int gsm0408_loc_upd_rej(struct gsm_subscriber_connection *conn, uint8_t cause) +static int gsm0408_loc_upd_rej(struct ran_conn *conn, uint8_t cause) { struct msgb *msg; @@ -223,7 +223,7 @@ } /* Chapter 9.2.13 : Send LOCATION UPDATE ACCEPT */ -static int gsm0408_loc_upd_acc(struct gsm_subscriber_connection *conn, +static int gsm0408_loc_upd_acc(struct ran_conn *conn, uint32_t send_tmsi) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 LOC UPD ACC"); @@ -274,7 +274,7 @@ } /* Transmit Chapter 9.2.10 Identity Request */ -static int mm_tx_identity_req(struct gsm_subscriber_connection *conn, uint8_t id_type) +static int mm_tx_identity_req(struct ran_conn *conn, uint8_t id_type) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ID REQ"); struct gsm48_hdr *gh; @@ -288,7 +288,7 @@ } /* Parse Chapter 9.2.11 Identity Response */ -static int mm_rx_id_resp(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int mm_rx_id_resp(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK; @@ -319,7 +319,7 @@ /* Chapter 9.2.15: Receive Location Updating Request. * Keep this function non-static for direct invocation by unit tests. */ -int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb *msg) +int mm_rx_loc_upd_req(struct ran_conn *conn, struct msgb *msg) { struct gsm_network *net = conn->network; struct gsm48_hdr *gh = msgb_l3(msg); @@ -451,7 +451,7 @@ /* Section 9.2.15a */ -int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn) +int gsm48_tx_mm_info(struct ran_conn *conn) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 MM INF"); struct gsm48_hdr *gh; @@ -610,7 +610,7 @@ * send; must be 16 bytes long, or pass NULL for plain GSM auth. * \param[in] key_seq auth tuple's sequence number. */ -int gsm48_tx_mm_auth_req(struct gsm_subscriber_connection *conn, uint8_t *rand, +int gsm48_tx_mm_auth_req(struct ran_conn *conn, uint8_t *rand, uint8_t *autn, int key_seq) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 AUTH REQ"); @@ -640,7 +640,7 @@ } /* Section 9.2.1 */ -int gsm48_tx_mm_auth_rej(struct gsm_subscriber_connection *conn) +int gsm48_tx_mm_auth_rej(struct ran_conn *conn) { DEBUGP(DMM, "-> AUTH REJECT\n"); return gsm48_tx_simple(conn, GSM48_PDISC_MM, GSM48_MT_MM_AUTH_REJ); @@ -649,7 +649,7 @@ static int msc_vlr_tx_cm_serv_acc(void *msc_conn_ref); static int msc_vlr_tx_cm_serv_rej(void *msc_conn_ref, enum gsm48_reject_value result); -static int cm_serv_reuse_conn(struct gsm_subscriber_connection *conn, const uint8_t *mi_lv) +static int cm_serv_reuse_conn(struct ran_conn *conn, const uint8_t *mi_lv) { uint8_t mi_type; char mi_string[GSM48_MI_SIZE]; @@ -704,7 +704,7 @@ * * Keep this function non-static for direct invocation by unit tests. */ -int gsm48_rx_mm_serv_req(struct gsm_subscriber_connection *conn, struct msgb *msg) +int gsm48_rx_mm_serv_req(struct ran_conn *conn, struct msgb *msg) { struct gsm_network *net = conn->network; uint8_t mi_type; @@ -812,7 +812,7 @@ } /* Receive a CM Re-establish Request */ -static int gsm48_rx_cm_reest_req(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm48_rx_cm_reest_req(struct ran_conn *conn, struct msgb *msg) { uint8_t mi_type; char mi_string[GSM48_MI_SIZE]; @@ -831,7 +831,7 @@ return msc_gsm48_tx_mm_serv_rej(conn, GSM48_REJECT_SRV_OPT_NOT_SUPPORTED); } -static int gsm48_rx_mm_imsi_detach_ind(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm48_rx_mm_imsi_detach_ind(struct ran_conn *conn, struct msgb *msg) { struct gsm_network *network = conn->network; struct gsm48_hdr *gh = msgb_l3(msg); @@ -898,7 +898,7 @@ } static int parse_gsm_auth_resp(uint8_t *res, uint8_t *res_len, - struct gsm_subscriber_connection *conn, + struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); @@ -918,7 +918,7 @@ } static int parse_umts_auth_resp(uint8_t *res, uint8_t *res_len, - struct gsm_subscriber_connection *conn, + struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh; @@ -970,7 +970,7 @@ } /* Chapter 9.2.3: Authentication Response */ -static int gsm48_rx_mm_auth_resp(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm48_rx_mm_auth_resp(struct ran_conn *conn, struct msgb *msg) { uint8_t res[16]; uint8_t res_len; @@ -1010,7 +1010,7 @@ res, res_len); } -static int gsm48_rx_mm_auth_fail(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm48_rx_mm_auth_fail(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); uint8_t cause; @@ -1092,7 +1092,7 @@ return vlr_subscr_rx_auth_fail(conn->vsub, auts); } -static int gsm48_rx_mm_tmsi_reall_compl(struct gsm_subscriber_connection *conn) +static int gsm48_rx_mm_tmsi_reall_compl(struct ran_conn *conn) { DEBUGP(DMM, "TMSI Reallocation Completed. Subscriber: %s\n", vlr_subscr_name(conn->vsub)); @@ -1105,7 +1105,7 @@ } /* Receive a GSM 04.08 Mobility Management (MM) message */ -static int gsm0408_rcv_mm(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm0408_rcv_mm(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); int rc = 0; @@ -1148,7 +1148,7 @@ } /* Receive a PAGING RESPONSE message from the MS */ -static int gsm48_rx_rr_pag_resp(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm48_rx_rr_pag_resp(struct ran_conn *conn, struct msgb *msg) { struct gsm_network *net = conn->network; struct gsm48_hdr *gh = msgb_l3(msg); @@ -1211,7 +1211,7 @@ return 0; } -static int gsm48_rx_rr_app_info(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm48_rx_rr_app_info(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); uint8_t apdu_id_flags; @@ -1234,7 +1234,7 @@ } /* Receive a GSM 04.08 Radio Resource (RR) message */ -static int gsm0408_rcv_rr(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm0408_rcv_rr(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); int rc = 0; @@ -1255,7 +1255,7 @@ return rc; } -int gsm48_send_rr_app_info(struct gsm_subscriber_connection *conn, uint8_t apdu_id, +int gsm48_send_rr_app_info(struct ran_conn *conn, uint8_t apdu_id, uint8_t apdu_len, const uint8_t *apdu) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 APP INF"); @@ -1311,7 +1311,7 @@ return false; } -void cm_service_request_concludes(struct gsm_subscriber_connection *conn, +void cm_service_request_concludes(struct ran_conn *conn, struct msgb *msg) { @@ -1393,7 +1393,7 @@ } /* TS 24.007 11.2.3.2 Message Type Octet / Duplicate Detection */ -static bool gsm0407_is_duplicate(struct gsm_subscriber_connection *conn, struct msgb *msg) +static bool gsm0407_is_duplicate(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh; uint8_t pdisc; @@ -1425,10 +1425,10 @@ } } -extern int gsm0408_rcv_cc(struct gsm_subscriber_connection *conn, struct msgb *msg); +extern int gsm0408_rcv_cc(struct ran_conn *conn, struct msgb *msg); /* Main entry point for GSM 04.08/44.008 Layer 3 data (e.g. from the BSC). */ -int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg) +int gsm0408_dispatch(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh; uint8_t pdisc; @@ -1518,7 +1518,7 @@ static int msc_vlr_tx_auth_req(void *msc_conn_ref, struct gsm_auth_tuple *at, bool send_autn) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; return gsm48_tx_mm_auth_req(conn, at->vec.rand, send_autn? at->vec.autn : NULL, at->key_seq); @@ -1527,48 +1527,48 @@ /* VLR asks us to send an authentication reject */ static int msc_vlr_tx_auth_rej(void *msc_conn_ref) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; return gsm48_tx_mm_auth_rej(conn); } /* VLR asks us to transmit an Identity Request of given type */ static int msc_vlr_tx_id_req(void *msc_conn_ref, uint8_t mi_type) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; return mm_tx_identity_req(conn, mi_type); } /* VLR asks us to transmit a Location Update Accept */ static int msc_vlr_tx_lu_acc(void *msc_conn_ref, uint32_t send_tmsi) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; return gsm0408_loc_upd_acc(conn, send_tmsi); } /* VLR asks us to transmit a Location Update Reject */ static int msc_vlr_tx_lu_rej(void *msc_conn_ref, enum gsm48_reject_value cause) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; return gsm0408_loc_upd_rej(conn, cause); } /* VLR asks us to transmit a CM Service Accept */ static int msc_vlr_tx_cm_serv_acc(void *msc_conn_ref) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; return msc_gsm48_tx_mm_serv_ack(conn); } static int msc_vlr_tx_common_id(void *msc_conn_ref) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; return msc_tx_common_id(conn); } /* VLR asks us to transmit MM info. */ static int msc_vlr_tx_mm_info(void *msc_conn_ref) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; if (!conn->network->send_mm_info) return 0; return gsm48_tx_mm_info(conn); @@ -1577,7 +1577,7 @@ /* VLR asks us to transmit a CM Service Reject */ static int msc_vlr_tx_cm_serv_rej(void *msc_conn_ref, enum gsm48_reject_value cause) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; int rc; rc = msc_gsm48_tx_mm_serv_rej(conn, cause); @@ -1594,7 +1594,7 @@ osmo_static_assert(sizeof(((struct gsm0808_encrypt_info*)0)->key) >= sizeof(((struct osmo_auth_vector*)0)->kc), gsm0808_encrypt_info_key_fits_osmo_auth_vec_kc); -int msc_geran_set_cipher_mode(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv) +int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { struct gsm_network *net = conn->network; struct gsm0808_encrypt_info ei; @@ -1672,7 +1672,7 @@ bool umts_aka, bool retrieve_imeisv) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; struct vlr_subscr *vsub; struct gsm_auth_tuple *tuple; @@ -1716,7 +1716,7 @@ return -ENOTSUP; } -void msc_rx_sec_mode_compl(struct gsm_subscriber_connection *conn) +void msc_rx_sec_mode_compl(struct ran_conn *conn) { struct vlr_ciph_result vlr_res = {}; @@ -1760,7 +1760,7 @@ static void msc_vlr_subscr_assoc(void *msc_conn_ref, struct vlr_subscr *vsub) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; OSMO_ASSERT(vsub); OSMO_ASSERT(!conn->vsub); conn->vsub = vlr_subscr_get(vsub); diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index c9dffe3..557e218 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -310,7 +310,7 @@ static int setup_trig_pag_evt(unsigned int hooknum, unsigned int event, struct msgb *msg, void *_conn, void *_transt) { - struct gsm_subscriber_connection *conn = _conn; + struct ran_conn *conn = _conn; struct gsm_trans *transt = _transt; enum gsm_paging_event paging_event = event; @@ -1755,7 +1755,7 @@ * mgcp-gw expects the incoming RTP stream from the remote * end (e.g. Asterisk) is known. */ - struct gsm_subscriber_connection *conn = trans->conn; + struct ran_conn *conn = trans->conn; struct gsm_network *network = conn->network; mncc_recv_rtp_sock(network, trans, MNCC_RTP_CREATE); @@ -1859,7 +1859,7 @@ { int i, rc = 0; struct gsm_trans *trans = NULL, *transt; - struct gsm_subscriber_connection *conn = NULL; + struct ran_conn *conn = NULL; struct gsm_mncc *data = arg, rel; DEBUGP(DMNCC, "receive message %s\n", get_mncc_name(msg_type)); @@ -2112,7 +2112,7 @@ #define DATASLLEN \ (sizeof(datastatelist) / sizeof(struct datastate)) -int gsm0408_rcv_cc(struct gsm_subscriber_connection *conn, struct msgb *msg) +int gsm0408_rcv_cc(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); uint8_t msg_type = gsm48_hdr_msg_type(gh); diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 88dc433..40d0a99 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -120,7 +120,7 @@ osmo_signal_dispatch(SS_SMS, sig_no, &sig); } -static int gsm411_sendmsg(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm411_sendmsg(struct ran_conn *conn, struct msgb *msg) { DEBUGP(DLSMS, "GSM4.11 TX %s\n", msgb_hexdump(msg)); msg->l3h = msg->data; @@ -131,7 +131,7 @@ static int paging_cb_mmsms_est_req(unsigned int hooknum, unsigned int event, struct msgb *msg, void *_conn, void *_trans) { - struct gsm_subscriber_connection *conn = _conn; + struct ran_conn *conn = _conn; struct gsm_trans *trans = _trans; struct gsm_sms *sms = trans->sms.sms; int rc = 0; @@ -406,7 +406,7 @@ return msg->len - old_msg_len; } -static int sms_route_mt_sms(struct gsm_subscriber_connection *conn, +static int sms_route_mt_sms(struct ran_conn *conn, struct gsm_sms *gsms) { int rc; @@ -477,7 +477,7 @@ static int gsm340_rx_tpdu(struct gsm_trans *trans, struct msgb *msg, uint32_t gsm411_msg_ref) { - struct gsm_subscriber_connection *conn = trans->conn; + struct ran_conn *conn = trans->conn; uint8_t *smsp = msgb_sms(msg); struct gsm_sms *gsms; unsigned int sms_alphabet; @@ -755,7 +755,7 @@ } static void sms_status_report(struct gsm_sms *gsms, - struct gsm_subscriber_connection *conn) + struct ran_conn *conn) { struct gsm_sms *sms_report; int rc; @@ -982,7 +982,7 @@ static struct gsm_trans *gsm411_alloc_mt_trans(struct gsm_network *net, struct vlr_subscr *vsub) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct gsm_trans *trans; int tid; @@ -1094,7 +1094,7 @@ } /* Entry point for incoming GSM48_PDISC_SMS from abis_rsl.c */ -int gsm0411_rcv_sms(struct gsm_subscriber_connection *conn, +int gsm0411_rcv_sms(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); @@ -1199,7 +1199,7 @@ } /* Process incoming SAPI N-REJECT from BSC */ -void gsm411_sapi_n_reject(struct gsm_subscriber_connection *conn) +void gsm411_sapi_n_reject(struct ran_conn *conn) { struct gsm_network *net; struct gsm_trans *trans, *tmp; diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c index 2be534c..8fe03a8 100644 --- a/src/libmsc/gsm_04_14.c +++ b/src/libmsc/gsm_04_14.c @@ -51,12 +51,12 @@ return msg; } -static int gsm0414_conn_sendmsg(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int gsm0414_conn_sendmsg(struct ran_conn *conn, struct msgb *msg) { return msc_tx_dtap(conn, msg); } -static int gsm0414_tx_simple(struct gsm_subscriber_connection *conn, uint8_t msg_type) +static int gsm0414_tx_simple(struct ran_conn *conn, uint8_t msg_type) { struct msgb *msg = create_gsm0414_msg(msg_type); @@ -65,7 +65,7 @@ /* Send a CLOSE_TCH_LOOOP_CMD according to Section 8.1 */ -int gsm0414_tx_close_tch_loop_cmd(struct gsm_subscriber_connection *conn, +int gsm0414_tx_close_tch_loop_cmd(struct ran_conn *conn, enum gsm414_tch_loop_mode loop_mode) { struct msgb *msg = create_gsm0414_msg(GSM414_MT_CLOSE_TCH_LOOP_CMD); @@ -78,25 +78,25 @@ } /* Send a OPEN_LOOP_CMD according to Section 8.3 */ -int gsm0414_tx_open_loop_cmd(struct gsm_subscriber_connection *conn) +int gsm0414_tx_open_loop_cmd(struct ran_conn *conn) { return gsm0414_tx_simple(conn, GSM414_MT_OPEN_LOOP_CMD); } /* Send a ACT_EMMI_CMD according to Section 8.8 */ -int gsm0414_tx_act_emmi_cmd(struct gsm_subscriber_connection *conn) +int gsm0414_tx_act_emmi_cmd(struct ran_conn *conn) { return gsm0414_tx_simple(conn, GSM414_MT_ACT_EMMI_CMD); } /* Send a DEACT_EMMI_CMD according to Section 8.10 */ -int gsm0414_tx_deact_emmi_cmd(struct gsm_subscriber_connection *conn) +int gsm0414_tx_deact_emmi_cmd(struct ran_conn *conn) { return gsm0414_tx_simple(conn, GSM414_MT_DEACT_EMMI_CMD); } /* Send a TEST_INTERFACE according to Section 8.11 */ -int gsm0414_tx_test_interface(struct gsm_subscriber_connection *conn, +int gsm0414_tx_test_interface(struct ran_conn *conn, uint8_t tested_devs) { struct msgb *msg = create_gsm0414_msg(GSM414_MT_TEST_INTERFACE); @@ -105,7 +105,7 @@ } /* Send a RESET_MS_POSITION_STORED according to Section 8.11 */ -int gsm0414_tx_reset_ms_pos_store(struct gsm_subscriber_connection *conn, +int gsm0414_tx_reset_ms_pos_store(struct ran_conn *conn, uint8_t technology) { struct msgb *msg = create_gsm0414_msg(GSM414_MT_RESET_MS_POS_STORED); @@ -116,7 +116,7 @@ /* Entry point for incoming GSM48_PDISC_TEST received from MS */ -int gsm0414_rcv_test(struct gsm_subscriber_connection *conn, +int gsm0414_rcv_test(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); diff --git a/src/libmsc/gsm_04_80.c b/src/libmsc/gsm_04_80.c index 81f2001..7bd50f3 100644 --- a/src/libmsc/gsm_04_80.c +++ b/src/libmsc/gsm_04_80.c @@ -47,7 +47,7 @@ * failed, any incorrect value can be passed (0x00 > x > 0xff), so * the universal NULL-tag (see table 3.6) will be used instead. */ -int msc_send_ussd_reject(struct gsm_subscriber_connection *conn, +int msc_send_ussd_reject(struct ran_conn *conn, uint8_t transaction_id, int invoke_id, uint8_t problem_tag, uint8_t problem_code) { @@ -70,7 +70,7 @@ return msc_tx_dtap(conn, msg); } -int msc_send_ussd_notify(struct gsm_subscriber_connection *conn, int level, const char *text) +int msc_send_ussd_notify(struct ran_conn *conn, int level, const char *text) { struct msgb *msg = gsm0480_create_ussd_notify(level, text); if (!msg) @@ -78,7 +78,7 @@ return msc_tx_dtap(conn, msg); } -int msc_send_ussd_release_complete(struct gsm_subscriber_connection *conn) +int msc_send_ussd_release_complete(struct ran_conn *conn) { struct msgb *msg = gsm0480_create_ussd_release_complete(); if (!msg) diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 63a1047..bd949ec 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -53,7 +53,7 @@ static uint32_t new_callref = 0x20000001; /* Entry point for call independent MO SS messages */ -int gsm0911_rcv_nc_ss(struct gsm_subscriber_connection *conn, struct msgb *msg) +int gsm0911_rcv_nc_ss(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); struct osmo_gsup_message gsup_msg; @@ -217,7 +217,7 @@ static int handle_paging_event(unsigned int hooknum, unsigned int event, struct msgb *msg, void *_conn, void *_transt) { - struct gsm_subscriber_connection *conn = _conn; + struct ran_conn *conn = _conn; enum gsm_paging_event paging_event = event; struct gsm_trans *transt = _transt; struct gsm48_hdr *gh; @@ -272,7 +272,7 @@ static struct gsm_trans *establish_nc_ss_trans(struct gsm_network *net, struct vlr_subscr *vsub, struct osmo_gsup_message *gsup_msg) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct gsm_trans *trans, *transt; int tid; diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index fb61209..6b66933 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -59,7 +59,7 @@ struct msgb *msg, void *data, void *param) { struct subscr_request *request, *tmp; - struct gsm_subscriber_connection *conn = data; + struct ran_conn *conn = data; struct vlr_subscr *vsub = param; struct paging_signal_data sig_data; @@ -189,10 +189,10 @@ talloc_free(request); } -struct gsm_subscriber_connection *connection_for_subscr(struct vlr_subscr *vsub) +struct ran_conn *connection_for_subscr(struct vlr_subscr *vsub) { struct gsm_network *net = vsub->vlr->user_ctx; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; llist_for_each_entry(conn, &net->subscr_conns, entry) { if (conn->vsub == vsub) diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index 95bbbee..7227b2a 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -48,11 +48,11 @@ #endif /* BUILD_IU */ /* For A-interface see libbsc/bsc_api.c subscr_con_allocate() */ -static struct gsm_subscriber_connection *subscr_conn_allocate_iu(struct gsm_network *network, +static struct ran_conn *subscr_conn_allocate_iu(struct gsm_network *network, struct ranap_ue_conn_ctx *ue, uint16_t lac) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; DEBUGP(DIUCS, "Allocating IuCS subscriber conn: lac %d, conn_id %" PRIx32 "\n", lac, ue->conn_id); @@ -78,7 +78,7 @@ if (!log_check_level(DIUCS, LOGL_DEBUG)) return; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; int i = 0; llist_for_each_entry(conn, &network->subscr_conns, entry) { DEBUGP(DIUCS, "%3d: %s", i, vlr_subscr_name(conn->vsub)); @@ -110,11 +110,11 @@ /* Return an existing IuCS subscriber connection record for the given * connection IDs, or return NULL if not found. */ -struct gsm_subscriber_connection *subscr_conn_lookup_iu( +struct ran_conn *subscr_conn_lookup_iu( struct gsm_network *network, struct ranap_ue_conn_ctx *ue) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; DEBUGP(DIUCS, "Looking for IuCS subscriber: conn_id %" PRIx32 "\n", ue->conn_id); @@ -144,7 +144,7 @@ { int rc; struct ranap_ue_conn_ctx *ue_ctx; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; ue_ctx = (struct ranap_ue_conn_ctx*)msg->dst; @@ -199,7 +199,7 @@ int iu_rab_act_cs(struct gsm_trans *trans) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct msgb *msg; bool use_x213_nsap; uint32_t conn_id; diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c index ec0b569..d23cb41 100644 --- a/src/libmsc/iucs_ranap.c +++ b/src/libmsc/iucs_ranap.c @@ -43,9 +43,9 @@ #include /* To continue authorization after a Security Mode Complete */ -int gsm0408_authorize(struct gsm_subscriber_connection *conn); +int gsm0408_authorize(struct ran_conn *conn); -static int iucs_rx_rab_assign(struct gsm_subscriber_connection *conn, RANAP_RAB_SetupOrModifiedItemIEs_t * setup_ies) +static int iucs_rx_rab_assign(struct ran_conn *conn, RANAP_RAB_SetupOrModifiedItemIEs_t * setup_ies) { uint8_t rab_id; RANAP_RAB_SetupOrModifiedItem_t *item = &setup_ies->raB_SetupOrModifiedItem; @@ -89,7 +89,7 @@ return 0; } -int iucs_rx_sec_mode_compl(struct gsm_subscriber_connection *conn, +int iucs_rx_sec_mode_compl(struct ran_conn *conn, RANAP_SecurityModeCompleteIEs_t *ies) { OSMO_ASSERT(conn->via_ran == RAN_UTRAN_IU); @@ -103,7 +103,7 @@ int iucs_rx_ranap_event(struct gsm_network *network, struct ranap_ue_conn_ctx *ue_ctx, int type, void *data) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; conn = subscr_conn_lookup_iu(network, ue_ctx); diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c index b76cdb4..8ae34fc 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -46,7 +46,7 @@ { 0, NULL } }; -static int msc_tx(struct gsm_subscriber_connection *conn, struct msgb *msg) +static int msc_tx(struct ran_conn *conn, struct msgb *msg) { if (!msg) return -EINVAL; @@ -77,7 +77,7 @@ } -int msc_tx_dtap(struct gsm_subscriber_connection *conn, +int msc_tx_dtap(struct ran_conn *conn, struct msgb *msg) { return msc_tx(conn, msg); @@ -85,7 +85,7 @@ /* 9.2.5 CM service accept */ -int msc_gsm48_tx_mm_serv_ack(struct gsm_subscriber_connection *conn) +int msc_gsm48_tx_mm_serv_ack(struct ran_conn *conn) { struct msgb *msg; struct gsm48_hdr *gh; @@ -106,7 +106,7 @@ } /* 9.2.6 CM service reject */ -int msc_gsm48_tx_mm_serv_rej(struct gsm_subscriber_connection *conn, +int msc_gsm48_tx_mm_serv_rej(struct ran_conn *conn, enum gsm48_reject_value value) { struct msgb *msg; @@ -125,7 +125,7 @@ return msc_tx_dtap(conn, msg); } -int msc_tx_common_id(struct gsm_subscriber_connection *conn) +int msc_tx_common_id(struct ran_conn *conn) { if (!conn) return -EINVAL; diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index c2bbe5f..8b6bf0e 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -280,7 +280,7 @@ struct msgb *msg; int rc; struct gsm_trans *trans; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; @@ -338,7 +338,7 @@ struct mgcp_ctx *mgcp_ctx = priv; int rc; struct gsm_trans *trans; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; /* NOTE: In case of error, we will not be able to perform any DLCX * operation because until we either get a parseable message that @@ -393,7 +393,7 @@ struct msgb *msg; int rc; struct gsm_trans *trans; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; @@ -447,7 +447,7 @@ struct mgcp_ctx *mgcp_ctx = priv; int rc; struct gsm_trans *trans; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; OSMO_ASSERT(mgcp_ctx); trans = mgcp_ctx->trans; @@ -487,7 +487,7 @@ { struct mgcp_ctx *mgcp_ctx = data; struct gsm_trans *trans; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; OSMO_ASSERT(mgcp_ctx); trans = mgcp_ctx->trans; @@ -548,7 +548,7 @@ struct mgcp_ctx *mgcp_ctx = data; struct mgcp_client *mgcp; struct gsm_trans *trans; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct mgcp_msg mgcp_msg; struct msgb *msg; int rc; @@ -631,7 +631,7 @@ static void fsm_mdcx_cn_compl_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct mgcp_ctx *mgcp_ctx = data; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct gsm_trans *trans; OSMO_ASSERT(mgcp_ctx); @@ -667,7 +667,7 @@ struct mgcp_ctx *mgcp_ctx = data; struct mgcp_client *mgcp; struct gsm_trans *trans; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct mgcp_msg mgcp_msg; struct msgb *msg; int rc; @@ -959,7 +959,7 @@ struct mgcp_ctx *mgcp_ctx; char name[32]; static bool fsm_registered = false; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct mgcp_client *mgcp; OSMO_ASSERT(trans); @@ -1031,7 +1031,7 @@ * port: port number of the remote leg. * addr: IP-address of the remote leg. * Returns -EINVAL on error, 0 on success. */ -int msc_mgcp_ass_complete(struct gsm_subscriber_connection *conn, uint16_t port, char *addr) +int msc_mgcp_ass_complete(struct ran_conn *conn, uint16_t port, char *addr) { struct mgcp_ctx *mgcp_ctx; @@ -1081,7 +1081,7 @@ int msc_mgcp_call_complete(struct gsm_trans *trans, uint16_t port, char *addr) { struct mgcp_ctx *mgcp_ctx; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; OSMO_ASSERT(trans); OSMO_ASSERT(addr); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 4f3ac04..9c82713 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -489,7 +489,7 @@ VTY_NEWLINE); } -static void vty_dump_one_conn(struct vty *vty, const struct gsm_subscriber_connection *conn) +static void vty_dump_one_conn(struct vty *vty, const struct ran_conn *conn) { vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s", conn->a.conn_id, @@ -507,7 +507,7 @@ DEFUN(show_msc_conn, show_msc_conn_cmd, "show connection", SHOW_STR "Subscriber Connections\n") { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; vty_conn_hdr(vty); llist_for_each_entry(conn, &gsmnet->subscr_conns, entry) @@ -628,7 +628,7 @@ /* Connection */ if (vsub->msc_conn_ref) { - struct gsm_subscriber_connection *conn = vsub->msc_conn_ref; + struct ran_conn *conn = vsub->msc_conn_ref; vty_conn_hdr(vty); vty_dump_one_conn(vty, conn); } @@ -1003,7 +1003,7 @@ "Text of USSD message to send\n") { char *text; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct vlr_subscr *vsub = get_vsub_by_argv(gsmnet, argv[0], argv[1]); int level; @@ -1095,7 +1095,7 @@ "Loop Type F\n" "Loop Type I\n") { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct vlr_subscr *vsub = get_vsub_by_argv(gsmnet, argv[0], argv[1]); const char *loop_str; int loop_mode; @@ -1128,7 +1128,7 @@ SUBSCR_HELP "Send a TS 04.14 MS Test Command to subscriber\n" "Open a TCH Loop inside the MS\n") { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct vlr_subscr *vsub = get_vsub_by_argv(gsmnet, argv[0], argv[1]); if (!vsub) { diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index f2c84e6..1c45b32 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -79,7 +79,7 @@ } /* Receive a SAPI-N-REJECT from BSC */ -void msc_sapi_n_reject(struct gsm_subscriber_connection *conn, int dlci) +void msc_sapi_n_reject(struct ran_conn *conn, int dlci) { int sapi = dlci & 0x7; @@ -89,7 +89,7 @@ /* receive a Level 3 Complete message and return MSC_CONN_ACCEPT or * MSC_CONN_REJECT */ -int msc_compl_l3(struct gsm_subscriber_connection *conn, +int msc_compl_l3(struct ran_conn *conn, struct msgb *msg, uint16_t chosen_channel) { msc_subscr_conn_get(conn, MSC_CONN_USE_COMPL_L3); @@ -121,7 +121,7 @@ } /* Receive a DTAP message from BSC */ -void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg) +void msc_dtap(struct ran_conn *conn, struct msgb *msg) { msc_subscr_conn_get(conn, MSC_CONN_USE_DTAP); gsm0408_dispatch(conn, msg); @@ -130,7 +130,7 @@ } /* Receive an ASSIGNMENT COMPLETE from BSC */ -void msc_assign_compl(struct gsm_subscriber_connection *conn, +void msc_assign_compl(struct ran_conn *conn, uint8_t rr_cause, uint8_t chosen_channel, uint8_t encr_alg_id, uint8_t speec) { @@ -138,14 +138,14 @@ } /* Receive an ASSIGNMENT FAILURE from BSC */ -void msc_assign_fail(struct gsm_subscriber_connection *conn, +void msc_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause) { LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n"); } /* Receive a CLASSMARK CHANGE from BSC */ -void msc_classmark_chg(struct gsm_subscriber_connection *conn, +void msc_classmark_chg(struct ran_conn *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len) { @@ -181,7 +181,7 @@ } /* Receive a CIPHERING MODE COMPLETE from BSC */ -void msc_cipher_mode_compl(struct gsm_subscriber_connection *conn, +void msc_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id) { struct vlr_ciph_result ciph_res = { .cause = VLR_CIPH_REJECT }; @@ -227,13 +227,13 @@ } /* Receive a CLEAR REQUEST from BSC */ -int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause) +int msc_clear_request(struct ran_conn *conn, uint32_t cause) { msc_subscr_conn_close(conn, cause); return 1; } -static const char *used_ref_counts_str(struct gsm_subscriber_connection *conn) +static const char *used_ref_counts_str(struct ran_conn *conn) { static char buf[256]; int bit_nr; @@ -265,8 +265,8 @@ } /* increment the ref-count. Needs to be called by every user */ -struct gsm_subscriber_connection * -_msc_subscr_conn_get(struct gsm_subscriber_connection *conn, +struct ran_conn * +_msc_subscr_conn_get(struct ran_conn *conn, enum msc_subscr_conn_use balance_token, const char *file, int line) { @@ -293,7 +293,7 @@ } /* decrement the ref-count. Once it reaches zero, we release */ -void _msc_subscr_conn_put(struct gsm_subscriber_connection *conn, +void _msc_subscr_conn_put(struct ran_conn *conn, enum msc_subscr_conn_use balance_token, const char *file, int line) { @@ -328,7 +328,7 @@ osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_UNUSED, NULL); } -bool msc_subscr_conn_used_by(struct gsm_subscriber_connection *conn, enum msc_subscr_conn_use token) +bool msc_subscr_conn_used_by(struct ran_conn *conn, enum msc_subscr_conn_use token) { return conn && (conn->use_tokens & (1 << token)); } diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 2a5c1aa..c0747cd 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -58,7 +58,7 @@ return get_value_string(rrlp_mode_names, mode); } -static int send_rrlp_req(struct gsm_subscriber_connection *conn) +static int send_rrlp_req(struct ran_conn *conn) { struct gsm_network *net = conn->network; const uint8_t *req; @@ -89,7 +89,7 @@ void *handler_data, void *signal_data) { struct vlr_subscr *vsub; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; switch (signal) { case S_SUBSCR_ATTACHED: diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index 9888894..a5ebe50 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -36,7 +36,7 @@ static int paging_cb_silent(unsigned int hooknum, unsigned int event, struct msgb *msg, void *_conn, void *_data) { - struct gsm_subscriber_connection *conn = _conn; + struct ran_conn *conn = _conn; struct scall_signal_data sigdata; int rc = 0; @@ -76,7 +76,7 @@ #if 0 /* receive a layer 3 message from a silent call */ -int silent_call_rx(struct gsm_subscriber_connection *conn, struct msgb *msg) +int silent_call_rx(struct ran_conn *conn, struct msgb *msg) { /* FIXME: do something like sending it through a UDP port */ LOGP(DLSMS, LOGL_NOTICE, "Discarding L3 message from a silent call.\n"); @@ -95,7 +95,7 @@ }; /* decide if we need to reroute a message as part of a silent call */ -int silent_call_reroute(struct gsm_subscriber_connection *conn, struct msgb *msg) +int silent_call_reroute(struct ran_conn *conn, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); uint8_t pdisc = gsm48_hdr_pdisc(gh); @@ -138,7 +138,7 @@ /* end a silent call with a given subscriber */ int gsm_silent_call_stop(struct vlr_subscr *vsub) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; conn = connection_for_subscr(vsub); if (!conn) { diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 051372c..10f3cfa 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -536,7 +536,7 @@ void smpp_cmd_ack(struct osmo_smpp_cmd *cmd) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct gsm_trans *trans; if (cmd->is_report) @@ -562,7 +562,7 @@ void smpp_cmd_err(struct osmo_smpp_cmd *cmd, uint32_t status) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct gsm_trans *trans; int gsm411_cause; @@ -636,7 +636,7 @@ } static int deliver_to_esme(struct osmo_esme *esme, struct gsm_sms *sms, - struct gsm_subscriber_connection *conn) + struct ran_conn *conn) { struct deliver_sm_t deliver; int mode, ret; @@ -731,13 +731,13 @@ static struct smsc *g_smsc; -int smpp_route_smpp_first(struct gsm_sms *sms, struct gsm_subscriber_connection *conn) +int smpp_route_smpp_first(struct gsm_sms *sms, struct ran_conn *conn) { return g_smsc->smpp_first; } int smpp_try_deliver(struct gsm_sms *sms, - struct gsm_subscriber_connection *conn) + struct ran_conn *conn) { struct osmo_esme *esme; struct osmo_smpp_addr dst; diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index 755e685..27a2646 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -158,10 +158,10 @@ struct gsm_sms; -struct gsm_subscriber_connection; +struct ran_conn; int smpp_route_smpp_first(struct gsm_sms *sms, - struct gsm_subscriber_connection *conn); + struct ran_conn *conn); int smpp_try_deliver(struct gsm_sms *sms, - struct gsm_subscriber_connection *conn); + struct ran_conn *conn); #endif diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index e6fa7e1..69bab25 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -57,7 +57,7 @@ static void update_counters(struct osmo_fsm_inst *fi, bool conn_accepted) { - struct gsm_subscriber_connection *conn = fi->priv; + struct ran_conn *conn = fi->priv; switch (conn->complete_layer3_type) { case COMPLETE_LAYER3_LU: rate_ctr_inc(&conn->network->msc_ctrs->ctr[ @@ -81,7 +81,7 @@ static void evaluate_acceptance_outcome(struct osmo_fsm_inst *fi, bool conn_accepted) { - struct gsm_subscriber_connection *conn = fi->priv; + struct ran_conn *conn = fi->priv; update_counters(fi, conn_accepted); @@ -164,7 +164,7 @@ } } -int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, +int msc_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { int rc; @@ -184,7 +184,7 @@ static void subscr_conn_fsm_wait_classmark_update(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct gsm_subscriber_connection *conn = fi->priv; + struct ran_conn *conn = fi->priv; switch (event) { case SUBSCR_CONN_E_CLASSMARK_UPDATE: /* Theoretically, this event can be used for requesting Classmark in various situations. @@ -226,7 +226,7 @@ static bool subscr_conn_fsm_has_active_transactions(struct osmo_fsm_inst *fi) { - struct gsm_subscriber_connection *conn = fi->priv; + struct ran_conn *conn = fi->priv; struct gsm_trans *trans; if (conn->silent_call) { @@ -263,7 +263,7 @@ static void subscr_conn_fsm_accepted_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - struct gsm_subscriber_connection *conn = fi->priv; + struct ran_conn *conn = fi->priv; /* Stop Location Update expiry for this subscriber. While the subscriber * has an open connection the LU expiry timer must remain disabled. @@ -324,7 +324,7 @@ static int subscr_conn_fsm_timeout(struct osmo_fsm_inst *fi) { - struct gsm_subscriber_connection *conn = fi->priv; + struct ran_conn *conn = fi->priv; if (msc_subscr_conn_in_release(conn)) { LOGPFSML(fi, LOGL_ERROR, "Timeout while releasing, discarding right now\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_TIMEOUT, NULL); @@ -337,7 +337,7 @@ static void subscr_conn_fsm_releasing_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - struct gsm_subscriber_connection *conn = fi->priv; + struct ran_conn *conn = fi->priv; /* Use count for either conn->a.waiting_for_clear_complete or * conn->iu.waiting_for_release_complete. 'get' it early, so we don't deallocate after tearing @@ -397,7 +397,7 @@ static void subscr_conn_fsm_released(struct osmo_fsm_inst *fi, uint32_t prev_state) { - /* Terminate, deallocate and also deallocate the gsm_subscriber_connection, which is allocated as + /* Terminate, deallocate and also deallocate the ran_conn, which is allocated as * a talloc child of fi. Also calls the cleanup function. */ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); } @@ -492,7 +492,7 @@ .timer_cb = subscr_conn_fsm_timeout, }; -char *msc_subscr_conn_get_conn_id(struct gsm_subscriber_connection *conn) +char *msc_subscr_conn_get_conn_id(struct ran_conn *conn) { char *id; @@ -514,7 +514,7 @@ /* Tidy up before the FSM deallocates */ static void subscr_conn_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { - struct gsm_subscriber_connection *conn = fi->priv; + struct ran_conn *conn = fi->priv; if (subscr_conn_fsm_has_active_transactions(fi)) LOGPFSML(fi, LOGL_ERROR, "Deallocating despite active transactions\n"); @@ -537,14 +537,14 @@ } /* Signal success of Complete Layer 3. Allow to keep the conn open for Auth and Ciph. */ -void msc_subscr_conn_complete_layer_3(struct gsm_subscriber_connection *conn) +void msc_subscr_conn_complete_layer_3(struct ran_conn *conn) { if (!conn) return; osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_COMPLETE_LAYER_3, NULL); } -void subscr_conn_release_when_unused(struct gsm_subscriber_connection *conn) +void subscr_conn_release_when_unused(struct ran_conn *conn) { if (!conn) return; @@ -563,7 +563,7 @@ osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_RELEASE_WHEN_UNUSED, NULL); } -static void conn_close(struct gsm_subscriber_connection *conn, uint32_t cause, uint32_t event) +static void conn_close(struct ran_conn *conn, uint32_t cause, uint32_t event) { if (!conn) { LOGP(DMM, LOGL_ERROR, "Cannot release NULL connection\n"); @@ -577,17 +577,17 @@ osmo_fsm_inst_dispatch(conn->fi, event, &cause); } -void msc_subscr_conn_close(struct gsm_subscriber_connection *conn, uint32_t cause) +void msc_subscr_conn_close(struct ran_conn *conn, uint32_t cause) { return conn_close(conn, cause, SUBSCR_CONN_E_CN_CLOSE); } -void msc_subscr_conn_mo_close(struct gsm_subscriber_connection *conn, uint32_t cause) +void msc_subscr_conn_mo_close(struct ran_conn *conn, uint32_t cause) { return conn_close(conn, cause, SUBSCR_CONN_E_MO_CLOSE); } -bool msc_subscr_conn_in_release(struct gsm_subscriber_connection *conn) +bool msc_subscr_conn_in_release(struct ran_conn *conn) { if (!conn || !conn->fi) return true; @@ -598,7 +598,7 @@ return false; } -bool msc_subscr_conn_is_accepted(const struct gsm_subscriber_connection *conn) +bool msc_subscr_conn_is_accepted(const struct ran_conn *conn) { if (!conn) return false; @@ -612,7 +612,7 @@ /* Indicate that *some* communication is happening with the phone, so that the conn FSM no longer times * out to release within a few seconds. */ -void msc_subscr_conn_communicating(struct gsm_subscriber_connection *conn) +void msc_subscr_conn_communicating(struct ran_conn *conn) { osmo_fsm_inst_dispatch(conn->fi, SUBSCR_CONN_E_COMMUNICATING, NULL); } @@ -627,10 +627,10 @@ * SUBSCR_CONN_E_RELEASE_COMPLETE event is dispatched, the FSM terminates and deallocates both FSM and * conn. As long as the FSM is waiting for responses from the subscriber, it will itself hold a use count * on the conn. */ -struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network *network, +struct ran_conn *msc_subscr_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; struct osmo_fsm_inst *fi; fi = osmo_fsm_inst_alloc(&subscr_conn_fsm, network, NULL, LOGL_DEBUG, NULL); @@ -639,13 +639,13 @@ return NULL; } - conn = talloc_zero(fi, struct gsm_subscriber_connection); + conn = talloc_zero(fi, struct ran_conn); if (!conn) { osmo_fsm_inst_free(fi); return NULL; } - *conn = (struct gsm_subscriber_connection){ + *conn = (struct ran_conn){ .network = network, .via_ran = via_ran, .lac = lac, @@ -657,7 +657,7 @@ return conn; } -bool msc_subscr_conn_is_establishing_auth_ciph(const struct gsm_subscriber_connection *conn) +bool msc_subscr_conn_is_establishing_auth_ciph(const struct ran_conn *conn) { if (!conn) return false; @@ -673,7 +673,7 @@ { 0, NULL } }; -void msc_subscr_conn_update_id(struct gsm_subscriber_connection *conn, +void msc_subscr_conn_update_id(struct ran_conn *conn, enum complete_layer3_type from, const char *id) { conn->complete_layer3_type = from; @@ -681,7 +681,7 @@ LOGPFSML(conn->fi, LOGL_DEBUG, "Updated ID\n"); } -static void rx_close_complete(struct gsm_subscriber_connection *conn, const char *label, bool *flag) +static void rx_close_complete(struct ran_conn *conn, const char *label, bool *flag) { if (!conn) return; @@ -698,12 +698,12 @@ } } -void msc_subscr_conn_rx_bssmap_clear_complete(struct gsm_subscriber_connection *conn) +void msc_subscr_conn_rx_bssmap_clear_complete(struct ran_conn *conn) { rx_close_complete(conn, "BSSMAP Clear Complete", &conn->a.waiting_for_clear_complete); } -void msc_subscr_conn_rx_iu_release_complete(struct gsm_subscriber_connection *conn) +void msc_subscr_conn_rx_iu_release_complete(struct ran_conn *conn) { rx_close_complete(conn, "Iu Release Complete", &conn->iu.waiting_for_release_complete); } diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index cffbe0d..51263e1 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -40,7 +40,7 @@ * \param[in] trans_id Transaction ID of transaction * \returns Matching transaction, if any */ -struct gsm_trans *trans_find_by_id(struct gsm_subscriber_connection *conn, +struct gsm_trans *trans_find_by_id(struct ran_conn *conn, uint8_t proto, uint8_t trans_id) { struct gsm_trans *trans; @@ -78,7 +78,7 @@ * \param[in] sm_rp_mr RP Message Reference (see GSM TS 04.11, section 8.2.3) * \returns Matching transaction, NULL otherwise */ -struct gsm_trans *trans_find_by_sm_rp_mr(struct gsm_subscriber_connection *conn, +struct gsm_trans *trans_find_by_sm_rp_mr(struct ran_conn *conn, uint8_t sm_rp_mr) { struct gsm_network *net = conn->network; @@ -141,7 +141,7 @@ void trans_free(struct gsm_trans *trans) { enum msc_subscr_conn_use conn_usage_token = MSC_CONN_USE_UNTRACKED; - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; switch (trans->protocol) { case GSM48_PDISC_CC: @@ -220,7 +220,7 @@ * \param[in] conn Connection to check * \returns 1 in case there is a transaction, 0 otherwise */ -struct gsm_trans *trans_has_conn(const struct gsm_subscriber_connection *conn) +struct gsm_trans *trans_has_conn(const struct ran_conn *conn) { struct gsm_trans *trans; @@ -236,7 +236,7 @@ * facilities, which will then send the necessary release indications. * \param[in] conn Connection that is going to be closed. */ -void trans_conn_closed(struct gsm_subscriber_connection *conn) +void trans_conn_closed(struct ran_conn *conn) { struct gsm_trans *trans; diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c index d206571..fcc8db7 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c @@ -25,7 +25,7 @@ static void test_reject_2nd_conn() { - struct gsm_subscriber_connection *conn1; + struct ran_conn *conn1; comment_start(); btw("Location Update Request on one connection"); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 01f5974..9e7e518 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -161,9 +161,9 @@ OSMO_ASSERT(gsup_tx_confirmed); } -bool conn_exists(const struct gsm_subscriber_connection *conn) +bool conn_exists(const struct ran_conn *conn) { - struct gsm_subscriber_connection *c; + struct ran_conn *c; if (!conn) return false; @@ -177,7 +177,7 @@ } /* Simplified version of the cm_service_request_concludes() */ -void conn_conclude_cm_service_req(struct gsm_subscriber_connection *conn, +void conn_conclude_cm_service_req(struct ran_conn *conn, enum ran_type via_ran) { btw("Concluding CM Service Request"); @@ -193,9 +193,9 @@ enum ran_type rx_from_ran = RAN_GERAN_A; -struct gsm_subscriber_connection *conn_new(void) +struct ran_conn *conn_new(void) { - struct gsm_subscriber_connection *conn; + struct ran_conn *conn; conn = msc_subscr_conn_alloc(net, rx_from_ran, 23); if (conn->via_ran == RAN_UTRAN_IU) { struct ranap_ue_conn_ctx *ue_ctx = talloc_zero(conn, struct ranap_ue_conn_ctx); @@ -207,7 +207,7 @@ return conn; } -struct gsm_subscriber_connection *g_conn = NULL; +struct ran_conn *g_conn = NULL; void rx_from_ms(struct msgb *msg) { @@ -643,8 +643,8 @@ } /* override, requires '-Wl,--wrap=a_iface_tx_clear_cmd' */ -int __real_a_iface_tx_clear_cmd(struct gsm_subscriber_connection *conn); -int __wrap_a_iface_tx_clear_cmd(struct gsm_subscriber_connection *conn) +int __real_a_iface_tx_clear_cmd(struct ran_conn *conn); +int __wrap_a_iface_tx_clear_cmd(struct ran_conn *conn) { btw("BSSAP Clear --%s--> MS", ran_type_name(RAN_GERAN_A)); OSMO_ASSERT(bssap_clear_expected); @@ -679,7 +679,7 @@ static int fake_vlr_tx_lu_acc(void *msc_conn_ref, uint32_t send_tmsi) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; if (send_tmsi == GSM_RESERVED_TMSI) btw("sending LU Accept for %s", vlr_subscr_name(conn->vsub)); else @@ -691,7 +691,7 @@ static int fake_vlr_tx_lu_rej(void *msc_conn_ref, enum gsm48_reject_value cause) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; btw("sending LU Reject for %s, cause %u", vlr_subscr_name(conn->vsub), cause); lu_result_sent |= RES_REJECT; return 0; @@ -699,7 +699,7 @@ static int fake_vlr_tx_cm_serv_acc(void *msc_conn_ref) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; btw("sending CM Service Accept for %s", vlr_subscr_name(conn->vsub)); cm_service_result_sent |= RES_ACCEPT; return 0; @@ -707,7 +707,7 @@ static int fake_vlr_tx_cm_serv_rej(void *msc_conn_ref, enum gsm48_reject_value cause) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; btw("sending CM Service Reject for %s, cause: %s", vlr_subscr_name(conn->vsub), gsm48_reject_value_name(cause)); cm_service_result_sent |= RES_REJECT; @@ -717,7 +717,7 @@ static int fake_vlr_tx_auth_req(void *msc_conn_ref, struct gsm_auth_tuple *at, bool send_autn) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; char *hex; bool ok = true; btw("sending %s Auth Request for %s: tuple use_count=%d key_seq=%d auth_types=0x%x and...", @@ -761,15 +761,15 @@ static int fake_vlr_tx_auth_rej(void *msc_conn_ref) { - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; btw("sending Auth Reject for %s", vlr_subscr_name(conn->vsub)); return 0; } /* override, requires '-Wl,--wrap=a_iface_tx_cipher_mode' */ -int __real_a_iface_tx_cipher_mode(const struct gsm_subscriber_connection *conn, +int __real_a_iface_tx_cipher_mode(const struct ran_conn *conn, struct gsm0808_encrypt_info *ei, int include_imeisv); -int __wrap_a_iface_tx_cipher_mode(const struct gsm_subscriber_connection *conn, +int __wrap_a_iface_tx_cipher_mode(const struct ran_conn *conn, struct gsm0808_encrypt_info *ei, int include_imeisv) { int i; @@ -824,7 +824,7 @@ #ifndef BUILD_IU /* If we built without support for IU, fake the IU part here. The root cause is that we don't * have differing sets of expected outputs for --enable-iu and --disable-iu. */ - struct gsm_subscriber_connection *conn = msc_conn_ref; + struct ran_conn *conn = msc_conn_ref; if (conn->via_ran == RAN_UTRAN_IU) { DEBUGP(DMM, "-> SECURITY MODE CONTROL %s\n", vlr_subscr_name(conn->vsub)); rc = __wrap_ranap_iu_tx_sec_mode_cmd(conn->iu.ue_ctx, &conn->vsub->last_tuple->vec, diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 40377c1..fd9ec91 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -49,7 +49,7 @@ #define comment_start() fprintf(stderr, "===== %s\n", __func__); #define comment_end() fprintf(stderr, "===== %s: SUCCESS\n\n", __func__); -extern struct gsm_subscriber_connection *g_conn; +extern struct ran_conn *g_conn; extern struct gsm_network *net; extern struct gsm_bts *the_bts; extern void *msgb_ctx; @@ -152,8 +152,8 @@ struct msgb *msgb_from_hex(const char *label, uint16_t size, const char *hex); void clear_vlr(); -bool conn_exists(const struct gsm_subscriber_connection *conn); -void conn_conclude_cm_service_req(struct gsm_subscriber_connection *conn, +bool conn_exists(const struct ran_conn *conn); +void conn_conclude_cm_service_req(struct ran_conn *conn, enum ran_type via_ran); void dtap_expect_tx(const char *hex); -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 29 Nov 2018 22:31:04 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscr_conn->mncc_rtp_bridge In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12013 ) Change subject: drop unused gsm_subscr_conn->mncc_rtp_bridge ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba Gerrit-Change-Number: 12013 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 22:31:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:43:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 22:43:34 +0000 Subject: Change in osmo-msc[master]: drop unused ran_conn->encr Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12016 Change subject: drop unused ran_conn->encr ...................................................................... drop unused ran_conn->encr The ran_conn->encr is never used. Drop completely. Drop the definition of struct gsm_encr from common_cs.h. Do not print the encr.alg_id in vty_dump_one_conn(), it always was zero anyway. Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce --- M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M src/libmsc/msc_vty.c 3 files changed, 1 insertion(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/12016/1 diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h index fddc6ec..14fe618 100644 --- a/include/osmocom/msc/common_cs.h +++ b/include/osmocom/msc/common_cs.h @@ -1,18 +1,8 @@ #pragma once -#include - struct msgb; struct gsm_network; typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); -#define MAX_A5_KEY_LEN (128/8) - -struct gsm_encr { - uint8_t alg_id; - uint8_t key_len; - uint8_t key[MAX_A5_KEY_LEN]; -}; - struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 5c167e1..4a829bd 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -125,7 +125,6 @@ enum ran_type via_ran; uint16_t lac; - struct gsm_encr encr; /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still * wants to request a Classmark Update first. */ diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 9c82713..ba042e5 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -491,7 +491,7 @@ static void vty_dump_one_conn(struct vty *vty, const struct ran_conn *conn) { - vty_out(vty, "%08x %22s %3s %5u %3u %08x %c /%1u %27s %s", + vty_out(vty, "%08x %22s %3s %5u %3u %08x %c %27s %s", conn->a.conn_id, conn->vsub ? vlr_subscr_name(conn->vsub) : "-", conn->via_ran == RAN_UTRAN_IU ? "Iu" : "A", @@ -499,7 +499,6 @@ conn->use_count, conn->use_tokens, conn->received_cm_service_request ? 'C' : '-', - conn->encr.alg_id, conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-", VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:47:38 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 29 Nov 2018 22:47:38 +0000 Subject: Change in libosmocore[master]: msgb: add test helper Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12017 Change subject: msgb: add test helper ...................................................................... msgb: add test helper It's often handy to compare msgb to a given array and print the position where they differ. Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 --- M include/osmocom/core/msgb.h M src/msgb.c 2 files changed, 83 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/12017/1 diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 2449151..6e344f1 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -565,6 +565,8 @@ void *msgb_talloc_ctx_init(void *root_ctx, unsigned int pool_size); void msgb_set_talloc_ctx(void *ctx) OSMO_DEPRECATED("Use msgb_talloc_ctx_init() instead"); int msgb_printf(struct msgb *msgb, const char *format, ...); +bool msgb_cmpr_l3(const char *f, size_t l, const struct msgb *msg, const uint8_t *data, size_t len, bool print); +bool msgb_cmpr(const char *f, size_t l, const struct msgb *msg, const uint8_t *data, size_t len, bool print); static inline const char *msgb_hexdump_l2(const struct msgb *msg) { diff --git a/src/msgb.c b/src/msgb.c index 844cfc6..ebecc3e 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -173,6 +173,87 @@ return msg->data; } +static inline bool compare_n_print(const char *f, size_t l, uint8_t level, + const uint8_t *m, const uint8_t *d, size_t len, bool print) +{ + size_t i; + if (memcmp(m, d, len) == 0) + return true; + + if (!print) + return false; + + printf("%s:%zu L%u data mismatch:\nexpected %s\n ", + f, l, level, osmo_hexdump(d, len)); + + for(i = 0; i < len; i++) + if (d[i] != m[i]) { + printf("!!\n"); + break; + } else + printf(".. "); + + /* N. B: that's intended to be used bymsgb_cmpr*() so length check is already passed, + so we can use len for both m and d */ + printf(" msgb %s\n", osmo_hexdump(m, len)); + + return false; +} + +/*! Compare and print: check L3 data in msgb against given data and print erros if any + * \param[in] f text prefix, usually __func__, ignored if print == false + * \param[in] l numeric prefix, usually __LINE__, ignored if print == false + * \param[in] msg message buffer + * \param[in] data expected L3 data + * \param[in] len length of data + * \param[in] print boolean indicating whether we should print anything to stdout + * \returns boolean indicating whether msgb L3 content is equal to a given data + */ +bool msgb_cmpr_l3(const char *f, size_t l, const struct msgb *msg, const uint8_t *data, size_t len, bool print) +{ + if (!msg) { + if (print) + printf("%s:%zu NULL msg comparison\n", f, l); + return false; + } + + if (msgb_l3len(msg) != len) { + if (print) + printf("%s:%zu Length mismatch: %d != %zu, %s\n", + f, l, msgb_l3len(msg), len, msgb_hexdump_l3(msg)); + return false; + } + + return compare_n_print(f, l, 3, msgb_l3(msg), data, len, print); +} + +/*! Compare and print: check data in msgb against given data and print erros if any + * \param[in] f text prefix, usually __func__, ignored if print == false + * \param[in] l numeric prefix, usually __LINE__, ignored if print == false + * \param[in] msg message buffer + * \param[in] data expected data + * \param[in] len length of data + * \param[in] print boolean indicating whether we should print anything to stdout + * \returns boolean indicating whether msgb content is equal to a given data + */ +bool msgb_cmpr(const char *f, size_t l, const struct msgb *msg, const uint8_t *data, size_t len, bool print) +{ + if (!msg) { + if (print) + printf("%s:%zu NULL msg comparison\n", f, l); + return false; + } + + if (msgb_length(msg) != len) { + if (print) + printf("%s:%zu Length mismatch: %d != %zu, %s\n", + f, l, msgb_length(msg), len, msgb_hexdump(msg)); + return false; + } + + return compare_n_print(f, l, 0, msgb_data(msg), data, len, print); +} + /*! get length of message buffer * \param[in] msg message buffer * \returns length of data section in message buffer -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:47:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 29 Nov 2018 22:47:39 +0000 Subject: Change in libosmocore[master]: Move BSSMAP_MSG_* defines to header file Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12018 Change subject: Move BSSMAP_MSG_* defines to header file ...................................................................... Move BSSMAP_MSG_* defines to header file Change-Id: I4d8cc05b8df8e70c1f6257e53ae3acec7901681f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/12018/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 9b19d69..298b3e4 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -29,6 +29,9 @@ #include #include +#define BSSMAP_MSG_SIZE 512 +#define BSSMAP_MSG_HEADROOM 128 + struct sockaddr_storage; struct msgb; diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index fe7bc2c..2566ad5 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -34,9 +34,6 @@ * message generation/encoding. */ -#define BSSMAP_MSG_SIZE 512 -#define BSSMAP_MSG_HEADROOM 128 - /*! Create "Complete L3 Info" for AoIP, legacy implementation. * Instead use gsm0808_create_layer3_aoip2(), which is capable of three-digit MNC with leading zeros. * \param[in] msg_l3 msgb containing Layer 3 Message -- To view, visit https://gerrit.osmocom.org/12018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4d8cc05b8df8e70c1f6257e53ae3acec7901681f Gerrit-Change-Number: 12018 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:47:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 29 Nov 2018 22:47:39 +0000 Subject: Change in libosmocore[master]: LCLS: fix GCR parameter name Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12019 Change subject: LCLS: fix GCR parameter name ...................................................................... LCLS: fix GCR parameter name * use proper struct pointer * update comments to be useful for doxygen Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/12019/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index c5bf280..57aa6ea 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -60,10 +60,10 @@ /*! LCLS-related parameters from 3GPP TS 48.008 */ struct osmo_lcls { - enum gsm0808_lcls_config config; /* ?3.2.2.116 Configuration */ - enum gsm0808_lcls_control control; /* ?3.2.2.117 Connection Status Control */ - struct gsm0808_gcr *gcr; /* ?3.2.2.115 Global Call Reference */ - bool corr_needed; /* ?3.2.2.118 Correlation-Not-Needed */ + enum gsm0808_lcls_config config; /*< doc ?3.2.2.116 Configuration */ + enum gsm0808_lcls_control control; /*< doc ?3.2.2.117 Connection Status Control */ + struct gsm29205_gcr *gcr; /*< doc ?3.2.2.115 Global Call Reference */ + bool corr_needed; /*< doc ?3.2.2.118 Correlation-Not-Needed */ }; extern const struct value_string gsm0808_cell_id_discr_names[]; -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:47:40 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 29 Nov 2018 22:47:40 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding Message-ID: Max has uploaded this change for review. ( https://gerrit.osmocom.org/12020 Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 103 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/12020/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 57aa6ea..5de0d9d 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -81,6 +81,10 @@ const struct sockaddr_storage *ss); int gsm0808_dec_aoip_trasp_addr(struct sockaddr_storage *ss, const uint8_t *elem, uint8_t len); + +uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct gsm29205_gcr *g); +int gsm0808_dec_gcr(struct gsm29205_gcr *g, struct tlv_parsed *tp); + uint8_t gsm0808_enc_speech_codec(struct msgb *msg, const struct gsm0808_speech_codec *sc); int gsm0808_dec_speech_codec(struct gsm0808_speech_codec *sc, diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index c58d828..9f7ec7e 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -482,6 +482,42 @@ return (int)(elem - old_elem); } +/*! Create BSSMAP Global Call Reference, 3GPP TS 48.008 ?3.2.2.115 + * \param[out] msg Message Buffer for appending IE + * \param[in] g Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 + * \returns number of bytes added to \a msg or 0 on error */ +uint8_t gsm0808_enc_gcr(struct msgb *msg, const struct gsm29205_gcr *g) +{ + uint8_t enc, *len; + + len = msgb_v_put(msg, GSM0808_IE_GLOBAL_CALL_REF); + + /* reserve space for length */ + msgb_v_put(msg, 0); /* len points to this reserved space already */ + + enc = gsm29205_enc_gcr(msg, g); + if (enc) { + len[0] = enc; + return enc + 2; /* type (1 byte) + length (1 byte) */ + } + + return 0; +} + +/*! Decode BSSMAP Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 + * \param[out] gcr Caller-provided memory to store Global Call Reference + * \param[in] elem IE value to be decoded + * \param[in] len Length of \a elem in bytes + * \returns number of bytes parsed; negative on error */ +int gsm0808_dec_gcr(struct gsm29205_gcr *gcr, struct tlv_parsed *tp) +{ + const uint8_t *buf = TLVP_VAL_MINLEN(tp, GSM0808_IE_GLOBAL_CALL_REF, OSMO_GCR_MIN_LEN); + if (!buf) + return -EINVAL; + + return 2 + gsm29205_dec_gcr(gcr, buf, TLVP_LEN(tp, GSM0808_IE_GLOBAL_CALL_REF)); +} + /*! Encode TS 08.08 Encryption Information IE * \param[out] msg Message Buffer to which IE is to be appended * \param[in] ei Encryption Information to be encoded diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index e1012b2..390b546 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -146,6 +146,8 @@ gsm29205_enc_gcr; gsm29205_dec_gcr; +gsm0808_enc_gcr; +gsm0808_dec_gcr; gsm0808_att_tlvdef; gsm0808_bssap_name; diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index 197ec06..e428970 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -569,6 +569,61 @@ msgb_free(in_msg); } +static void test_enc_dec_gcr() +{ + static const uint8_t res[] = { + GSM0808_IE_GLOBAL_CALL_REF, + 0x0d, /* GCR length */ + 0x03, /* .net_len */ + 0x4f, 0x4f, 0x4f, /* .net */ + 0x02, /* .node length */ + 0xde, 0xad, /* .node */ + 0x05, /* length of Call. Ref. */ + 0x4e, 0x4e, 0x4e, 0x4e, 0x4e /* .cr - Call. Ref. */ + }; + uint8_t len; + struct msgb *msg; + struct gsm29205_gcr g = { .net_len = 3, .node = 0xDEAD }, p = { 0 }; + int rc; + struct tlv_parsed tp; + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "global call reference"); + if (!msg) + return; + + memset(g.cr, 'N', sizeof(g.cr)); + memset(g.net, 'O', g.net_len); + + len = gsm0808_enc_gcr(msg, &g); + printf("Testing Global Call Reference IE encoder...\n\t%d bytes added: %s\n", + len, len == ARRAY_SIZE(res) ? "OK" : "FAIL"); + + if (!msgb_cmpr(__func__, __LINE__, msg, res, ARRAY_SIZE(res), true)) + abort(); + + rc = osmo_bssap_tlv_parse(&tp, msgb_data(msg), msgb_length(msg)); + if (rc < 0) + printf("parsing failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); + + rc = gsm0808_dec_gcr(&p, &tp); + if (rc < 0) + printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); + + if (p.net_len != g.net_len) + printf("Network ID length parsed wrong: %u != %u\n", p.net_len, g.net_len); + + if (p.node != g.node) + printf("Node ID parsed wrong: 0x%X != 0x%X\n", p.node, g.node); + + if (memcmp(p.net, g.net, g.net_len) != 0) + printf("Network ID parsed wrong: %s\n", osmo_hexdump(p.net, p.net_len)); + + if (memcmp(p.cr, g.cr, 5) != 0) + printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(p.cr, 5)); + + printf("\tdecoded %d bytes: %s\n", rc, rc == len ? "OK" : "FAIL"); + msgb_free(msg); +} + static void test_enc_dec_aoip_trasp_addr_v4() { struct sockaddr_storage enc_addr; @@ -1791,6 +1846,9 @@ test_create_paging(); test_create_dtap(); test_prepend_dtap(); + + test_enc_dec_gcr(); + test_enc_dec_aoip_trasp_addr_v4(); test_enc_dec_aoip_trasp_addr_v6(); test_gsm0808_enc_dec_speech_codec(); diff --git a/tests/gsm0808/gsm0808_test.ok b/tests/gsm0808/gsm0808_test.ok index a48cf1d..f38dac3 100644 --- a/tests/gsm0808/gsm0808_test.ok +++ b/tests/gsm0808/gsm0808_test.ok @@ -20,6 +20,9 @@ Testing creating Paging Request Testing creating DTAP Testing prepend DTAP +Testing Global Call Reference IE encoder... + 15 bytes added: OK + decoded 15 bytes: OK test_gsm0808_enc_dec_cell_id_list_lac: encoded: 1a 07 05 01 24 ab cd 56 78 (rc = 9) ------- test_cell_id_list_add cell_id_list == CGI[0]:{} -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 1 Gerrit-Owner: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:48:06 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 29 Nov 2018 22:48:06 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 29 Nov 2018 22:48:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 22:48:14 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Thu, 29 Nov 2018 22:48:14 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 12 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 29 Nov 2018 22:48:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 23:06:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 23:06:25 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscriber_connection->encr In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12016 to look at the new patch set (#2). Change subject: drop unused gsm_subscriber_connection->encr ...................................................................... drop unused gsm_subscriber_connection->encr The gsm_subscriber_connection->encr is never used. Drop completely. Drop the definition of struct gsm_encr from common_cs.h. Do not print the encr.alg_id in vty_dump_one_conn(), it always was zero anyway. Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce --- M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M src/libmsc/msc_vty.c 3 files changed, 1 insertion(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/12016/2 -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 23:06:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 23:06:25 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12015 to look at the new patch set (#2). Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... rename gsm_subscriber_connection to ran_conn In preparation for inter-BSC and inter-MSC handover, we need to separate the subscriber management logic from the actual RAN connections. What better time to finally rename gsm_subscriber_connection. * Name choice: In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it "bss_conn": in 3G a BSS is called RNS, IIUC. The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network. * Rationale: A subscriber in the MSC so far has only one RAN connection, but e.g. for inter-BSC handover, a second one needs to be created to handover to. Most of the items in the former gsm_subscriber_connection are actually related to the RAN, with only a few MM and RTP related items. So, as a first step, just rename it to ran_conn, to cosmetically prepare for moving the not strictly RAN related items away later. Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_14.h M include/osmocom/msc/gsm_04_80.h M include/osmocom/msc/gsm_09_11.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_ifaces.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/signal.h M include/osmocom/msc/silent_call.h M include/osmocom/msc/transaction.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 54 files changed, 3,167 insertions(+), 3,167 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12015/2 -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 23:20:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 23:20:43 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12015 to look at the new patch set (#3). Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... rename gsm_subscriber_connection to ran_conn In preparation for inter-BSC and inter-MSC handover, we need to separate the subscriber management logic from the actual RAN connections. What better time to finally rename gsm_subscriber_connection. * Name choice: In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it "bss_conn": in 3G a BSS is called RNS, IIUC. The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network. * Rationale: A subscriber in the MSC so far has only one RAN connection, but e.g. for inter-BSC handover, a second one needs to be created to handover to. Most of the items in the former gsm_subscriber_connection are actually related to the RAN, with only a few MM and RTP related items. So, as a first step, just rename it to ran_conn, to cosmetically prepare for moving the not strictly RAN related items away later. Also: - Rename some functions from msc_subscr_conn_* to ran_conn_* - Rename "Subscr_Conn" FSM instance name to "RAN_conn" - Rename SUBSCR_CONN_* to RAN_CONN_* Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_14.h M include/osmocom/msc/gsm_04_80.h M include/osmocom/msc/gsm_09_11.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_ifaces.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/signal.h M include/osmocom/msc/silent_call.h M include/osmocom/msc/transaction.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M src/libvlr/vlr.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 56 files changed, 3,652 insertions(+), 3,655 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12015/3 -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 23:20:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 29 Nov 2018 23:20:44 +0000 Subject: Change in osmo-msc[master]: cosmetic: subscr_conn_fsm_auth_ciph() should be static Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12021 Change subject: cosmetic: subscr_conn_fsm_auth_ciph() should be static ...................................................................... cosmetic: subscr_conn_fsm_auth_ciph() should be static Only used in subscr_conn.c. Change-Id: Iaa2c63d2b06f59d34e0465c40a98741f56ec526a --- M src/libmsc/subscr_conn.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/12021/1 diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index e6fa7e1..854b380 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -137,7 +137,7 @@ } } -void subscr_conn_fsm_auth_ciph(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void subscr_conn_fsm_auth_ciph(struct osmo_fsm_inst *fi, uint32_t event, void *data) { /* If accepted, transition the state, all other cases mean failure. */ switch (event) { -- To view, visit https://gerrit.osmocom.org/12021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa2c63d2b06f59d34e0465c40a98741f56ec526a Gerrit-Change-Number: 12021 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 00:29:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 00:29:27 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule SS session timeout Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12022 Change subject: SS/USSD: fix: properly (re)schedule SS session timeout ...................................................................... SS/USSD: fix: properly (re)schedule SS session timeout It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. For some reason, it wasn't properly resceduled in case of any SS/USSD activity, so the lifetime of a session was limited to hard-coded 30 seconds. Let's introduce a VTY option, which can be used to configure the timer (by default it is 120 seconds now): hlr ... ! Use 0 to disable this timer ss-guard-timeout 120 and properly (re)schedule it. Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120 Related: OS#3717 --- M src/hlr.c M src/hlr.h M src/hlr_ussd.c M src/hlr_vty.c M tests/test_nodes.vty 5 files changed, 36 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/22/12022/1 diff --git a/src/hlr.c b/src/hlr.c index 78d6c91..9f1b907 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -604,6 +604,9 @@ INIT_LLIST_HEAD(&g_hlr->ss_sessions); INIT_LLIST_HEAD(&g_hlr->ussd_routes); + /* Default SS guard timeout is 120 (i.e. 2 mins) */ + g_hlr->ss_guard_timeout = 120; + rc = osmo_init_logging2(hlr_ctx, &hlr_log_info); if (rc < 0) { fprintf(stderr, "Error initializing logging\n"); diff --git a/src/hlr.h b/src/hlr.h index 315c3dd..5236356 100644 --- a/src/hlr.h +++ b/src/hlr.h @@ -45,6 +45,9 @@ struct hlr_euse *euse_default; struct llist_head iuse_list; + /* SS session guard timer value */ + int ss_guard_timeout; + struct llist_head ussd_routes; struct llist_head ss_sessions; diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index ba373f3..6ba1dcc 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -1,6 +1,7 @@ /* OsmoHLR SS/USSD implementation */ /* (C) 2018 Harald Welte + * (C) 2018 by Vadim Yanitskiy * * All Rights Reserved * @@ -208,11 +209,13 @@ OSMO_STRLCPY_ARRAY(ss->imsi, imsi); ss->session_id = session_id; + + /* Schedule self-destruction timer */ osmo_timer_setup(&ss->timeout, ss_session_timeout, ss); - /* NOTE: The timeout is currently global and not refreshed with subsequent messages - * within the SS/USSD session. So 30s after the initial SS message, the session will - * timeout! */ - osmo_timer_schedule(&ss->timeout, 30, 0); + if (g_hlr->ss_guard_timeout > 0) { + osmo_timer_schedule(&ss->timeout, + g_hlr->ss_guard_timeout, 0); + } llist_add_tail(&ss->list, &hlr->ss_sessions); return ss; @@ -535,6 +538,13 @@ gsup->imsi, gsup->session_id); goto out_err; } + + /* Reschedule self-destruction timer */ + if (g_hlr->ss_guard_timeout > 0) { + osmo_timer_schedule(&ss->timeout, + g_hlr->ss_guard_timeout, 0); + } + if (ss_op_is_ussd(req.opcode)) { /* dispatch unstructured SS to routing */ handle_ussd(conn, ss, gsup, &req); diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 2d9b929..be49113 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -288,9 +288,22 @@ if (g_hlr->euse_default) vty_out(vty, " ussd default-route external %s%s", g_hlr->euse_default->name, VTY_NEWLINE); + if (g_hlr->ss_guard_timeout > 0) + vty_out(vty, " ss-guard-timeout %i%s", + g_hlr->ss_guard_timeout, VTY_NEWLINE); + return 0; } +DEFUN(cfg_ss_guard_timeout, cfg_ss_guard_timeout_cmd, + "ss-guard-timeout <0-255>", + "Set guard timer for SS/USSD session activity\n" + "Guard timer value (sec.), or 0 to disable") +{ + g_hlr->ss_guard_timeout = atoi(argv[0]); + return CMD_SUCCESS; +} + /*********************************************************************** * Common Code ***********************************************************************/ @@ -353,6 +366,7 @@ install_element(HLR_NODE, &cfg_ussd_no_route_pfx_cmd); install_element(HLR_NODE, &cfg_ussd_defaultroute_cmd); install_element(HLR_NODE, &cfg_ussd_no_defaultroute_cmd); + install_element(HLR_NODE, &cfg_ss_guard_timeout_cmd); hlr_vty_subscriber_init(); } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index a9d4ac4..88ee5fb 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -77,6 +77,7 @@ no ussd route prefix PREFIX ussd default-route external EUSE no ussd default-route + ss-guard-timeout <0-255> OsmoHLR(config-hlr)# gsup OsmoHLR(config-hlr-gsup)# list @@ -118,4 +119,5 @@ bind ip 127.0.0.1 ussd route prefix *#100# internal own-msisdn ussd route prefix *#101# internal own-imsi + ss-guard-timeout 120 end -- To view, visit https://gerrit.osmocom.org/12022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120 Gerrit-Change-Number: 12022 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 01:02:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 01:02:22 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for SS sessions In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for SS sessions ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11992/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11992/3//COMMIT_MSG at 18 PS3, Line 18: the timer expires after 120 seconds I think it's quite big value. Maybe, 30 seconds is better? -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 01:02:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 01:20:22 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 01:20:22 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: release IUSE sessions immediately after response Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12023 Change subject: SS/USSD: release IUSE sessions immediately after response ...................................................................... SS/USSD: release IUSE sessions immediately after response At the moment, all available IUSE handlers do assume a single request-response operation, e.g. MS requests its MSISDN - IUSE responds. No further nor intermediate communications is required. Let's immediately terminate such SS sessions in order to avoid waiting for the session inactivity watchdog (i.e. timeout). Change-Id: Iaefe37512da79e10fbe92378236bfff0eae0f8b9 --- M src/hlr_ussd.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/23/12023/1 diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 6ba1dcc..f9119d7 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -458,6 +458,8 @@ } else { /* Handle internally */ ss->u.iuse->handle_ussd(conn, ss, gsup, req); + /* Release session immediately */ + ss_session_free(ss); } } -- To view, visit https://gerrit.osmocom.org/12023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaefe37512da79e10fbe92378236bfff0eae0f8b9 Gerrit-Change-Number: 12023 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 01:20:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 01:20:27 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule SS session timeout In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12022 ) Change subject: SS/USSD: fix: properly (re)schedule SS session timeout ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120 Gerrit-Change-Number: 12022 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 30 Nov 2018 01:20:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 01:22:32 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 01:22:32 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_09_11.c: implement guard timer for SS sessions In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/11992 ) Change subject: libmsc/gsm_09_11.c: implement guard timer for SS sessions ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Gerrit-Change-Number: 11992 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 01:22:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 01:28:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 01:28:45 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule SS session timeout In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12022 to look at the new patch set (#3). Change subject: SS/USSD: fix: properly (re)schedule SS session timeout ...................................................................... SS/USSD: fix: properly (re)schedule SS session timeout It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. For some reason, it wasn't properly resceduled in case of any SS/USSD activity, so the lifetime of a session was limited to hard-coded 30 seconds. Let's introduce a VTY option, which can be used to configure the timer (by default it's set to 30 seconds): hlr ... ! Use 0 to disable this timer ss-guard-timeout 30 and properly (re)schedule it. Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120 Related: OS#3717 --- M src/hlr.c M src/hlr.h M src/hlr_ussd.c M src/hlr_vty.c M tests/test_nodes.vty 5 files changed, 36 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/22/12022/3 -- To view, visit https://gerrit.osmocom.org/12022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120 Gerrit-Change-Number: 12022 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 01:33:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 01:33:06 +0000 Subject: Change in osmo-msc[master]: cosmetic: subscr_conn_fsm_auth_ciph() should be static In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12021 ) Change subject: cosmetic: subscr_conn_fsm_auth_ciph() should be static ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa2c63d2b06f59d34e0465c40a98741f56ec526a Gerrit-Change-Number: 12021 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 01:33:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 01:35:30 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 01:35:30 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscriber_connection->encr In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12016 ) Change subject: drop unused gsm_subscriber_connection->encr ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12016/2/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/12016/2/src/libmsc/msc_vty.c at a488 PS2, Line 488: This should be corrected too. -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 01:35:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 01:38:45 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 01:38:45 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12015 ) Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... Patch Set 3: Code-Review+1 I definitely like this. The old 'gsm_subscriber_connection' makes function declarations / definitions look awkward :? -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 01:38:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:44 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscr_conn->mncc_rtp_bridge In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12013 to look at the new patch set (#2). Change subject: drop unused gsm_subscr_conn->mncc_rtp_bridge ...................................................................... drop unused gsm_subscr_conn->mncc_rtp_bridge Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/mncc_builtin.c 3 files changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/13/12013/2 -- To view, visit https://gerrit.osmocom.org/12013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba Gerrit-Change-Number: 12013 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:44 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12015 to look at the new patch set (#4). Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... rename gsm_subscriber_connection to ran_conn In preparation for inter-BSC and inter-MSC handover, we need to separate the subscriber management logic from the actual RAN connections. What better time to finally rename gsm_subscriber_connection. * Name choice: In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it "bss_conn": in 3G a BSS is called RNS, IIUC. The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network. * Rationale: A subscriber in the MSC so far has only one RAN connection, but e.g. for inter-BSC handover, a second one needs to be created to handover to. Most of the items in the former gsm_subscriber_connection are actually related to the RAN, with only a few MM and RTP related items. So, as a first step, just rename it to ran_conn, to cosmetically prepare for moving the not strictly RAN related items away later. Also: - Rename some functions from msc_subscr_conn_* to ran_conn_* - Rename "Subscr_Conn" FSM instance name to "RAN_conn" - Rename SUBSCR_CONN_* to RAN_CONN_* Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_14.h M include/osmocom/msc/gsm_04_80.h M include/osmocom/msc/gsm_09_11.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_ifaces.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/signal.h M include/osmocom/msc/silent_call.h M include/osmocom/msc/transaction.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M src/libvlr/vlr.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 57 files changed, 3,843 insertions(+), 3,846 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12015/4 -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:45 +0000 Subject: Change in osmo-msc[master]: drop unused openbscdefines.h Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12024 Change subject: drop unused openbscdefines.h ...................................................................... drop unused openbscdefines.h Change-Id: If35cd49baa4d0a3b38f31736e1696f481babba9c --- M include/osmocom/msc/Makefile.am D include/osmocom/msc/openbscdefines.h 2 files changed, 0 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/24/12024/1 diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index ebc946a..28e4b14 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -20,7 +20,6 @@ mncc_int.h \ msc_ifaces.h \ msc_mgcp.h \ - openbscdefines.h \ a_reset.h \ osmo_msc.h \ rrlp.h \ diff --git a/include/osmocom/msc/openbscdefines.h b/include/osmocom/msc/openbscdefines.h deleted file mode 100644 index c6ac153..0000000 --- a/include/osmocom/msc/openbscdefines.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * (C) 2009 by Holger Hans Peter Freyther - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#ifndef OPENBSCDEFINES_H -#define OPENBSCDEFINES_H - -#ifdef BUILDING_ON_WINDOWS - #ifdef BUILDING_OPENBSC - #define BSC_API __declspec(dllexport) - #else - #define BSC_API __declspec(dllimport) - #endif -#else - #define BSC_API __attribute__((visibility("default"))) -#endif - -#endif -- To view, visit https://gerrit.osmocom.org/12024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If35cd49baa4d0a3b38f31736e1696f481babba9c Gerrit-Change-Number: 12024 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:46 +0000 Subject: Change in osmo-msc[master]: drop unused SUBSCR_CONN_E_INVALID Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12025 Change subject: drop unused SUBSCR_CONN_E_INVALID ...................................................................... drop unused SUBSCR_CONN_E_INVALID The idea to catch uninitialized vars was completely moot. We pass events by constants anyway. Change-Id: I6f3c964ee04fec9a96f385199fb3141ac8d672d4 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/subscr_conn.c 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/25/12025/1 diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index a757a99..ad81da5 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -12,8 +12,6 @@ #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT enum subscr_conn_fsm_event { - /* Mark 0 as invalid to catch uninitialized vars */ - SUBSCR_CONN_E_INVALID = 0, /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ SUBSCR_CONN_E_COMPLETE_LAYER_3, /* Received Classmark Update, typically neede for Ciphering Mode Command */ diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index e6fa7e1..78af274 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -43,7 +43,6 @@ #define SUBSCR_CONN_TIMEOUT 5 /* seconds */ static const struct value_string subscr_conn_fsm_event_names[] = { - OSMO_VALUE_STRING(SUBSCR_CONN_E_INVALID), OSMO_VALUE_STRING(SUBSCR_CONN_E_COMPLETE_LAYER_3), OSMO_VALUE_STRING(SUBSCR_CONN_E_CLASSMARK_UPDATE), OSMO_VALUE_STRING(SUBSCR_CONN_E_ACCEPTED), -- To view, visit https://gerrit.osmocom.org/12025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6f3c964ee04fec9a96f385199fb3141ac8d672d4 Gerrit-Change-Number: 12025 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:46 +0000 Subject: Change in osmo-msc[master]: drop unused gsm0408_allow_everyone() declaration Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12026 Change subject: drop unused gsm0408_allow_everyone() declaration ...................................................................... drop unused gsm0408_allow_everyone() declaration Change-Id: Id56ea492594edc38d1f9d31d94a1679c0cb61fa0 --- M include/osmocom/msc/gsm_04_08.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/12026/1 diff --git a/include/osmocom/msc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h index 8767070..0692e09 100644 --- a/include/osmocom/msc/gsm_04_08.h +++ b/include/osmocom/msc/gsm_04_08.h @@ -26,7 +26,6 @@ struct msgb *msg); /* config options controlling the behaviour of the lower leves */ -void gsm0408_allow_everyone(int allow); void gsm0408_clear_all_trans(struct gsm_network *net, int protocol); int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/12026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id56ea492594edc38d1f9d31d94a1679c0cb61fa0 Gerrit-Change-Number: 12026 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:46 +0000 Subject: Change in osmo-msc[master]: drop unused tests/db/* Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12027 Change subject: drop unused tests/db/* ...................................................................... drop unused tests/db/* Another one of those "what is this still doing here". Not mentioned in configure.ac nor Makefile.am SUBDIR... Change-Id: I05880507d9bf029f0ec451efda0ebe54ac09ef12 --- D tests/db/Makefile.am D tests/db/db_test.c D tests/db/db_test.err D tests/db/db_test.ok D tests/db/hlr.sqlite3 5 files changed, 0 insertions(+), 337 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/12027/1 diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am deleted file mode 100644 index 249a873..0000000 --- a/tests/db/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - -ggdb3 \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(LIBSMPP34_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -EXTRA_DIST = \ - db_test.ok \ - db_test.err \ - hlr.sqlite3 \ - $(NULL) - -noinst_PROGRAMS = \ - db_test \ - $(NULL) - -db_test_SOURCES = \ - db_test.c \ - $(NULL) - -db_test_LDADD = \ - $(top_builddir)/src/libmsc/libmsc.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/tests/libiudummy/libiudummy.a \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBSMPP34_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - -ldbi \ - $(NULL) diff --git a/tests/db/db_test.c b/tests/db/db_test.c deleted file mode 100644 index 63099f6..0000000 --- a/tests/db/db_test.c +++ /dev/null @@ -1,286 +0,0 @@ -/* (C) 2008 by Jan Luebbe - * (C) 2009-2016 by Holger Hans Peter Freyther - * (C) 2014 by Alexander Chemeris - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -static struct gsm_network dummy_net; -static struct gsm_subscriber_group dummy_sgrp; - -#define SUBSCR_PUT(sub) \ - sub->group = &dummy_sgrp; \ - subscr_put(sub); - -#define COMPARE(original, copy) \ - if (original->id != copy->id) \ - printf("Ids do not match in %s:%d %llu %llu\n", \ - __FUNCTION__, __LINE__, original->id, copy->id); \ - if (original->lac != copy->lac) \ - printf("LAC do not match in %s:%d %d %d\n", \ - __FUNCTION__, __LINE__, original->lac, copy->lac); \ - if (original->authorized != copy->authorized) \ - printf("Authorize do not match in %s:%d %d %d\n", \ - __FUNCTION__, __LINE__, original->authorized, \ - copy->authorized); \ - if (strcmp(original->imsi, copy->imsi) != 0) \ - printf("IMSIs do not match in %s:%d '%s' '%s'\n", \ - __FUNCTION__, __LINE__, original->imsi, copy->imsi); \ - if (original->tmsi != copy->tmsi) \ - printf("TMSIs do not match in %s:%d '%u' '%u'\n", \ - __FUNCTION__, __LINE__, original->tmsi, copy->tmsi); \ - if (strcmp(original->name, copy->name) != 0) \ - printf("names do not match in %s:%d '%s' '%s'\n", \ - __FUNCTION__, __LINE__, original->name, copy->name); \ - if (strcmp(original->extension, copy->extension) != 0) \ - printf("Extensions do not match in %s:%d '%s' '%s'\n", \ - __FUNCTION__, __LINE__, original->extension, copy->extension); \ - -/* - * Create/Store a SMS and then try to load it. - */ -static void test_sms(void) -{ - int rc; - struct gsm_sms *sms; - struct gsm_subscriber *subscr; - subscr = db_get_subscriber(GSM_SUBSCRIBER_IMSI, "9993245423445"); - OSMO_ASSERT(subscr); - subscr->group = &dummy_sgrp; - - sms = sms_alloc(); - sms->receiver = subscr_get(subscr); - - sms->src.ton = 0x23; - sms->src.npi = 0x24; - memcpy(sms->src.addr, "1234", strlen("1234") + 1); - - sms->dst.ton = 0x32; - sms->dst.npi = 0x42; - memcpy(sms->dst.addr, subscr->extension, sizeof(subscr->extension)); - - memcpy(sms->text, "Text123", strlen("Text123") + 1); - memcpy(sms->user_data, "UserData123", strlen("UserData123") + 1); - sms->user_data_len = strlen("UserData123"); - - /* random values */ - sms->reply_path_req = 1; - sms->status_rep_req = 2; - sms->ud_hdr_ind = 3; - sms->protocol_id = 4; - sms->data_coding_scheme = 5; - - rc = db_sms_store(sms); - sms_free(sms); - OSMO_ASSERT(rc == 0); - - /* now query */ - sms = db_sms_get_unsent_for_subscr(subscr); - OSMO_ASSERT(sms); - OSMO_ASSERT(sms->receiver == subscr); - OSMO_ASSERT(sms->reply_path_req == 1); - OSMO_ASSERT(sms->status_rep_req == 2); - OSMO_ASSERT(sms->ud_hdr_ind == 3); - OSMO_ASSERT(sms->protocol_id == 4); - OSMO_ASSERT(sms->data_coding_scheme == 5); - OSMO_ASSERT(sms->src.ton == 0x23); - OSMO_ASSERT(sms->src.npi == 0x24); - OSMO_ASSERT(sms->dst.ton == 0x32); - OSMO_ASSERT(sms->dst.npi == 0x42); - OSMO_ASSERT(strcmp((char *) sms->text, "Text123") == 0); - OSMO_ASSERT(sms->user_data_len == strlen("UserData123")); - OSMO_ASSERT(strcmp((char *) sms->user_data, "UserData123") == 0); - - /* Mark the SMS as delivered */ - db_sms_mark_delivered(sms); - sms_free(sms); - - sms = db_sms_get_unsent_for_subscr(subscr); - OSMO_ASSERT(!sms); - - subscr_put(subscr); -} - -static void test_sms_migrate(void) -{ - struct gsm_subscriber *rcv_subscr; - struct gsm_sms *sms; - static const uint8_t user_data_1[] = { - 0x41, 0xf1, 0xd8, 0x05, 0x22, 0x96, 0xcd, 0x2e, - 0x90, 0xf1, 0xfd, 0x06, 0x00 }; - static const uint8_t user_data_2[] = { - 0x41, 0xf1, 0xd8, 0x05, 0x22, 0x96, 0xcd, 0x2e, - 0xd0, 0xf1, 0xfd, 0x06, 0x00 }; - - rcv_subscr = db_get_subscriber(GSM_SUBSCRIBER_IMSI, "901010000001111"); - rcv_subscr->group = &dummy_sgrp; - - sms = db_sms_get(&dummy_net, 1); - OSMO_ASSERT(sms->id == 1); - OSMO_ASSERT(sms->receiver == rcv_subscr); - OSMO_ASSERT(strcmp(sms->text, "Abc. Def. Foo") == 0); - OSMO_ASSERT(sms->user_data_len == ARRAY_SIZE(user_data_1)); - OSMO_ASSERT(memcmp(sms->user_data, user_data_1, ARRAY_SIZE(user_data_1)) == 0); - sms_free(sms); - - sms = db_sms_get(&dummy_net, 2); - OSMO_ASSERT(sms->id == 2); - OSMO_ASSERT(sms->receiver == rcv_subscr); - OSMO_ASSERT(strcmp(sms->text, "Abc. Def. Goo") == 0); - OSMO_ASSERT(sms->user_data_len == ARRAY_SIZE(user_data_2)); - OSMO_ASSERT(memcmp(sms->user_data, user_data_2, ARRAY_SIZE(user_data_2)) == 0); - sms_free(sms); - - subscr_put(rcv_subscr); -} - -static void test_subs(const char *imsi, char *imei1, char *imei2, bool make_ext) -{ - struct gsm_subscriber *alice = NULL, *alice_db; - char scratch_str[256]; - - alice = db_create_subscriber(imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, - make_ext); - db_subscriber_assoc_imei(alice, imei1); - if (imei2) - db_subscriber_assoc_imei(alice, imei2); - db_subscriber_alloc_tmsi(alice); - alice->lac=42; - db_sync_subscriber(alice); - /* Get by TMSI */ - snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by IMSI */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by id */ - snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by extension */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); - if (alice_db) { - if (!make_ext) - printf("FAIL: bogus extension created for IMSI %s\n", - imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - } else if (make_ext) - printf("FAIL: no subscriber extension for IMSI %s\n", imsi); - SUBSCR_PUT(alice); -} - -int main() -{ - printf("Testing subscriber database code.\n"); - osmo_init_logging(&log_info); - log_set_print_filename(osmo_stderr_target, 0); - - dummy_net.subscr_group = &dummy_sgrp; - dummy_sgrp.net = &dummy_net; - - if (db_init("hlr.sqlite3")) { - printf("DB: Failed to init database. Please check the option settings.\n"); - return 1; - } - printf("DB: Database initialized.\n"); - - if (db_prepare()) { - printf("DB: Failed to prepare database.\n"); - return 1; - } - printf("DB: Database prepared.\n"); - - struct gsm_subscriber *alice = NULL; - struct gsm_subscriber *alice_db; - - char *alice_imsi = "3243245432345"; - alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, - true); - db_sync_subscriber(alice); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice->imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - SUBSCR_PUT(alice); - - test_subs("3693245423445", "1234567890", NULL, true); - test_subs("9993245423445", "1234567890", "6543560920", true); - test_subs("3123122223445", "1234567890", NULL, false); - test_subs("9123121223445", "1234567890", "6543560920", false); - - /* create it again and see it fails */ - alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, - true); - OSMO_ASSERT(!alice); - - test_sms(); - test_sms_migrate(); - - db_fini(); - - printf("Done\n"); - return 0; -} - -/* stubs */ -void vty_out() {} -void vlr_subscr_disconnected() {} -void vlr_subscr_rx_tmsi_reall_compl() {} -void vlr_subscr_rx_id_resp() {} -void vlr_subscr_rx_auth_resp() {} -void vlr_loc_update() {} -void vlr_proc_acc_req() {} -void vlr_init() {} -unsigned int mgcpgw_client_next_endpoint(struct mgcpgw_client *client) -{ return 0; } -struct msgb *mgcp_msg_crcx(struct mgcpgw_client *mgcp, - uint16_t rtp_endpoint, unsigned int call_id, - enum mgcp_connection_mode mode) -{ return NULL; } -struct msgb *mgcp_msg_mdcx(struct mgcpgw_client *mgcp, - uint16_t rtp_endpoint, const char *rtp_conn_addr, - uint16_t rtp_port, enum mgcp_connection_mode mode) -{ return NULL; } -int mgcpgw_client_tx(struct mgcpgw_client *mgcp, struct msgb *msg, - mgcp_response_cb_t response_cb, void *priv) -{ return -EINVAL; } -const char *mgcpgw_client_remote_addr_str(struct mgcpgw_client *mgcp) -{ return "0.0.0.0"; } -uint32_t mgcpgw_client_remote_addr_n(struct mgcpgw_client *mgcp) -{ return 0; } -int mgcp_response_parse_params(struct mgcp_response *r) -{ return -EINVAL; } -struct RANAP_Cause; -int iu_tx_release(struct ue_conn_ctx *ctx, const struct RANAP_Cause *cause) -{ return 0; } diff --git a/tests/db/db_test.err b/tests/db/db_test.err deleted file mode 100644 index 27e5703..0000000 --- a/tests/db/db_test.err +++ /dev/null @@ -1,3 +0,0 @@ -Going to migrate from revision 3 -Going to migrate from revision 4 - \ No newline at end of file diff --git a/tests/db/db_test.ok b/tests/db/db_test.ok deleted file mode 100644 index 2632a8c..0000000 --- a/tests/db/db_test.ok +++ /dev/null @@ -1,4 +0,0 @@ -Testing subscriber database code. -DB: Database initialized. -DB: Database prepared. -Done diff --git a/tests/db/hlr.sqlite3 b/tests/db/hlr.sqlite3 deleted file mode 100644 index e59dcdc..0000000 --- a/tests/db/hlr.sqlite3 +++ /dev/null Binary files differ -- To view, visit https://gerrit.osmocom.org/12027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I05880507d9bf029f0ec451efda0ebe54ac09ef12 Gerrit-Change-Number: 12027 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:46 +0000 Subject: Change in osmo-msc[master]: adjust copyright in subscr_conn.c Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12028 Change subject: adjust copyright in subscr_conn.c ...................................................................... adjust copyright in subscr_conn.c Change-Id: Ia89e2d343a850234557e365457705a11d26fd925 --- M src/libmsc/subscr_conn.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/28/12028/1 diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index a63297f..f9e1985 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -1,7 +1,7 @@ /* MSC subscriber connection implementation */ /* - * (C) 2016 by sysmocom s.m.f.c. + * (C) 2016-2018 by sysmocom s.m.f.c. * All Rights Reserved * * Author: Neels Hofmeyr -- To view, visit https://gerrit.osmocom.org/12028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia89e2d343a850234557e365457705a11d26fd925 Gerrit-Change-Number: 12028 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:47 +0000 Subject: Change in osmo-msc[master]: drop msc_compl_l3() return value Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12029 Change subject: drop msc_compl_l3() return value ...................................................................... drop msc_compl_l3() return value msc_compl_l3() always returns MSC_CONN_ACCEPT, because the conn FSM handles (or should handle) all reject cases. The accept/reject return value is a legacy from libbsc internally passing a conn over to libmsc, in osmo-nitb. Drop enum msc_compl_l3_rc. Change msc_compl_l3_rc() to return void. Change all callers to always act like for acceptance, as they always did anyway. Drop some local variables now no longer needed. Adjust the comment to msc_compl_l3(). Drop a bunch of #if-0'd code from msc_compl_l3(). Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface_bssap.c M src/libmsc/iucs.c M src/libmsc/osmo_msc.c 4 files changed, 11 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/12029/1 diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index ad81da5..674de3b 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -40,11 +40,6 @@ SUBSCR_CONN_S_RELEASED, }; -enum msc_compl_l3_rc { - MSC_CONN_ACCEPT = 0, - MSC_CONN_REJECT = 1, -}; - struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac); @@ -59,8 +54,8 @@ void msc_sapi_n_reject(struct gsm_subscriber_connection *conn, int dlci); int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause); -int msc_compl_l3(struct gsm_subscriber_connection *conn, - struct msgb *msg, uint16_t chosen_channel); +void msc_compl_l3(struct gsm_subscriber_connection *conn, + struct msgb *msg, uint16_t chosen_channel); void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg); int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 9a2333d..77d84b3 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -260,8 +260,6 @@ uint16_t lac = 0; uint8_t data_length; const uint8_t *data; - int rc; - struct gsm_network *network = a_conn_info->network; struct gsm_subscriber_connection *conn; @@ -345,17 +343,8 @@ conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id); /* Handover location update to the MSC code */ - rc = msc_compl_l3(conn, msg, 0); - - if (rc == MSC_CONN_ACCEPT) { - LOGP(DMSC, LOGL_INFO, "User has been accepted by MSC.\n"); - return 0; - } else if (rc == MSC_CONN_REJECT) - LOGP(DMSC, LOGL_INFO, "User has been rejected by MSC.\n"); - else - LOGP(DMSC, LOGL_INFO, "User has been rejected by MSC (unknown error)\n"); - - return -EINVAL; + msc_compl_l3(conn, msg, 0); + return 0; } /* Endpoint to handle BSSMAP classmark update */ diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index 95bbbee..c3fea0d 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -142,7 +142,6 @@ int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg, uint16_t *lac) { - int rc; struct ranap_ue_conn_ctx *ue_ctx; struct gsm_subscriber_connection *conn; @@ -174,7 +173,6 @@ OSMO_ASSERT(pdisc != GSM48_PDISC_RR); msc_dtap(conn, msg); - rc = 0; } else { /* allocate a new connection */ @@ -191,10 +189,10 @@ abort(); /* ownership of conn hereby goes to the MSC: */ - rc = msc_compl_l3(conn, msg, 0); + msc_compl_l3(conn, msg, 0); } - return rc; + return 0; } int iu_rab_act_cs(struct gsm_trans *trans) diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index f2c84e6..9a371a4 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -87,37 +87,15 @@ gsm411_sapi_n_reject(conn); } -/* receive a Level 3 Complete message and return MSC_CONN_ACCEPT or - * MSC_CONN_REJECT */ -int msc_compl_l3(struct gsm_subscriber_connection *conn, - struct msgb *msg, uint16_t chosen_channel) +/* receive a Level 3 Complete message. + * Ownership of the conn is completely passed to the conn FSM, i.e. for both acceptance and rejection, + * the conn FSM shall decide when to release this conn. It may already be discarded before this exits. */ +void msc_compl_l3(struct gsm_subscriber_connection *conn, + struct msgb *msg, uint16_t chosen_channel) { msc_subscr_conn_get(conn, MSC_CONN_USE_COMPL_L3); gsm0408_dispatch(conn, msg); - msc_subscr_conn_put(conn, MSC_CONN_USE_COMPL_L3); - - /* Always return acceptance, because even if the conn was not accepted, - * we assumed ownership of it and the caller shall not interfere with - * that. We may even already have discarded the conn. */ - return MSC_CONN_ACCEPT; - -#if 0 - /* - * If this is a silent call we want the channel to remain open as long as - * possible and this is why we accept this connection regardless of any - * pending transaction or ongoing operation. - */ - if (conn->silent_call) - return MSC_CONN_ACCEPT; - if (conn->loc_operation || conn->sec_operation || conn->anch_operation) - return MSC_CONN_ACCEPT; - if (trans_has_conn(conn)) - return MSC_CONN_ACCEPT; - - LOGP(DRR, LOGL_INFO, "MSC Complete L3: Rejecting connection.\n"); - return MSC_CONN_REJECT; -#endif } /* Receive a DTAP message from BSC */ -- To view, visit https://gerrit.osmocom.org/12029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09 Gerrit-Change-Number: 12029 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:47 +0000 Subject: Change in osmo-msc[master]: rename some RAN conn related stuff to ran_conn_* Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12030 Change subject: rename some RAN conn related stuff to ran_conn_* ...................................................................... rename some RAN conn related stuff to ran_conn_* Following previous rename of gsm_subscriber_connection: Some functions and #defines are still called like "msc_conn" or just "msc_", while they are clearly about a RAN conn. To avoid confusion with the future separate concepts of MSC roles and a RAN connection, rename all those to match the common "ran_conn" prefix. Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_tests.c 15 files changed, 97 insertions(+), 97 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/12030/1 diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 713d0de..d8b34d6 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -50,21 +50,21 @@ int msc_vlr_alloc(struct gsm_network *net); int msc_vlr_start(struct gsm_network *net); -void msc_sapi_n_reject(struct ran_conn *conn, int dlci); -int msc_clear_request(struct ran_conn *conn, uint32_t cause); -void msc_compl_l3(struct ran_conn *conn, - struct msgb *msg, uint16_t chosen_channel); -void msc_dtap(struct ran_conn *conn, struct msgb *msg); -int msc_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, +void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci); +int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause); +void ran_conn_compl_l3(struct ran_conn *conn, + struct msgb *msg, uint16_t chosen_channel); +void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg); +int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); -int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); -void msc_cipher_mode_compl(struct ran_conn *conn, +int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); +void ran_conn_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id); -void msc_rx_sec_mode_compl(struct ran_conn *conn); -void msc_classmark_chg(struct ran_conn *conn, +void ran_conn_rx_sec_mode_compl(struct ran_conn *conn); +void ran_conn_classmark_chg(struct ran_conn *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len); -void msc_assign_fail(struct ran_conn *conn, +void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause); void ran_conn_init(void); @@ -79,16 +79,16 @@ void ran_conn_rx_iu_release_complete(struct ran_conn *conn); enum ran_conn_use { - MSC_CONN_USE_UNTRACKED = -1, - MSC_CONN_USE_COMPL_L3, - MSC_CONN_USE_DTAP, - MSC_CONN_USE_AUTH_CIPH, - MSC_CONN_USE_CM_SERVICE, - MSC_CONN_USE_TRANS_CC, - MSC_CONN_USE_TRANS_SMS, - MSC_CONN_USE_TRANS_NC_SS, - MSC_CONN_USE_SILENT_CALL, - MSC_CONN_USE_RELEASE, + RAN_CONN_USE_UNTRACKED = -1, + RAN_CONN_USE_COMPL_L3, + RAN_CONN_USE_DTAP, + RAN_CONN_USE_AUTH_CIPH, + RAN_CONN_USE_CM_SERVICE, + RAN_CONN_USE_TRANS_CC, + RAN_CONN_USE_TRANS_SMS, + RAN_CONN_USE_TRANS_NC_SS, + RAN_CONN_USE_SILENT_CALL, + RAN_CONN_USE_RELEASE, }; extern const struct value_string ran_conn_use_names[]; diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index fa0cb5f..82519d6 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -629,7 +629,7 @@ uint32_t conn_id = conn->a.conn_id; LOGPCONN(conn, LOGL_NOTICE, "Dropping orphaned RAN connection\n"); /* This call will/may talloc_free(conn), so we must save conn_id above */ - msc_clear_request(conn, GSM48_CC_CAUSE_SWITCH_CONG); + ran_conn_clear_request(conn, GSM48_CC_CAUSE_SWITCH_CONG); /* If there is still an SCCP connection active, remove it now */ if (check_connection_active(conn_id)) { diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 31cdb06..4d03d23 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -343,7 +343,7 @@ conn = ran_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id); /* Handover location update to the MSC code */ - msc_compl_l3(conn, msg, 0); + ran_conn_compl_l3(conn, msg, 0); return 0; } @@ -372,7 +372,7 @@ } /* Inform MSC about the classmark change */ - msc_classmark_chg(conn, cm2, cm2_len, cm3, cm3_len); + ran_conn_classmark_chg(conn, cm2, cm2_len, cm3, cm3_len); return 0; } @@ -383,9 +383,9 @@ { /* FIXME: The field GSM0808_IE_LAYER_3_MESSAGE_CONTENTS is optional by * means of the specification. So there can be messages without L3 info. - * In this case, the code will crash becrause msc_cipher_mode_compl() + * In this case, the code will crash becrause ran_conn_cipher_mode_compl() * is not able to deal with msg = NULL and apperently - * msc_cipher_mode_compl() was never meant to be used without L3 data. + * ran_conn_cipher_mode_compl() was never meant to be used without L3 data. * This needs to be discussed further! */ uint8_t alg_id = 1; @@ -407,7 +407,7 @@ rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE]); /* Hand over cipher mode complete message to the MSC */ - msc_cipher_mode_compl(conn, msg, alg_id); + ran_conn_cipher_mode_compl(conn, msg, alg_id); return 0; } @@ -462,12 +462,12 @@ /* FIXME: In AoIP, the Assignment failure will carry also an optional * Codec List (BSS Supported) element. It has to be discussed if we - * can ignore this element. If not, The msc_assign_fail() function - * call has to change. However msc_assign_fail() does nothing in the + * can ignore this element. If not, The ran_conn_assign_fail() function + * call has to change. However ran_conn_assign_fail() does nothing in the * end. So probably we can just leave it as it is. Even for AoIP */ /* Inform the MSC about the assignment failure event */ - msc_assign_fail(conn, cause, rr_cause_ptr); + ran_conn_assign_fail(conn, cause, rr_cause_ptr); return 0; } @@ -494,7 +494,7 @@ dlci = TLVP_VAL(tp, GSM0808_IE_DLCI)[0]; /* Inform the MSC about the sapi "n" reject event */ - msc_sapi_n_reject(conn, dlci); + ran_conn_sapi_n_reject(conn, dlci); return 0; } @@ -582,7 +582,7 @@ /* FIXME: Seems to be related to authentication or, encryption. Is this really in the right place? */ - msc_rx_sec_mode_compl(conn); + ran_conn_rx_sec_mode_compl(conn); return 0; } @@ -670,12 +670,12 @@ LOGPCONN(conn, LOGL_DEBUG, "Rx DTAP %s\n", msgb_hexdump_l2(msg)); - /* msc_dtap expects the dtap payload in l3h */ + /* ran_conn_dtap expects the dtap payload in l3h */ msg->l3h = msg->l2h + 3; OMSC_LINKID_CB(msg) = dtap->link_id; /* Forward dtap payload into the msc */ - msc_dtap(conn, msg); + ran_conn_dtap(conn, msg); return 0; } diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 3de7d27..c20dba2 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -687,7 +687,7 @@ if (!conn->received_cm_service_request) { conn->received_cm_service_request = true; - ran_conn_get(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_get(conn, RAN_CONN_USE_CM_SERVICE); } ran_conn_update_id(conn, conn->complete_layer3_type, mi_string); return conn->network->vlr->ops.tx_cm_serv_acc(conn); @@ -1332,7 +1332,7 @@ gsm48_pdisc_msgtype_name(pdisc, msg_type)); } conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); } /* TS 24.007 11.2.3.2.3 Message Type Octet / Duplicate Detection */ @@ -1584,7 +1584,7 @@ if (conn->received_cm_service_request) { conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); } return rc; @@ -1594,7 +1594,7 @@ osmo_static_assert(sizeof(((struct gsm0808_encrypt_info*)0)->key) >= sizeof(((struct osmo_auth_vector*)0)->kc), gsm0808_encrypt_info_key_fits_osmo_auth_vec_kc); -int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) +int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { struct gsm_network *net = conn->network; struct gsm0808_encrypt_info ei; @@ -1640,7 +1640,7 @@ vlr_subscr_name(conn->vsub), request_classmark_for_a5_n, request_classmark); - return msc_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv); + return ran_conn_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv); } if (ei.perm_algo_len == 0) { @@ -1694,7 +1694,7 @@ switch (conn->via_ran) { case RAN_GERAN_A: - return msc_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv); + return ran_conn_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv); case RAN_UTRAN_IU: #ifdef BUILD_IU @@ -1716,7 +1716,7 @@ return -ENOTSUP; } -void msc_rx_sec_mode_compl(struct ran_conn *conn) +void ran_conn_rx_sec_mode_compl(struct ran_conn *conn) { struct vlr_ciph_result vlr_res = {}; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 516fc51..8ac87c1 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -322,7 +322,7 @@ vlr_subscr_msisdn_or_name(transt->vsub)); OSMO_ASSERT(conn); /* Assign conn */ - transt->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC); + transt->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC); transt->paging_request = NULL; /* send SETUP request to called party */ gsm48_cc_tx_setup(transt, &transt->cc.msg); @@ -2005,7 +2005,7 @@ } /* Assign conn */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC); trans->dlci = 0x00; /* SAPI=0, not SACCH */ vlr_subscr_put(vsub); } else { @@ -2160,7 +2160,7 @@ return -ENOMEM; } /* Assign transaction */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC); trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */ cm_service_request_concludes(conn, msg); } diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 40c7472..03027ae 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -148,7 +148,7 @@ switch (event) { case GSM_PAGING_SUCCEEDED: /* Associate transaction with established connection */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); /* FIXME: specify SACCH in case we already have active TCH */ trans->dlci = 0x03; /* Confirm successful connection establishment */ @@ -1012,7 +1012,7 @@ conn = connection_for_subscr(vsub); if (conn) { /* Associate transaction with connection */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); /* Generate unique RP Message Reference */ trans->sms.sm_rp_mr = conn->next_rp_ref++; } @@ -1139,7 +1139,7 @@ gsm411_smr_init(&trans->sms.smr_inst, 0, 1, gsm411_rl_recv, gsm411_mn_send); - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */ new_trans = 1; diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index e1ea681..c0a0bdd 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -113,7 +113,7 @@ /* Count active NC SS/USSD sessions */ osmo_counter_inc(conn->network->active_nc_ss); - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS); trans->dlci = OMSC_LINKID_CB(msg); cm_service_request_concludes(conn, msg); } @@ -232,7 +232,7 @@ vlr_subscr_msisdn_or_name(transt->vsub)); /* Assign connection */ - transt->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS); + transt->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS); transt->paging_request = NULL; /* Send stored message */ @@ -324,7 +324,7 @@ conn = connection_for_subscr(vsub); if (conn) { /* Assign connection */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS); trans->dlci = 0x00; /* SAPI=0, not SACCH */ return trans; } diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index f9ed759..1e4ab19 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -172,7 +172,7 @@ uint8_t pdisc = gh->proto_discr & 0x0f; OSMO_ASSERT(pdisc != GSM48_PDISC_RR); - msc_dtap(conn, msg); + ran_conn_dtap(conn, msg); } else { /* allocate a new connection */ @@ -189,7 +189,7 @@ abort(); /* ownership of conn hereby goes to the MSC: */ - msc_compl_l3(conn, msg, 0); + ran_conn_compl_l3(conn, msg, 0); } return 0; diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c index 7358080..a657857 100644 --- a/src/libmsc/iucs_ranap.c +++ b/src/libmsc/iucs_ranap.c @@ -96,7 +96,7 @@ /* TODO evalute ies */ - msc_rx_sec_mode_compl(conn); + ran_conn_rx_sec_mode_compl(conn); return 0; } diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index c1b26e1..fc85dd1 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -79,7 +79,7 @@ } /* Receive a SAPI-N-REJECT from BSC */ -void msc_sapi_n_reject(struct ran_conn *conn, int dlci) +void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci) { int sapi = dlci & 0x7; @@ -90,21 +90,21 @@ /* receive a Level 3 Complete message. * Ownership of the conn is completely passed to the conn FSM, i.e. for both acceptance and rejection, * the conn FSM shall decide when to release this conn. It may already be discarded before this exits. */ -void msc_compl_l3(struct ran_conn *conn, - struct msgb *msg, uint16_t chosen_channel) +void ran_conn_compl_l3(struct ran_conn *conn, + struct msgb *msg, uint16_t chosen_channel) { - ran_conn_get(conn, MSC_CONN_USE_COMPL_L3); + ran_conn_get(conn, RAN_CONN_USE_COMPL_L3); gsm0408_dispatch(conn, msg); - ran_conn_put(conn, MSC_CONN_USE_COMPL_L3); + ran_conn_put(conn, RAN_CONN_USE_COMPL_L3); } /* Receive a DTAP message from BSC */ -void msc_dtap(struct ran_conn *conn, struct msgb *msg) +void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg) { - ran_conn_get(conn, MSC_CONN_USE_DTAP); + ran_conn_get(conn, RAN_CONN_USE_DTAP); gsm0408_dispatch(conn, msg); - ran_conn_put(conn, MSC_CONN_USE_DTAP); + ran_conn_put(conn, RAN_CONN_USE_DTAP); } /* Receive an ASSIGNMENT COMPLETE from BSC */ @@ -116,14 +116,14 @@ } /* Receive an ASSIGNMENT FAILURE from BSC */ -void msc_assign_fail(struct ran_conn *conn, +void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause) { LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n"); } /* Receive a CLASSMARK CHANGE from BSC */ -void msc_classmark_chg(struct ran_conn *conn, +void ran_conn_classmark_chg(struct ran_conn *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len) { @@ -159,7 +159,7 @@ } /* Receive a CIPHERING MODE COMPLETE from BSC */ -void msc_cipher_mode_compl(struct ran_conn *conn, +void ran_conn_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id) { struct vlr_ciph_result ciph_res = { .cause = VLR_CIPH_REJECT }; @@ -205,7 +205,7 @@ } /* Receive a CLEAR REQUEST from BSC */ -int msc_clear_request(struct ran_conn *conn, uint32_t cause) +int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause) { ran_conn_close(conn, cause); return 1; @@ -250,7 +250,7 @@ { OSMO_ASSERT(conn); - if (balance_token != MSC_CONN_USE_UNTRACKED) { + if (balance_token != RAN_CONN_USE_UNTRACKED) { uint32_t flag = 1 << balance_token; OSMO_ASSERT(balance_token < 32); if (conn->use_tokens & flag) @@ -277,7 +277,7 @@ { OSMO_ASSERT(conn); - if (balance_token != MSC_CONN_USE_UNTRACKED) { + if (balance_token != RAN_CONN_USE_UNTRACKED) { uint32_t flag = 1 << balance_token; OSMO_ASSERT(balance_token < 32); if (!(conn->use_tokens & flag)) @@ -312,16 +312,16 @@ } const struct value_string ran_conn_use_names[] = { - {MSC_CONN_USE_UNTRACKED, "UNTRACKED"}, - {MSC_CONN_USE_COMPL_L3, "compl_l3"}, - {MSC_CONN_USE_DTAP, "dtap"}, - {MSC_CONN_USE_AUTH_CIPH, "auth+ciph"}, - {MSC_CONN_USE_CM_SERVICE, "cm_service"}, - {MSC_CONN_USE_TRANS_CC, "trans_cc"}, - {MSC_CONN_USE_TRANS_SMS, "trans_sms"}, - {MSC_CONN_USE_TRANS_NC_SS, "trans_nc_ss"}, - {MSC_CONN_USE_SILENT_CALL, "silent_call"}, - {MSC_CONN_USE_RELEASE, "release"}, + {RAN_CONN_USE_UNTRACKED, "UNTRACKED"}, + {RAN_CONN_USE_COMPL_L3, "compl_l3"}, + {RAN_CONN_USE_DTAP, "dtap"}, + {RAN_CONN_USE_AUTH_CIPH, "auth+ciph"}, + {RAN_CONN_USE_CM_SERVICE, "cm_service"}, + {RAN_CONN_USE_TRANS_CC, "trans_cc"}, + {RAN_CONN_USE_TRANS_SMS, "trans_sms"}, + {RAN_CONN_USE_TRANS_NC_SS, "trans_nc_ss"}, + {RAN_CONN_USE_SILENT_CALL, "silent_call"}, + {RAN_CONN_USE_RELEASE, "release"}, {0, NULL}, }; diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index 6c6e217..c6c31a0 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -57,7 +57,7 @@ conn->lchan->ts->nr, conn->lchan->ts->trx->arfcn); #endif conn->silent_call = 1; - ran_conn_get(conn, MSC_CONN_USE_SILENT_CALL); + ran_conn_get(conn, RAN_CONN_USE_SILENT_CALL); /* increment lchan reference count */ osmo_signal_dispatch(SS_SCALL, S_SCALL_SUCCESS, &sigdata); break; @@ -162,7 +162,7 @@ #endif conn->silent_call = 0; - ran_conn_put(conn, MSC_CONN_USE_SILENT_CALL); + ran_conn_put(conn, RAN_CONN_USE_SILENT_CALL); return 0; } diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index b1c8bc9..5fab1c6 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -94,7 +94,7 @@ if (conn->complete_layer3_type == COMPLETE_LAYER3_CM_SERVICE_REQ && conn_accepted) { conn->received_cm_service_request = true; - ran_conn_get(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_get(conn, RAN_CONN_USE_CM_SERVICE); } if (conn_accepted) @@ -163,7 +163,7 @@ } } -int msc_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, +int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { int rc; @@ -190,14 +190,14 @@ * So far though, the only time we send a Classmark Request is during Ciphering. As soon * as more such situations arise, we need to add state to indicate what action should * follow after a Classmark Update is received (e.g. - * msc_classmark_request_then_cipher_mode_cmd() sets an enum value to indicate that + * ran_conn_classmark_request_then_cipher_mode_cmd() sets an enum value to indicate that * Ciphering should continue afterwards). But right now, it is accurate to always * continue with Ciphering: */ /* During Ciphering, we needed Classmark information. The Classmark Update has come in, * go back into the Set Ciphering Command procedure. */ osmo_fsm_inst_state_chg(fi, RAN_CONN_S_AUTH_CIPH, RAN_CONN_TIMEOUT, 0); - if (msc_geran_set_cipher_mode(conn, conn->geran_set_cipher_mode.umts_aka, + if (ran_conn_geran_set_cipher_mode(conn, conn->geran_set_cipher_mode.umts_aka, conn->geran_set_cipher_mode.retrieve_imeisv)) { LOGPFSML(fi, LOGL_ERROR, "Sending Cipher Mode Command failed, aborting attach\n"); @@ -341,13 +341,13 @@ /* Use count for either conn->a.waiting_for_clear_complete or * conn->iu.waiting_for_release_complete. 'get' it early, so we don't deallocate after tearing * down active transactions. Safeguard against double-get (though it shouldn't happen). */ - if (!ran_conn_used_by(conn, MSC_CONN_USE_RELEASE)) - ran_conn_get(conn, MSC_CONN_USE_RELEASE); + if (!ran_conn_used_by(conn, RAN_CONN_USE_RELEASE)) + ran_conn_get(conn, RAN_CONN_USE_RELEASE); /* Cancel pending CM Service Requests */ if (conn->received_cm_service_request) { conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); } /* Cancel all VLR FSMs, if any */ @@ -693,7 +693,7 @@ } if (*flag) { *flag = false; - ran_conn_put(conn, MSC_CONN_USE_RELEASE); + ran_conn_put(conn, RAN_CONN_USE_RELEASE); } } diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 5c80e5f..cf12066 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -140,21 +140,21 @@ */ void trans_free(struct gsm_trans *trans) { - enum ran_conn_use conn_usage_token = MSC_CONN_USE_UNTRACKED; + enum ran_conn_use conn_usage_token = RAN_CONN_USE_UNTRACKED; struct ran_conn *conn; switch (trans->protocol) { case GSM48_PDISC_CC: _gsm48_cc_trans_free(trans); - conn_usage_token = MSC_CONN_USE_TRANS_CC; + conn_usage_token = RAN_CONN_USE_TRANS_CC; break; case GSM48_PDISC_SMS: _gsm411_sms_trans_free(trans); - conn_usage_token = MSC_CONN_USE_TRANS_SMS; + conn_usage_token = RAN_CONN_USE_TRANS_SMS; break; case GSM48_PDISC_NC_SS: _gsm911_nc_ss_trans_free(trans); - conn_usage_token = MSC_CONN_USE_TRANS_NC_SS; + conn_usage_token = RAN_CONN_USE_TRANS_NC_SS; break; } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 5819e51..ef88c5a 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -404,7 +404,7 @@ cc_to_mncc_expect_tx("", MNCC_REL_CNF); dtap_expect_tx("032d"); /* CC: Release */ expect_iu_release(); - msc_clear_request(g_conn, 0); + ran_conn_clear_request(g_conn, 0); OSMO_ASSERT(cc_to_mncc_tx_confirmed); OSMO_ASSERT(iu_release_sent); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 92e0acc..2443e31 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -186,7 +186,7 @@ OSMO_ASSERT(conn->received_cm_service_request); conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); ASSERT_RELEASE_CLEAR(via_ran); } @@ -225,14 +225,14 @@ g_conn = conn_new(); reset_l3_seq_nr(); patch_l3_seq_nr(msg); - msc_compl_l3(g_conn, msg, 23); + ran_conn_compl_l3(g_conn, msg, 23); } else { patch_l3_seq_nr(msg); if ((gsm48_hdr_pdisc(gh) == GSM48_PDISC_RR) && (gsm48_hdr_msg_type(gh) == GSM48_MT_RR_CIPH_M_COMPL)) - msc_cipher_mode_compl(g_conn, msg, 0); + ran_conn_cipher_mode_compl(g_conn, msg, 0); else - msc_dtap(g_conn, msg); + ran_conn_dtap(g_conn, msg); } if (!conn_exists(g_conn)) @@ -842,7 +842,7 @@ OSMO_ASSERT(g_conn); OSMO_ASSERT(g_conn->via_ran == RAN_UTRAN_IU); OSMO_ASSERT(g_conn->iu.ue_ctx); - msc_rx_sec_mode_compl(g_conn); + ran_conn_rx_sec_mode_compl(g_conn); } void bss_sends_clear_complete() -- To view, visit https://gerrit.osmocom.org/12030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 Gerrit-Change-Number: 12030 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:48 +0000 Subject: Change in osmo-msc[master]: move subscr_conn.c to ran_conn.c Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12031 Change subject: move subscr_conn.c to ran_conn.c ...................................................................... move subscr_conn.c to ran_conn.c subscr_conn.c exclusively defines ran_conn related things. Rename the file. Change-Id: I6aa6b335842116c717a554c981083a914724ee21 --- M src/libmsc/Makefile.am R src/libmsc/ran_conn.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/12031/1 diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index 90bbbf8..9183ff9 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -44,13 +44,13 @@ mncc_sock.c \ msc_ifaces.c \ msc_mgcp.c \ + ran_conn.c \ rrlp.c \ silent_call.c \ sms_queue.c \ transaction.c \ osmo_msc.c \ ctrl_commands.c \ - subscr_conn.c \ $(NULL) if BUILD_IU libmsc_a_SOURCES += \ diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/ran_conn.c similarity index 99% rename from src/libmsc/subscr_conn.c rename to src/libmsc/ran_conn.c index 5fab1c6..9b63f16 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/ran_conn.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include -- To view, visit https://gerrit.osmocom.org/12031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6aa6b335842116c717a554c981083a914724ee21 Gerrit-Change-Number: 12031 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:48 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12033 Change subject: combine several small .h in msc_common.h ...................................................................... combine several small .h in msc_common.h For hysterical raisins, there are some header files that contain few declarations, and where the name doesn't reflect the content. Combine them to new msc_common.h: - common.h - common_cs.h - debug.h - osmo_msc.h => msc_common.h Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 --- M include/osmocom/msc/Makefile.am D include/osmocom/msc/common.h D include/osmocom/msc/common_cs.h D include/osmocom/msc/debug.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_data_shared.h A include/osmocom/msc/msc_common.h D include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/a_reset.c M src/libmsc/ctrl_commands.c M src/libmsc/db.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/mncc.c M src/libmsc/mncc_builtin.c M src/libmsc/mncc_sock.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/ran_conn.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.c M src/libmsc/sms_queue.c M src/libmsc/transaction.c M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_lu_fsm.c M src/osmo-msc/msc_main.c M src/utils/smpp_mirror.c M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h M tests/smpp/smpp_test.c M tests/sms_queue/sms_queue_test.c 45 files changed, 52 insertions(+), 113 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/12033/1 diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index 9fa58c7..ca83b2d 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -1,10 +1,7 @@ noinst_HEADERS = \ a_iface.h \ a_iface_bssap.h \ - common.h \ - common_cs.h \ db.h \ - debug.h \ gsm_04_08.h \ gsm_04_11.h \ gsm_04_14.h \ @@ -18,10 +15,10 @@ iu_dummy.h \ mncc.h \ mncc_int.h \ + msc_common.h \ msc_ifaces.h \ msc_mgcp.h \ a_reset.h \ - osmo_msc.h \ ran_conn.h \ rrlp.h \ signal.h \ diff --git a/include/osmocom/msc/common.h b/include/osmocom/msc/common.h deleted file mode 100644 index d91b3d3..0000000 --- a/include/osmocom/msc/common.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -enum nsap_addr_enc { - NSAP_ADDR_ENC_X213, - NSAP_ADDR_ENC_V4RAW, -}; diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h deleted file mode 100644 index 14fe618..0000000 --- a/include/osmocom/msc/common_cs.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -struct msgb; -struct gsm_network; - -typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); - -struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); diff --git a/include/osmocom/msc/debug.h b/include/osmocom/msc/debug.h deleted file mode 100644 index 717cf74..0000000 --- a/include/osmocom/msc/debug.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include - -/* Debug Areas of the code */ -enum { - DRLL, - DCC, - DMM, - DRR, - DMNCC, - DPAG, - DMSC, - DMGCP, - DHO, - DDB, - DREF, - DCTRL, - DSMPP, - DRANAP, - DVLR, - DIUCS, - DBSSAP, - Debug_LastEntry, -}; diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 35ec752..3ffa100 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -13,10 +13,10 @@ #include #include -#include -#include #include +#include + #include "gsm_data_shared.h" /* TS 48.008 DLCI containing DCCH/ACCH + SAPI */ diff --git a/include/osmocom/msc/gsm_data_shared.h b/include/osmocom/msc/gsm_data_shared.h index f71e92b..732607b 100644 --- a/include/osmocom/msc/gsm_data_shared.h +++ b/include/osmocom/msc/gsm_data_shared.h @@ -12,8 +12,6 @@ #include #include -#include - struct osmo_bsc_data; struct osmo_bsc_sccp_con; diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h new file mode 100644 index 0000000..d0c2c0b --- /dev/null +++ b/include/osmocom/msc/msc_common.h @@ -0,0 +1,43 @@ +#pragma once + +struct msgb; +struct gsm_network; +struct vlr_subscr; + +#define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" +#define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT + +enum msc_debug_categories { + DRLL, + DCC, + DMM, + DRR, + DMNCC, + DPAG, + DMSC, + DMGCP, + DHO, + DDB, + DREF, + DCTRL, + DSMPP, + DRANAP, + DVLR, + DIUCS, + DBSSAP, + Debug_LastEntry +}; + +enum nsap_addr_enc { + NSAP_ADDR_ENC_X213, + NSAP_ADDR_ENC_V4RAW, +}; + +typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); + +struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); + +int msc_vlr_alloc(struct gsm_network *net); +int msc_vlr_start(struct gsm_network *net); + +void msc_stop_paging(struct vlr_subscr *vsub); diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h deleted file mode 100644 index 1512017..0000000 --- a/include/osmocom/msc/osmo_msc.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -/* Routines for the MSC handling */ - -struct gsm_network; -struct vlr_subscr; - -#define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" -#define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT - -int msc_vlr_alloc(struct gsm_network *net); -int msc_vlr_start(struct gsm_network *net); - -void msc_stop_paging(struct vlr_subscr *vsub); diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 82519d6..14744fc 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -39,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 4d03d23..c31be29 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -27,11 +27,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include diff --git a/src/libmsc/a_reset.c b/src/libmsc/a_reset.c index 1e35a10..6c2b5cb 100644 --- a/src/libmsc/a_reset.c +++ b/src/libmsc/a_reset.c @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #define RESET_RESEND_INTERVAL 2 /* sec */ #define RESET_RESEND_TIMER_NO 16 /* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.2 */ diff --git a/src/libmsc/ctrl_commands.c b/src/libmsc/ctrl_commands.c index e37cc94..1d877cb 100644 --- a/src/libmsc/ctrl_commands.c +++ b/src/libmsc/ctrl_commands.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/src/libmsc/db.c b/src/libmsc/db.c index b5e7ad8..c11c6d2 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index c20dba2..83f8d99 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -35,7 +35,6 @@ #include "bscconfig.h" #include -#include #include #include #include @@ -46,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 8ac87c1..1d9ec57 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -33,7 +33,6 @@ #include "bscconfig.h" #include -#include #include #include #include @@ -44,7 +43,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 03027ae..191b6bb 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -43,7 +43,6 @@ #include #include -#include #include #include #include @@ -52,7 +51,6 @@ #include #include #include -#include #include #ifdef BUILD_SMPP diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c index 8fe03a8..f7e225d 100644 --- a/src/libmsc/gsm_04_14.c +++ b/src/libmsc/gsm_04_14.c @@ -26,7 +26,6 @@ #include "bscconfig.h" -#include #include #include #include diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index c0a0bdd..b5f586a 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -41,8 +41,6 @@ #include #include -#include -#include #include #include #include diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index a5bf745..a4ebf5f 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -42,11 +42,9 @@ #include #include -#include #include #include #include -#include #include #include diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index 1e4ab19..062317b 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -26,12 +26,10 @@ #include #include -#include #include #include #include -#include #include #include diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c index a657857..da64333 100644 --- a/src/libmsc/iucs_ranap.c +++ b/src/libmsc/iucs_ranap.c @@ -31,13 +31,11 @@ #include #include -#include #include #include #include #include #include -#include #include #include diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c index d2cd170..f4c8c7e 100644 --- a/src/libmsc/mncc.c +++ b/src/libmsc/mncc.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c index 135a5e4..bc37b4a 100644 --- a/src/libmsc/mncc_builtin.c +++ b/src/libmsc/mncc_builtin.c @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c index 57b4bd8..47a7a6c 100644 --- a/src/libmsc/mncc_sock.c +++ b/src/libmsc/mncc_sock.c @@ -35,7 +35,6 @@ #include #include -#include #include #include #include diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c index 8ae34fc..4559e96 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -20,7 +20,6 @@ #include -#include #include #include #include diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 1ddec08..c2b7441 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 598916a..03dbbc9 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -43,7 +43,6 @@ #endif #include -#include #include #include #include diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index fc85dd1..9d93d50 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -21,12 +21,9 @@ * */ -#include -#include #include #include #include -#include #include #include #include diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index 9b63f16..5cb62ef 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -27,7 +27,6 @@ #include #include -#include #include #include #include diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index 6ff30b7..32844f5 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -25,7 +25,6 @@ #include #include -#include #include #include diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index c6c31a0..da9df6c 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -26,10 +26,8 @@ #include #include -#include #include #include -#include #include /* paging of the requested subscriber has completed */ diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 10f3cfa..0f0871d 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index ea5303c..87295cd 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -41,7 +41,6 @@ #include "smpp_smsc.h" -#include #include /*! \brief Ugly wrapper. libsmpp34 should do this itself! */ diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 9907f4f..fd38d50 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index cf12066..dfb1acf 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -21,11 +21,9 @@ #include #include #include -#include #include #include #include -#include #include void *tall_trans_ctx; diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 189cb66..c777d8a 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 3a0760d..0642d1d 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "vlr_core.h" #include "vlr_auth_fsm.h" diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index d5a8555..6384d39 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "vlr_core.h" #include "vlr_auth_fsm.h" diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 02e49e0..637eb97 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -22,7 +22,6 @@ #include #include #include -#include #include "vlr_core.h" #include "vlr_auth_fsm.h" diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index a139046..f300b3d 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -41,12 +41,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c index 3053553..f464425 100644 --- a/src/utils/smpp_mirror.c +++ b/src/utils/smpp_mirror.c @@ -17,8 +17,9 @@ #include #include #include +#include -#include +#include /* FIXME: merge with smpp_smsc.c */ #define SMPP_SYS_ID_LEN 16 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 2443e31..861e56f 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index f308a03..f7ff940 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -27,7 +27,6 @@ #include #include -#include #include #include diff --git a/tests/smpp/smpp_test.c b/tests/smpp/smpp_test.c index 1abb63b..1d1edca 100644 --- a/tests/smpp/smpp_test.c +++ b/tests/smpp/smpp_test.c @@ -20,10 +20,11 @@ #include #include -#include - #include #include +#include + +#include #include "smpp_smsc.h" diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index 6ce0b88..e9443e0 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -23,7 +23,6 @@ #include -#include #include static void *talloc_ctx = NULL; -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:48 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12032 Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... move ran_conn declarations to new ran_conn.h With the dawn of inter-BSC,MSC handover, adopting the MSC-A,-I,-T roles from 3GPP TS 49.008, the RAN connection shall soon be a neatly separated corner of osmo-msc, so gravitate ran_conn decarations to files of matching name. Also, the current chaos of API defined in files with mismatching/meaningless names drives me crazy. Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h A include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/rrlp.c 8 files changed, 242 insertions(+), 240 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/12032/1 diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index 28e4b14..9fa58c7 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -22,6 +22,7 @@ msc_mgcp.h \ a_reset.h \ osmo_msc.h \ + ran_conn.h \ rrlp.h \ signal.h \ silent_call.h \ diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 0028a3d..35ec752 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -34,7 +33,6 @@ struct mncc_sock_state; struct vlr_instance; struct vlr_subscr; -struct ranap_ue_conn_ctx; #define tmsi_from_string(str) strtoul(str, NULL, 10) @@ -51,139 +49,6 @@ }; #define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ -enum ran_type { - RAN_UNKNOWN, - RAN_GERAN_A, /* 2G / A-interface */ - RAN_UTRAN_IU, /* 3G / Iu-interface (IuCS or IuPS) */ -}; - -extern const struct value_string ran_type_names[]; -static inline const char *ran_type_name(enum ran_type val) -{ return get_value_string(ran_type_names, val); } - -struct gsm_classmark { - bool classmark1_set; - struct gsm48_classmark1 classmark1; - uint8_t classmark2_len; - uint8_t classmark2[3]; - uint8_t classmark3_len; - uint8_t classmark3[14]; /* if cm3 gets extended by spec, it will be truncated */ -}; - -enum integrity_protection_state { - INTEGRITY_PROTECTION_NONE = 0, - INTEGRITY_PROTECTION_IK = 1, - INTEGRITY_PROTECTION_IK_CK = 2, -}; - -enum complete_layer3_type { - COMPLETE_LAYER3_NONE, - COMPLETE_LAYER3_LU, - COMPLETE_LAYER3_CM_SERVICE_REQ, - COMPLETE_LAYER3_PAGING_RESP, -}; - -extern const struct value_string complete_layer3_type_names[]; -static inline const char *complete_layer3_type_name(enum complete_layer3_type val) -{ - return get_value_string(complete_layer3_type_names, val); -} - -/* active radio connection of a mobile subscriber */ -struct ran_conn { - /* global linked list of ran_conn instances */ - struct llist_head entry; - - /* FSM instance to control the RAN connection's permissions and lifetime. */ - struct osmo_fsm_inst *fi; - enum complete_layer3_type complete_layer3_type; - - /* usage count. If this drops to zero, we start the release - * towards A/Iu */ - uint32_t use_count; - uint32_t use_tokens; - - /* The MS has opened the conn with a CM Service Request, and we shall - * keep it open for an actual request (or until timeout). */ - bool received_cm_service_request; - - /* libmsc/libvlr subscriber information (if available) */ - struct vlr_subscr *vsub; - - /* LU expiration handling */ - uint8_t expire_timer_stopped; - /* SMS helpers for libmsc */ - uint8_t next_rp_ref; - - /* Are we part of a special "silent" call */ - int silent_call; - - /* back pointers */ - struct gsm_network *network; - - /* connected via 2G or 3G? */ - enum ran_type via_ran; - - uint16_t lac; - - /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still - * wants to request a Classmark Update first. */ - struct { - bool umts_aka; - bool retrieve_imeisv; - } geran_set_cipher_mode; - - /* N(SD) expected in the received frame, per flow (TS 24.007 11.2.3.2.3.2.2) */ - uint8_t n_sd_next[4]; - - struct { - struct mgcp_ctx *mgcp_ctx; - unsigned int mgcp_rtp_endpoint; - - uint16_t local_port_ran; - char local_addr_ran[INET_ADDRSTRLEN]; - uint16_t remote_port_ran; - char remote_addr_ran[INET_ADDRSTRLEN]; - enum mgcp_codecs codec_ran; - - uint16_t local_port_cn; - char local_addr_cn[INET_ADDRSTRLEN]; - uint16_t remote_port_cn; - char remote_addr_cn[INET_ADDRSTRLEN]; - enum mgcp_codecs codec_cn; - } rtp; - - /* which Iu-CS connection, if any. */ - struct { - struct ranap_ue_conn_ctx *ue_ctx; - uint8_t rab_id; - bool waiting_for_release_complete; - } iu; - - struct { - /* A pointer to the SCCP user that handles - * the SCCP connections for this subscriber - * connection */ - struct osmo_sccp_user *scu; - - /* The address of the BSC that is associated - * with this RAN connection */ - struct osmo_sccp_addr bsc_addr; - - /* The connection identifier that is used - * to reference the SCCP connection that is - * associated with this RAN connection */ - uint32_t conn_id; - - bool waiting_for_clear_complete; - } a; - - /* Temporary storage for Classmark Information for times when a connection has no VLR subscriber - * associated yet. It will get copied to the VLR subscriber upon msc_vlr_subscr_assoc(). */ - struct gsm_classmark temporary_classmark; -}; - - enum { MSC_CTR_LOC_UPDATE_TYPE_ATTACH, MSC_CTR_LOC_UPDATE_TYPE_NORMAL, diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index ec2d3a4..428b889 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -8,6 +8,8 @@ #include +struct ran_conn; + #define GSM_NAME_LENGTH 160 #define GSM_EXTENSION_LENGTH 15 /* MSISDN can only be 15 digits length */ diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index ddd8837..9d8b01d 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -23,6 +23,8 @@ #include #include +struct ran_conn; + /* MGCP state handler context. This context information stores all information * to handle the direction of the RTP streams via MGCP. There is one instance * of this context struct per RAN connection. diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index d8b34d6..1512017 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -1,114 +1,14 @@ +#pragma once + /* Routines for the MSC handling */ -#ifndef OSMO_MSC_H -#define OSMO_MSC_H - -#include -#include - -#include +struct gsm_network; +struct vlr_subscr; #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT -enum ran_conn_fsm_event { - /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ - RAN_CONN_E_COMPLETE_LAYER_3, - /* Received Classmark Update, typically neede for Ciphering Mode Command */ - RAN_CONN_E_CLASSMARK_UPDATE, - /* LU or Process Access FSM has determined that this conn is good */ - RAN_CONN_E_ACCEPTED, - /* received first reply from MS in "real" CC, SMS, USSD communication */ - RAN_CONN_E_COMMUNICATING, - /* Some async action has completed, check again whether all is done */ - RAN_CONN_E_RELEASE_WHEN_UNUSED, - /* MS/BTS/BSC originated close request */ - RAN_CONN_E_MO_CLOSE, - /* MSC originated close request, e.g. failed authentication */ - RAN_CONN_E_CN_CLOSE, - /* The usage count for the conn has reached zero */ - RAN_CONN_E_UNUSED, -}; - -enum ran_conn_fsm_state { - RAN_CONN_S_NEW, - RAN_CONN_S_AUTH_CIPH, - RAN_CONN_S_WAIT_CLASSMARK_UPDATE, - RAN_CONN_S_ACCEPTED, - RAN_CONN_S_COMMUNICATING, - RAN_CONN_S_RELEASING, - RAN_CONN_S_RELEASED, -}; - -struct ran_conn *ran_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac); - -void ran_conn_update_id(struct ran_conn *conn, enum complete_layer3_type from, const char *id); -char *ran_conn_get_conn_id(struct ran_conn *conn); - -void ran_conn_complete_layer_3(struct ran_conn *conn); - int msc_vlr_alloc(struct gsm_network *net); int msc_vlr_start(struct gsm_network *net); -void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci); -int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause); -void ran_conn_compl_l3(struct ran_conn *conn, - struct msgb *msg, uint16_t chosen_channel); -void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg); -int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, - bool retrieve_imeisv); -int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); -void ran_conn_cipher_mode_compl(struct ran_conn *conn, - struct msgb *msg, uint8_t alg_id); -void ran_conn_rx_sec_mode_compl(struct ran_conn *conn); -void ran_conn_classmark_chg(struct ran_conn *conn, - const uint8_t *cm2, uint8_t cm2_len, - const uint8_t *cm3, uint8_t cm3_len); -void ran_conn_assign_fail(struct ran_conn *conn, - uint8_t cause, uint8_t *rr_cause); - -void ran_conn_init(void); -bool ran_conn_is_accepted(const struct ran_conn *conn); -bool ran_conn_is_establishing_auth_ciph(const struct ran_conn *conn); -void ran_conn_communicating(struct ran_conn *conn); -void ran_conn_close(struct ran_conn *conn, uint32_t cause); -void ran_conn_mo_close(struct ran_conn *conn, uint32_t cause); -bool ran_conn_in_release(struct ran_conn *conn); - -void ran_conn_rx_bssmap_clear_complete(struct ran_conn *conn); -void ran_conn_rx_iu_release_complete(struct ran_conn *conn); - -enum ran_conn_use { - RAN_CONN_USE_UNTRACKED = -1, - RAN_CONN_USE_COMPL_L3, - RAN_CONN_USE_DTAP, - RAN_CONN_USE_AUTH_CIPH, - RAN_CONN_USE_CM_SERVICE, - RAN_CONN_USE_TRANS_CC, - RAN_CONN_USE_TRANS_SMS, - RAN_CONN_USE_TRANS_NC_SS, - RAN_CONN_USE_SILENT_CALL, - RAN_CONN_USE_RELEASE, -}; - -extern const struct value_string ran_conn_use_names[]; -static inline const char *ran_conn_use_name(enum ran_conn_use val) -{ return get_value_string(ran_conn_use_names, val); } - -#define ran_conn_get(conn, balance_token) \ - _ran_conn_get(conn, balance_token, __FILE__, __LINE__) -#define ran_conn_put(conn, balance_token) \ - _ran_conn_put(conn, balance_token, __FILE__, __LINE__) -struct ran_conn * -_ran_conn_get(struct ran_conn *conn, - enum ran_conn_use balance_token, - const char *file, int line); -void _ran_conn_put(struct ran_conn *conn, - enum ran_conn_use balance_token, - const char *file, int line); -bool ran_conn_used_by(struct ran_conn *conn, - enum ran_conn_use token); - void msc_stop_paging(struct vlr_subscr *vsub); - -#endif diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h new file mode 100644 index 0000000..10771b1 --- /dev/null +++ b/include/osmocom/msc/ran_conn.h @@ -0,0 +1,231 @@ +#pragma once +/* MSC RAN connection implementation */ + +#include + +#include +#include +#include + +enum ran_type { + RAN_UNKNOWN, + RAN_GERAN_A, /* 2G / A-interface */ + RAN_UTRAN_IU, /* 3G / Iu-interface (IuCS or IuPS) */ +}; + +extern const struct value_string ran_type_names[]; +static inline const char *ran_type_name(enum ran_type val) +{ return get_value_string(ran_type_names, val); } + +enum ran_conn_fsm_event { + /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ + RAN_CONN_E_COMPLETE_LAYER_3, + /* Received Classmark Update, typically neede for Ciphering Mode Command */ + RAN_CONN_E_CLASSMARK_UPDATE, + /* LU or Process Access FSM has determined that this conn is good */ + RAN_CONN_E_ACCEPTED, + /* received first reply from MS in "real" CC, SMS, USSD communication */ + RAN_CONN_E_COMMUNICATING, + /* Some async action has completed, check again whether all is done */ + RAN_CONN_E_RELEASE_WHEN_UNUSED, + /* MS/BTS/BSC originated close request */ + RAN_CONN_E_MO_CLOSE, + /* MSC originated close request, e.g. failed authentication */ + RAN_CONN_E_CN_CLOSE, + /* The usage count for the conn has reached zero */ + RAN_CONN_E_UNUSED, +}; + +enum ran_conn_fsm_state { + RAN_CONN_S_NEW, + RAN_CONN_S_AUTH_CIPH, + RAN_CONN_S_WAIT_CLASSMARK_UPDATE, + RAN_CONN_S_ACCEPTED, + RAN_CONN_S_COMMUNICATING, + RAN_CONN_S_RELEASING, + RAN_CONN_S_RELEASED, +}; + +enum integrity_protection_state { + INTEGRITY_PROTECTION_NONE = 0, + INTEGRITY_PROTECTION_IK = 1, + INTEGRITY_PROTECTION_IK_CK = 2, +}; + +enum complete_layer3_type { + COMPLETE_LAYER3_NONE, + COMPLETE_LAYER3_LU, + COMPLETE_LAYER3_CM_SERVICE_REQ, + COMPLETE_LAYER3_PAGING_RESP, +}; + +extern const struct value_string complete_layer3_type_names[]; +static inline const char *complete_layer3_type_name(enum complete_layer3_type val) +{ + return get_value_string(complete_layer3_type_names, val); +} + +struct gsm_classmark { + bool classmark1_set; + struct gsm48_classmark1 classmark1; + uint8_t classmark2_len; + uint8_t classmark2[3]; + uint8_t classmark3_len; + uint8_t classmark3[14]; /* if cm3 gets extended by spec, it will be truncated */ +}; + +/* active radio connection of a mobile subscriber */ +struct ran_conn { + /* global linked list of ran_conn instances */ + struct llist_head entry; + + /* FSM instance to control the RAN connection's permissions and lifetime. */ + struct osmo_fsm_inst *fi; + enum complete_layer3_type complete_layer3_type; + + /* usage count. If this drops to zero, we start the release + * towards A/Iu */ + uint32_t use_count; + uint32_t use_tokens; + + /* The MS has opened the conn with a CM Service Request, and we shall + * keep it open for an actual request (or until timeout). */ + bool received_cm_service_request; + + /* libmsc/libvlr subscriber information (if available) */ + struct vlr_subscr *vsub; + + /* LU expiration handling */ + uint8_t expire_timer_stopped; + /* SMS helpers for libmsc */ + uint8_t next_rp_ref; + + /* Are we part of a special "silent" call */ + int silent_call; + + /* back pointers */ + struct gsm_network *network; + + /* connected via 2G or 3G? */ + enum ran_type via_ran; + + uint16_t lac; + + /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still + * wants to request a Classmark Update first. */ + struct { + bool umts_aka; + bool retrieve_imeisv; + } geran_set_cipher_mode; + + /* N(SD) expected in the received frame, per flow (TS 24.007 11.2.3.2.3.2.2) */ + uint8_t n_sd_next[4]; + + struct { + struct mgcp_ctx *mgcp_ctx; + unsigned int mgcp_rtp_endpoint; + + uint16_t local_port_ran; + char local_addr_ran[INET_ADDRSTRLEN]; + uint16_t remote_port_ran; + char remote_addr_ran[INET_ADDRSTRLEN]; + enum mgcp_codecs codec_ran; + + uint16_t local_port_cn; + char local_addr_cn[INET_ADDRSTRLEN]; + uint16_t remote_port_cn; + char remote_addr_cn[INET_ADDRSTRLEN]; + enum mgcp_codecs codec_cn; + } rtp; + + /* which Iu-CS connection, if any. */ + struct { + struct ranap_ue_conn_ctx *ue_ctx; + uint8_t rab_id; + bool waiting_for_release_complete; + } iu; + + struct { + /* A pointer to the SCCP user that handles + * the SCCP connections for this subscriber + * connection */ + struct osmo_sccp_user *scu; + + /* The address of the BSC that is associated + * with this RAN connection */ + struct osmo_sccp_addr bsc_addr; + + /* The connection identifier that is used + * to reference the SCCP connection that is + * associated with this RAN connection */ + uint32_t conn_id; + + bool waiting_for_clear_complete; + } a; + + /* Temporary storage for Classmark Information for times when a connection has no VLR subscriber + * associated yet. It will get copied to the VLR subscriber upon msc_vlr_subscr_assoc(). */ + struct gsm_classmark temporary_classmark; +}; + +struct ran_conn *ran_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac); + +void ran_conn_update_id(struct ran_conn *conn, enum complete_layer3_type from, const char *id); +char *ran_conn_get_conn_id(struct ran_conn *conn); + +void ran_conn_complete_layer_3(struct ran_conn *conn); + +void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci); +int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause); +void ran_conn_compl_l3(struct ran_conn *conn, + struct msgb *msg, uint16_t chosen_channel); +void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg); +int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, + bool retrieve_imeisv); +int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); +void ran_conn_cipher_mode_compl(struct ran_conn *conn, + struct msgb *msg, uint8_t alg_id); +void ran_conn_rx_sec_mode_compl(struct ran_conn *conn); +void ran_conn_classmark_chg(struct ran_conn *conn, + const uint8_t *cm2, uint8_t cm2_len, + const uint8_t *cm3, uint8_t cm3_len); +void ran_conn_assign_fail(struct ran_conn *conn, + uint8_t cause, uint8_t *rr_cause); + +void ran_conn_init(void); +bool ran_conn_is_accepted(const struct ran_conn *conn); +bool ran_conn_is_establishing_auth_ciph(const struct ran_conn *conn); +void ran_conn_communicating(struct ran_conn *conn); +void ran_conn_close(struct ran_conn *conn, uint32_t cause); +void ran_conn_mo_close(struct ran_conn *conn, uint32_t cause); +bool ran_conn_in_release(struct ran_conn *conn); + +void ran_conn_rx_bssmap_clear_complete(struct ran_conn *conn); +void ran_conn_rx_iu_release_complete(struct ran_conn *conn); + +enum ran_conn_use { + RAN_CONN_USE_UNTRACKED = -1, + RAN_CONN_USE_COMPL_L3, + RAN_CONN_USE_DTAP, + RAN_CONN_USE_AUTH_CIPH, + RAN_CONN_USE_CM_SERVICE, + RAN_CONN_USE_TRANS_CC, + RAN_CONN_USE_TRANS_SMS, + RAN_CONN_USE_TRANS_NC_SS, + RAN_CONN_USE_SILENT_CALL, + RAN_CONN_USE_RELEASE, +}; + +extern const struct value_string ran_conn_use_names[]; +static inline const char *ran_conn_use_name(enum ran_conn_use val) +{ return get_value_string(ran_conn_use_names, val); } + +#define ran_conn_get(conn, balance_token) \ + _ran_conn_get(conn, balance_token, __FILE__, __LINE__) +#define ran_conn_put(conn, balance_token) \ + _ran_conn_put(conn, balance_token, __FILE__, __LINE__) +struct ran_conn * _ran_conn_get(struct ran_conn *conn, enum ran_conn_use balance_token, + const char *file, int line); +void _ran_conn_put(struct ran_conn *conn, enum ran_conn_use balance_token, + const char *file, int line); +bool ran_conn_used_by(struct ran_conn *conn, enum ran_conn_use token); diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 6e16903..1168c32 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include // for GSM_NAME_LENGTH #include #include diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index c0747cd..6ff30b7 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -27,6 +27,7 @@ #include #include #include +#include /* RRLP msPositionReq, nsBased, * Accuracy=60, Method=gps, ResponseTime=2, oneSet */ -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:48 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop some unused opaque struct defs Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12034 Change subject: cosmetic: drop some unused opaque struct defs ...................................................................... cosmetic: drop some unused opaque struct defs Change-Id: I4d461dd39d0abdc4f2327445671459340ca1c946 --- M include/osmocom/msc/db.h M include/osmocom/msc/iu_dummy.h M src/libmsc/iu_dummy.c 3 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/12034/1 diff --git a/include/osmocom/msc/db.h b/include/osmocom/msc/db.h index a1de7d6..6d07055 100644 --- a/include/osmocom/msc/db.h +++ b/include/osmocom/msc/db.h @@ -24,10 +24,7 @@ #include "gsm_subscriber.h" -struct gsm_equipment; struct gsm_network; -struct gsm_auth_info; -struct gsm_auth_tuple; struct gsm_sms; /* one time initialisation */ diff --git a/include/osmocom/msc/iu_dummy.h b/include/osmocom/msc/iu_dummy.h index d5e1428..01a8aa6 100644 --- a/include/osmocom/msc/iu_dummy.h +++ b/include/osmocom/msc/iu_dummy.h @@ -29,7 +29,6 @@ #include struct msgb; -struct gsm_auth_tuple; struct RANAP_Cause; struct osmo_auth_vector; diff --git a/src/libmsc/iu_dummy.c b/src/libmsc/iu_dummy.c index bb53367..3f11d94 100644 --- a/src/libmsc/iu_dummy.c +++ b/src/libmsc/iu_dummy.c @@ -34,7 +34,6 @@ struct msgb; struct ranap_ue_conn_ctx; -struct gsm_auth_tuple; struct RANAP_Cause; struct osmo_auth_vector; -- To view, visit https://gerrit.osmocom.org/12034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4d461dd39d0abdc4f2327445671459340ca1c946 Gerrit-Change-Number: 12034 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:49 +0000 Subject: Change in osmo-msc[master]: move gsm_auth_tuple to vlr.h as vlr_auth_tuple Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12035 Change subject: move gsm_auth_tuple to vlr.h as vlr_auth_tuple ...................................................................... move gsm_auth_tuple to vlr.h as vlr_auth_tuple Along goes GSM_KEYSEQ_INVAL as VLR_*. It's where it logically belongs, and is almost the only reason why vlr.h includes gsm_data.h. The remaining reason, GSM_EXTENSION_LENGTH, will be moved by upcoming patch. Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M src/libvlr/vlr_auth_fsm.c M tests/msc_vlr/msc_vlr_tests.c 7 files changed, 27 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/12035/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 3ffa100..30a3c79 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -42,13 +42,6 @@ struct msgb *msg, void *data, void *param); -struct gsm_auth_tuple { - int use_count; - int key_seq; - struct osmo_auth_vector vec; -}; -#define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ - enum { MSC_CTR_LOC_UPDATE_TYPE_ATTACH, MSC_CTR_LOC_UPDATE_TYPE_NORMAL, diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 1168c32..1865618 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -77,6 +77,14 @@ VLR_CIPH_COMPL, }; +struct vlr_auth_tuple { + int use_count; + int key_seq; + struct osmo_auth_vector vec; +}; +#define VLR_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ + + struct vlr_ciph_result { enum vlr_ciph_result_cause cause; char imeisv[GSM48_MI_SIZE]; @@ -122,8 +130,8 @@ uint32_t age_indicator; /* 2.17.1 */ /* Authentication Data */ - struct gsm_auth_tuple auth_tuples[5]; /* 2.3.1-2.3.4 */ - struct gsm_auth_tuple *last_tuple; + struct vlr_auth_tuple auth_tuples[5]; /* 2.3.1-2.3.4 */ + struct vlr_auth_tuple *last_tuple; enum vlr_subscr_security_context sec_ctx; /* Data local to VLR is below */ @@ -205,7 +213,7 @@ * \param[in] at auth tuple providing rand, key_seq and autn. * \param[in] send_autn True to send AUTN, for r99 UMTS auth. */ - int (*tx_auth_req)(void *msc_conn_ref, struct gsm_auth_tuple *at, + int (*tx_auth_req)(void *msc_conn_ref, struct vlr_auth_tuple *at, bool send_autn); /* encode + transmit an AUTH REJECT towards the MS */ int (*tx_auth_rej)(void *msc_conn_ref); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 83f8d99..e159419 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1513,7 +1513,7 @@ ***********************************************************************/ /* VLR asks us to send an authentication request */ -static int msc_vlr_tx_auth_req(void *msc_conn_ref, struct gsm_auth_tuple *at, +static int msc_vlr_tx_auth_req(void *msc_conn_ref, struct vlr_auth_tuple *at, bool send_autn) { struct ran_conn *conn = msc_conn_ref; @@ -1599,7 +1599,7 @@ int i, j = 0; int request_classmark = 0; int request_classmark_for_a5_n = 0; - struct gsm_auth_tuple *tuple = conn->vsub->last_tuple; + struct vlr_auth_tuple *tuple = conn->vsub->last_tuple; if (!conn || !conn->vsub || !conn->vsub->last_tuple) { /* This should really never happen, because we checked this in msc_vlr_set_ciph_mode() @@ -1672,7 +1672,7 @@ { struct ran_conn *conn = msc_conn_ref; struct vlr_subscr *vsub; - struct gsm_auth_tuple *tuple; + struct vlr_auth_tuple *tuple; if (!conn || !conn->vsub) { LOGP(DMM, LOGL_ERROR, "Cannot send Ciphering Mode Command to" diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 03dbbc9..87e59f6 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -601,7 +601,7 @@ #endif if (vsub->last_tuple) { - struct gsm_auth_tuple *t = vsub->last_tuple; + struct vlr_auth_tuple *t = vsub->last_tuple; vty_out(vty, " A3A8 last tuple (used %d times):%s", t->use_count, VTY_NEWLINE); vty_out(vty, " seq # : %d%s", diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index c777d8a..b424563 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -241,7 +241,7 @@ vsub->tmsi_new = GSM_RESERVED_TMSI; for (i = 0; i < ARRAY_SIZE(vsub->auth_tuples); i++) - vsub->auth_tuples[i].key_seq = GSM_KEY_SEQ_INVAL; + vsub->auth_tuples[i].key_seq = VLR_KEY_SEQ_INVAL; INIT_LLIST_HEAD(&vsub->cs.requests); INIT_LLIST_HEAD(&vsub->ps.pdp_list); @@ -660,7 +660,7 @@ if (gsup->num_auth_vectors) { memset(&vsub->auth_tuples, 0, sizeof(vsub->auth_tuples)); for (i = 0; i < ARRAY_SIZE(vsub->auth_tuples); i++) - vsub->auth_tuples[i].key_seq = GSM_KEY_SEQ_INVAL; + vsub->auth_tuples[i].key_seq = VLR_KEY_SEQ_INVAL; } got_tuples = 0; diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index 6384d39..ca072b1 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -64,13 +64,13 @@ * least used auth tuple without enforcing a maximum use count. If there are * no auth tuples, return NULL. */ -static struct gsm_auth_tuple * +static struct vlr_auth_tuple * _vlr_subscr_next_auth_tuple(struct vlr_subscr *vsub, int max_reuse_count) { unsigned int count; unsigned int idx; - struct gsm_auth_tuple *at = NULL; - unsigned int key_seq = GSM_KEY_SEQ_INVAL; + struct vlr_auth_tuple *at = NULL; + unsigned int key_seq = VLR_KEY_SEQ_INVAL; if (!vsub) return NULL; @@ -78,7 +78,7 @@ if (vsub->last_tuple) key_seq = vsub->last_tuple->key_seq; - if (key_seq == GSM_KEY_SEQ_INVAL) + if (key_seq == VLR_KEY_SEQ_INVAL) /* Start with 0 after increment modulo array size */ idx = ARRAY_SIZE(vsub->auth_tuples) - 1; else @@ -87,7 +87,7 @@ for (count = ARRAY_SIZE(vsub->auth_tuples); count > 0; count--) { idx = (idx + 1) % ARRAY_SIZE(vsub->auth_tuples); - if (vsub->auth_tuples[idx].key_seq == GSM_KEY_SEQ_INVAL) + if (vsub->auth_tuples[idx].key_seq == VLR_KEY_SEQ_INVAL) continue; if (!at || vsub->auth_tuples[idx].use_count < at->use_count) @@ -101,10 +101,10 @@ } /* Return an auth tuple and increment its use count. */ -static struct gsm_auth_tuple * +static struct vlr_auth_tuple * vlr_subscr_get_auth_tuple(struct vlr_subscr *vsub, int max_reuse_count) { - struct gsm_auth_tuple *at = _vlr_subscr_next_auth_tuple(vsub, + struct vlr_auth_tuple *at = _vlr_subscr_next_auth_tuple(vsub, max_reuse_count); if (!at) return NULL; @@ -123,7 +123,7 @@ bool is_utran, const uint8_t *res, uint8_t res_len) { - struct gsm_auth_tuple *at = vsub->last_tuple; + struct vlr_auth_tuple *at = vsub->last_tuple; struct osmo_auth_vector *vec = &at->vec; bool check_umts; bool res_is_umts_aka; @@ -262,7 +262,7 @@ { struct auth_fsm_priv *afp = fi->priv; struct vlr_subscr *vsub = afp->vsub; - struct gsm_auth_tuple *at; + struct vlr_auth_tuple *at; bool use_umts_aka; /* Caller ensures we have vectors available */ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 861e56f..0ca95c4 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -713,7 +713,7 @@ return 0; } -static int fake_vlr_tx_auth_req(void *msc_conn_ref, struct gsm_auth_tuple *at, +static int fake_vlr_tx_auth_req(void *msc_conn_ref, struct vlr_auth_tuple *at, bool send_autn) { struct ran_conn *conn = msc_conn_ref; -- To view, visit https://gerrit.osmocom.org/12035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 Gerrit-Change-Number: 12035 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:49 +0000 Subject: Change in osmo-msc[master]: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12036 Change subject: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH ...................................................................... GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH gsm_subscriber.h contains some legacy cruft, part of which is that the VLR's max MSISDN length should rather be defined in vlr.h. Same for GSM_NAME_LENGTH -> VLR_NAME_LENGTH. Adjust some sms_queue stuff that anyway includes vlr.h already. Drop gsm_subscriber.h from vlr.h. Add other (more concise) includes that thus become necessary, since the include chain vlr.h->gsm_subscriber.h->gsm_data.h is no longer in place. Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/sms_queue.c M tests/sms_queue/sms_queue_test.c 4 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/12036/1 diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index 428b889..00d7b98 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -10,9 +10,6 @@ struct ran_conn; -#define GSM_NAME_LENGTH 160 - -#define GSM_EXTENSION_LENGTH 15 /* MSISDN can only be 15 digits length */ #define GSM_MIN_EXTEN 20000 #define GSM_MAX_EXTEN 49999 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 1865618..c0e4864 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -10,8 +10,7 @@ #include #include #include -// for GSM_NAME_LENGTH -#include +#include #include #define LOGGSUPP(level, gsup, fmt, args...) \ @@ -111,6 +110,9 @@ struct sgsn_mm_ctx; struct vlr_instance; +#define VLR_NAME_LENGTH 160 +#define VLR_MSISDN_LENGTH 15 + /* The VLR subscriber is the part of the GSM subscriber state in VLR (CS) or * SGSN (PS), particularly while interacting with the HLR via GSUP */ struct vlr_subscr { @@ -123,8 +125,8 @@ /* Data from HLR */ /* 3GPP TS 23.008 */ /* Always use vlr_subscr_set_imsi() to write to imsi[] */ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; /* 2.1.1.1 */ - char msisdn[GSM_EXTENSION_LENGTH+1]; /* 2.1.2 */ - char name[GSM_NAME_LENGTH+1]; /* proprietary */ + char msisdn[VLR_MSISDN_LENGTH+1]; /* 2.1.2 */ + char name[VLR_NAME_LENGTH+1]; /* proprietary */ OSMO_LBUF_DECL(hlr, 16); /* 2.4.7 */ uint32_t periodic_lu_timer; /* 2.4.24 */ uint32_t age_indicator; /* 2.17.1 */ diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index fd38d50..c7fe5f4 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -64,7 +64,7 @@ struct llist_head pending_sms; - char last_msisdn[GSM_EXTENSION_LENGTH+1]; + char last_msisdn[VLR_MSISDN_LENGTH+1]; }; static int sms_subscr_cb(unsigned int, unsigned int, void *, void *); diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index e9443e0..b31824b 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -24,6 +24,7 @@ #include #include +#include static void *talloc_ctx = NULL; @@ -128,7 +129,7 @@ static void test_next_sms() { int i; - char last_msisdn[GSM_EXTENSION_LENGTH+1] = ""; + char last_msisdn[VLR_MSISDN_LENGTH+1] = ""; printf("Testing smsq_take_next_sms()\n"); -- To view, visit https://gerrit.osmocom.org/12036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 Gerrit-Change-Number: 12036 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:50 +0000 Subject: Change in osmo-msc[master]: drop cruft from gsm_subscriber.h Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12037 Change subject: drop cruft from gsm_subscriber.h ...................................................................... drop cruft from gsm_subscriber.h Change-Id: If6e2252486fe8d932f229a70ce5a4b6f22f6fc52 --- M include/osmocom/msc/gsm_subscriber.h 1 file changed, 0 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/12037/1 diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index 00d7b98..f8d8ef0 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -10,25 +10,6 @@ struct ran_conn; -#define GSM_MIN_EXTEN 20000 -#define GSM_MAX_EXTEN 49999 - -#define GSM_SUBSCRIBER_FIRST_CONTACT 0x00000001 -/* gprs_sgsn.h defines additional flags including and above bit 16 (0x10000) */ - -enum gsm_subscriber_field { - GSM_SUBSCRIBER_IMSI, - GSM_SUBSCRIBER_TMSI, - GSM_SUBSCRIBER_EXTENSION, - GSM_SUBSCRIBER_ID, -}; - -enum gsm_subscriber_update_reason { - GSM_SUBSCRIBER_UPDATE_ATTACHED, - GSM_SUBSCRIBER_UPDATE_DETACHED, - GSM_SUBSCRIBER_UPDATE_EQUIPMENT, -}; - /* * Struct for pending channel requests. This is managed in the * llist_head requests of each subscriber. The reference counting @@ -46,8 +27,6 @@ void *param; }; -int subscr_update(struct vlr_subscr *vsub, int reason); - /* * Paging handling with authentication */ @@ -56,8 +35,6 @@ const char *label); void subscr_remove_request(struct subscr_request *req); -int subscr_rx_paging_response(struct msgb *msg, - struct ran_conn *conn); void subscr_paging_cancel(struct vlr_subscr *vsub, enum gsm_paging_event event); int subscr_paging_dispatch(unsigned int hooknum, unsigned int event, -- To view, visit https://gerrit.osmocom.org/12037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If6e2252486fe8d932f229a70ce5a4b6f22f6fc52 Gerrit-Change-Number: 12037 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:45:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:45:50 +0000 Subject: Change in osmo-msc[master]: move gsm_cbfn to gsm_subscriber.h, the only user Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12038 Change subject: move gsm_cbfn to gsm_subscriber.h, the only user ...................................................................... move gsm_cbfn to gsm_subscriber.h, the only user (with two less line feeds) Change-Id: I375e5b021e643f6b1986ea35ebaf3a6d60e189f5 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h 2 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/12038/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 30a3c79..d3cb7d8 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -36,12 +36,6 @@ #define tmsi_from_string(str) strtoul(str, NULL, 10) -struct msgb; -typedef int gsm_cbfn(unsigned int hooknum, - unsigned int event, - struct msgb *msg, - void *data, void *param); - enum { MSC_CTR_LOC_UPDATE_TYPE_ATTACH, MSC_CTR_LOC_UPDATE_TYPE_NORMAL, diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index f8d8ef0..2051067 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -9,6 +9,10 @@ #include struct ran_conn; +struct msgb; + +typedef int gsm_cbfn(unsigned int hooknum, unsigned int event, struct msgb *msg, + void *data, void *param); /* * Struct for pending channel requests. This is managed in the -- To view, visit https://gerrit.osmocom.org/12038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I375e5b021e643f6b1986ea35ebaf3a6d60e189f5 Gerrit-Change-Number: 12038 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:49:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:49:31 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscriber_connection->encr In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12016 ) Change subject: drop unused gsm_subscriber_connection->encr ...................................................................... Patch Set 3: thanks man, nice catch -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 02:49:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:49:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:49:43 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscriber_connection->encr In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12016 to look at the new patch set (#4). Change subject: drop unused gsm_subscriber_connection->encr ...................................................................... drop unused gsm_subscriber_connection->encr The gsm_subscriber_connection->encr is never used. Drop completely. Drop the definition of struct gsm_encr from common_cs.h. Do not print the encr.alg_id in vty_dump_one_conn(), it always was zero anyway. Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce --- M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M src/libmsc/msc_vty.c 3 files changed, 2 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/12016/4 -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 02:51:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 02:51:43 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscriber_connection->encr In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12016 ) Change subject: drop unused gsm_subscriber_connection->encr ...................................................................... Patch Set 4: I'm thinking, the MSC should be able know the A5 actually used? Maybe we should rather fix or re-add later... -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 02:51:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 03:00:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 03:00:30 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscriber_connection->encr In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12016 ) Change subject: drop unused gsm_subscriber_connection->encr ...................................................................... Patch Set 4: Code-Review-1 according to 48.008 Ciphering Mode Complete, the BSC should send back the ciphering mode used (optional IE), and we do encode that IE in osmo-bsc. But osmo-msc doesn't decode that IE when receiving the Ciphering Mode Complete in msc_cipher_mode_compl(). So instead of dropping it, we should probably fix the IE parsing and populate the value. -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 03:00:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 03:19:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 03:19:21 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscriber_connection->encr In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12016 ) Change subject: drop unused gsm_subscriber_connection->encr ...................................................................... Patch Set 4: duh, it *is* decoded and passed on as argument to msc_cipher_mode_compl(), so we just need to *use* it. -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 03:19:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 03:39:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 03:39:30 +0000 Subject: Change in osmo-msc[master]: populate gsm_subscriber_connection->encr during Ciph In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12016 to look at the new patch set (#5). Change subject: populate gsm_subscriber_connection->encr during Ciph ...................................................................... populate gsm_subscriber_connection->encr during Ciph The gsm_subscriber_connection->encr is never used. Use it. When sending the Ciphering Mode Command, populate the encryption key. When receivint the Ciphering Mode Complete, populate the chosen alg_id. Hence the vty_dump_one_conn() now reports the actually chosen A5 algorithm ID used. For 3G connections, though, this will still remain 0 in the VTY, since there is no explicit A5 algorithm negotiated on UTRAN. (Security Mode Command and Security Mode Complete instead of the GERAN Ciphering.) Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce --- M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/12016/5 -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 03:39:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 03:39:30 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12032 to look at the new patch set (#3). Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... move ran_conn declarations to new ran_conn.h With the dawn of inter-BSC,MSC handover, adopting the MSC-A,-I,-T roles from 3GPP TS 49.008, the RAN connection shall soon be a neatly separated corner of osmo-msc, so gravitate ran_conn decarations to files of matching name. Also, the current chaos of API defined in files with mismatching/meaningless names drives me crazy. Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h A include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/rrlp.c 9 files changed, 251 insertions(+), 249 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/12032/3 -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 03:39:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 03:39:30 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12033 to look at the new patch set (#3). Change subject: combine several small .h in msc_common.h ...................................................................... combine several small .h in msc_common.h For hysterical raisins, there are some header files that contain few declarations, and where the name doesn't reflect the content. Combine them to new msc_common.h: - common.h - common_cs.h - debug.h - osmo_msc.h => msc_common.h Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 --- M include/osmocom/msc/Makefile.am D include/osmocom/msc/common.h D include/osmocom/msc/common_cs.h D include/osmocom/msc/debug.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_data_shared.h A include/osmocom/msc/msc_common.h D include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/a_reset.c M src/libmsc/ctrl_commands.c M src/libmsc/db.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/mncc.c M src/libmsc/mncc_builtin.c M src/libmsc/mncc_sock.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/ran_conn.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.c M src/libmsc/sms_queue.c M src/libmsc/transaction.c M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_lu_fsm.c M src/osmo-msc/msc_main.c M src/utils/smpp_mirror.c M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h M tests/smpp/smpp_test.c M tests/sms_queue/sms_queue_test.c 45 files changed, 52 insertions(+), 115 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/12033/3 -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 03:39:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 03:39:34 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/12039 Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... rename gsm_encr to geran_encr, it is only applicable on GERAN On UTRAN, Security Mode is used instead of Ciphering Command, which does not feature an A5 algorithm id. Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 --- M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/12039/1 diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h index fddc6ec..410f102 100644 --- a/include/osmocom/msc/common_cs.h +++ b/include/osmocom/msc/common_cs.h @@ -9,7 +9,7 @@ #define MAX_A5_KEY_LEN (128/8) -struct gsm_encr { +struct geran_encr { uint8_t alg_id; uint8_t key_len; uint8_t key[MAX_A5_KEY_LEN]; diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 94a6ffd..1231327 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -125,7 +125,7 @@ enum ran_type via_ran; uint16_t lac; - struct gsm_encr encr; + struct geran_encr encr; /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still * wants to request a Classmark Update first. */ -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 03:40:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 03:40:05 +0000 Subject: Change in osmo-msc[master]: populate gsm_subscriber_connection->encr during Ciph In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12016 ) Change subject: populate gsm_subscriber_connection->encr during Ciph ...................................................................... Patch Set 5: how is this. I haven't tested properly yet, but can't be worse than before, can it. -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 03:40:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 04:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 04:08:20 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscr_conn->mncc_rtp_bridge In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12013 to look at the new patch set (#3). Change subject: drop unused gsm_subscr_conn->mncc_rtp_bridge ...................................................................... drop unused gsm_subscr_conn->mncc_rtp_bridge Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/13/12013/3 -- To view, visit https://gerrit.osmocom.org/12013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba Gerrit-Change-Number: 12013 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 04:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 04:08:20 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_network->handover.active In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12014 to look at the new patch set (#3). Change subject: drop unused gsm_network->handover.active ...................................................................... drop unused gsm_network->handover.active gsm_network contains an int handover.active which is always zero. Drop it. There is real handover code coming up soon, one part of this is to avoid confusion. The internal MNCC code queried it to decide whether to MNCC_BRIDGE or proxy RTP (MNCC_FRAME_RECV). Since RTP is being handled by osmo-mgw since forever, drop that entire condition from mncc_builtin. Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 --- M include/osmocom/msc/gsm_data.h M src/libmsc/mncc_builtin.c 2 files changed, 2 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/14/12014/3 -- To view, visit https://gerrit.osmocom.org/12014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 Gerrit-Change-Number: 12014 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 04:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 04:08:20 +0000 Subject: Change in osmo-msc[master]: populate gsm_subscriber_connection->encr during Ciph In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12016 to look at the new patch set (#6). Change subject: populate gsm_subscriber_connection->encr during Ciph ...................................................................... populate gsm_subscriber_connection->encr during Ciph The gsm_subscriber_connection->encr is never used. Use it. When sending the Ciphering Mode Command, populate the encryption key. When receivint the Ciphering Mode Complete, populate the chosen alg_id. Out of paranoia, store the enc key only if the size is large enough. Hence the vty_dump_one_conn() now reports the actually chosen A5 algorithm ID used. For 3G connections, though, this will still remain 0 in the VTY, since there is no explicit A5 algorithm negotiated on UTRAN. (Security Mode Command and Security Mode Complete instead of the GERAN Ciphering.) Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce --- M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/12016/6 -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 04:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 04:08:20 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12039 to look at the new patch set (#2). Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... rename gsm_encr to geran_encr, it is only applicable on GERAN On UTRAN, Security Mode is used instead of Ciphering Command, which does not feature an A5 algorithm id. Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 --- M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/12039/2 -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 04:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 04:08:20 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12015 to look at the new patch set (#7). Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... rename gsm_subscriber_connection to ran_conn In preparation for inter-BSC and inter-MSC handover, we need to separate the subscriber management logic from the actual RAN connections. What better time to finally rename gsm_subscriber_connection. * Name choice: In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it "bss_conn": in 3G a BSS is called RNS, IIUC. The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network. * Rationale: A subscriber in the MSC so far has only one RAN connection, but e.g. for inter-BSC handover, a second one needs to be created to handover to. Most of the items in the former gsm_subscriber_connection are actually related to the RAN, with only a few MM and RTP related items. So, as a first step, just rename it to ran_conn, to cosmetically prepare for moving the not strictly RAN related items away later. Also: - Rename some functions from msc_subscr_conn_* to ran_conn_* - Rename "Subscr_Conn" FSM instance name to "RAN_conn" - Rename SUBSCR_CONN_* to RAN_CONN_* Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_14.h M include/osmocom/msc/gsm_04_80.h M include/osmocom/msc/gsm_09_11.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_ifaces.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/signal.h M include/osmocom/msc/silent_call.h M include/osmocom/msc/transaction.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M src/libvlr/vlr.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 57 files changed, 3,841 insertions(+), 3,850 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12015/7 -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 04:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 04:08:20 +0000 Subject: Change in osmo-msc[master]: rename some RAN conn related stuff to ran_conn_* In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12030 to look at the new patch set (#4). Change subject: rename some RAN conn related stuff to ran_conn_* ...................................................................... rename some RAN conn related stuff to ran_conn_* Following previous rename of gsm_subscriber_connection: Some functions and #defines are still called like "msc_conn" or just "msc_", while they are clearly about a RAN conn. To avoid confusion with the future separate concepts of MSC roles and a RAN connection, rename all those to match the common "ran_conn" prefix. Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_tests.c 15 files changed, 104 insertions(+), 109 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/12030/4 -- To view, visit https://gerrit.osmocom.org/12030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 Gerrit-Change-Number: 12030 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 04:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 04:08:20 +0000 Subject: Change in osmo-msc[master]: move subscr_conn.c to ran_conn.c In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12031 to look at the new patch set (#4). Change subject: move subscr_conn.c to ran_conn.c ...................................................................... move subscr_conn.c to ran_conn.c subscr_conn.c exclusively defines ran_conn related things. Rename the file. Change-Id: I6aa6b335842116c717a554c981083a914724ee21 --- M src/libmsc/Makefile.am R src/libmsc/ran_conn.c 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/12031/4 -- To view, visit https://gerrit.osmocom.org/12031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6aa6b335842116c717a554c981083a914724ee21 Gerrit-Change-Number: 12031 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 04:08:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 04:08:20 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12032 to look at the new patch set (#4). Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... move ran_conn declarations to new ran_conn.h With the dawn of inter-BSC,MSC handover, adopting the MSC-A,-I,-T roles from 3GPP TS 49.008, the RAN connection shall soon be a neatly separated corner of osmo-msc, so gravitate ran_conn decarations to files of matching name. Also, the current chaos of API defined in files with mismatching/meaningless names drives me crazy. Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h A include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/ran_conn.c M src/libmsc/rrlp.c 11 files changed, 252 insertions(+), 244 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/12032/4 -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 30 06:52:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 30 Nov 2018 06:52:03 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-simtrace2_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#205?= In-Reply-To: <1361187826.904.1543474323161.JavaMail.jenkins@jenkins.osmocom.org> References: <1361187826.904.1543474323161.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <748521308.920.1543560723106.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 168.16 KB...] 8 0 0 8 8 obj/owhw/dfu_boardver_adc.o 30 16 0 46 2e obj/owhw/dfu_manifest.o 239 0 0 239 ef obj/owhw/dfu_owhw.o 1472 1 0 1473 5c1 obj/owhw/dfu_main.o 244 0 0 244 f4 obj/owhw/dfu_dfu.o 645 4 6 655 28f obj/owhw/dfu_dfu_runtime.o 3490 0 208 3698 e72 obj/owhw/dfu_card_emu.o 0 0 0 0 0 obj/owhw/dfu_cciddriver.o 2629 12 4 2645 a55 obj/owhw/dfu_iso7816_4.o 96 0 0 96 60 obj/owhw/dfu_iso7816_fidi.o 0 0 0 0 0 obj/owhw/dfu_mitm.o 2308 1152 0 3460 d84 obj/owhw/dfu_mode_cardemu.o 0 0 0 0 0 obj/owhw/dfu_mode_ccid.o 352 0 520 872 368 obj/owhw/dfu_simtrace_iso7816.o 0 0 0 0 0 obj/owhw/dfu_sniffer.o 488 40 0 528 210 obj/owhw/dfu_tc_etu.o 597 48 0 645 285 obj/owhw/dfu_usb.o 26024 0 17988 44012 abec bin/owhw-cardem-dfu.elf =============== owhw / cardem RES:0 ============== =============== FIRMWARE TESTS =========== cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu_tests.hobj -c card_emu_tests.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from card_emu_tests.c:4: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ card_emu_tests.c: In function ?get_and_verify_rctx?: card_emu_tests.c:171:34: warning: unused variable ?td? [-Wunused-variable] struct cardemu_usb_msg_tx_data *td; ^~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o card_emu.hobj -c ../libcommon/source/card_emu.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../atmel_softpack_libraries/libchip_sam3s/include/trace.h:70, from ../libcommon/include/assert.h:60, from ../libcommon/source/card_emu.c:21: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ In file included from ../libcommon/source/card_emu.c:27:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ ../libcommon/source/card_emu.c: In function ?flush_rx_buffer?: ../libcommon/source/card_emu.c:279:11: warning: unused variable ?data_len? [-Wunused-variable] uint32_t data_len; ^~~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o usb_buf.hobj -c ../libcommon/source/usb_buf.c In file included from ../libboard/common/include/board_common.h:24:0, from ../libboard/simtrace/include/board.h:21, from ../libcommon/source/usb_buf.c:17: ../atmel_softpack_libraries/libchip_sam3s/chip.h:11:6: warning: #warning Library does not support the specified chip, specifying sam3s4. [-Wcpp] #warning Library does not support the specified chip, specifying sam3s4. ^~~~~~~ cc -g -Wall `pkg-config --cflags libosmocore` -I../src_simtrace -I../atmel_softpack_libraries/libchip_sam3s -I../atmel_softpack_libraries/libchip_sam3s/cmsis -I../atmel_softpack_libraries/libchip_sam3s/include -I../atmel_softpack_libraries/usb/include -I../libcommon/include -I../libboard/common/include -I../libboard/simtrace/include -I. -o iso7816_fidi.hobj -c ../libcommon/source/iso7816_fidi.c In file included from ../libcommon/source/iso7816_fidi.c:22:0: ../libcommon/include/utils.h:31:2: warning: #warning "local_irq_{save,restore}() not implemented" [-Wcpp] #warning "local_irq_{save,restore}() not implemented" ^~~~~~~ cc `pkg-config --libs libosmocore` -o card_emu_test card_emu_tests.hobj card_emu.hobj usb_buf.hobj iso7816_fidi.hobj tc_etu_init(tc_chan=23) -I- 0: ATR set: 3b 02 14 50 -I- 0: VCC activated uart_enable(uart_chan=42, OFF) -I- 0: CLK activated uart_enable(uart_chan=42, OFF) -I- 0: RST released tc_etu_enable(tc_chan=23) -I- 0: computed Fi(1) Di(1) ratio: 372 uart_update_fidi(uart_chan=42, fidi=372) tc_etu_set_etu(tc_chan=23, etu=372) tc_etu_set_wtime(tc_chan=23, wtime=2) tc_etu_enable(tc_chan=23) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, TX) uart_interrupt(uart_chan=42) receiving + verifying ATR: UART_TX(3b) UART_TX(02) UART_TX(14) UART_TX(50) tc_etu_set_wtime(tc_chan=23, wtime=9600) uart_enable(uart_chan=42, RX) UART_RX(ff) UART_RX(10) UART_RX(00) UART_RX(ef) uart_enable(uart_chan=42, TX) [L1]> 01 07 00 00 00 00 15 00 [L2]> 04 ff 10 00 ef 00 00 ff 10 00 ef 00 00 UART_TX(ff) UART_TX(10) UART_TX(00) UART_TX(ef) -I- 0: computed FiDi ration -22 unsupported uart_enable(uart_chan=42, RX) ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-RX) UART_RX(a0) UART_RX(d2) UART_RX(00) UART_RX(00) UART_RX(07) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 d2 00 00 07 -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 d2 00 00 07 flags=1, data= a0 d2 00 00 07 UART_TX(d2) uart_enable(uart_chan=42, RX) UART_RX(00) UART_RX(01) UART_RX(02) UART_RX(03) UART_RX(04) UART_RX(05) UART_RX(06) -I- 0: flush_rx_buffer (7) [L1]> 01 06 00 00 00 00 15 00 [L2]> 02 00 00 00 07 00 00 01 02 03 04 05 06 flags=2, data= 00 01 02 03 04 05 06 UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated ==> transmitting APDU (HDR + PB + card-TX) UART_RX(a0) UART_RX(b2) UART_RX(00) UART_RX(00) UART_RX(0a) uart_enable(uart_chan=42, TX) -I- 0: send_tpdu_header: a0 b2 00 00 0a -I- 0: flush_rx_buffer (5) [L1]> 01 06 00 00 00 00 13 00 [L2]> 01 00 00 00 05 00 a0 b2 00 00 0a flags=1, data= a0 b2 00 00 0a UART_TX(b2) UART_TX(00) UART_TX(01) UART_TX(02) UART_TX(03) UART_TX(04) UART_TX(05) UART_TX(06) UART_TX(07) UART_TX(08) UART_TX(09) UART_TX(90) UART_TX(00) uart_enable(uart_chan=42, RX) uart_enable(uart_chan=42, RX) -I- 0: CLK deactivated -I- 0: CLK activated =============== HOST START ============== cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-remsim.o -c simtrace2-remsim.c simtrace2-remsim.c: In function ?main?: simtrace2-remsim.c:598:6: warning: variable ?skip_atr? set but not used [-Wunused-but-set-variable] int skip_atr = 0; ^~~~~~~~ At top level: simtrace2-remsim.c:389:12: warning: ?process_do_error? defined but not used [-Wunused-function] static int process_do_error(struct cardem_inst *ci, uint8_t *buf, int len) ^~~~~~~~~~~~~~~~ simtrace2-remsim.c:89:12: warning: ?gsmtap_send_sim? defined but not used [-Wunused-function] static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len) ^~~~~~~~~~~~~~~ cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o apdu_dispatch.o -c apdu_dispatch.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-discovery.o -c simtrace2-discovery.c cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o libusb_util.o -c libusb_util.c cc -o simtrace2-remsim simtrace2-remsim.o apdu_dispatch.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread `pkg-config --libs libosmosim libpcsclite` cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o usb2udp.o -c usb2udp.c cc -o simtrace2-remsim-usb2udp usb2udp.o simtrace2-discovery.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2_usb.o -c simtrace2_usb.c cc -o simtrace2-list simtrace2_usb.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread cc -Wall -g `pkg-config --cflags libusb-1.0 libosmocore` -o simtrace2-sniff.o -c simtrace2-sniff.c cc -o simtrace2-sniff simtrace2-sniff.o simtrace2-discovery.o libusb_util.o `pkg-config --libs libusb-1.0 libosmocore` -pthread =============== UPLOAD BUILD ============== Warning: Permanently added the ECDSA host key for IP address '[144.76.43.76]:48' to the list of known hosts. Permission denied (publickey,keyboard-interactive). rsync: connection unexpectedly closed (0 bytes received so far) [sender] rsync error: unexplained error (code 255) at io.c(235) [sender=3.1.2] Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Nov 30 09:03:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 09:03:37 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_network->handover.active In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12014 ) Change subject: drop unused gsm_network->handover.active ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 Gerrit-Change-Number: 12014 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 09:03:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 09:39:00 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 09:39:00 +0000 Subject: Change in openbsc[master]: manuals: Osmo{NAT, MGCP} -> OsmoBSC{NAT, MGCP} Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12040 Change subject: manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} ...................................................................... manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} Rename the manuals to their proper names. Change-Id: I8c020361c141c758bfb32562dbd7f34f4fd81c39 --- R manuals/OsmoBSCMGCP/Makefile C manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml R manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml R manuals/OsmoBSCMGCP/vty/mgcp_vty_reference.xml R manuals/OsmoBSCNAT/Makefile R manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.xml R manuals/OsmoBSCNAT/vty/nat_vty_additions.xml R manuals/OsmoBSCNAT/vty/nat_vty_reference.xml D manuals/OsmoNAT/osmonat-vty-reference.xml 9 files changed, 4 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/40/12040/1 diff --git a/manuals/OsmoMGCP/Makefile b/manuals/OsmoBSCMGCP/Makefile similarity index 80% rename from manuals/OsmoMGCP/Makefile rename to manuals/OsmoBSCMGCP/Makefile index 022f6d4..a6cbc8e 100644 --- a/manuals/OsmoMGCP/Makefile +++ b/manuals/OsmoBSCMGCP/Makefile @@ -1,7 +1,7 @@ OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) srcdir=$(CURDIR) -VTY_REFERENCE = osmomgcp-vty-reference.xml +VTY_REFERENCE = osmo-bsc-mgcp-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml b/manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml similarity index 95% copy from manuals/OsmoMGCP/osmomgcp-vty-reference.xml copy to manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml index e9cc898..22fad1b 100644 --- a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml +++ b/manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml @@ -26,7 +26,7 @@ - OsmoMGCP VTY Reference + OsmoBSCMGCP VTY Reference 2012-2014 diff --git a/manuals/OsmoMGCP/vty/mgcp_vty_additions.xml b/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml similarity index 100% rename from manuals/OsmoMGCP/vty/mgcp_vty_additions.xml rename to manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml diff --git a/manuals/OsmoMGCP/vty/mgcp_vty_reference.xml b/manuals/OsmoBSCMGCP/vty/mgcp_vty_reference.xml similarity index 100% rename from manuals/OsmoMGCP/vty/mgcp_vty_reference.xml rename to manuals/OsmoBSCMGCP/vty/mgcp_vty_reference.xml diff --git a/manuals/OsmoNAT/Makefile b/manuals/OsmoBSCNAT/Makefile similarity index 81% rename from manuals/OsmoNAT/Makefile rename to manuals/OsmoBSCNAT/Makefile index 9c380a2..9b8e208 100644 --- a/manuals/OsmoNAT/Makefile +++ b/manuals/OsmoBSCNAT/Makefile @@ -1,7 +1,7 @@ OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) srcdir=$(CURDIR) -VTY_REFERENCE = osmonat-vty-reference.xml +VTY_REFERENCE = osmo-bsc-nat-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml b/manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.xml similarity index 95% rename from manuals/OsmoMGCP/osmomgcp-vty-reference.xml rename to manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.xml index e9cc898..7b2b483 100644 --- a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml +++ b/manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.xml @@ -26,7 +26,7 @@ - OsmoMGCP VTY Reference + OsmoBSCNAT VTY Reference 2012-2014 diff --git a/manuals/OsmoNAT/vty/nat_vty_additions.xml b/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml similarity index 100% rename from manuals/OsmoNAT/vty/nat_vty_additions.xml rename to manuals/OsmoBSCNAT/vty/nat_vty_additions.xml diff --git a/manuals/OsmoNAT/vty/nat_vty_reference.xml b/manuals/OsmoBSCNAT/vty/nat_vty_reference.xml similarity index 100% rename from manuals/OsmoNAT/vty/nat_vty_reference.xml rename to manuals/OsmoBSCNAT/vty/nat_vty_reference.xml diff --git a/manuals/OsmoNAT/osmonat-vty-reference.xml b/manuals/OsmoNAT/osmonat-vty-reference.xml deleted file mode 100644 index 8f8b096..0000000 --- a/manuals/OsmoNAT/osmonat-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th August 2012 - hf - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoNAT VTY Reference - - - 2012-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - -- To view, visit https://gerrit.osmocom.org/12040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8c020361c141c758bfb32562dbd7f34f4fd81c39 Gerrit-Change-Number: 12040 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 09:42:07 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 09:42:07 +0000 Subject: Change in openbsc[master]: manuals: Osmo{NAT, MGCP} -> OsmoBSC{NAT, MGCP} In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12040 ) Change subject: manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} ...................................................................... Patch Set 1: The diff looks a bit weird, because git assumes that manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml was renamed to manuals/OsmoMGCP/osmomgcp-vty-reference.xml and vice versa, because the files are so similar. But the change is pretty simple actually :) -- To view, visit https://gerrit.osmocom.org/12040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8c020361c141c758bfb32562dbd7f34f4fd81c39 Gerrit-Change-Number: 12040 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 30 Nov 2018 09:42:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 09:42:21 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 09:42:21 +0000 Subject: Change in openbsc[master]: manuals: Osmo{NAT, MGCP} -> OsmoBSC{NAT, MGCP} In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12040 ) Change subject: manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} ...................................................................... Patch Set 1: Verified+1 verified that it is building -- To view, visit https://gerrit.osmocom.org/12040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8c020361c141c758bfb32562dbd7f34f4fd81c39 Gerrit-Change-Number: 12040 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 30 Nov 2018 09:42:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 09:43:34 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 09:43:34 +0000 Subject: Change in openbsc[master]: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12010 ) Change subject: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git ...................................................................... Patch Set 1: Done: https://gerrit.osmocom.org/#/c/openbsc/+/12040/ -- To view, visit https://gerrit.osmocom.org/12010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 Gerrit-Change-Number: 12010 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Nov 2018 09:43:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 09:53:10 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 09:53:10 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Comment-Date: Fri, 30 Nov 2018 09:53:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 09:53:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 09:53:13 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 13 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 09:53:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:01:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:01:08 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12039/2/include/osmocom/msc/common_cs.h File include/osmocom/msc/common_cs.h: https://gerrit.osmocom.org/#/c/12039/2/include/osmocom/msc/common_cs.h at 12 PS2, Line 12: geran_encr Maybe we could even move this definition into the 'gsm_subscriber_connection' struct definition? (unrelated, just an idea) -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:01:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:01:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:01:52 +0000 Subject: Change in osmo-msc[master]: drop unused openbscdefines.h In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12024 ) Change subject: drop unused openbscdefines.h ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If35cd49baa4d0a3b38f31736e1696f481babba9c Gerrit-Change-Number: 12024 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:01:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:09:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:09:08 +0000 Subject: Change in osmo-msc[master]: drop unused SUBSCR_CONN_E_INVALID In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12025 ) Change subject: drop unused SUBSCR_CONN_E_INVALID ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f3c964ee04fec9a96f385199fb3141ac8d672d4 Gerrit-Change-Number: 12025 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:09:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:09:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:09:34 +0000 Subject: Change in osmo-msc[master]: drop unused gsm0408_allow_everyone() declaration In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12026 ) Change subject: drop unused gsm0408_allow_everyone() declaration ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id56ea492594edc38d1f9d31d94a1679c0cb61fa0 Gerrit-Change-Number: 12026 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:09:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:10:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:10:06 +0000 Subject: Change in osmo-msc[master]: drop unused tests/db/* In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12027 ) Change subject: drop unused tests/db/* ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I05880507d9bf029f0ec451efda0ebe54ac09ef12 Gerrit-Change-Number: 12027 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:10:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:13:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 30 Nov 2018 10:13:48 +0000 Subject: Change in libosmocore[master]: fix Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12041 Change subject: fix ...................................................................... fix Change-Id: I8fd675a2e0e83a3382aae8cdbf174d42d4958d08 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 2 files changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/12041/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 005ed0c..f22019b 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -171,7 +171,7 @@ struct gsm0808_handover_performed { uint16_t cause; - struct gsm0808_cell_id cell; + struct gsm0808_cell_id cell_id; bool chosen_channel_present; uint8_t chosen_channel; @@ -184,6 +184,12 @@ bool speech_codec_chosen_present; struct gsm0808_speech_codec speech_codec_chosen; + + bool lcls_bss_status_present; + enum gsm0808_lcls_status lcls_bss_status; + + /* more items are defined in the spec and may be added later */ + bool more_items; /*< always set this to false */ }; struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_performed *params); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 96d4d3a..04d786e 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -910,10 +910,10 @@ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_PERFORMED); /* Cause, 3.2.2.5 */ - msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); + msgb_tlv_put(msg, GSM0808_IE_CAUSE, gsm0808_cause_ext(params->cause) ? 2 : 1, (const uint8_t *)¶ms->cause); /* Cell Identifier, 3.2.2.17 */ - gsm0808_enc_cell_id(msg, ¶ms->cell); + gsm0808_enc_cell_id(msg, ¶ms->cell_id); /* Chosen Channel 3.2.2.33 */ if (params->chosen_channel_present) @@ -923,7 +923,7 @@ if (params->chosen_encr_alg_present) msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, params->chosen_encr_alg); - /* Sspeech Version (chosen) 3.2.2.51 */ + /* Speech Version (chosen) 3.2.2.51 */ if (params->speech_version_chosen_present) msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, params->speech_version_chosen); @@ -931,6 +931,10 @@ if (params->speech_codec_chosen_present) gsm0808_enc_speech_codec(msg, ¶ms->speech_codec_chosen); + /* LCLS-BSS-Status 3.2.2.119 */ + if (params->lcls_bss_status_present) + msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, params->lcls_bss_status); + /* prepend header with final length */ msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); -- To view, visit https://gerrit.osmocom.org/12041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8fd675a2e0e83a3382aae8cdbf174d42d4958d08 Gerrit-Change-Number: 12041 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:14:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 30 Nov 2018 10:14:17 +0000 Subject: Change in libosmocore[master]: fix In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/12041 ) Change subject: fix ...................................................................... Abandoned fogot to fixup -- To view, visit https://gerrit.osmocom.org/12041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I8fd675a2e0e83a3382aae8cdbf174d42d4958d08 Gerrit-Change-Number: 12041 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:14:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 30 Nov 2018 10:14:48 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Hello Max, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11728 to look at the new patch set (#6). Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... gsm0808: add message generator for BSSMAP HANDOVER PERFORMED We currently have no generator function that can generate BSSMAP HANDOVER PERFORMED messages. Lets add function for this. Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/11728/6 -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:15:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:15:03 +0000 Subject: Change in osmo-msc[master]: drop msc_compl_l3() return value In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12029 ) Change subject: drop msc_compl_l3() return value ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09 Gerrit-Change-Number: 12029 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:15:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:16:46 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 30 Nov 2018 10:16:46 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 6: (6 comments) > I mean gsm0808_create_handover_performed() of course. As far as I can see this is the LCLS-BSS-Status. I have added it now so you can use it right away. https://gerrit.osmocom.org/#/c/11728/4/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/11728/4/include/osmocom/gsm/gsm0808.h at 174 PS4, Line 174: struct gsm0808_cell_id cell_id; > (in osmo-bsc it is usually called "cell_id") Done https://gerrit.osmocom.org/#/c/11728/4/include/osmocom/gsm/gsm0808.h at 186 PS4, Line 186: struct gsm0808_speech_codec speech_codec_chosen; > in above structs we have a 'bool more_items' to allow backwards compatible extensions to this struct [?] Done https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 894 PS1, Line 894: > frankly I'm not sure at all; and also it seems we don't really care about big endian after all... [?] Done https://gerrit.osmocom.org/#/c/11728/1/src/gsm/gsm0808.c at 897 PS1, Line 897: > the gsm0808_create_layer3 precedes the cell identity encoding API. [?] Done https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c at 913 PS4, Line 913: msgb_tlv_put(msg, GSM0808_IE_CAUSE, gsm0808_cause_ext(params->cause) ? 2 : 1, (const uint8_t *)¶ms->cause); > Yes, it does - at least it's the same IE. [?] I see, we should add a helper function that adds a cause. This line is not really well readable and the ?-Notation does not help either in this case. I will fix this, also for the other functions. https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c at 926 PS4, Line 926: /* Speech Version (chosen) 3.2.2.51 */ > Chosen: Parseltounge [?] Done -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 10:16:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:18:18 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:18:18 +0000 Subject: Change in osmo-msc[master]: rename some RAN conn related stuff to ran_conn_* In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12030 ) Change subject: rename some RAN conn related stuff to ran_conn_* ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 Gerrit-Change-Number: 12030 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:18:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:21:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:21:56 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12032 ) Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:21:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:22:25 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 10:22:25 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 6: (2 comments) https://gerrit.osmocom.org/#/c/11728/6/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/11728/6/include/osmocom/gsm/gsm0808.h at 188 PS6, Line 188: bool lcls_bss_status_present; You can use GSM0808_LCLS_STS_NA - no need in separate bool variable. https://gerrit.osmocom.org/#/c/11728/6/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/6/src/gsm/gsm0808.c at 935 PS6, Line 935: if (params->lcls_bss_status_present) Same here - check for GSM0808_LCLS_STS_NA and add if it differs. -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 10:22:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:25:29 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 10:25:29 +0000 Subject: Change in osmo-ci[master]: master-builds: make SSH keys available in Docker Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12042 Change subject: master-builds: make SSH keys available in Docker ...................................................................... master-builds: make SSH keys available in Docker At runtime, mount the Jenkins host's ~/.ssh folder inside the Docker containers, from which manual PDFs will be published. To my surprise, local testing showed that ssh is looking for the keys in /home/build/.ssh, although the HOME variable inside the image is set to /build, not /home/build. Related: OS#3385 Change-Id: Icfff3b6a620de79d1bab7ff6a35309f828581c09 --- M jobs/master-builds.yml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/42/12042/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 67a9b80..d485a5f 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -175,6 +175,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-bts: @@ -235,6 +236,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ osmocom:amd64 /build/contrib/jenkins.sh --publish trigger: master-osmo-msc, master-osmo-bsc @@ -258,6 +260,7 @@ -w /build -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-pcap @@ -298,6 +301,7 @@ -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ -w /build -i -u build \ -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + -v "$HOME/.ssh:/home/build/.ssh:ro" \ osmocom:amd64 /build/contrib/jenkins.sh --publish - osmo-sip-connector: -- To view, visit https://gerrit.osmocom.org/12042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icfff3b6a620de79d1bab7ff6a35309f828581c09 Gerrit-Change-Number: 12042 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:32:16 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:32:16 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12033 ) Change subject: combine several small .h in msc_common.h ...................................................................... Patch Set 4: (3 comments) https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/debug.h File include/osmocom/msc/debug.h: https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/debug.h at a6 PS4, Line 6: I would keep logging related stuff separately... https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/msc_common.h File include/osmocom/msc/msc_common.h: https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/msc_common.h at 7 PS4, Line 7: #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" : #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT This is rather VLR specific stuff, because exactly VLR speaks GSUP with HLR. https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/msc_common.h at 10 PS4, Line 10: msc_debug_categories Do we really need to name this enum? It isn't referenced anywhere AFAIK. Also, it goes beyond the commit's main idea. -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:32:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:33:13 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:33:13 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop some unused opaque struct defs In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12034 ) Change subject: cosmetic: drop some unused opaque struct defs ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d461dd39d0abdc4f2327445671459340ca1c946 Gerrit-Change-Number: 12034 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:33:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:34:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:34:44 +0000 Subject: Change in osmo-msc[master]: move gsm_auth_tuple to vlr.h as vlr_auth_tuple In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12035 ) Change subject: move gsm_auth_tuple to vlr.h as vlr_auth_tuple ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 Gerrit-Change-Number: 12035 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:34:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:35:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:35:57 +0000 Subject: Change in osmo-msc[master]: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12036 ) Change subject: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 Gerrit-Change-Number: 12036 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:35:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:36:13 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 10:36:13 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/4/src/gsm/gsm0808.c at 913 PS4, Line 913: msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80 ? 2 : 1, (const uint8_t *)¶ms->cause); > I see, we should add a helper function that adds a cause. [?] It's already implemented - see gsm0808_create_cipher_reject_ext() -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 10:36:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:36:21 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:36:21 +0000 Subject: Change in osmo-msc[master]: drop cruft from gsm_subscriber.h In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12037 ) Change subject: drop cruft from gsm_subscriber.h ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If6e2252486fe8d932f229a70ce5a4b6f22f6fc52 Gerrit-Change-Number: 12037 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:36:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 10:37:34 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 10:37:34 +0000 Subject: Change in osmo-msc[master]: move gsm_cbfn to gsm_subscriber.h, the only user In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12038 ) Change subject: move gsm_cbfn to gsm_subscriber.h, the only user ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I375e5b021e643f6b1986ea35ebaf3a6d60e189f5 Gerrit-Change-Number: 12038 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 10:37:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:00:48 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 30 Nov 2018 11:00:48 +0000 Subject: Change in osmo-bsc[master]: handover_fsm: send HANDOVER PERFORMED msg on internal ho In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11734 to look at the new patch set (#5). Change subject: handover_fsm: send HANDOVER PERFORMED msg on internal ho ...................................................................... handover_fsm: send HANDOVER PERFORMED msg on internal ho When an internal handover is done the specification demands to inform the MSC about the event. - Add sending of BSSMAP HANDOVER PERFORMED msg. Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Depends: libosmocore I825106858bd89afc9837811b8fed2e8accc82441 Related: OS#3645 --- M src/osmo-bsc/handover_fsm.c M tests/handover/handover_test.c 2 files changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/34/11734/5 -- To view, visit https://gerrit.osmocom.org/11734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If26e5807280e0f75a423b3b04f8e3c698c82a351 Gerrit-Change-Number: 11734 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:27:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 30 Nov 2018 11:27:01 +0000 Subject: Change in osmo-sysmon[master]: fix file descriptor leak in osysmon_file_read In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/11943 ) Change subject: fix file descriptor leak in osysmon_file_read ...................................................................... fix file descriptor leak in osysmon_file_read Don't forget to close the file which was opened at the beginning of this function's scope. Found by Coverity. Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Related: CID#189756 --- M osysmon_file.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/osysmon_file.c b/osysmon_file.c index 6f826b4..3a228fa 100644 --- a/osysmon_file.c +++ b/osysmon_file.c @@ -77,7 +77,7 @@ static void osysmon_file_read(struct osysmon_file *of, struct value_node *parent) { char buf[512]; - char *nl; + char *s, *nl; FILE *f; f = fopen(of->cfg.path, "r"); @@ -85,7 +85,9 @@ value_node_add(parent, parent, of->cfg.name, ""); return; } - if (fgets(buf, sizeof(buf), f) == NULL) { + s = fgets(buf, sizeof(buf), f); + fclose(f); + if (s == NULL) { value_node_add(parent, parent, of->cfg.name, ""); return; } -- To view, visit https://gerrit.osmocom.org/11943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sysmon Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie1b5734748438c6d785cd96dfa9af6303cd102da Gerrit-Change-Number: 11943 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:29:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 11:29:41 +0000 Subject: Change in osmo-bsc[master]: follow-up: logging tweak for Immediate Assignment In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11942 ) Change subject: follow-up: logging tweak for Immediate Assignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 Gerrit-Change-Number: 11942 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 11:29:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:30:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 11:30:13 +0000 Subject: Change in osmo-gsm-tester[master]: nanobts: Use -G parameter of ipaccess-config to avoid need to restart... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11750 ) Change subject: nanobts: Use -G parameter of ipaccess-config to avoid need to restart nanoBTS ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2871dee3de11512250445127f0b807a8990fd4c6 Gerrit-Change-Number: 11750 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 11:30:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:30:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 11:30:14 +0000 Subject: Change in osmo-gsm-tester[master]: nanobts: Use -G parameter of ipaccess-config to avoid need to restart... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11750 ) Change subject: nanobts: Use -G parameter of ipaccess-config to avoid need to restart nanoBTS ...................................................................... nanobts: Use -G parameter of ipaccess-config to avoid need to restart nanoBTS If OML IP doesn't need to be changed because it's the one already configured, then there's no need to set + restart the nanoBTS, which means we can speed up a test running a nanoBTS by aprox 2 minutes per nanoBTS used. Requires osmo-bsc.git 5c2485dcff35996fce328798351af79c0ff4474c, which fixes json generation in ipaccess-config after -G -q was implemented. Related: OS#3624 Change-Id: I2871dee3de11512250445127f0b807a8990fd4c6 --- M src/osmo_gsm_tester/bts_nanobts.py 1 file changed, 36 insertions(+), 18 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index ab75b16..5fe8bae 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -19,6 +19,7 @@ import os import re +import json from . import log, config, util, process, pcap_recorder, bts, pcu from . import powersupply from .event_loop import MainLoop @@ -122,24 +123,31 @@ ipfind.stop() ipconfig = IpAccessConfig(self.suite_run, self.run_dir, bts_trx_ip) + running_oml_ip = ipconfig.get_oml_ip() + if running_unitid != unitid or running_trx != trx_i: if not ipconfig.set_unit_id(unitid, trx_i, False): raise log.Error('Failed configuring unit id %d trx %d' % (unitid, trx_i)) - # Apply OML IP and restart nanoBTS as it is required to apply the changes. - if not ipconfig.set_oml_ip(self.bsc.addr(), True): - raise log.Error('Failed configuring OML IP %s' % bts_trx_ip) - # Let some time for BTS to restart. It takes much more than 20 secs, and - # this way we make sure we don't catch responses in abisip-find prior to - # BTS restarting. - MainLoop.sleep(self, 20) + if running_oml_ip != self.bsc.addr(): + # Apply OML IP and restart nanoBTS as it is required to apply the changes. + self.dbg('Current OML IPaddr "%s" does not match BSC IPaddr "%s", reconfiguring and restarting it' % (running_oml_ip, self.bsc.addr())) + if not ipconfig.set_oml_ip(self.bsc.addr(), True): + raise log.Error('Failed configuring OML IP %s' % bts_trx_ip) - self.log('Starting to connect id %d trx %d to' % (unitid, trx_i), self.bsc) - ipfind = AbisIpFind(self.suite_run, self.run_dir, local_bind_ip, 'postconf') - ipfind.start() - ipfind.wait_bts_ready(bts_trx_ip) - self.log('nanoBTS id %d trx %d configured and running' % (unitid, trx_i)) - ipfind.stop() + # Let some time for BTS to restart. It takes much more than 20 secs, and + # this way we make sure we don't catch responses in abisip-find prior to + # BTS restarting. + MainLoop.sleep(self, 20) + + self.dbg('Starting to connect id %d trx %d to' % (unitid, trx_i), self.bsc) + ipfind = AbisIpFind(self.suite_run, self.run_dir, local_bind_ip, 'postconf') + ipfind.start() + ipfind.wait_bts_ready(bts_trx_ip) + self.log('nanoBTS id %d trx %d configured and running' % (unitid, trx_i)) + ipfind.stop() + else: + self.dbg('nanoBTS id %d trx %d no need to change OML IP (%s) and restart' % (unitid, trx_i, running_oml_ip)) MainLoop.wait(self, self.bsc.bts_is_connected, self, timeout=600) self.log('nanoBTS connected to BSC') @@ -274,20 +282,30 @@ def set_unit_id(self, unitid, trx_num, restart=False): uid_str = '%d/0/%d' % (unitid, trx_num) if restart: - retcode = self.run('unitid', '--restart', '--unit-id', '%s' % uid_str, self.bts_ip) + retcode = self.run('setunitid', '--restart', '--unit-id', '%s' % uid_str, self.bts_ip) else: - retcode = self.run('unitid', '--unit-id', '%s' % uid_str, self.bts_ip) + retcode = self.run('setunitid', '--unit-id', '%s' % uid_str, self.bts_ip) if retcode != 0: - log.err('ipaccess-config --unit-id %s returned error code %d' % (uid_str, retcode)) + self.err('ipaccess-config --unit-id %s returned error code %d' % (uid_str, retcode)) return retcode == 0 def set_oml_ip(self, omlip, restart=False): if restart: - retcode = self.run('oml', '--restart', '--oml-ip', omlip, self.bts_ip) + retcode = self.run('setoml', '--restart', '--oml-ip', omlip, self.bts_ip) else: - retcode = self.run('oml', '--oml-ip', omlip, self.bts_ip) + retcode = self.run('setoml', '--oml-ip', omlip, self.bts_ip) if retcode != 0: self.error('ipaccess-config --oml-ip %s returned error code %d' % (omlip, retcode)) return retcode == 0 + def get_oml_ip(self): + retcode = self.run('getoml', '-q', '-G', self.bts_ip) + if retcode != 0: + raise log.Error('ipaccess-config -q -G %s returned error code %d' % (self.bts_ip, retcode)) + output = self.proc.get_stdout() + # Our logging system adds "launched on" line at the start, so let's skip until the json code: + output_json = output[output.index('{'):] + json_data = json.loads(output_json) + return json_data['primary_oml_ip'] + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/11750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2871dee3de11512250445127f0b807a8990fd4c6 Gerrit-Change-Number: 11750 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:30:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 11:30:31 +0000 Subject: Change in osmo-gsm-tester[master]: Add and use compatible scenario when testing IPA dynts with nanoBTS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11986 ) Change subject: Add and use compatible scenario when testing IPA dynts with nanoBTS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I37f3fe813d4074fbfe64ff3176048e7d25d470e2 Gerrit-Change-Number: 11986 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 11:30:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:30:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 11:30:33 +0000 Subject: Change in osmo-gsm-tester[master]: Add and use compatible scenario when testing IPA dynts with nanoBTS In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/11986 ) Change subject: Add and use compatible scenario when testing IPA dynts with nanoBTS ...................................................................... Add and use compatible scenario when testing IPA dynts with nanoBTS nanoBTS doesn't support SDCCH8 in TS!=1 according to osmo-bsc code. Let's use in this case TCH/H to make sure they are not used for the test (since we require osmo-bsc to use full rate codecs for the call). Change-Id: I37f3fe813d4074fbfe64ff3176048e7d25d470e2 --- M example/default-suites.conf A example/scenarios/mod-bts0-dynts67-ipa-compat-nanobts.conf 2 files changed, 15 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 07b8a5f..5ba36e1 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -106,7 +106,7 @@ - gprs:nanobts+band-1900 - gprs:nanobts+band-1900+mod-bts0-egprs - gprs:nanobts+band-1900+mod-bts0-dynts-ipa -- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:nanobts+band-1900+mod-bts0-dynts67-ipa-compat-nanobts+cfg-codec-fr-any - sms:nanobts+band-900 - nitb_ussd:nanobts+band-900 @@ -121,7 +121,7 @@ - gprs:nanobts+band-900+mod-bts0-egprs - gprs:nanobts+band-900+mod-bts0-dynts-ipa - gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend -- dynts:nanobts+band-900+mod-bts0-dynts67-ipa+cfg-codec-fr-any +- dynts:nanobts+band-900+mod-bts0-dynts67-ipa-compat-nanobts+cfg-codec-fr-any - nitb_smpp - smpp diff --git a/example/scenarios/mod-bts0-dynts67-ipa-compat-nanobts.conf b/example/scenarios/mod-bts0-dynts67-ipa-compat-nanobts.conf new file mode 100644 index 0000000..1eed05c --- /dev/null +++ b/example/scenarios/mod-bts0-dynts67-ipa-compat-nanobts.conf @@ -0,0 +1,13 @@ +modifiers: + bts: + - num_trx: 1 + trx_list: + - timeslot_list: + - phys_chan_config: 'CCCH+SDCCH4' + - phys_chan_config: 'SDCCH8' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/H' + - phys_chan_config: 'TCH/F_PDCH' + - phys_chan_config: 'TCH/F_PDCH' -- To view, visit https://gerrit.osmocom.org/11986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I37f3fe813d4074fbfe64ff3176048e7d25d470e2 Gerrit-Change-Number: 11986 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:40:53 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 30 Nov 2018 11:40:53 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 5: (4 comments) https://gerrit.osmocom.org/#/c/11898/5/src/Makefile.am File src/Makefile.am: https://gerrit.osmocom.org/#/c/11898/5/src/Makefile.am at 119 PS5, Line 119: echo "/* DO NOT EDIT THIS FILE. It is generated from files in osmo-hlr.git/sql/ */" > "$@" > (wow, I really cooked up some voodoo here didn't I ... now wondering whether a python script "sql2c. [?] Yes, later putayta. https://gerrit.osmocom.org/#/c/11898/5/src/db.c File src/db.c: https://gerrit.osmocom.org/#/c/11898/5/src/db.c at 378 PS5, Line 378: rc = sqlite3_exec(dbc->db, "PRAGMA journal_mode=WAL; PRAGMA synchonous = NORMAL;", 0, 0, &err_msg); > (interesting typo in old code: "synchronous" [?] This should not break anything. It seems this statement is trying to switch the synchronous pragma from 'FULL' to 'NORMAL'. In a hlr.db freshly created by running osmo-hlr, the pragma is set to 'FULL' by default. Because 'FULL' is more paranoid than 'NORMAL', we didn't lose anything here except for negligible performance differences. See https://sqlite.org/pragma.html#pragma_synchronous https://gerrit.osmocom.org/#/c/11898/5/src/db.c at 383 PS5, Line 383: if (!db_is_bootstrapped(dbc)) { > imagine some future scheme adds a new table. [?] The idea is that this function will only ever check for tables which were already known in schema version 0. In which case the problems you point out won't occur. Maybe I should add a comment about that. Checking for tables which are added in later schema versions should be done as an additional later step. There's a bit of a blurry line between checking for being bootstrapped and full-on schema verification; so we'll have to find some acceptable trade-off. https://gerrit.osmocom.org/#/c/11898/5/src/db.c at 403 PS5, Line 403: LOGP(DDB, LOGL_ERROR, "Unable to read user version number from database '%s'\n", dbc->fname); > Is the user_version always present in an sqlite db? otherwise, if I read this right, when osmo-hlr n [?] No, it will only return -1 if queries return errors. It seems to me like user_version will always be zero unless we explicitly set it. On an empty sqlite DB, pragma user_version returns zero. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 11:40:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:44:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 11:44:47 +0000 Subject: Change in libosmocore[master]: msgb: add test helper In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helper ...................................................................... Patch Set 1: Code-Review-1 (7 comments) https://gerrit.osmocom.org/#/c/12017/1/include/osmocom/core/msgb.h File include/osmocom/core/msgb.h: https://gerrit.osmocom.org/#/c/12017/1/include/osmocom/core/msgb.h at 569 PS1, Line 569: bool msgb_cmpr(const char *f, size_t l, const struct msgb *msg, const uint8_t *data, size_t len, bool print); strcmp, so why not msgb_cmp instead of msgb_cmpr? https://gerrit.osmocom.org/#/c/12017/1/src/msgb.c File src/msgb.c: https://gerrit.osmocom.org/#/c/12017/1/src/msgb.c at 176 PS1, Line 176: static inline bool compare_n_print(const char *f, size_t l, uint8_t level, remove inline, let the compiler decide what's more optimal. https://gerrit.osmocom.org/#/c/12017/1/src/msgb.c at 196 PS1, Line 196: /* N. B: that's intended to be used bymsgb_cmpr*() so length check is already passed, This comment needs to be moved to line 180 since len is already used there. https://gerrit.osmocom.org/#/c/12017/1/src/msgb.c at 230 PS1, Line 230: /*! Compare and print: check data in msgb against given data and print erros if any typo: errors https://gerrit.osmocom.org/#/c/12017/1/src/msgb.c at 231 PS1, Line 231: * \param[in] f text prefix, usually __func__, ignored if print == false If it's based on print value, then it makes sense to move it at the end after print, not here at the start of the function. BTW, you should move these functions to have an underscore before it (_msg_cmp) and then have a define as msg_cmp(foo, bar) _msg_cmp(foo, bar, __FILE__, __LINE__). We do that in fsm.h check it. https://gerrit.osmocom.org/#/c/12017/1/src/msgb.c at 232 PS1, Line 232: * \param[in] l numeric prefix, usually __LINE__, ignored if print == false Same, move at the end. https://gerrit.osmocom.org/#/c/12017/1/src/msgb.c at 239 PS1, Line 239: bool msgb_cmpr(const char *f, size_t l, const struct msgb *msg, const uint8_t *data, size_t len, bool print) I'd expect a msgb_cmp to compare two structs of msgb, so better calling this one msgb_cmp_data, in case we want to add the other one later. Now that we are adding the API, what about having it return an int like memcmp? after all we are using memcmp, so we can return an int. -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 11:44:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:56:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 11:56:52 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 9: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/11827/9/src/gsm/gsm29_205.c File src/gsm/gsm29_205.c: https://gerrit.osmocom.org/#/c/11827/9/src/gsm/gsm29_205.c at 76 PS9, Line 76: return -E2BIG; probably another error would be better here. returning "too big" when size is too small is really confusing. https://gerrit.osmocom.org/#/c/11827/9/src/gsm/gsm29_205.c at 82 PS9, Line 82: parsed += (2 + 1); parenthesis can be dropped here. https://gerrit.osmocom.org/#/c/11827/9/src/gsm/gsm29_205.c at 85 PS9, Line 85: return -EBADF; Doesn't look like EBADF is a good error to return here. -EINVAL maybe? https://gerrit.osmocom.org/#/c/11827/9/src/gsm/libosmogsm.map File src/gsm/libosmogsm.map: https://gerrit.osmocom.org/#/c/11827/9/src/gsm/libosmogsm.map at 147 PS9, Line 147: gsm29205_enc_gcr; I know not everything is perfectly sorted, but let's try to keep it as sorted as possible, so move these to line 225 https://gerrit.osmocom.org/#/c/11827/9/tests/gsm29205/gsm29205_test.c File tests/gsm29205/gsm29205_test.c: https://gerrit.osmocom.org/#/c/11827/9/tests/gsm29205/gsm29205_test.c at 64 PS9, Line 64: printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); All these should exit, or at least return. -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 11:56:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 11:57:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 11:57:34 +0000 Subject: Change in libosmocore[master]: Move BSSMAP_MSG_* defines to header file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12018 ) Change subject: Move BSSMAP_MSG_* defines to header file ...................................................................... Patch Set 1: Code-Review-1 Explain why is this needed in the commit description. -- To view, visit https://gerrit.osmocom.org/12018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d8cc05b8df8e70c1f6257e53ae3acec7901681f Gerrit-Change-Number: 12018 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 11:57:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:03:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:03:37 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule SS session timeout In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12022 ) Change subject: SS/USSD: fix: properly (re)schedule SS session timeout ...................................................................... Patch Set 3: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/12022/3/src/hlr_ussd.c File src/hlr_ussd.c: https://gerrit.osmocom.org/#/c/12022/3/src/hlr_ussd.c at 542 PS3, Line 542: /* Reschedule self-destruction timer */ Can we split adding the VTY command and adding this block into separate commits? One is a feature and the other one is a fix. https://gerrit.osmocom.org/#/c/12022/3/src/hlr_vty.c File src/hlr_vty.c: https://gerrit.osmocom.org/#/c/12022/3/src/hlr_vty.c at 291 PS3, Line 291: if (g_hlr->ss_guard_timeout > 0) Can we have a defin for SS_GUARD_TIMEOUT_DEFAULT 30, then use it in hlr.c to set the default, and then here have: if (g_hlr->ss_guard_timeout > 0 && g_hlr->ss_guard_timeout != SS_GUARD_TIMEOUT_DEFAULT) -- To view, visit https://gerrit.osmocom.org/12022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120 Gerrit-Change-Number: 12022 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 12:03:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:04:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:04:09 +0000 Subject: Change in osmo-msc[master]: cosmetic: subscr_conn_fsm_auth_ciph() should be static In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12021 ) Change subject: cosmetic: subscr_conn_fsm_auth_ciph() should be static ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaa2c63d2b06f59d34e0465c40a98741f56ec526a Gerrit-Change-Number: 12021 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 12:04:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:05:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:05:30 +0000 Subject: Change in osmo-msc[master]: adjust copyright in subscr_conn.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12028 ) Change subject: adjust copyright in subscr_conn.c ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/12028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia89e2d343a850234557e365457705a11d26fd925 Gerrit-Change-Number: 12028 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 12:05:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:07:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:07:03 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscr_conn->mncc_rtp_bridge In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12013 ) Change subject: drop unused gsm_subscr_conn->mncc_rtp_bridge ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba Gerrit-Change-Number: 12013 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 12:07:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:11:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:11:54 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12015 ) Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 12:11:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:16:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:16:27 +0000 Subject: Change in osmo-msc[master]: populate gsm_subscriber_connection->encr during Ciph In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12016 ) Change subject: populate gsm_subscriber_connection->encr during Ciph ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/12016/6//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12016/6//COMMIT_MSG at 19 PS6, Line 19: For 3G connections, though, this will still remain 0 in the VTY, since there is Can we then rename the parameter to ->gsm_encr or ->geran_encr or whatever instead of "->encr" ? in order to indicate it's not used by 3G. -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 12:16:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:16:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:16:58 +0000 Subject: Change in osmo-msc[master]: move subscr_conn.c to ran_conn.c In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12031 ) Change subject: move subscr_conn.c to ran_conn.c ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6aa6b335842116c717a554c981083a914724ee21 Gerrit-Change-Number: 12031 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 12:16:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:17:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 12:17:00 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12043 Change subject: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS ...................................................................... libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS In I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 I've introduced a regression. According to GSM TS 04.11, section 2.3, SAPI 3 shall be used for both MO/MT SMS transmissions. Change-Id: I08d0801a89d377441e95fb8e3dd27c8d587f89e9 --- M src/libmsc/gsm_04_11.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/12043/1 diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 88dc433..b602344 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -149,8 +149,6 @@ case GSM_PAGING_SUCCEEDED: /* Associate transaction with established connection */ trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_SMS); - /* FIXME: specify SACCH in case we already have active TCH */ - trans->dlci = 0x03; /* Confirm successful connection establishment */ gsm411_smc_recv(&trans->sms.smc_inst, GSM411_MMSMS_EST_CNF, NULL, 0); @@ -1017,6 +1015,9 @@ trans->sms.sm_rp_mr = conn->next_rp_ref++; } + /* Use SAPI 3 (see GSM 04.11, section 2.3) */ + trans->dlci = UM_SAPI_SMS; + return trans; } -- To view, visit https://gerrit.osmocom.org/12043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I08d0801a89d377441e95fb8e3dd27c8d587f89e9 Gerrit-Change-Number: 12043 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:18:12 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 12:18:12 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS In-Reply-To: References: Message-ID: Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12043 ) Change subject: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS ...................................................................... libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS In I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 I've introduced a regression. According to GSM TS 04.11, section 2.3, SAPI 3 shall be used for both MO/MT SMS transmissions. Change-Id: I08d0801a89d377441e95fb8e3dd27c8d587f89e9 Related: OS#3716 --- M src/libmsc/gsm_04_11.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/12043/2 -- To view, visit https://gerrit.osmocom.org/12043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I08d0801a89d377441e95fb8e3dd27c8d587f89e9 Gerrit-Change-Number: 12043 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:19:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:19:17 +0000 Subject: Change in libosmocore[master]: LCLS: fix GCR parameter name In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12019 ) Change subject: LCLS: fix GCR parameter name ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12019/1/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/12019/1/include/osmocom/gsm/gsm0808_utils.h at 65 PS1, Line 65: struct gsm29205_gcr *gcr; /*< doc ?3.2.2.115 Global Call Reference */ In the previous commit, "struct gsm29205_gcr" is added. Can we remove "struct gsm0808_gcr" since it's no longer of any use, or is it being used somehwere still? -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 12:19:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:24:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:24:17 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12043 ) Change subject: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08d0801a89d377441e95fb8e3dd27c8d587f89e9 Gerrit-Change-Number: 12043 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 12:24:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:26:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:26:12 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_network->handover.active In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12014 ) Change subject: drop unused gsm_network->handover.active ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 Gerrit-Change-Number: 12014 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 12:26:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:27:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:27:16 +0000 Subject: Change in openbsc[master]: manuals: Osmo{NAT, MGCP} -> OsmoBSC{NAT, MGCP} In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12040 ) Change subject: manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8c020361c141c758bfb32562dbd7f34f4fd81c39 Gerrit-Change-Number: 12040 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Nov 2018 12:27:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:43:13 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 30 Nov 2018 12:43:13 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/12044 Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... gsm0808: add encoder for cause codes and use it At the moment the all gsm0808 cause codes are encoded directly using the tlv API directly to put a one byte TLV field. This works ok for most situations where the cause code consists of a single byte. However, gsm0808 specifies a two byte cause code model where cause codes may be extended up to two bytes. Lets implement the encoding over and over again, lets rather have an encoder function we can call. - Add an encoder function that can generate single byte and extended cause codeds and makes the length decision automatically. - Use only this function to append cause codes Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c 3 files changed, 43 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/12044/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index c5bf280..e1dd11e 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -77,6 +77,7 @@ int gsm0808_cell_id_u_name(char *buf, size_t buflen, enum CELL_IDENT id_discr, const union gsm0808_cell_id_u *u); +uint8_t gsm0808_enc_cause(struct msgb *msg, uint16_t cause); uint8_t gsm0808_enc_aoip_trasp_addr(struct msgb *msg, const struct sockaddr_storage *ss); int gsm0808_dec_aoip_trasp_addr(struct sockaddr_storage *ss, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 04d786e..3e2d8da 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -144,7 +144,7 @@ return NULL; msgb_v_put(msg, BSS_MAP_MSG_RESET); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + gsm0808_enc_cause(msg, cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); return msg; @@ -193,7 +193,7 @@ msg->l3h = msgb_tv_put(msg, BSSAP_MSG_BSS_MANAGEMENT, 4); msgb_v_put(msg, BSS_MAP_MSG_CLEAR_CMD); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + gsm0808_enc_cause(msg, cause); return msg; } @@ -276,7 +276,7 @@ msgb_v_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, (const uint8_t *)&cause); + gsm0808_enc_cause(msg, cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); @@ -289,18 +289,22 @@ * \returns callee-allocated msgb with BSSMAP Cipher Mode Reject message */ struct msgb *gsm0808_create_cipher_reject_ext(enum gsm0808_cause_class class, uint8_t ext) { - uint8_t c[2]; + uint16_t cause; struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "bssmap: cipher mode reject"); if (!msg) return NULL; - c[0] = 0x80 | (class << 4); /* set the high bit to indicate extended cause */ - c[1] = ext; + /* Set cause code class in the upper byte */ + cause = 0x80 | (class << 4); + cause = cause << 8; + + /* Set cause code extension in the lower byte */ + cause |= ext; msgb_v_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 2, c); + gsm0808_enc_cause(msg, cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); @@ -575,7 +579,7 @@ return NULL; msgb_v_put(msg, BSS_MAP_MSG_ASSIGMENT_FAILURE); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + gsm0808_enc_cause(msg, cause); /* RR cause 3.2.2.22 */ if (rr_cause) @@ -617,7 +621,7 @@ return NULL; msgb_v_put(msg, BSS_MAP_MSG_CLEAR_RQST); - msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause); + gsm0808_enc_cause(msg, cause); msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); return msg; @@ -754,7 +758,7 @@ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_REQUIRED); /* Cause, 3.2.2.5 */ - msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80? 2 : 1, (const uint8_t*)¶ms->cause); + gsm0808_enc_cause(msg, params->cause); /* Cell Identifier List, 3.2.2.27 */ gsm0808_enc_cell_id_list2(msg, ¶ms->cil); @@ -879,7 +883,7 @@ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_FAILURE); /* Cause, 3.2.2.5 */ - msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80? 2 : 1, (const uint8_t*)¶ms->cause); + gsm0808_enc_cause(msg, params->cause); /* RR Cause, 3.2.2.22 */ if (params->rr_cause_present) @@ -910,7 +914,7 @@ msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_PERFORMED); /* Cause, 3.2.2.5 */ - msgb_tlv_put(msg, GSM0808_IE_CAUSE, gsm0808_cause_ext(params->cause) ? 2 : 1, (const uint8_t *)¶ms->cause); + gsm0808_enc_cause(msg, params->cause); /* Cell Identifier, 3.2.2.17 */ gsm0808_enc_cell_id(msg, ¶ms->cell_id); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index c58d828..1252857 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -48,6 +48,32 @@ * \file gsm0808_utils.c */ +/*! Encode TS 08.08 AoIP Cause IE + * \param[out] msg Message Buffer to which to append IE + * \param[in] cause Cause code to be used in IE + * \returns number of bytes added to \a msg */ +uint8_t gsm0808_enc_cause(struct msgb *msg, uint16_t cause) +{ + /* See also 3GPP TS 48.008 3.2.2.5 Cause */ + uint8_t *old_tail; + bool extended; + uint8_t buf[2]; + + old_tail = msg->tail; + + extended = gsm0808_cause_ext(cause >> 8); + + if (extended) { + buf[1] = (uint8_t) (cause & 0xff); + buf[0] = (uint8_t) ((cause >> 8) & 0xff); + } else + buf[0] = (uint8_t) (cause & 0xff); + + msgb_tlv_put(msg, GSM0808_IE_CAUSE, extended ? 2 : 1, buf); + + return (uint8_t) (msg->tail - old_tail); +} + /*! Encode TS 08.08 AoIP transport address IE * \param[out] msg Message Buffer to which to append IE * \param[in] ss Socket Address to be used in IE -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:49:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 12:49:03 +0000 Subject: Change in openbsc[master]: manuals: Osmo{NAT, MGCP} -> OsmoBSC{NAT, MGCP} In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12040 ) Change subject: manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} ...................................................................... manuals: Osmo{NAT,MGCP} -> OsmoBSC{NAT,MGCP} Rename the manuals to their proper names. Change-Id: I8c020361c141c758bfb32562dbd7f34f4fd81c39 --- R manuals/OsmoBSCMGCP/Makefile C manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml R manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml R manuals/OsmoBSCMGCP/vty/mgcp_vty_reference.xml R manuals/OsmoBSCNAT/Makefile R manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.xml R manuals/OsmoBSCNAT/vty/nat_vty_additions.xml R manuals/OsmoBSCNAT/vty/nat_vty_reference.xml D manuals/OsmoNAT/osmonat-vty-reference.xml 9 files changed, 4 insertions(+), 48 deletions(-) Approvals: osmith: Verified Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/manuals/OsmoMGCP/Makefile b/manuals/OsmoBSCMGCP/Makefile similarity index 80% rename from manuals/OsmoMGCP/Makefile rename to manuals/OsmoBSCMGCP/Makefile index 022f6d4..a6cbc8e 100644 --- a/manuals/OsmoMGCP/Makefile +++ b/manuals/OsmoBSCMGCP/Makefile @@ -1,7 +1,7 @@ OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) srcdir=$(CURDIR) -VTY_REFERENCE = osmomgcp-vty-reference.xml +VTY_REFERENCE = osmo-bsc-mgcp-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml b/manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml similarity index 95% copy from manuals/OsmoMGCP/osmomgcp-vty-reference.xml copy to manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml index e9cc898..22fad1b 100644 --- a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml +++ b/manuals/OsmoBSCMGCP/osmo-bsc-mgcp-vty-reference.xml @@ -26,7 +26,7 @@ - OsmoMGCP VTY Reference + OsmoBSCMGCP VTY Reference 2012-2014 diff --git a/manuals/OsmoMGCP/vty/mgcp_vty_additions.xml b/manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml similarity index 100% rename from manuals/OsmoMGCP/vty/mgcp_vty_additions.xml rename to manuals/OsmoBSCMGCP/vty/mgcp_vty_additions.xml diff --git a/manuals/OsmoMGCP/vty/mgcp_vty_reference.xml b/manuals/OsmoBSCMGCP/vty/mgcp_vty_reference.xml similarity index 100% rename from manuals/OsmoMGCP/vty/mgcp_vty_reference.xml rename to manuals/OsmoBSCMGCP/vty/mgcp_vty_reference.xml diff --git a/manuals/OsmoNAT/Makefile b/manuals/OsmoBSCNAT/Makefile similarity index 81% rename from manuals/OsmoNAT/Makefile rename to manuals/OsmoBSCNAT/Makefile index 9c380a2..9b8e208 100644 --- a/manuals/OsmoNAT/Makefile +++ b/manuals/OsmoBSCNAT/Makefile @@ -1,7 +1,7 @@ OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) srcdir=$(CURDIR) -VTY_REFERENCE = osmonat-vty-reference.xml +VTY_REFERENCE = osmo-bsc-nat-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml b/manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.xml similarity index 95% rename from manuals/OsmoMGCP/osmomgcp-vty-reference.xml rename to manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.xml index e9cc898..7b2b483 100644 --- a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml +++ b/manuals/OsmoBSCNAT/osmo-bsc-nat-vty-reference.xml @@ -26,7 +26,7 @@ - OsmoMGCP VTY Reference + OsmoBSCNAT VTY Reference 2012-2014 diff --git a/manuals/OsmoNAT/vty/nat_vty_additions.xml b/manuals/OsmoBSCNAT/vty/nat_vty_additions.xml similarity index 100% rename from manuals/OsmoNAT/vty/nat_vty_additions.xml rename to manuals/OsmoBSCNAT/vty/nat_vty_additions.xml diff --git a/manuals/OsmoNAT/vty/nat_vty_reference.xml b/manuals/OsmoBSCNAT/vty/nat_vty_reference.xml similarity index 100% rename from manuals/OsmoNAT/vty/nat_vty_reference.xml rename to manuals/OsmoBSCNAT/vty/nat_vty_reference.xml diff --git a/manuals/OsmoNAT/osmonat-vty-reference.xml b/manuals/OsmoNAT/osmonat-vty-reference.xml deleted file mode 100644 index 8f8b096..0000000 --- a/manuals/OsmoNAT/osmonat-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th August 2012 - hf - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoNAT VTY Reference - - - 2012-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - -- To view, visit https://gerrit.osmocom.org/12040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8c020361c141c758bfb32562dbd7f34f4fd81c39 Gerrit-Change-Number: 12040 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:51:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 12:51:39 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: with_manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12045 Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... gerrit-verifications/master-builds: with_manuals Add a new "with_manuals" axis to all jobs generated by gerrit-verifications.yml and master-builds.yml, which already have at least one axis. Adjust the combination filters, so the manuals are generated (and published) only once. The contrib/jenkins.sh scripts will be adjusted to append --enable-manuals to the configure options, when with_manuals is set. For all jobs that do not have any axes, we can always append this flag. Two different methods of passing through the configure flags are used in both yml files already. One is creating a "with_var" variable with True and False as arguments. The other is creating a "VAR" variable with "--enable-foo" and "--disable-foo" as values. I decided to use the "with_var" approach, so we could use it to activate multiple configure options at once: --enable-manuals and --enable-man when the UNIX man pages feature gets implemented (OS#3386). Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 86 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/12045/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 71a0904..a4ee878 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -90,22 +90,29 @@ a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, litecell15, oc2g, oc2g-next] a2_name: BTS_MODEL a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g] + a3_name: with_manuals + a3: !!python/tuple [True, False] combination_filter: > - FIRMWARE_VERSION == "master" || - (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g") || - (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g") + (FIRMWARE_VERSION == "master" && with_manuals == True) || + (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && with_manuals == False) || + (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && with_manuals == False) || + (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && with_manuals == False) || + (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && with_manuals == False) cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] + a2_name: with_manuals + a2: !!python/tuple [True, False] + combination_filter: > + (GTP == "--enable-gtp-linux" && with_manuals == True) || + (GTP == "--disable-gtp-linux" && with_manuals == False) cmd: GTP="$GTP" ./contrib/jenkins.sh - osmo-gsm-manuals @@ -117,7 +124,12 @@ - osmo-mgw: a1_name: MGCP a1: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (MGCP == "--enable-mgcp-transcoding" && with_manuals == True) || + (MGCP == "--disable-mgcp-transcoding" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ @@ -128,7 +140,12 @@ - osmo-msc: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (IU == "--enable-iu" && with_manuals == True) || + (IU == "--disable-iu" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" @@ -149,13 +166,15 @@ a2: !!python/tuple [True, False] a3_name: with_dsp a3: !!python/tuple [sysmo, lc15, none] + a4_name: with_manuals + a4: !!python/tuple [True, False] sequential: true combination_filter: > - (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || - (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") + (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && with_manuals == True) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && with_manuals == False) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && with_manuals == False) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && with_manuals == False) || + (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && with_manuals == False) || - osmo-python-tests: repos_url: 'ssh://jenkins at gerrit.osmocom.org:29418/python/{repos}' @@ -164,7 +183,12 @@ - osmo-sgsn: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (IU == "--enable-iu" && with_manuals == True) || + (IU == "--disable-iu" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ @@ -176,10 +200,14 @@ - osmo-trx: a1_name: INSTR - # ARM variants temporarily disabled due to issue OS#3061 + # ARM variants temporarily disabled due to issue OS#3061 (mind the combination_filter below!) # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (INSTR == "--with-sse" && with_manuals == True) - osmocom-bb - osmo-tetra diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 67a9b80..729211e 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -182,20 +182,27 @@ a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15] a2_name: BTS_MODEL a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15] + a3_name: with_manuals + a3: !!python/tuple [True, False] combination_filter: > - FIRMWARE_VERSION == "master" || - (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") + (FIRMWARE_VERSION == "master" && with_manuals == True) || + (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && with_manuals == False) || + (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && with_manuals == False) cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL" --publish' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] + a2_name: with_manuals + a2: !!python/tuple [True, False] + combination_filter: > + (GTP == "--enable-gtp-linux" && with_manuals == True) || + (GTP == "--disable-gtp-linux" && with_manuals == False) cmd: GTP="$GTP" ./contrib/jenkins.sh --publish trigger: master-osmo-sgsn @@ -223,7 +230,12 @@ - osmo-mgw: a1_name: MGCP a1: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (MGCP == "--enable-mgcp-transcoding" && with_manuals == True) || + (MGCP == "--disable-mgcp-transcoding" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines docker run --rm=true \ @@ -241,7 +253,12 @@ - osmo-msc: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (IU == "--enable-iu" && with_manuals == True) || + (IU == "--disable-iu" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" @@ -274,19 +291,26 @@ a2: !!python/tuple [True, False] a3_name: with_dsp a3: !!python/tuple [sysmo, lc15, none] + a4_name: with_manuals + a4: !!python/tuple [True, False] sequential: true combination_filter: > - (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || - (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") + (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && with_manuals == True) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && with_manuals == False) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && with_manuals == False) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && with_manuals == False) || + (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && with_manuals == False) cmd: ./contrib/jenkins.sh --publish - osmo-sgsn: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (IU == "--enable-iu" && with_manuals == True) || + (IU == "--disable-iu" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines docker run --rm=true \ @@ -309,10 +333,14 @@ - osmo-trx: a1_name: INSTR - # ARM variants temporarily disabled due to issue OS#3061 + # ARM variants temporarily disabled due to issue OS#3061 (mind the combination_filter below!) # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (INSTR == "--with-sse" && with_manuals == True) cmd: ./contrib/jenkins.sh --publish - osmocom-bb -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 12:52:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 12:52:22 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 12:52:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:00:10 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 13:00:10 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: with_manuals In-Reply-To: References: Message-ID: osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... gerrit-verifications/master-builds: with_manuals Add a new "with_manuals" axis to all jobs generated by gerrit-verifications.yml and master-builds.yml, which already have at least one axis. Adjust the combination filters, so the manuals are generated (and published) only once. The contrib/jenkins.sh scripts will be adjusted to append --enable-manuals to the configure options, when with_manuals is set. For all jobs that do not have any axes, we can always append this flag. Two different methods of passing through the configure flags are used in both yml files already. One is creating a "with_var" variable with True and False as arguments. The other is creating a "VAR" variable with "--enable-foo" and "--disable-foo" as values. I decided to use the "with_var" approach, so we could use it to activate multiple configure options at once: --enable-manuals and --enable-man when the UNIX man pages feature gets implemented (OS#3386). Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 86 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/12045/2 -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 2 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:02:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:02:48 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12044 ) Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Waiting for MAx review to give +2 https://gerrit.osmocom.org/#/c/12044/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12044/1//COMMIT_MSG at 13 PS1, Line 13: extended up to two bytes. Lets implement the encoding over and over I guess you menat: "Instead of implementing the encoding over and over and again, let's rather have and encoder function we can call". -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 13:02:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:07:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 30 Nov 2018 13:07:13 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11898 to look at the new patch set (#6). Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database Make use of pragma user_version to store our database schema version. The present schema is now identitifed as 'version 0', which is also the default value for databases on which we never ran the statement 'pragma user_version' before. Only bootstrap the database if it hasn't been bootstrapped yet. Previously, bootstrap SQL statements ran every time osmo-hlr opened the database, and any errors were being ignored in SQL. Instead, we now first run a query which checks whether tables already exist, and only create them if necessary. This change will allow future schema updates to work properly. Prepare for future schema upgrades by adding a new command-line option which enables upgrades. This option defaults to 'false' in order to avoid accidental upgrades. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/Makefile.am M sql/hlr.sql A sql/hlr_index.sql M src/Makefile.am M src/db.c M src/db.h R src/db_sql2c.sed M src/hlr.c M src/hlr_db_tool.c 9 files changed, 161 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/6 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:07:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 13:07:53 +0000 Subject: Change in osmo-hlr[master]: contrib/jenkins.sh: build and publish manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/11976 ) Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/11976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia1a6ab64c7912f30a693ca4f5f474f22d72b8873 Gerrit-Change-Number: 11976 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Nov 2018 13:07:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:08:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:08:07 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: with_manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml at 97 PS2, Line 97: (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && with_manuals == True) || why building thm here instead of "master" version? https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml at 177 PS2, Line 177: (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && with_manuals == False) || I'd also enable it here instead of the sysmo one. https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml at 190 PS2, Line 190: (IU == "--enable-iu" && with_manuals == True) || Since enable iu takes more time, probably makes sense to enable document build in disable-iu instead, so they take more a less the same time when running in parallel. You can probably do the same for other projects, like osmo-ggsn (enable-gtp), etc. -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 13:08:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:08:37 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 30 Nov 2018 13:08:37 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/11898 ) Change subject: add database schema versioning to the HLR database ...................................................................... Patch Set 6: > Patch Set 5: Code-Review-1 > The above is what I'd like to see, unless it takes inifinitely too much time. All done except tests. How does it look now? I'll try to add those before this gets merged; but they could be added as a separate patch as far as I'm concerned. -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 13:08:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:15:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:15:41 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: with_manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml at 206 PS2, Line 206: cmd: GTP="$GTP" ./contrib/jenkins.sh --publish Shouldn't publish be called conditionally based on with_manuals? see GTP="$GTP" as example. Not sure how to apply it as a boolean to env var though, you may need to move them to strings. a2_name: MANUALS a2: !!python/tuple ["--enable-manuals", "--disable-manuals"] GTP="$GTP" MANUALS="$MANUALS" ./contrib/jenkins.sh --publish And then use $MANUALS inside jenkins.sh. -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 13:15:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:19:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 30 Nov 2018 13:19:08 +0000 Subject: Change in osmo-hlr[master]: add database schema versioning to the HLR database In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11898 to look at the new patch set (#7). Change subject: add database schema versioning to the HLR database ...................................................................... add database schema versioning to the HLR database Make use of pragma user_version to store our database schema version. The present schema is now identitifed as 'version 0', which is also the default value for databases on which we never ran the statement 'pragma user_version' before. Only bootstrap the database if it hasn't been bootstrapped yet. Previously, bootstrap SQL statements ran every time osmo-hlr opened the database, and any errors were being ignored in SQL. Instead, we now first run a query which checks whether tables already exist, and only create them if necessary. This change will allow future schema updates to work properly. Prepare for future schema upgrades by adding a new command-line option which enables upgrades. This option defaults to 'false' in order to avoid accidental upgrades. Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Related: OS#2838 --- M sql/Makefile.am M sql/hlr.sql A sql/hlr_index.sql M src/Makefile.am M src/db.c M src/db.h R src/db_sql2c.sed M src/hlr.c M src/hlr_db_tool.c M tests/db/db_test.c 10 files changed, 162 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/98/11898/7 -- To view, visit https://gerrit.osmocom.org/11898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aeaa9a404b622657cbc7138106f38aa6ad8d01b Gerrit-Change-Number: 11898 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:26:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:26:51 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/12020/2/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12020/2/src/gsm/gsm0808_utils.c at 496 PS2, Line 496: msgb_v_put(msg, 0); /* len points to this reserved space already */ /* reserve space for length, len points to this reserved space already */ msgb_v_put(msg, 0); https://gerrit.osmocom.org/#/c/12020/2/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/2/tests/gsm0808/gsm0808_test.c at 600 PS2, Line 600: if (!msgb_cmpr(__func__, __LINE__, msg, res, ARRAY_SIZE(res), true)) Same comments as before: msgb_cmp, etc. https://gerrit.osmocom.org/#/c/12020/2/tests/gsm0808/gsm0808_test.c at 605 PS2, Line 605: printf("parsing failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); Exit or at last return in all failed cases. -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 13:26:51 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:35:37 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 13:35:37 +0000 Subject: Change in osmo-pcu[master]: contrib/jenkins.sh: build and publish manuals Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12046 Change subject: contrib/jenkins.sh: build and publish manuals ...................................................................... contrib/jenkins.sh: build and publish manuals Install osmo-gsm-manuals like any other dependency. Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure --enable-manuals. Add optional --publish parameter to contrib/jenkins.sh to be used by the master-builds jenkins job. It will automatically upload the newly generated PDFs when commits land in master. Related: OS#3385 Change-Id: Id460a932431b46b88937d96637edd209ca56db97 --- M contrib/jenkins.sh 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/12046/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5f81978..575b5a4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -14,6 +14,10 @@ exit 1 fi +# gerrit-verifications.yml: leaves this empty +# master-builds.yml: sets this to "--publish" +publish="$1" + base="$PWD" deps="$base/deps" inst="$deps/install" @@ -65,6 +69,12 @@ export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +if [ "$with_manuals" = "True" ]; then + osmo-build-dep.sh osmo-gsm-manuals + PCU_CONFIG="$PCU_CONFIG --enable-manuals" +fi set +x echo @@ -81,4 +91,8 @@ $MAKE distcheck \ || cat-testlogs.sh +if [ "$with_manuals" = "True" ] && [ "$publish" = "--publish" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/12046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id460a932431b46b88937d96637edd209ca56db97 Gerrit-Change-Number: 12046 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:37:17 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 13:37:17 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: with_manuals In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml at 97 PS2, Line 97: (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && with_manuals == True) || > why building thm here instead of "master" version? I had this first: (FIRMWARE_VERSION == "master" && with_manuals == True) But then I've realized that the missing BTS_MODEL means: build this with FIRMWARE_VERSION == "master" for *every* BTS_MODEL. Here's a nice visualization: https://jenkins.osmocom.org/jenkins/view/master/job/master-osmo-bts/ I've moved it to this line, so the manuals really only get built once. https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml at 177 PS2, Line 177: (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && with_manuals == False) || > I'd also enable it here instead of the sysmo one. Ack https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml at 190 PS2, Line 190: (IU == "--enable-iu" && with_manuals == True) || > Since enable iu takes more time, probably makes sense to enable document build in disable-iu instead [?] Ack https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml at 206 PS2, Line 206: cmd: GTP="$GTP" ./contrib/jenkins.sh --publish > Shouldn't publish be called conditionally based on with_manuals? see GTP="$GTP" as example. [?] I think the GTP="$GPT" is redundant here, the variable should automatically be set as environment variable. But I've missed adjusting the docker lines, they will need to get the new with_manuals environment variable passed through. I'll fix this. I'd rather use with_manuals than MANUALS, so we could extend it with building man pages later (see commit message). To answer your question, I don't see a nice way of implementing this. We could do it like that, but it really gets ugly when we would need to duplicate the whole docker line. cmd: | if [ "$with_manuals" = "True" ]; then ./contrib/jenkins.sh --publish else ./contrib/jenkins.sh fi Instead I would implement logic in contrib/jenkins.sh, so it only publishes the manuals when both with_manuals is True and --publish is set. For example: https://gerrit.osmocom.org/#/c/osmo-pcu/+/12046/ -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Nov 2018 13:37:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:49:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:49:01 +0000 Subject: Change in osmo-msc[master]: drop unused openbscdefines.h In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12024 ) Change subject: drop unused openbscdefines.h ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If35cd49baa4d0a3b38f31736e1696f481babba9c Gerrit-Change-Number: 12024 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 13:49:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:50:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:50:11 +0000 Subject: Change in osmo-msc[master]: drop unused SUBSCR_CONN_E_INVALID In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12025 ) Change subject: drop unused SUBSCR_CONN_E_INVALID ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f3c964ee04fec9a96f385199fb3141ac8d672d4 Gerrit-Change-Number: 12025 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 13:50:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:50:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:50:56 +0000 Subject: Change in osmo-msc[master]: drop unused gsm0408_allow_everyone() declaration In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12026 ) Change subject: drop unused gsm0408_allow_everyone() declaration ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id56ea492594edc38d1f9d31d94a1679c0cb61fa0 Gerrit-Change-Number: 12026 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 13:50:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:51:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:51:49 +0000 Subject: Change in osmo-msc[master]: drop unused tests/db/* In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12027 ) Change subject: drop unused tests/db/* ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I05880507d9bf029f0ec451efda0ebe54ac09ef12 Gerrit-Change-Number: 12027 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 13:51:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:54:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:54:05 +0000 Subject: Change in osmo-msc[master]: drop msc_compl_l3() return value In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12029 ) Change subject: drop msc_compl_l3() return value ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09 Gerrit-Change-Number: 12029 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 13:54:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:56:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:56:16 +0000 Subject: Change in osmo-msc[master]: rename some RAN conn related stuff to ran_conn_* In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12030 ) Change subject: rename some RAN conn related stuff to ran_conn_* ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 Gerrit-Change-Number: 12030 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 13:56:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 13:58:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 13:58:16 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12032 ) Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 13:58:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:03:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 14:03:12 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12033 ) Change subject: combine several small .h in msc_common.h ...................................................................... Patch Set 4: (3 comments) https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/debug.h File include/osmocom/msc/debug.h: https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/debug.h at a6 PS4, Line 6: > I would keep logging related stuff separately... ack. also made sense to me later but didn't care enough to change the patch... https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/msc_common.h File include/osmocom/msc/msc_common.h: https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/msc_common.h at 7 PS4, Line 7: #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" : #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT > This is rather VLR specific stuff, because exactly VLR speaks GSUP with HLR. mhyeeaaa though it's the MSC's job to tell the VLR how to configure its GSUP. Maybe it can go to msc_main.c. https://gerrit.osmocom.org/#/c/12033/4/include/osmocom/msc/msc_common.h at 10 PS4, Line 10: msc_debug_categories > Do we really need to name this enum? It isn't referenced anywhere AFAIK. [?] ack -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 14:03:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:06:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 14:06:34 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_subscr_conn->mncc_rtp_bridge In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12013 ) Change subject: drop unused gsm_subscr_conn->mncc_rtp_bridge ...................................................................... drop unused gsm_subscr_conn->mncc_rtp_bridge Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 085248c..4d3a2e4 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -118,9 +118,6 @@ /* Are we part of a special "silent" call */ int silent_call; - /* MNCC rtp bridge markers */ - int mncc_rtp_bridge; - /* back pointers */ struct gsm_network *network; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index f9888d7..c9dffe3 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1723,8 +1723,6 @@ return 0; } - trans->conn->mncc_rtp_bridge = 1; - /* When we call msc_mgcp_call_assignment() we will trigger, depending * on the RAN type the call assignment on the A or Iu interface. * msc_mgcp_call_assignment() also takes care about sending the CRCX -- To view, visit https://gerrit.osmocom.org/12013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I322dc18cfe2cc573744261df837e719b5cf224ba Gerrit-Change-Number: 12013 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:06:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 14:06:34 +0000 Subject: Change in osmo-msc[master]: drop unused gsm_network->handover.active In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12014 ) Change subject: drop unused gsm_network->handover.active ...................................................................... drop unused gsm_network->handover.active gsm_network contains an int handover.active which is always zero. Drop it. There is real handover code coming up soon, one part of this is to avoid confusion. The internal MNCC code queried it to decide whether to MNCC_BRIDGE or proxy RTP (MNCC_FRAME_RECV). Since RTP is being handled by osmo-mgw since forever, drop that entire condition from mncc_builtin. Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 --- M include/osmocom/msc/gsm_data.h M src/libmsc/mncc_builtin.c 2 files changed, 2 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 4d3a2e4..94a6ffd 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -283,9 +283,6 @@ uint8_t a5_encryption_mask; bool authentication_required; int send_mm_info; - struct { - int active; - } handover; struct rate_ctr_group *msc_ctrs; struct osmo_counter *active_calls; diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c index d6f3e3d..135a5e4 100644 --- a/src/libmsc/mncc_builtin.c +++ b/src/libmsc/mncc_builtin.c @@ -166,8 +166,7 @@ static int mncc_setup_cnf(struct gsm_call *call, int msg_type, struct gsm_mncc *connect) { - struct gsm_mncc connect_ack, frame_recv; - struct gsm_network *net = call->net; + struct gsm_mncc connect_ack; struct gsm_call *remote; struct gsm_mncc_bridge bridge = { .msg_type = MNCC_BRIDGE }; @@ -189,21 +188,7 @@ bridge.callref[1] = call->remote_ref; DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref); - /* proxy mode */ - if (!net->handover.active) { - /* in the no-handover case, we can bridge, i.e. use - * the old RTP proxy code */ - return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge); - } else { - /* in case of handover, we need to re-write the RTP - * SSRC, sequence and timestamp values and thus - * need to enable RTP receive for both directions */ - memset(&frame_recv, 0, sizeof(struct gsm_mncc)); - frame_recv.callref = call->callref; - mncc_tx_to_cc(call->net, MNCC_FRAME_RECV, &frame_recv); - frame_recv.callref = call->remote_ref; - return mncc_tx_to_cc(call->net, MNCC_FRAME_RECV, &frame_recv); - } + return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge); } static int mncc_disc_ind(struct gsm_call *call, int msg_type, -- To view, visit https://gerrit.osmocom.org/12014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie16e718266882588b38297121364ca0b7fdfe948 Gerrit-Change-Number: 12014 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:22:03 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 14:22:03 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: with_manuals In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12045 to look at the new patch set (#3). Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... gerrit-verifications/master-builds: with_manuals Add a new "with_manuals" axis to all jobs generated by gerrit-verifications.yml and master-builds.yml, which already have at least one axis. Adjust the combination filters, so the manuals are generated (and published) only once. The contrib/jenkins.sh scripts will be adjusted to append --enable-manuals to the configure options, when with_manuals is set. For all jobs that do not have any axes, we can always append this flag. Two different methods of passing through the configure flags are used in both yml files already. One is creating a "with_var" variable with True and False as arguments. The other is creating a "VAR" variable with "--enable-foo" and "--disable-foo" as values. I decided to use the "with_var" approach, so we could use it to activate multiple configure options at once: --enable-manuals and --enable-man when the UNIX man pages feature gets implemented (OS#3386). Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 92 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/12045/3 -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:22:04 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 14:22:04 +0000 Subject: Change in osmo-ci[master]: cosmetic: gerrit-verifications: format docker cmd Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12047 Change subject: cosmetic: gerrit-verifications: format docker cmd ...................................................................... cosmetic: gerrit-verifications: format docker cmd Format the docker command lines just like they are formatted in master-builds.yml. Most notably, this puts every environment variable on its own line. This makes it much easier to compare both files side by side. Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 --- M jobs/gerrit-verifications.yml 1 file changed, 61 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/47/12047/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 71a0904..e70d28e 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -32,9 +32,14 @@ concurrent: true cmd: > # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e PATH="$PATH:/build_bin" -w /build \ - -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + docker run --rm=true \ + -e HOME=/build \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e PATH="$PATH:/build_bin" \ + -w /build -i -u build \ + -v "$PWD:/build" \ + -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - libasn1c @@ -64,11 +69,21 @@ # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" mkdir -p "$ARTIFACT_STORE" - docker run --rm=true -e HOME=/build -e ARTIFACT_STORE=/artifact_store \ - -e JOB_NAME="$JOB_NAME" -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e IU="$IU" -e SMPP="$SMPP" -e MGCP="$MGCP" -e PATH="$PATH:/build_bin" \ - -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build -i -u build -v "$PWD:/build" \ - -v "$HOME/bin:/build_bin" -v "$ARTIFACT_STORE:/artifact_store" \ + docker run --rm=true \ + -e HOME=/build \ + -e ARTIFACT_STORE=/artifact_store \ + -e JOB_NAME="$JOB_NAME" \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e IU="$IU" \ + -e SMPP="$SMPP" \ + -e MGCP="$MGCP" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -i -u build \ + -v "$PWD:/build" \ + -v "$HOME/bin:/build_bin" \ + -v "$ARTIFACT_STORE:/artifact_store" \ osmocom:amd64 /build/contrib/jenkins.sh - openggsn: @@ -80,10 +95,15 @@ concurrent: true cmd: > # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build -i -u build \ - -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ - osmocom:amd64 /build/contrib/jenkins.sh + docker run --rm=true \ + -e HOME=/build \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -i -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + osmocom:amd64 /build/contrib/jenkins.sh - osmo-bts: a1_name: FIRMWARE_VERSION @@ -120,9 +140,15 @@ concurrent: true cmd: > # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e MGCP="$MGCP" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build \ - -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + docker run --rm=true \ + -e HOME=/build \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e MGCP="$MGCP" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -i -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - osmo-msc: @@ -133,10 +159,17 @@ # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" mkdir -p "$ARTIFACT_STORE" - docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store \ - -e JOB_NAME="$JOB_NAME" -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e IU="$IU" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ - -w /build -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + docker run --rm=true -i \ + -e HOME=/build \ + -e ARTIFACT_STORE=/artifact_store \ + -e JOB_NAME="$JOB_NAME" \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e IU="$IU" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ -v "$ARTIFACT_STORE:/artifact_store" \ osmocom:amd64 /build/contrib/jenkins.sh @@ -167,9 +200,15 @@ concurrent: true cmd: > # keep first line with less indent to preserve newlines - docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \ - -e IU="$IU" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build \ - -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ + docker run --rm=true \ + -e HOME=/build \ + -e MAKE=make \ + -e PARALLEL_MAKE="$PARALLEL_MAKE" \ + -e IU="$IU" \ + -e PATH="$PATH:/build_bin" \ + -e OSMOPY_DEBUG_TCP_SOCKETS="1" \ + -w /build -i -u build \ + -v "$PWD:/build" -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - osmo-sip-connector -- To view, visit https://gerrit.osmocom.org/12047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 Gerrit-Change-Number: 12047 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:24:39 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 30 Nov 2018 14:24:39 +0000 Subject: Change in osmo-ci[master]: cosmetic: gerrit-verifications: format docker cmd In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/12047 ) Change subject: cosmetic: gerrit-verifications: format docker cmd ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/12047/1/jobs/gerrit-verifications.yml File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/#/c/12047/1/jobs/gerrit-verifications.yml at 43 PS1, Line 43: osmocom:amd64 /build/contrib/jenkins.sh nice, gerrit's (not-)highlighting of the characters that have only been moved to a different line without modification is really useful here. -- To view, visit https://gerrit.osmocom.org/12047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 Gerrit-Change-Number: 12047 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Nov 2018 14:24:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:35:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 14:35:21 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12039/2/include/osmocom/msc/common_cs.h File include/osmocom/msc/common_cs.h: https://gerrit.osmocom.org/#/c/12039/2/include/osmocom/msc/common_cs.h at 12 PS2, Line 12: geran_encr > Maybe we could even move this definition into the 'gsm_subscriber_connection' struct definition? (un [?] I thought it was a good idea and applied it, but then saw that I can't do this anymore: conn->geran_encr = (struct geran_encr){}; so leaving it separate now. -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 14:35:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:37:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 14:37:00 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12039/2/include/osmocom/msc/common_cs.h File include/osmocom/msc/common_cs.h: https://gerrit.osmocom.org/#/c/12039/2/include/osmocom/msc/common_cs.h at 12 PS2, Line 12: geran_encr > conn->geran_encr = (struct geran_encr){}; why not 'conn->geran_encr = { 0 }'? -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 14:37:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:37:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 14:37:57 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/12039/2/include/osmocom/msc/common_cs.h File include/osmocom/msc/common_cs.h: https://gerrit.osmocom.org/#/c/12039/2/include/osmocom/msc/common_cs.h at 12 PS2, Line 12: geran_encr > > conn->geran_encr = (struct geran_encr){}; [?] or alternatively: memset(&conn->geran_encr, 0x00, sizeof(conn->geran_encr)); -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 14:37:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:50:35 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12017 to look at the new patch set (#2). Change subject: msgb: add test helpers ...................................................................... msgb: add test helpers It's often handy to compare certain msgb layer to a given array and print the position where they differ. Add simple pretty-printer and corresponding L* wrappers. Add missing L* helpers for per-layer data access and printing. Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 --- M include/osmocom/core/msgb.h M src/msgb.c 2 files changed, 243 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/12017/2 -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:50:35 +0000 Subject: Change in libosmocore[master]: Move BSSMAP_MSG_* defines to header file In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12018 to look at the new patch set (#2). Change subject: Move BSSMAP_MSG_* defines to header file ...................................................................... Move BSSMAP_MSG_* defines to header file This will be reused be several tests related to TS 48.008 and TS 29.205 in follow-up commits. Change-Id: I4d8cc05b8df8e70c1f6257e53ae3acec7901681f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/12018/2 -- To view, visit https://gerrit.osmocom.org/12018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4d8cc05b8df8e70c1f6257e53ae3acec7901681f Gerrit-Change-Number: 12018 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:50:35 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11827 to look at the new patch set (#10). Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... LCLS, TS 29.205: add GCR routines Add functions to encode and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1 add corresponding tests. Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/Makefile.am A include/osmocom/gsm/gsm29_205.h M src/gsm/Makefile.am A src/gsm/gsm29_205.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm29205/gsm29205_test.c A tests/gsm29205/gsm29205_test.ok M tests/testsuite.at 9 files changed, 243 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11827/10 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:50:35 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12020 to look at the new patch set (#3). Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... LCLS, TS 48.008: add GCR IE encoding/decoding * add functions to encode Global Call. Ref. from TS 29.205 as 3GPP TS 48.008 ?3.2.2.115 information element * add corresponding tests Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 104 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/12020/3 -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:50:35 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:50:35 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11826 to look at the new patch set (#14). Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... LCLS: add gsm0808_create_ass_ext() It allows setting additional assignment parameters explicitly. Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Related: OS#2487 --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map M tests/gsm0808/gsm0808_test.c M tests/gsm0808/gsm0808_test.ok 5 files changed, 132 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/11826/14 -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 14 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:52:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 14:52:15 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12039 to look at the new patch set (#3). Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... rename gsm_encr to geran_encr, it is only applicable on GERAN On UTRAN, Security Mode is used instead of Ciphering Command, which does not feature an A5 algorithm id. Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 --- M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c 5 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/12039/3 -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:52:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 14:52:15 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12032 to look at the new patch set (#5). Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... move ran_conn declarations to new ran_conn.h With the dawn of inter-BSC,MSC handover, adopting the MSC-A,-I,-T roles from 3GPP TS 49.008, the RAN connection shall soon be a neatly separated corner of osmo-msc, so gravitate ran_conn decarations to files of matching name. Also, the current chaos of API defined in files with mismatching/meaningless names drives me crazy. Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h A include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/ran_conn.c M src/libmsc/rrlp.c 11 files changed, 252 insertions(+), 244 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/12032/5 -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:52:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 14:52:15 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12033 to look at the new patch set (#5). Change subject: combine several small .h in msc_common.h ...................................................................... combine several small .h in msc_common.h For hysterical raisins, there are some header files that contain few declarations, and where the name doesn't reflect the content. Combine them to new msc_common.h: - common.h - common_cs.h - osmo_msc.h Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 --- M include/osmocom/msc/Makefile.am D include/osmocom/msc/common.h D include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_data_shared.h A include/osmocom/msc/msc_common.h D include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/a_reset.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_tests.h 23 files changed, 26 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/12033/5 -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:54:09 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:54:09 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 2: > what about having it return an int like memcmp? What for? > after all we are using memcmp, so we can return an in That would be pretty useless - I've yet to see the use-case where it would be necessary. It will also make API cumbersome and counter-intuitive because we not only use memcmp() but also compare lengths and check data availability. In fact, memcmp() might not be called at all. The rest should be addressed in next revision. -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 14:54:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:57:39 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:57:39 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 9: (3 comments) The rest should be addressed in next revision. https://gerrit.osmocom.org/#/c/11827/9/src/gsm/gsm29_205.c File src/gsm/gsm29_205.c: https://gerrit.osmocom.org/#/c/11827/9/src/gsm/gsm29_205.c at 82 PS9, Line 82: parsed += (2 + 1); > parenthesis can be dropped here. I think it would reduce readability so I'd rather keep them. https://gerrit.osmocom.org/#/c/11827/9/src/gsm/libosmogsm.map File src/gsm/libosmogsm.map: https://gerrit.osmocom.org/#/c/11827/9/src/gsm/libosmogsm.map at 147 PS9, Line 147: gsm29205_enc_gcr; > I know not everything is perfectly sorted, but let's try to keep it as sorted as possible, so move t [?] Curious, why it should be sorted at all? I thought this file is loaded completely by linker and entries order does not matter. https://gerrit.osmocom.org/#/c/11827/9/tests/gsm29205/gsm29205_test.c File tests/gsm29205/gsm29205_test.c: https://gerrit.osmocom.org/#/c/11827/9/tests/gsm29205/gsm29205_test.c at 64 PS9, Line 64: printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); > All these should exit, or at least return. Why? Printing unexpected text on the screen will cause test failure just like unexpected exit. At the same time running till the end of the test allows us to see multiple errors at once. -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 9 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 14:57:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:58:33 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:58:33 +0000 Subject: Change in libosmocore[master]: LCLS: fix GCR parameter name In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12019 ) Change subject: LCLS: fix GCR parameter name ...................................................................... Patch Set 1: (1 comment) Or did I misunderstood your question? https://gerrit.osmocom.org/#/c/12019/1/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/12019/1/include/osmocom/gsm/gsm0808_utils.h at 65 PS1, Line 65: struct gsm29205_gcr *gcr; /*< doc ?3.2.2.115 Global Call Reference */ > In the previous commit, "struct gsm29205_gcr" is added. [?] That's what this patch does. -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 14:58:33 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 14:59:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 14:59:20 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 2: (1 comment) The rest should be addressed in next revision. https://gerrit.osmocom.org/#/c/12020/2/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/2/tests/gsm0808/gsm0808_test.c at 605 PS2, Line 605: printf("parsing failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); > Exit or at last return in all failed cases. Same comment as in one of the previous commits - why? -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 14:59:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:05:20 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 15:05:20 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12017 to look at the new patch set (#3). Change subject: msgb: add test helpers ...................................................................... msgb: add test helpers It's often handy to compare certain msgb layer to a given array and print the position where they differ. Add simple pretty-printer and corresponding L* wrappers. Add missing L* helpers for per-layer data access and printing. Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 --- M include/osmocom/core/msgb.h M src/msgb.c 2 files changed, 249 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/12017/3 -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:08:56 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 15:08:56 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... Patch Set 10: (1 comment) I've tried to address other comments in extended patch series. Let me know if I've missed something. https://gerrit.osmocom.org/#/c/11826/10/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/11826/10/include/osmocom/gsm/gsm0808.h at 67 PS10, Line 67: struct msgb *gsm0808_create_ass_ext(const struct gsm0808_channel_type *ct, > please call it gsm0808_create_ass2() instead Why? So far both ...2() and ..._ext() are widely used throughout the code. Did I miss some discussion in ML about it? -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 10 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 15:08:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri Nov 30 15:10:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 30 Nov 2018 15:10:23 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#323?= In-Reply-To: <1905133029.907.1543504207578.JavaMail.jenkins@jenkins.osmocom.org> References: <1905133029.907.1543504207578.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <637462262.923.1543590623959.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.52 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:13:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 15:13:20 +0000 Subject: Change in libosmocore[master]: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11728 ) Change subject: gsm0808: add message generator for BSSMAP HANDOVER PERFORMED ...................................................................... Patch Set 6: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/11728/6/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/11728/6/include/osmocom/gsm/gsm0808.h at 188 PS6, Line 188: bool lcls_bss_status_present; > You can use GSM0808_LCLS_STS_NA - no need in separate bool variable. my problem with that is that GSM0808_LCLS_STS_NA is != 0. So if I create a gsm0808_handover_performed struct, this would be the only item where I need to set something in order to disable the IE. So I'm -1 on using the STS_NA and +1 the current patch version. Also re: adding struct osmo_lcls suggested earlier, that would be a bit of a layer violation. This function should only encode specific values, not query a status struct and so forth. So again IMHO this patch version is better. https://gerrit.osmocom.org/#/c/11728/6/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11728/6/src/gsm/gsm0808.c at 913 PS6, Line 913: msgb_tlv_put(msg, GSM0808_IE_CAUSE, gsm0808_cause_ext(params->cause) ? 2 : 1, (const uint8_t *)¶ms->cause); it was suggested to look at gsm0808_create_cipher_reject_ext(), but clearly that is about an unrelated IE, the implementation also just "manually" encodes the length and can obviously not be re-used here. Hence I would prefer to merge this as it is, and possibly unify the length finnacky stuff as a general-purpose function in a separate patch, which would then also include some .c regression test. https://gerrit.osmocom.org/#/c/11728/6/src/gsm/gsm0808.c at 935 PS6, Line 935: if (params->lcls_bss_status_present) > Same here - check for GSM0808_LCLS_STS_NA and add if it differs. (same, I like the current patch version better) -- To view, visit https://gerrit.osmocom.org/11728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I825106858bd89afc9837811b8fed2e8accc82441 Gerrit-Change-Number: 11728 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 15:13:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:18:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 15:18:17 +0000 Subject: Change in libosmocore[master]: LCLS: fix GCR parameter name In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12019 ) Change subject: LCLS: fix GCR parameter name ...................................................................... Patch Set 3: Code-Review-1 (1 comment) this commit log seems completely unrelated to the actual patch. what's going on? https://gerrit.osmocom.org/#/c/12019/3/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/12019/3/include/osmocom/gsm/gsm0808_utils.h at 63 PS3, Line 63: enum gsm0808_lcls_config config; /*< doc ?3.2.2.116 Configuration */ what's "doc" about? -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 15:18:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:32:19 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 15:32:19 +0000 Subject: Change in libosmocore[master]: gsm0808: add encoder for cause codes and use it In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12044 ) Change subject: gsm0808: add encoder for cause codes and use it ...................................................................... Patch Set 1: (3 comments) I think the test should be added as well. It's rather easy and the user of this function are outside of the library so it wouldn't be immediately obvious that smth is broken if we don't test for it. https://gerrit.osmocom.org/#/c/12044/1/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12044/1/src/gsm/gsm0808_utils.c at 51 PS1, Line 51: /*! Encode TS 08.08 AoIP Cause IE I think it's better to reference the same spec as in body of this function. https://gerrit.osmocom.org/#/c/12044/1/src/gsm/gsm0808_utils.c at 67 PS1, Line 67: buf[1] = (uint8_t) (cause & 0xff); I think it's better to use osmo_store16*() - that way it's immediately obvious which endian is used. Plus it's easier to read. https://gerrit.osmocom.org/#/c/12044/1/src/gsm/gsm0808_utils.c at 74 PS1, Line 74: return (uint8_t) (msg->tail - old_tail); You know for sure how many bytes are added - just return explicit number from corresponding if clause, there's no need to bother with pointer arithmetic. -- To view, visit https://gerrit.osmocom.org/12044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71d58fad89502a43532f60717ca022c15c73f8bb Gerrit-Change-Number: 12044 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 15:32:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:34:52 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 15:34:52 +0000 Subject: Change in libosmocore[master]: LCLS: fix GCR parameter name In-Reply-To: References: Message-ID: Max has posted comments on this change. ( https://gerrit.osmocom.org/12019 ) Change subject: LCLS: fix GCR parameter name ...................................................................... Patch Set 3: (1 comment) It's kinda confusing when you complain about presence and absence of " what's "doc" about? That was requested by you to make the comments visible to doxygen. -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 15:34:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:38:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 15:38:41 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11827 to look at the new patch set (#12). Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... LCLS, TS 29.205: add GCR routines Add functions to encode and decode Global Call Reference as per 3GPP TS 29.205 Table B 2.1.9.1 add corresponding tests. Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Related: OS#2487 --- M include/Makefile.am A include/osmocom/gsm/gsm29_205.h M src/gsm/Makefile.am A src/gsm/gsm29_205.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm29205/gsm29205_test.c A tests/gsm29205/gsm29205_test.ok M tests/testsuite.at 9 files changed, 243 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/11827/12 -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 12 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:38:41 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 15:38:41 +0000 Subject: Change in libosmocore[master]: LCLS: fix GCR parameter type In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12019 to look at the new patch set (#4). Change subject: LCLS: fix GCR parameter type ...................................................................... LCLS: fix GCR parameter type * use proper struct pointer * update comments to be useful for doxygen Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/19/12019/4 -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:49:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 15:49:25 +0000 Subject: Change in libosmocore[master]: LCLS, TS 48.008: add GCR IE encoding/decoding In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12020 ) Change subject: LCLS, TS 48.008: add GCR IE encoding/decoding ...................................................................... Patch Set 5: Code-Review-1 (13 comments) what, I accidentally commented on an old patch set? but I think the comments still apply. https://gerrit.osmocom.org/#/c/12020/4/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/12020/4/include/osmocom/gsm/gsm0808_utils.h at 86 PS4, Line 86: (ws) https://gerrit.osmocom.org/#/c/12020/4/include/osmocom/gsm/gsm0808_utils.h at 87 PS4, Line 87: int gsm0808_dec_gcr(struct gsm29205_gcr *g, struct tlv_parsed *tp); constify the tp arg plz. kind of weird that the function name says 0808 and the struct says 29205. (edit) I think I get it now, this is the GCR 0808 message, and the IE is defined in 29.205? https://gerrit.osmocom.org/#/c/12020/4/src/gsm/gsm0808_utils.c File src/gsm/gsm0808_utils.c: https://gerrit.osmocom.org/#/c/12020/4/src/gsm/gsm0808_utils.c at 485 PS4, Line 485: /*! Create BSSMAP Global Call Reference, 3GPP TS 48.008 ?3.2.2.115 always end the summary with a '.' for doxygen https://gerrit.osmocom.org/#/c/12020/4/src/gsm/gsm0808_utils.c at 493 PS4, Line 493: len = msgb_v_put(msg, GSM0808_IE_GLOBAL_CALL_REF); msbg_v_put works, but the name indicates that you are putting a V, a value, instead of this T, a tag. I see in the rest of the file that we often use mgb_v_put() to add the message discriminator. Which is actually accurate, because it is the start of the 0808 "value". But for IE tags, let's use something with 't' in the name. There must be other places in this file that set the length after writing? hmm, looking around, we should have a msgb_tl_put() function for these situations but it doesn't exist, and it seems code is working around variable-length values in different ways. unless you find something nicer still, maybe rather use msgb_put_u8() instead of msgb_v_put(). Same thing but less misleading name. https://gerrit.osmocom.org/#/c/12020/4/src/gsm/gsm0808_utils.c at 499 PS4, Line 499: if (enc) { the general exit-early style would be 'if (!enc) return 0' here instead. https://gerrit.osmocom.org/#/c/12020/4/src/gsm/gsm0808_utils.c at 500 PS4, Line 500: len[0] = enc; (I'd prefer '*len = enc' since it isn't an array) https://gerrit.osmocom.org/#/c/12020/4/src/gsm/gsm0808_utils.c at 507 PS4, Line 507: /*! Decode BSSMAP Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 '.' https://gerrit.osmocom.org/#/c/12020/4/src/gsm/gsm0808_utils.c at 518 PS4, Line 518: return 2 + gsm29205_dec_gcr(gcr, buf, TLVP_LEN(tp, GSM0808_IE_GLOBAL_CALL_REF)); are you sure gsm29205_dec_gcr can never and will never in the future return negative error / zero? https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c File tests/gsm0808/gsm0808_test.c: https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 582 PS4, Line 582: 0x4e, 0x4e, 0x4e, 0x4e, 0x4e /* .cr - Call. Ref. */ nicer to use different byte value in each position, to ensure correct ordering. wait, didn't I say that before? https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 586 PS4, Line 586: struct gsm29205_gcr g = { .net_len = 3, .node = 0xDEAD }, p = { 0 }; also looks familiar: just write 'p = {}' https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 594 PS4, Line 594: memset(g.net, 'O', g.net_len); nicer to use differing bytes https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 600 PS4, Line 600: if (!msgb_cmp_data_print(msg, res, ARRAY_SIZE(res))) "!foo_cmp(a, b)" in C convention means "a == b". If you want to use bool return value, don't call it 'cmp'! https://gerrit.osmocom.org/#/c/12020/4/tests/gsm0808/gsm0808_test.c at 605 PS4, Line 605: printf("parsing failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); abort()? -- To view, visit https://gerrit.osmocom.org/12020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82ce0207dc8de50689a8806c6471ad7fbae6219d Gerrit-Change-Number: 12020 Gerrit-PatchSet: 5 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 15:49:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:54:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 15:54:22 +0000 Subject: Change in libosmocore[master]: LCLS: add gsm0808_create_ass_ext() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11826 ) Change subject: LCLS: add gsm0808_create_ass_ext() ...................................................................... Patch Set 16: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/11826/10/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/11826/10/include/osmocom/gsm/gsm0808.h at 67 PS10, Line 67: struct msgb *gsm0808_create_ass_ext(const struct gsm0808_channel_type *ct, > Why? So far both ...2() and ..._ext() are widely used throughout the code. [?] "ext" refers to "extended", while this is not something that the spec calls "extended" in any way. This is just a newer version of our API function, and for that the convention is (or should be) adding numbers. What if at some point some more IEs should be added, or some bug gets fixed? what do we call the next API function then, create_ass_ext_ext()? Use '2'. https://gerrit.osmocom.org/#/c/11826/16/src/gsm/gsm0808.c File src/gsm/gsm0808.c: https://gerrit.osmocom.org/#/c/11826/16/src/gsm/gsm0808.c at 424 PS16, Line 424: /*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 ?3.2.1.1 especially if adding more comment, the initial summary line must end in a '.' https://gerrit.osmocom.org/#/c/11826/16/src/gsm/gsm0808.c at 425 PS16, Line 425: This is identical to gsm0808_create_ass(), but adds KC and LCLS IEs. lacks a '*' https://gerrit.osmocom.org/#/c/11826/16/src/gsm/gsm0808.c at 512 PS16, Line 512: /*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 ?3.2.1.1 . -- To view, visit https://gerrit.osmocom.org/11826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id89765df3f8c12f55f73f1d7a9d90c8883eb3bba Gerrit-Change-Number: 11826 Gerrit-PatchSet: 16 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 15:54:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 15:58:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 15:58:05 +0000 Subject: Change in libosmocore[master]: LCLS: fix GCR parameter type In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12019 ) Change subject: LCLS: fix GCR parameter type ...................................................................... Patch Set 4: Code-Review-1 (1 comment) still: please explain why this commit log mismatches the patch completely. I get tired of asking the same stuff. https://gerrit.osmocom.org/#/c/12019/3/include/osmocom/gsm/gsm0808_utils.h File include/osmocom/gsm/gsm0808_utils.h: https://gerrit.osmocom.org/#/c/12019/3/include/osmocom/gsm/gsm0808_utils.h at 64 PS3, Line 64: enum gsm0808_lcls_control control; /*< doc ?3.2.2.117 Connection Status Control */ hah no, don't write "doc"! Please read the doxygen documentation to familiarize yourself with the comment styles /*! ... */ /*< ... */ -- To view, visit https://gerrit.osmocom.org/12019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ccfbd0c146e462e599e5305520cc89602364ec3 Gerrit-Change-Number: 12019 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 15:58:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:10:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:10:05 +0000 Subject: Change in osmo-ci[master]: gerrit-verifications/master-builds: with_manuals In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12045 ) Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/#/c/12045/2/jobs/gerrit-verifications.yml at 97 PS2, Line 97: (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && with_manuals == True) || > I had this first: [?] Ah indeed, makes sense then. https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml File jobs/master-builds.yml: https://gerrit.osmocom.org/#/c/12045/2/jobs/master-builds.yml at 206 PS2, Line 206: cmd: GTP="$GTP" ./contrib/jenkins.sh --publish > I think the [?] I know I wrote --publish is my previous comment, but I actually think it makes sense to have --publish being passed inside jenkins.sh based on MANUALS env var value (because we only want to use --publish when we build the manuals right?). Ok, fine not definding it as a2: !!python/tuple ["--enable-manuals", "--disable-manuals"] , but still makes sense to call it in caps MANUALS (or WITH_MANUALS), and pass it as an envar and use it in jenkins.sh (like you do in the commit you shared in your comment). AFAIU the var is not redundant because it is not exported, so you'd need to either export GTP="$GTP" before calling jenkins.sh or, do it as it is done now. If that's not the case, then let's remove the GTP="$GTP" fomr verywhere, but I'd at least investigate git log why do wo do that. -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Nov 2018 16:10:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:11:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:11:15 +0000 Subject: Change in osmo-ci[master]: cosmetic: gerrit-verifications: format docker cmd In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12047 ) Change subject: cosmetic: gerrit-verifications: format docker cmd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 Gerrit-Change-Number: 12047 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Nov 2018 16:11:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:12:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:12:35 +0000 Subject: Change in libosmocore[master]: Move BSSMAP_MSG_* defines to header file In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12018 ) Change subject: Move BSSMAP_MSG_* defines to header file ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d8cc05b8df8e70c1f6257e53ae3acec7901681f Gerrit-Change-Number: 12018 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 16:12:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:14:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:14:45 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12033 ) Change subject: combine several small .h in msc_common.h ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 16:14:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:15:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 16:15:25 +0000 Subject: Change in libosmocore[master]: LCLS, TS 29.205: add GCR routines In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/11827 ) Change subject: LCLS, TS 29.205: add GCR routines ...................................................................... Patch Set 12: Code-Review-1 (15 comments) https://gerrit.osmocom.org/#/c/11827/12/include/osmocom/gsm/gsm29_205.h File include/osmocom/gsm/gsm29_205.h: https://gerrit.osmocom.org/#/c/11827/12/include/osmocom/gsm/gsm29_205.h at 1 PS12, Line 1: /*! \defgroup gsm29205 3GPP TS 29.205 (if everything is calld 29205, then maybe also call the file 29205 without _ ... personally I get annoyed by typing gsm_08_08.c and gsm_04_08.c, gsm0808 is so much quicker, that's why my pref would be no underscores... if you agree.) https://gerrit.osmocom.org/#/c/11827/12/include/osmocom/gsm/gsm29_205.h at 32 PS12, Line 32: /*! Parsed representation of Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 */ . https://gerrit.osmocom.org/#/c/11827/12/include/osmocom/gsm/gsm29_205.h at 34 PS12, Line 34: uint8_t net[5]; /*< doc Network ID, ITU-T Q.1902.3 */ doc https://gerrit.osmocom.org/#/c/11827/12/src/gsm/gsm29_205.c File src/gsm/gsm29_205.c: https://gerrit.osmocom.org/#/c/11827/12/src/gsm/gsm29_205.c at 37 PS12, Line 37: /*! Create Global Call Reference . https://gerrit.osmocom.org/#/c/11827/12/src/gsm/gsm29_205.c at 56 PS12, Line 56: msgb_lv_put(msg, 5, g->cr); (but to reduce magic numbers, maybe sizeof(g->cr)?) https://gerrit.osmocom.org/#/c/11827/12/src/gsm/gsm29_205.c at 62 PS12, Line 62: /*! Decode Global Call Reference, 3GPP TS 29.205 Table B 2.1.9.1 . https://gerrit.osmocom.org/#/c/11827/12/src/gsm/gsm29_205.c at 72 PS12, Line 72: return -EBADMSG; (I guess would also be -EINVAL?) https://gerrit.osmocom.org/#/c/11827/12/src/gsm/gsm29_205.c at 79 PS12, Line 79: parsed += (gcr->net_len + 1); net_len is what you just parsed, and the +1? If +1 is the following len, then parse and check that instead of ignoring https://gerrit.osmocom.org/#/c/11827/12/src/gsm/gsm29_205.c at 84 PS12, Line 84: if (elem[parsed - 1] != 5) /* see Table B 2.1.9.2 */ it's weird to first add +1 and then do -1 again. Rather drop the +1 above, then parse the len at elem[parsed], and then +1 after that. (nice to use sizeof instead of magic) https://gerrit.osmocom.org/#/c/11827/12/src/gsm/gsm29_205.c at 85 PS12, Line 85: return -ENOENT; I guess would also be -EINVAL? https://gerrit.osmocom.org/#/c/11827/12/tests/gsm29205/gsm29205_test.c File tests/gsm29205/gsm29205_test.c: https://gerrit.osmocom.org/#/c/11827/12/tests/gsm29205/gsm29205_test.c at 41 PS12, Line 41: 0x46, 0x46, 0x46, 0x46, 0x46 /* .cr - Call. Ref. */ vary byte values https://gerrit.osmocom.org/#/c/11827/12/tests/gsm29205/gsm29205_test.c at 45 PS12, Line 45: struct gsm29205_gcr g = { .net_len = 3, .node = 0xDEAD }, p = { 0 }; = {} https://gerrit.osmocom.org/#/c/11827/12/tests/gsm29205/gsm29205_test.c at 53 PS12, Line 53: memset(g.net, 'U', g.net_len); vary bytes https://gerrit.osmocom.org/#/c/11827/12/tests/gsm29205/gsm29205_test.c at 59 PS12, Line 59: if (!msgb_cmp_data_print(msg, res, ARRAY_SIZE(res))) cmp() == 0 means match https://gerrit.osmocom.org/#/c/11827/12/tests/gsm29205/gsm29205_test.c at 64 PS12, Line 64: printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg)); abort(): it does not make sense to parse network id length and so on if not even the p got populated -- To view, visit https://gerrit.osmocom.org/11827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee95aa4e5c056645b6cb5667e4a067097d52dfbf Gerrit-Change-Number: 11827 Gerrit-PatchSet: 12 Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 16:15:25 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:16:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:16:25 +0000 Subject: Change in osmo-ci[master]: master-builds: make SSH keys available in Docker In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12042 ) Change subject: master-builds: make SSH keys available in Docker ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfff3b6a620de79d1bab7ff6a35309f828581c09 Gerrit-Change-Number: 12042 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 16:16:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:16:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:16:54 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop some unused opaque struct defs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12034 ) Change subject: cosmetic: drop some unused opaque struct defs ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d461dd39d0abdc4f2327445671459340ca1c946 Gerrit-Change-Number: 12034 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 16:16:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:18:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:18:29 +0000 Subject: Change in osmo-msc[master]: move gsm_auth_tuple to vlr.h as vlr_auth_tuple In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12035 ) Change subject: move gsm_auth_tuple to vlr.h as vlr_auth_tuple ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 Gerrit-Change-Number: 12035 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 16:18:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:27:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:27:41 +0000 Subject: Change in osmo-msc[master]: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12036 ) Change subject: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 Gerrit-Change-Number: 12036 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 16:27:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:28:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:28:22 +0000 Subject: Change in osmo-msc[master]: drop cruft from gsm_subscriber.h In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12037 ) Change subject: drop cruft from gsm_subscriber.h ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If6e2252486fe8d932f229a70ce5a4b6f22f6fc52 Gerrit-Change-Number: 12037 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 16:28:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:28:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:28:55 +0000 Subject: Change in osmo-msc[master]: move gsm_cbfn to gsm_subscriber.h, the only user In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12038 ) Change subject: move gsm_cbfn to gsm_subscriber.h, the only user ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I375e5b021e643f6b1986ea35ebaf3a6d60e189f5 Gerrit-Change-Number: 12038 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 16:28:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:32:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:32:14 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/12039/3/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12039/3/src/libmsc/gsm_04_08.c at 1666 PS3, Line 1666: conn->geran_encr = (struct geran_encr){}; This looks cleaner to me: conn->geran_encr = {0}; -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 16:32:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:33:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:33:06 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/12039/3/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12039/3/src/libmsc/gsm_04_08.c at 1666 PS3, Line 1666: conn->geran_encr = (struct geran_encr){}; > This looks cleaner to me: [?] Or you can only do that at same time you declare the struct variable? -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 16:33:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:49:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 16:49:34 +0000 Subject: Change in libosmocore[master]: msgb: add test helpers In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12017 ) Change subject: msgb: add test helpers ...................................................................... Patch Set 3: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/12017/3/include/osmocom/core/msgb.h File include/osmocom/core/msgb.h: https://gerrit.osmocom.org/#/c/12017/3/include/osmocom/core/msgb.h at 133 PS3, Line 133: /*! obtain L4 header of msgb */ All these l4 functions belong to another patch imho. Are they going to be used by someone in follow up patches? https://gerrit.osmocom.org/#/c/12017/3/include/osmocom/core/msgb.h at 612 PS3, Line 612: /* msgb test/debug helpers */ IMHO having all these is too much cruft. Let's keep the print parameter in the macro and remove all _print ones, I think it's fine enough. https://gerrit.osmocom.org/#/c/12017/3/include/osmocom/core/msgb.h at 709 PS3, Line 709: bool msgb_cmpr_l3(const char *f, size_t l, const struct msgb *msg, const uint8_t *data, size_t len, bool print); This should not be there anymore. https://gerrit.osmocom.org/#/c/12017/3/src/msgb.c File src/msgb.c: https://gerrit.osmocom.org/#/c/12017/3/src/msgb.c at 211 PS3, Line 211: m_dump = msgb_hexdump(msg); Since this function can be quite heavy, let's do: m_dump = print ? msgb_hexdump(msg) : NULL; https://gerrit.osmocom.org/#/c/12017/3/src/msgb.c at 252 PS3, Line 252: printf("%s:%zu %s() L%u data mismatch:\nexpected %s\n ", extra whitespace here right? -- To view, visit https://gerrit.osmocom.org/12017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bc95f2f5ab6e3f4b502647fb3e0aaaf1f7c4cf5 Gerrit-Change-Number: 12017 Gerrit-PatchSet: 3 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 16:49:34 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 16:59:09 2018 From: gerrit-no-reply at lists.osmocom.org (Max) Date: Fri, 30 Nov 2018 16:59:09 +0000 Subject: Change in libosmocore[master]: Move BSSMAP_MSG_* defines to header file In-Reply-To: References: Message-ID: Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/12018 ) Change subject: Move BSSMAP_MSG_* defines to header file ...................................................................... Move BSSMAP_MSG_* defines to header file This will be reused be several tests related to TS 48.008 and TS 29.205 in follow-up commits. Change-Id: I4d8cc05b8df8e70c1f6257e53ae3acec7901681f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 9b19d69..298b3e4 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -29,6 +29,9 @@ #include #include +#define BSSMAP_MSG_SIZE 512 +#define BSSMAP_MSG_HEADROOM 128 + struct sockaddr_storage; struct msgb; diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index fe7bc2c..2566ad5 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -34,9 +34,6 @@ * message generation/encoding. */ -#define BSSMAP_MSG_SIZE 512 -#define BSSMAP_MSG_HEADROOM 128 - /*! Create "Complete L3 Info" for AoIP, legacy implementation. * Instead use gsm0808_create_layer3_aoip2(), which is capable of three-digit MNC with leading zeros. * \param[in] msg_l3 msgb containing Layer 3 Message -- To view, visit https://gerrit.osmocom.org/12018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4d8cc05b8df8e70c1f6257e53ae3acec7901681f Gerrit-Change-Number: 12018 Gerrit-PatchSet: 4 Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:03:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 30 Nov 2018 17:03:59 +0000 Subject: Change in osmo-ci[master]: master-builds: make SSH keys available in Docker In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12042 ) Change subject: master-builds: make SSH keys available in Docker ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icfff3b6a620de79d1bab7ff6a35309f828581c09 Gerrit-Change-Number: 12042 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 17:03:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:04:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 30 Nov 2018 17:04:38 +0000 Subject: Change in osmocom-bb[master]: doc/manuals: integrate into this repository In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/11998 ) Change subject: doc/manuals: integrate into this repository ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/11998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 Gerrit-Change-Number: 11998 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 17:04:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:06:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 30 Nov 2018 17:06:10 +0000 Subject: Change in osmo-ci[master]: cosmetic: gerrit-verifications: format docker cmd In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/12047 ) Change subject: cosmetic: gerrit-verifications: format docker cmd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0adcb028be24c2e05189c15b85811777d6287387 Gerrit-Change-Number: 12047 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 30 Nov 2018 17:06:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:18:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 17:18:50 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: make SS session timeout configurable Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12048 Change subject: SS/USSD: make SS session timeout configurable ...................................................................... SS/USSD: make SS session timeout configurable It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. Let's introduce a VTY option, which can be used to configure this timer (by default it's set to 30 seconds): hlr ... ! Use 0 to disable this timer ss-guard-timeout 30 Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Related: OS#3717 --- M src/hlr.c M src/hlr.h M src/hlr_ussd.c M src/hlr_ussd.h M src/hlr_vty.c M tests/test_nodes.vty 6 files changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/48/12048/1 diff --git a/src/hlr.c b/src/hlr.c index 78d6c91..f1f251c 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -604,6 +604,9 @@ INIT_LLIST_HEAD(&g_hlr->ss_sessions); INIT_LLIST_HEAD(&g_hlr->ussd_routes); + /* Init default SS guard timeout value */ + g_hlr->ss_guard_timeout = SS_GUARD_TIMEOUT_DEFAULT; + rc = osmo_init_logging2(hlr_ctx, &hlr_log_info); if (rc < 0) { fprintf(stderr, "Error initializing logging\n"); diff --git a/src/hlr.h b/src/hlr.h index 315c3dd..5236356 100644 --- a/src/hlr.h +++ b/src/hlr.h @@ -45,6 +45,9 @@ struct hlr_euse *euse_default; struct llist_head iuse_list; + /* SS session guard timer value */ + int ss_guard_timeout; + struct llist_head ussd_routes; struct llist_head ss_sessions; diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index ba373f3..5991148 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -209,10 +209,11 @@ OSMO_STRLCPY_ARRAY(ss->imsi, imsi); ss->session_id = session_id; osmo_timer_setup(&ss->timeout, ss_session_timeout, ss); - /* NOTE: The timeout is currently global and not refreshed with subsequent messages - * within the SS/USSD session. So 30s after the initial SS message, the session will - * timeout! */ - osmo_timer_schedule(&ss->timeout, 30, 0); + /* NOTE: The timeout is currently not refreshed with subsequent messages + * within the SS/USSD session. So X seconds after the initial SS message, + * the session will timeout! */ + if (g_hlr->ss_guard_timeout > 0) + osmo_timer_schedule(&ss->timeout, g_hlr->ss_guard_timeout, 0); llist_add_tail(&ss->list, &hlr->ss_sessions); return ss; diff --git a/src/hlr_ussd.h b/src/hlr_ussd.h index 0414924..5c15874 100644 --- a/src/hlr_ussd.h +++ b/src/hlr_ussd.h @@ -7,6 +7,8 @@ #include "gsup_server.h" +#define SS_GUARD_TIMEOUT_DEFAULT 30 + struct hlr_ussd_route { /* g_hlr.routes */ struct llist_head list; diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 2d9b929..be49113 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -288,9 +288,22 @@ if (g_hlr->euse_default) vty_out(vty, " ussd default-route external %s%s", g_hlr->euse_default->name, VTY_NEWLINE); + if (g_hlr->ss_guard_timeout > 0) + vty_out(vty, " ss-guard-timeout %i%s", + g_hlr->ss_guard_timeout, VTY_NEWLINE); + return 0; } +DEFUN(cfg_ss_guard_timeout, cfg_ss_guard_timeout_cmd, + "ss-guard-timeout <0-255>", + "Set guard timer for SS/USSD session activity\n" + "Guard timer value (sec.), or 0 to disable") +{ + g_hlr->ss_guard_timeout = atoi(argv[0]); + return CMD_SUCCESS; +} + /*********************************************************************** * Common Code ***********************************************************************/ @@ -353,6 +366,7 @@ install_element(HLR_NODE, &cfg_ussd_no_route_pfx_cmd); install_element(HLR_NODE, &cfg_ussd_defaultroute_cmd); install_element(HLR_NODE, &cfg_ussd_no_defaultroute_cmd); + install_element(HLR_NODE, &cfg_ss_guard_timeout_cmd); hlr_vty_subscriber_init(); } diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index a9d4ac4..d824de2 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -77,6 +77,7 @@ no ussd route prefix PREFIX ussd default-route external EUSE no ussd default-route + ss-guard-timeout <0-255> OsmoHLR(config-hlr)# gsup OsmoHLR(config-hlr-gsup)# list @@ -118,4 +119,5 @@ bind ip 127.0.0.1 ussd route prefix *#100# internal own-msisdn ussd route prefix *#101# internal own-imsi + ss-guard-timeout 30 end -- To view, visit https://gerrit.osmocom.org/12048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d Gerrit-Change-Number: 12048 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:18:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 17:18:50 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule SS session timeout Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12049 Change subject: SS/USSD: fix: properly (re)schedule SS session timeout ...................................................................... SS/USSD: fix: properly (re)schedule SS session timeout It may happen that either the MS or an ESME would become unresponsive, e.g. due to a bug, or a dropped message. This is why we have SS session timeout, that prevents keeping 'stalled' sessions forever. For some reason, it wasn't properly resceduled in case of subsequent SS/USSD activity, so the lifetime of a session was limited. Let's properly (re)schedule it. Change-Id: I11aeacf012b06d3d0b5cc6e64baecf857b645fda Related: OS#3717 --- M src/hlr_ussd.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/49/12049/1 diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 5991148..a20a168 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -208,10 +208,9 @@ OSMO_STRLCPY_ARRAY(ss->imsi, imsi); ss->session_id = session_id; + + /* Schedule self-destruction timer */ osmo_timer_setup(&ss->timeout, ss_session_timeout, ss); - /* NOTE: The timeout is currently not refreshed with subsequent messages - * within the SS/USSD session. So X seconds after the initial SS message, - * the session will timeout! */ if (g_hlr->ss_guard_timeout > 0) osmo_timer_schedule(&ss->timeout, g_hlr->ss_guard_timeout, 0); @@ -536,6 +535,11 @@ gsup->imsi, gsup->session_id); goto out_err; } + + /* Reschedule self-destruction timer */ + if (g_hlr->ss_guard_timeout > 0) + osmo_timer_schedule(&ss->timeout, g_hlr->ss_guard_timeout, 0); + if (ss_op_is_ussd(req.opcode)) { /* dispatch unstructured SS to routing */ handle_ussd(conn, ss, gsup, &req); -- To view, visit https://gerrit.osmocom.org/12049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I11aeacf012b06d3d0b5cc6e64baecf857b645fda Gerrit-Change-Number: 12049 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:19:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 17:19:20 +0000 Subject: Change in osmo-hlr[master]: SS/USSD: fix: properly (re)schedule SS session timeout In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/12022 ) Change subject: SS/USSD: fix: properly (re)schedule SS session timeout ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/12022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120 Gerrit-Change-Number: 12022 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:21:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 17:21:16 +0000 Subject: Change in osmo-bsc[master]: Fix ts_for_each_lchan iteration for dynamic TS in process of being PD... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11957 ) Change subject: Fix ts_for_each_lchan iteration for dynamic TS in process of being PDCH deactivated ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/11957/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11957/3//COMMIT_MSG at 11 PS3, Line 11: being used. > I believe this commit log message has 'I wrote a long letter because I didn't have the time to make [?] I think that's fine for you because you know related context, but I wrote far more details which I think were interesting for me when learning the code and which may be of use by somebody looking at history and why these different loop types exist. -- To view, visit https://gerrit.osmocom.org/11957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 Gerrit-Change-Number: 11957 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 17:21:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:23:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 17:23:02 +0000 Subject: Change in osmo-bsc[master]: bsc: timelost_fsm: Remove unneeded set of out variable on failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11981 ) Change subject: bsc: timelost_fsm: Remove unneeded set of out variable on failure ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/11981/2/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11981/2/src/osmo-bsc/timeslot_fsm.c at 867 PS2, Line 867: return false; > my idea here was to avoid leaving a value in an uninitialized state. [?] It's really not needed and it just adds extra code for no reason, since it's not the purpose of the function. -- To view, visit https://gerrit.osmocom.org/11981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8f9b7e1f584dee885d6823dc043682577572bd8 Gerrit-Change-Number: 11981 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 30 Nov 2018 17:23:02 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:28:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 17:28:37 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11954 ) Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/11954/5/src/osmo-bsc/timeslot_fsm.c File src/osmo-bsc/timeslot_fsm.c: https://gerrit.osmocom.org/#/c/11954/5/src/osmo-bsc/timeslot_fsm.c at 894 PS5, Line 894: return true; > Don't drop below 'case'. [?] Ok makes sense. But then I'll submit an extra patch setting correctly for IPA dynTS too: case TS_ST_WAIT_PDCH_DEACT: if (target_pchan) *target_pchan = pchan_on_init == OSMO ? GSM_PCHAN_NONE : GSM_PCHAN_TCH_F; return true; -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 17:28:37 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:42:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 17:42:21 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Switch to error state before dispatching error eve... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11995 ) Change subject: bsc: timeslot_fsm: Switch to error state before dispatching error event to lchans ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/11995/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11995/2//COMMIT_MSG at 9 PS2, Line 9: This way we receive tear down events such as TS_EV_CLHAN_UNUSED in a state prepared typo TS_EV_CLHAN_UNUSED https://gerrit.osmocom.org/#/c/11995/2//COMMIT_MSG at 10 PS2, Line 10: to handle them, as a result from dispatching LCHAN_EV_TS_ERROR previously. > I don't understand: which state is unable to handle TS_EV_LCHAN_UNUSED? If it should be able to, the [?] Unfortunately I forgot to add the log trace here for this one. It is most probably coming from the time I was testing DEACT NACK, so following your recommendations, we should add in ts_fsm_wait_pdch_deact similar stuff done in others states: case TS_EV_LCHAN_UNUSED: /* ignored */ return; Because otherwise it asserts in default case. -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 17:42:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 17:58:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 17:58:52 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/11932 ) Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/#/c/11932/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/11932/4//COMMIT_MSG at 10 PS4, Line 10: into account if TRX succeeded or failed to set the TS: > are we talking bootstrapping the BTS in the beginning? No, during bootstap afair no PDCH DEACT is sent, it's simply configured through OML. https://gerrit.osmocom.org/#/c/11932/4//COMMIT_MSG at 32 PS4, Line 32: 20181123044720705 DTRX <000b> trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' > since you're posting a lot of logging in commit logs lately... [?] I actually like having the timestamp, as I stated in another review recently. It gives me more information about timings of events and allows discarding some actions like timers, etc. which may interfere. "dropping category-hex, instead adding the loglevel as explicit string". Actually I like this idea, thanks for the advise and providing required config :) I actually didn't even notice that hex stuff was the category in hex lol. src line I don't want to omit, it helps me a lot understand log traces. About putting it to the end, that's a personal preference. I'll submit a new version removing the category log for this patch. -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 17:58:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:23:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:23:43 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 3: (1 comment) can i has +2? https://gerrit.osmocom.org/#/c/12039/3/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/#/c/12039/3/src/libmsc/gsm_04_08.c at 1666 PS3, Line 1666: conn->geran_encr = (struct geran_encr){}; > Or you can only do that at same time you declare the struct variable? sorry guys, it's going to stay this way. I'm already using this scheme throughout all code I write, and it is the single best method. Here is my reasoning: - memset() is the byte hacking way and I don't like it. In practice, clearing out is always 0, and even '\0' is 0, and NULL is 0, and false is 0, but that's just incidental. Semantically, each type has its own constructor default value. Using memset() totally brushes over that concept; which works out fine in practice, but I will use compiler provided default values wherever I can and avoid memset. - just 'var = {0}' doesn't work, you need to supply the type name to the compiler (unless it is a new variable declaration init, which this is not; see examples below). - the struct variable is part of ran_conn, I need to here clean out one part of that. It does not make sense to declare a new local variable for that. (see examples below) - to write "{0}" means that I indicate the first item's value to be zero. Doing "{}" is the more general way that achieves to zero all items, no matter what type they are. Let me illustrate... With this, writing {0} is fine, since the first element is an int: struct foo { int a; int b[3]; } struct foo my_foo = {0}; // initialize a = 0, the rest as zero But what about this: struct bar { struct { int a; } sub; char c[3]; } Doesn't work: struct bar my_bar = {0}; Would have to be one of: struct bar my_bar = { {0} }; struct bar my_bar = { .sub = {0} }; struct bar my_bar = { .c = {0, 0, 0} }; struct bar my_bar = { .c = {} }; But I don't WANT any specific value! Just zero all! The Generally Always Working Best (TM) way to approach this is: struct bar my_bar = {}; All items are zeroed without needing to know anything about its structure. Why this (struct bar){} notation here? because I have struct moo { struct bar item; }; void my_func(struct moo *m) { m->item = (struct bar){}; } This is the way it should be done, and you will not convince me otherwise, sorry -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 18:23:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:26:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:26:08 +0000 Subject: Change in osmo-msc[master]: adjust copyright in subscr_conn.c In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12028 ) Change subject: adjust copyright in subscr_conn.c ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia89e2d343a850234557e365457705a11d26fd925 Gerrit-Change-Number: 12028 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 18:26:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:26:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:26:45 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/12032 ) Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... Patch Set 5: Code-Review+2 (re-applying Pau's +2 after merely cosmetic rebase changes) -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 18:26:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: populate gsm_subscriber_connection->encr during Ciph In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12016 to look at the new patch set (#7). Change subject: populate gsm_subscriber_connection->encr during Ciph ...................................................................... populate gsm_subscriber_connection->encr during Ciph The gsm_subscriber_connection->encr is never used. Use it. When sending the Ciphering Mode Command, populate the encryption key. When receivint the Ciphering Mode Complete, populate the chosen alg_id. Out of paranoia, store the enc key only if the size is large enough. Hence the vty_dump_one_conn() now reports the actually chosen A5 algorithm ID used. For 3G connections, though, this will still remain 0 in the VTY, since there is no explicit A5 algorithm negotiated on UTRAN. (Security Mode Command and Security Mode Complete instead of the GERAN Ciphering.) (Note, 'struct gsm_encr encr' will be renamed to 'struct geran_encr geran_encr' in Idc7ca9da1aa13ae16f5db2cb1024676cbc770820) Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce --- M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/12016/7 -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12039 to look at the new patch set (#4). Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... rename gsm_encr to geran_encr, it is only applicable on GERAN On UTRAN, Security Mode is used instead of Ciphering Command, which does not feature an A5 algorithm id. Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 --- M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c 5 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/12039/4 -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: drop msc_compl_l3() return value In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12029 to look at the new patch set (#6). Change subject: drop msc_compl_l3() return value ...................................................................... drop msc_compl_l3() return value msc_compl_l3() always returns MSC_CONN_ACCEPT, because the conn FSM handles (or should handle) all reject cases. The accept/reject return value is a legacy from libbsc internally passing a conn over to libmsc, in osmo-nitb. Drop enum msc_compl_l3_rc. Change msc_compl_l3_rc() to return void. Change all callers to always act like for acceptance, as they always did anyway. Drop some local variables now no longer needed. Adjust the comment to msc_compl_l3(). Drop a bunch of #if-0'd code from msc_compl_l3(). Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface_bssap.c M src/libmsc/iucs.c M src/libmsc/osmo_msc.c 4 files changed, 11 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/12029/6 -- To view, visit https://gerrit.osmocom.org/12029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09 Gerrit-Change-Number: 12029 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12015 to look at the new patch set (#9). Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... rename gsm_subscriber_connection to ran_conn In preparation for inter-BSC and inter-MSC handover, we need to separate the subscriber management logic from the actual RAN connections. What better time to finally rename gsm_subscriber_connection. * Name choice: In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it "bss_conn": in 3G a BSS is called RNS, IIUC. The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network. * Rationale: A subscriber in the MSC so far has only one RAN connection, but e.g. for inter-BSC handover, a second one needs to be created to handover to. Most of the items in the former gsm_subscriber_connection are actually related to the RAN, with only a few MM and RTP related items. So, as a first step, just rename it to ran_conn, to cosmetically prepare for moving the not strictly RAN related items away later. Also: - Rename some functions from msc_subscr_conn_* to ran_conn_* - Rename "Subscr_Conn" FSM instance name to "RAN_conn" - Rename SUBSCR_CONN_* to RAN_CONN_* Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_14.h M include/osmocom/msc/gsm_04_80.h M include/osmocom/msc/gsm_09_11.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_ifaces.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/signal.h M include/osmocom/msc/silent_call.h M include/osmocom/msc/transaction.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M src/libvlr/vlr.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 57 files changed, 3,841 insertions(+), 3,850 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12015/9 -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 9 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: rename some RAN conn related stuff to ran_conn_* In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12030 to look at the new patch set (#6). Change subject: rename some RAN conn related stuff to ran_conn_* ...................................................................... rename some RAN conn related stuff to ran_conn_* Following previous rename of gsm_subscriber_connection: Some functions and #defines are still called like "msc_conn" or just "msc_", while they are clearly about a RAN conn. To avoid confusion with the future separate concepts of MSC roles and a RAN connection, rename all those to match the common "ran_conn" prefix. Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_tests.c 15 files changed, 104 insertions(+), 109 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/12030/6 -- To view, visit https://gerrit.osmocom.org/12030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 Gerrit-Change-Number: 12030 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: move subscr_conn.c to ran_conn.c In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12031 to look at the new patch set (#6). Change subject: move subscr_conn.c to ran_conn.c ...................................................................... move subscr_conn.c to ran_conn.c subscr_conn.c exclusively defines ran_conn related things. Rename the file. Change-Id: I6aa6b335842116c717a554c981083a914724ee21 --- M src/libmsc/Makefile.am R src/libmsc/ran_conn.c 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/12031/6 -- To view, visit https://gerrit.osmocom.org/12031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6aa6b335842116c717a554c981083a914724ee21 Gerrit-Change-Number: 12031 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12032 to look at the new patch set (#6). Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... move ran_conn declarations to new ran_conn.h With the dawn of inter-BSC,MSC handover, adopting the MSC-A,-I,-T roles from 3GPP TS 49.008, the RAN connection shall soon be a neatly separated corner of osmo-msc, so gravitate ran_conn decarations to files of matching name. Also, the current chaos of API defined in files with mismatching/meaningless names drives me crazy. Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h A include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/ran_conn.c M src/libmsc/rrlp.c 11 files changed, 252 insertions(+), 244 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/12032/6 -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12033 to look at the new patch set (#6). Change subject: combine several small .h in msc_common.h ...................................................................... combine several small .h in msc_common.h For hysterical raisins, there are some header files that contain few declarations, and where the name doesn't reflect the content. Combine them to new msc_common.h: - common.h - common_cs.h - osmo_msc.h Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 --- M include/osmocom/msc/Makefile.am D include/osmocom/msc/common.h D include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_data_shared.h A include/osmocom/msc/msc_common.h D include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/a_reset.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_tests.h 23 files changed, 26 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/12033/6 -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop some unused opaque struct defs In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12034 to look at the new patch set (#6). Change subject: cosmetic: drop some unused opaque struct defs ...................................................................... cosmetic: drop some unused opaque struct defs Change-Id: I4d461dd39d0abdc4f2327445671459340ca1c946 --- M include/osmocom/msc/db.h M include/osmocom/msc/iu_dummy.h M src/libmsc/iu_dummy.c 3 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/12034/6 -- To view, visit https://gerrit.osmocom.org/12034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4d461dd39d0abdc4f2327445671459340ca1c946 Gerrit-Change-Number: 12034 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: move gsm_auth_tuple to vlr.h as vlr_auth_tuple In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12035 to look at the new patch set (#6). Change subject: move gsm_auth_tuple to vlr.h as vlr_auth_tuple ...................................................................... move gsm_auth_tuple to vlr.h as vlr_auth_tuple Along goes GSM_KEYSEQ_INVAL as VLR_*. It's where it logically belongs, and is almost the only reason why vlr.h includes gsm_data.h. The remaining reason, GSM_EXTENSION_LENGTH, will be moved by upcoming patch. Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M src/libvlr/vlr_auth_fsm.c M tests/msc_vlr/msc_vlr_tests.c 7 files changed, 27 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/35/12035/6 -- To view, visit https://gerrit.osmocom.org/12035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 Gerrit-Change-Number: 12035 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12036 to look at the new patch set (#6). Change subject: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH ...................................................................... GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH gsm_subscriber.h contains some legacy cruft, part of which is that the VLR's max MSISDN length should rather be defined in vlr.h. Same for GSM_NAME_LENGTH -> VLR_NAME_LENGTH. Adjust some sms_queue stuff that anyway includes vlr.h already. Drop gsm_subscriber.h from vlr.h. Add other (more concise) includes that thus become necessary, since the include chain vlr.h->gsm_subscriber.h->gsm_data.h is no longer in place. Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/sms_queue.c M tests/sms_queue/sms_queue_test.c 4 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/12036/6 -- To view, visit https://gerrit.osmocom.org/12036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 Gerrit-Change-Number: 12036 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: drop cruft from gsm_subscriber.h In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12037 to look at the new patch set (#6). Change subject: drop cruft from gsm_subscriber.h ...................................................................... drop cruft from gsm_subscriber.h Change-Id: If6e2252486fe8d932f229a70ce5a4b6f22f6fc52 --- M include/osmocom/msc/gsm_subscriber.h 1 file changed, 0 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/12037/6 -- To view, visit https://gerrit.osmocom.org/12037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If6e2252486fe8d932f229a70ce5a4b6f22f6fc52 Gerrit-Change-Number: 12037 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:30:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:30:03 +0000 Subject: Change in osmo-msc[master]: move gsm_cbfn to gsm_subscriber.h, the only user In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12038 to look at the new patch set (#6). Change subject: move gsm_cbfn to gsm_subscriber.h, the only user ...................................................................... move gsm_cbfn to gsm_subscriber.h, the only user (with two less line feeds) Change-Id: I375e5b021e643f6b1986ea35ebaf3a6d60e189f5 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h 2 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/12038/6 -- To view, visit https://gerrit.osmocom.org/12038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I375e5b021e643f6b1986ea35ebaf3a6d60e189f5 Gerrit-Change-Number: 12038 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:33:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:33:41 +0000 Subject: Change in osmo-bsc[master]: follow-up: logging tweak for Immediate Assignment In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11942 to look at the new patch set (#2). Change subject: follow-up: logging tweak for Immediate Assignment ...................................................................... follow-up: logging tweak for Immediate Assignment follow-up to I9ad094d272254d7aee9b0a676201d4ed8cd727ca because it was merged before fixeria's code review could be incorporated. Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/11942/2 -- To view, visit https://gerrit.osmocom.org/11942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 Gerrit-Change-Number: 11942 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:33:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 18:33:41 +0000 Subject: Change in osmo-bsc[master]: follow-up: logging tweak for Immediate Assignment In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11942 ) Change subject: follow-up: logging tweak for Immediate Assignment ...................................................................... follow-up: logging tweak for Immediate Assignment follow-up to I9ad094d272254d7aee9b0a676201d4ed8cd727ca because it was merged before fixeria's code review could be incorporated. Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5e99239..742836c 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -97,17 +97,15 @@ switch (activ_for) { case FOR_MS_CHANNEL_REQUEST: - if (lchan->activate.immediate_assignment_sent) { - LOG_LCHAN(lchan, LOGL_ERROR, - "lchan activation failed, after Immediate Assignment message was sent (%s)\n", - lchan->last_error ? : "unknown error"); - /* Likely the MS never showed up. Just tear down the lchan. */ - } else { + if (!lchan->activate.immediate_assignment_sent) { /* Failure before Immediate Assignment message, send a reject. */ LOG_LCHAN(lchan, LOGL_NOTICE, "Tx Immediate Assignment Reject (%s)\n", lchan->last_error ? : "unknown error"); rsl_tx_imm_ass_rej(lchan->ts->trx->bts, lchan->rqd_ref); } + /* Otherwise, likely the MS never showed up after the Assignment, and the failure cause + * (Timeout?) was already logged elsewhere. Just continue to tear down the lchan after + * lchan_on_activation_failure(), no additional action or logging needed. */ break; case FOR_ASSIGNMENT: -- To view, visit https://gerrit.osmocom.org/11942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I474cf1a58d1f00ec5b0ae52bd095a60aad763975 Gerrit-Change-Number: 11942 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11980 to look at the new patch set (#3). Change subject: bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init ...................................................................... bsc: Add define for ts_as_pchan_for_each_lchan with ts->pchan_on_init It will be used further in follow-up patches. It also provides a place to document its (intricate) logic around it and its possible uses. Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/timeslot_fsm.c 2 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/11980/3 -- To view, visit https://gerrit.osmocom.org/11980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia1d4bdbfca6b9719f54ee609b6bfadf7f3a4bb43 Gerrit-Change-Number: 11980 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: Fix lchan iteration for dyn TS during PDCH Deact In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11957 to look at the new patch set (#4). Change subject: bsc: Fix lchan iteration for dyn TS during PDCH Deact ...................................................................... bsc: Fix lchan iteration for dyn TS during PDCH Deact In general PDCH channels are not handled as lchans in BSC (lchan_fsm.c), and so when a TS is in ts->pchan_is=GSM_PCHAN_PDCH, no lchan slot is being used. However, during Dynamic TS PDCH Deactivation being in progress (state WAIT_PDCH_DEACT in timeslot_fsm.c), ts->pchan_is =GSM_PCHAN_PDCH, but an lchan slot of that TS is actually already being used by a TCH lchan: it's the one who initiated the deactivate in order to be able to use the TS. While being in WAIT_PDCH_DEACT state and receiving a PDCH DEACT NACK, ts_fsm_error() was called in order to kill the TS and it was expected that it would kill any lchan using it (or willing to start using it). In order to do that, it calls ts_lchans_dispatch() which in turns iterates over all lchans attached to the TS using ts_for_each_lchan(). However, when the NACK arrived we still had ts->pchan_is=GSM_PCHAN_PDCH, ts_for_each_lchan ends up calling ts_as_pchan_for_each_lchan(GSM_PCHAN_PDCH), which in turns calls pchan_subslots(GSM_PCHAN_PDCH) which returns 0, because we don't manage lchans in that mode as explained in first paragraph. This means in this case ts_for_each_lchan() is actually an empty loop while still any of the TCH channels may be in use, and won't be advertised about the TS entering in a broken state. As a result, the lchan won't be released for a while, only after T23001 expires. Related: OS#3708 Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/11957/4 -- To view, visit https://gerrit.osmocom.org/11957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9cedb77d6578597f1febab36c54b2ee427c7a4a2 Gerrit-Change-Number: 11957 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11954 to look at the new patch set (#6). Change subject: bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan ...................................................................... bsc: timeslot_fsm: Fix ts_is_lchan_waiting_for_pchan If ts_is_lchan_waiting_for_pchan() wasn't accounting for TCH lchans waiting for TS to deactive PDCH in order to setup the TS as TCH. Since now TCH lchan is catched by ts_is_lchan_waiting_for_pchan() when TS state is TS_ST_WAIT_PDCH_DEACT, there's no need to check for that case in caller ts_is_pchan_switching(), since it will never hit because the callee returns true in that case now. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/11954/6 -- To view, visit https://gerrit.osmocom.org/11954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib03e5a91438a5b74a04e69f81fab565842b02b66 Gerrit-Change-Number: 11954 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Harald Welte Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_l... In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11982 to look at the new patch set (#3). Change subject: bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms ...................................................................... bsc: timeslot_fsm: Fix possible skip of some lchans in ts_terminate_lchan_fsms If TS is in state changing from PDCH->TCH, the TCH lchan provoking the switch would be skipped and not terminated before this patch. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/11982/3 -- To view, visit https://gerrit.osmocom.org/11982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9dc2a6e5b15376d049bd2ac5ddfa24340771b5c8 Gerrit-Change-Number: 11982 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Fix count in ts_lchans_waiting In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11983 to look at the new patch set (#3). Change subject: bsc: timeslot_fsm: Fix count in ts_lchans_waiting ...................................................................... bsc: timeslot_fsm: Fix count in ts_lchans_waiting Before this patch, TCH lchans waiting for dynamic TS to switch PDCH->TCH wouldn't be counted. See osmo-bsc I9cedb77d6578597f1febab36c54b2ee427c7a4a2 for similar extensive explanation. Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/11983/3 -- To view, visit https://gerrit.osmocom.org/11983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I32008859cc23cd2afddd79daae21497d0945fed0 Gerrit-Change-Number: 11983 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11993 to look at the new patch set (#3). Change subject: bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event ...................................................................... bsc: lchan_rtp_fsm: Avoid duplicate LCHAN_EV_RTP_RELEASED event When lchan_rtp_fsm instance is allcoated with osmo_fsm_inst_alloc_child(..., LCHAN_EV_RTP_RELEASED) we already let fsm code to take care of sending that event ito the parent when the fsm is terminated (but only if freeing cause is not OSMO_FSM_TERM_PARENT). The lchan_rtp_fsm cleanup() callback, which is called immediatelly before sending to the parent the event defined during osmo_gsm_install_alloc_child(), currently also sends that same event, which ends up in a duplicated event being sent as shown in log files below. Let's only send the event in cleanup() if we are in the cause=OSMO_FSM_TERM_PARENT scenario, to make sure parent always receives the event, but only once. 20181128193707326 DAS osmo-bsc/assignment_fsm.c:127 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: (bts=0,trx=0,ts=6,ss=0) Assignment failed 20181128193707326 DAS osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Terminating (cause = OSMO_FSM_TERM_ERROR) 20181128193707326 DAS osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Removing from parent SUBSCR_CONN(conn4)[0x612000002920] 20181128193707326 DCHAN osmo-bsc/lchan_fsm.c:1333 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Received Event LCHAN_RTP_EV_ROLLBACK 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Terminating (cause = OSMO_FSM_TERM_REQUEST) 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Removing from parent lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] 20181128193707326 DRSL osmo-bsc/mgw_endpoint_fsm.c:441 mgw-endpoint(conn4)[0x6120000021a0]{WAIT_MGW_RESPONSE}: (rtpbridge/*@mgw) CI[0] to-BTS: DLCX :0: notify=NULL 20181128193707326 DRSL osmo-bsc/mgw_endpoint_fsm.c:482 mgw-endpoint(conn4)[0x6120000021a0]{WAIT_MGW_RESPONSE}: (rtpbridge/*@mgw) CI[0] to-BTS: DLCX :0: Scheduling 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:742 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Freeing instance 20181128193707327 DCHAN fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Deallocated 20181128193707327 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707330 DCHAN osmo-bsc/lchan_fsm.c:1347 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: transition to state WAIT_RLL_RTP_RELEASED not permitted! 20181128193707330 DAS osmo-bsc/assignment_fsm.c:128 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Freeing instance 20181128193707330 DAS fsm.c:381 assignment(conn4_0-0-6-TCH_F_PDCHasPDCH-0)[0x6120000024a0]{WAIT_LCHAN_ACTIVE}: Deallocated Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/11993/3 -- To view, visit https://gerrit.osmocom.org/11993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3e95a21e5a5ec6c35b1ab20b7a642fd7eb81e556 Gerrit-Change-Number: 11993 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RE... In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11994 to look at the new patch set (#3). Change subject: bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED ...................................................................... bsc: lchan_fsm: Add missing transition WAIT_TS_READY->WAIT_RLL_RTP_RELEASED 20181128193707326 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Freeing instance 20181128193707327 DCHAN fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x612000002320]{WAIT_MGW_ENDPOINT_AVAILABLE}: Deallocated 20181128193707327 DCHAN osmo-bsc/lchan_rtp_fsm.c:193 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: Received Event LCHAN_EV_RTP_RELEASED 20181128193707330 DCHAN osmo-bsc/lchan_fsm.c:1347 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_TS_READY}: transition to state WAIT_RLL_RTP_RELEASED not permitted! Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/11994/3 -- To view, visit https://gerrit.osmocom.org/11994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I43aab5ed8ac369869b191b3b7c938ce4985ab849 Gerrit-Change-Number: 11994 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH D... In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11995 to look at the new patch set (#3). Change subject: bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT ...................................................................... bsc: timeslot_fsm: Handle and ignore tear down of lchan during PDCH DEACT lchan sends TS_EV_LCHAN_UNUSED to its parent (ts) during release time. It was experimentally found that it can happen that an lchan can be terminated while waiting for a PDCH DEACT (N)ACK response. The fsm definition actually states that this event can be received in state TS_ST_WAIT_PDCH_DEACT, but it was not handled before and as a result the process aborted due to the defalt switch case. Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/11995/3 -- To view, visit https://gerrit.osmocom.org/11995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If61493e7d5449bf2c2de9fd34cdf2410625e92ac Gerrit-Change-Number: 11995 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:12 +0000 Subject: Change in osmo-bsc[master]: bsc: lchan_fsm: Fix invalid duplicated transition In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11996 to look at the new patch set (#3). Change subject: bsc: lchan_fsm: Fix invalid duplicated transition ...................................................................... bsc: lchan_fsm: Fix invalid duplicated transition When we enter WAIT_RLL_RTP_RELEASED (lchan_fsm_wait_rll_rtp_released_onenter), we call lchan_do_release() which in turn dispatches LCHAN_RTP_EV_RELEASE to lchan_rtp_fsm.c, which will dispatch back an LCHAN_EV_RTP_RELEASED event, which will be handled by lchan_fsm_wait_rll_rtp_released(), which will change state to WAIT_BEFORE_RF_RELEASE. When going back the stack (return), we are still in lchan_fsm_wait_rll_rtp_released_onenter() which again triggers a change state to WAIT_BEFORE_RF_RELEASE because it checks same conditions than first one. 20181128203727051 DCHAN osmo-bsc/lchan_fsm.c:1388 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{ESTABLISHED}: lchan detaches from conn SUBSCR_CONN(conn3)[0x612000002da0] 20181128203727051 DMSC osmo-bsc/lchan_fsm.c:1391 SUBSCR_CONN(conn3)[0x612000002da0]{CLEARING}: lchan lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] detaches from conn 20181128203727051 DCHAN osmo-bsc/lchan_fsm.c:1359 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{ESTABLISHED}: state_chg to WAIT_RLL_RTP_RELEASED 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:959 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: (type=TCH_F) SAPI[0] = 1 20181128203727052 DRR osmo-bsc/gsm_04_08_rr.c:254 Sending Channel Release: Chan: Number: 0 Type: 2 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:945 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Received Event LCHAN_RTP_EV_RELEASE 20181128203727052 DCHAN osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) 20181128203727052 DCHAN osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Removing from parent lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0] 20181128203727052 DCHAN osmo-bsc/lchan_rtp_fsm.c:572 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Freeing instance 20181128203727052 DCHAN fsm.c:381 lchan_rtp(0-0-6-TCH_F_PDCH-0)[0x6120000027a0]{ESTABLISHED}: Deallocated 20181128203727052 DCHAN osmo-bsc/lchan_rtp_fsm.c:572 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: Received Event LCHAN_EV_RTP_RELEASED 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:856 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: (type=TCH_F) Still active SAPIs: 0 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:1011 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_RLL_RTP_RELEASED}: state_chg to WAIT_BEFORE_RF_RELEASE 20181128203727052 DRSL osmo-bsc/abis_rsl.c:633 (bts=0,trx=0,ts=6,ss=0) DEACTivate SACCH CMD 20181128203727052 DCHAN osmo-bsc/lchan_fsm.c:986 lchan(0-0-6-TCH_F_PDCH-0)[0x6120000039a0]{WAIT_BEFORE_RF_RELEASE}: transition to state WAIT_BEFORE_RF_RELEASE not permitted! Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/11996/3 -- To view, visit https://gerrit.osmocom.org/11996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d95bbd8244cc8e9c1cfb6fe0f76148332386a3d Gerrit-Change-Number: 11996 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:35:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:35:22 +0000 Subject: Change in osmo-bsc[master]: bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12050 Change subject: bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan ...................................................................... bsc: ts_is_pchan_switching: Return correct IPA dyn TS target_pchan Change-Id: Ie438b4efaa9832c44009a92c3df698875f1fa9ae --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/12050/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 773d92f..5e37ed8 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -896,8 +896,21 @@ case TS_ST_WAIT_PDCH_DEACT: /* If lchan started a PDCH deact but got somehow released while * waiting for PDCH DEACT (N)ACK */ - if (target_pchan) - *target_pchan = GSM_PCHAN_NONE; + if (target_pchan) { + switch (ts->pchan_on_init) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (target_pchan) + *target_pchan = GSM_PCHAN_NONE; + break; + case GSM_PCHAN_TCH_F_PDCH: + if (target_pchan) + *target_pchan = GSM_PCHAN_TCH_F; + break; + default: + /* Can't be in this state and be a non dyn TS */ + OSMO_ASSERT(false); + } + } return true; default: -- To view, visit https://gerrit.osmocom.org/12050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie438b4efaa9832c44009a92c3df698875f1fa9ae Gerrit-Change-Number: 12050 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 18:37:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 18:37:01 +0000 Subject: Change in osmo-msc[master]: populate gsm_subscriber_connection->encr during Ciph In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12016 ) Change subject: populate gsm_subscriber_connection->encr during Ciph ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 18:37:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 19:16:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 19:16:41 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 4 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 19:16:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 19:20:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 19:20:55 +0000 Subject: Change in osmo-bts[master]: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT In-Reply-To: References: Message-ID: Hello Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11932 to look at the new patch set (#5). Change subject: bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT ...................................................................... bts-trx: (n)ack PDCH DEACT only after TRX answered SETSLOT Before this patch, PDCH DEACT was (n)acked to the BSC without taking into account if TRX succeeded or failed to set the TS: 20181123044720655 DRLL rsl.c:2523 (bts=0,trx=0,ts=0,ss=0) Rx RLL DATA_REQ Abis -> LAPDm 20181123044720700 DRSL rsl.c:2805 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) ss=0 Rx RSL IPAC_PDCH_DEACT 20181123044720700 DRSL rsl.c:2205 (bts=0,trx=0,ts=6,pchan=TCH/F_PDCH as PDCH) Request to PDCH DEACT, but lchan is still active 20181123044720700 DRSL rsl.c:2131 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT NACK (cause = 0x0f) 20181123044720700 DPCU pcu_sock.c:124 Sending info 20181123044720700 DPCU pcu_sock.c:139 BTS is up 20181123044720700 DPCU pcu_sock.c:232 trx=0 ts=7: available (tsc=7 arfcn=868) 20181123044720703 DPCU pcu_sock.c:608 Deactivate request received: TRX=0 TX=6 20181123044720703 DL1C l1sap.c:1519 deactivating channel chan_nr=TCH/F on TS6 trx=0 20181123044720703 DTRX trx_if.c:242 Enqueuing TRX control command 'CMD NOHANDOVER 6 0' 20181123044720703 DL1C l1sap.c:648 deactivate confirm chan_nr=TCH/F on TS6 trx=0 20181123044720703 DRSL rsl.c:714 (bts=0,trx=0,ts=6,ss=0) not sending REL ACK 20181123044720703 DRSL rsl.c:2264 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: channel disconnected, will reconnect as TCH 20181123044720703 DL1C scheduler.c:593 Configuring multiframe with TCH/F+SACCH trx=0 ts=6 20181123044720703 DTRX trx_if.c:242 Enqueuing TRX control command 'CMD SETSLOT 6 1' 20181123044720703 DL1C l1_if.c:780 (bts=0,trx=0,ts=6) bts_model_ts_connect(as_pchan=TCH/F) success, calling cb_ts_connected() 20181123044720703 DRSL rsl.c:2339 (bts=0,trx=0,ts=6,ss=0) PDCH DEACT operation: timeslot connected as TCH/F 20181123044720703 DRSL rsl.c:2440 (bts=0,trx=0,ts=6,ss=0) TCH/F_PDCH switched to TCH/F mode (ts->flags == 0) 20181123044720703 DRSL rsl.c:2103 (bts=0,trx=0,ts=6,ss=0) Tx PDCH DEACT ACK 20181123044720704 DTRX trx_if.c:492 Response message: 'RSP NOHANDOVER 0 6' 20181123044720705 DTRX trx_if.c:492 Response message: 'RSP SETSLOT 0 6 1' Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c --- M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h 3 files changed, 81 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/11932/5 -- To view, visit https://gerrit.osmocom.org/11932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I888de761b65c3ea8bfe623fcf009f3b2b57c926c Gerrit-Change-Number: 11932 Gerrit-PatchSet: 5 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 19:43:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 19:43:01 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/12043 ) Change subject: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/12043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08d0801a89d377441e95fb8e3dd27c8d587f89e9 Gerrit-Change-Number: 12043 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Fri, 30 Nov 2018 19:43:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 19:43:28 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 19:43:28 +0000 Subject: Change in osmo-msc[master]: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12043 ) Change subject: libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS ...................................................................... libmsc/gsm_04_11.c: fix: always use SAPI 3 for MT SMS In I4a07ece80d8dd40b23da6bb1ffc9d3d745b54092 I've introduced a regression. According to GSM TS 04.11, section 2.3, SAPI 3 shall be used for both MO/MT SMS transmissions. Due to a mistake, caused by misunderstanding of the meaning of trans->dlci, SAPI 3 was not assigned to SM transactions if there is already an active RAN connection with subscriber. Let's fix this. Let's also drop this misleading comment: /* FIXME: specify SACCH in case we already have active TCH */ because it's a task of the BSC/BTS to decide which lchan to use. Change-Id: I08d0801a89d377441e95fb8e3dd27c8d587f89e9 Related: OS#3716 --- M src/libmsc/gsm_04_11.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 88dc433..b602344 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -149,8 +149,6 @@ case GSM_PAGING_SUCCEEDED: /* Associate transaction with established connection */ trans->conn = msc_subscr_conn_get(conn, MSC_CONN_USE_TRANS_SMS); - /* FIXME: specify SACCH in case we already have active TCH */ - trans->dlci = 0x03; /* Confirm successful connection establishment */ gsm411_smc_recv(&trans->sms.smc_inst, GSM411_MMSMS_EST_CNF, NULL, 0); @@ -1017,6 +1015,9 @@ trans->sms.sm_rp_mr = conn->next_rp_ref++; } + /* Use SAPI 3 (see GSM 04.11, section 2.3) */ + trans->dlci = UM_SAPI_SMS; + return trans; } -- To view, visit https://gerrit.osmocom.org/12043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I08d0801a89d377441e95fb8e3dd27c8d587f89e9 Gerrit-Change-Number: 12043 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 19:45:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 19:45:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11984 ) Change subject: library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR ...................................................................... library/GSUP_Types.ttcn: fix missing session state IE in PROC_SS_ERR Both session state and session ID IEs are always being encoded together by libosmocore's GSUP implementation. So, if a message contains a session ID IE, session state IE shall also be there. For some reason, the session state IE was missing in both ts_GSUP_PROC_SS_ERR and tr_GSUP_PROC_SS_ERR templates. This could led to incorrect matching in our test cases. This change fixes both templates by adding the missing IE. Since tr_GSUP_PROC_SS_ERR templete is used in HLR_Tests.ttcn, all the affected matching statements were also corrected. This correction doesn't affect successful test case executions, because we don't test possible problematic situations yet. But if something went wrong on the HLR side (i.e. SUT), the matching statements wouldn't match the PROC_SS_ERR message correctly and continue to wait until the guard timer is expired. Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn index f7902be..e32fa68 100644 --- a/hlr/HLR_Tests.ttcn +++ b/hlr/HLR_Tests.ttcn @@ -476,16 +476,16 @@ GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(imsi, sid, state, ss))); T.start; alt { - [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, exp_err_cause)) -> value ret { + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, exp_err_cause)) -> value ret { setverdict(pass); } - [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, ?)) -> value ret { setverdict(fail, "Unexpected PROC_SS ERROR Cause"); } [exp_fail] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, ?, ?)) -> value ret { setverdict(fail, "Unexpected PROC_SS.res for unknown IMSI"); } - [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, ?)) -> value ret { setverdict(fail, "Unexpected PROC_SS ERROR"); } [not exp_fail] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, ?, ?)) -> value ret { @@ -511,7 +511,7 @@ } T.start; alt { - [] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?)) -> value ret { + [] GSUP.receive(tr_GSUP_PROC_SS_ERR(imsi, sid, ?, ?)) -> value ret { setverdict(fail, "Unexpected PROC_SS ERROR Cause"); } [not exp_ss] GSUP.receive(tr_GSUP_PROC_SS_RES(imsi, sid, state, omit)) -> value ret { diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 7680815..cadc6d8 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -692,24 +692,28 @@ template (value) GSUP_PDU ts_GSUP_PROC_SS_ERR( hexstring imsi, OCT4 sid, + GSUP_SessionState state, integer cause ) := ts_GSUP( OSMO_GSUP_MSGT_PROC_SS_ERROR, { valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_SessionId(sid)), + valueof(ts_GSUP_IE_SessionState(state)), valueof(ts_GSUP_IE_Cause(cause)) } ); template GSUP_PDU tr_GSUP_PROC_SS_ERR( template hexstring imsi, template OCT4 sid := ?, + template GSUP_SessionState state := ?, template integer cause := ? ) := tr_GSUP( OSMO_GSUP_MSGT_PROC_SS_ERROR, { tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_SessionId(sid), + tr_GSUP_IE_SessionState(state), tr_GSUP_IE_Cause(cause) } ); -- To view, visit https://gerrit.osmocom.org/11984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I44070396ce7119eab4608d9f9fb090bb223dfaa2 Gerrit-Change-Number: 11984 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 19:45:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 19:45:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11990 ) Change subject: library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates ...................................................................... library/GSUP_Types.ttcn: fix IE order in PROC_SS_ERROR templates In general, the order of IEs in a GSUP message doesn't matter. Despite libosmocore's GSUP API encodes IEs in a fixed order, it is capable to decode them in any arbitary order. Meanwhile, in the current TTCN-3 definitions (i.e. templates) the order makes a difference, because the 'GSUP_IEs' type is a record, that according to the TTCN-3 documentation represents an *ordered* sequence of elements. Let's reorder the IEs of both t{r|s}_GSUP_PROC_SS_ERR templates in a way that is used by the libosmocore's GSUP encoder. This correction doesn't affect successful test case executions, because we don't test possible problematic situations yet. But if something went wrong on the HLR side (i.e. SUT), the matching statements wouldn't match the PROC_SS_ERR message correctly and continue to wait until the guard timer is expired. Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db --- M library/GSUP_Types.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index cadc6d8..6329ebd 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -698,9 +698,9 @@ OSMO_GSUP_MSGT_PROC_SS_ERROR, { valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_Cause(cause)), valueof(ts_GSUP_IE_SessionId(sid)), - valueof(ts_GSUP_IE_SessionState(state)), - valueof(ts_GSUP_IE_Cause(cause)) + valueof(ts_GSUP_IE_SessionState(state)) } ); template GSUP_PDU tr_GSUP_PROC_SS_ERR( @@ -712,9 +712,9 @@ OSMO_GSUP_MSGT_PROC_SS_ERROR, { tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_Cause(cause), tr_GSUP_IE_SessionId(sid), - tr_GSUP_IE_SessionState(state), - tr_GSUP_IE_Cause(cause) + tr_GSUP_IE_SessionState(state) } ); -- To view, visit https://gerrit.osmocom.org/11990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5eb2314f6a9ab0e9fc5e836390414cec6e1a12db Gerrit-Change-Number: 11990 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 19:45:06 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Fri, 30 Nov 2018 19:45:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout In-Reply-To: References: Message-ID: Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/11985 ) Change subject: MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout ...................................................................... MSC_Tests.ttcn: introduce TC_lu_and_ss_session_timeout The idea of this test case is to verify SS session termination due to expiry of its guard timeout. The timeout value is intentionally set to a few seconds in order to speedup test case execution (we don't want to wait 2 minutes). We expect OsmoMSC to inform both session entities (MS and EUSE) about timeout expiry before releasing the transaction. The MS should receive GSM 04.80 RELEASE COMPLETE message with optional cause, while the EUSE should receive OSMO_GSUP_MSGT_PROC_SS_ERROR. At the moment, it's not clean which cause values should be used: - for GSM 04.80 RELEASE COMPLETE the cause IE is optional, and possible values are defined in GSM TS 04.08, annex G-H. The H.6.7 Cause No. 102 "recovery on timer expiry" seems to be suitable; - for OSMO_GSUP_MSGT_PROC_SS_ERROR the generic cause IE could be used, but actually this IE is not generic at all, and limited by 'gsm48_gmm_cause' enum; so we temporarily expect arbitrary cause values in both messages. Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Depends-on: (OsmoMSC) Icf4d87c45e90324764073e8230e0fb9cb96dd9cb Related: OS#3655 --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 74 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 2a6c034..a0ace4e 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2694,6 +2694,78 @@ vc_conn.done; } +/* LU followed by MO USSD request and MT Release due to timeout */ +private function f_tc_lu_and_ss_session_timeout(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + + /* Perform location update */ + f_perform_lu(); + + /* Send CM Service Request for SS/USSD */ + f_establish_fully(EST_TYPE_SS_ACT); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + var template OCTN facility_ms_req := f_USSD_FACILITY_IE_INVOKE( + invoke_id := 1, + op_code := SS_OP_CODE_PROCESS_USS_REQ, + ussd_string := "#release_me"); + + /* Compose MO SS/REGISTER message with request */ + var template (value) PDU_ML3_MS_NW ussd_ms_req := ts_ML3_MO_SS_REGISTER( + tid := 1, /* An arbitrary transaction identifier */ + ti_flag := c_TIF_ORIG, /* Sent from the side that originates the TI */ + facility := valueof(facility_ms_req)); + + /* Compose expected MSC -> HLR message */ + var template GSUP_PDU gsup_ms_req := tr_GSUP_PROC_SS_REQ( + imsi := g_pars.imsi, + state := OSMO_GSUP_SESSION_STATE_BEGIN, + ss := valueof(facility_ms_req)); + + /* To be used for sending response with correct session ID */ + var GSUP_PDU gsup_ms_req_complete; + + /* Initiate a new SS transaction */ + BSSAP.send(ts_PDU_DTAP_MO(ussd_ms_req)); + /* Expect GSUP request with original Facility IE */ + gsup_ms_req_complete := f_expect_gsup_msg(gsup_ms_req); + + /* Don't respond, wait for timeout */ + f_sleep(3.0); + + var template PDU_ML3_NW_MS dtap_rel := tr_ML3_MT_SS_RELEASE_COMPLETE( + tid := 1, /* Should match the request's tid */ + ti_flag := c_TIF_REPL, /* Sent to the side that originates the TI */ + cause := *, /* TODO: expect some specific value */ + facility := omit); + + var template GSUP_PDU gsup_rel := tr_GSUP_PROC_SS_ERR( + imsi := g_pars.imsi, + sid := gsup_ms_req_complete.ies[1].val.session_id, + state := OSMO_GSUP_SESSION_STATE_END, + cause := ?); /* TODO: expect some specific value */ + + /* Expect release on both interfaces */ + interleave { + [] BSSAP.receive(tr_PDU_DTAP_MT(dtap_rel)) { }; + [] GSUP.receive(gsup_rel) { }; + } + + f_expect_clear(); + setverdict(pass); +} +testcase TC_lu_and_ss_session_timeout() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "msc", "ss-guard-timeout 3"); + vc_conn := f_start_handler(refers(f_tc_lu_and_ss_session_timeout), 51); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "ss-guard-timeout 0"); +} + /* TODO (SMS): * different user data lengths * SMPP transaction mode with unsuccessful delivery @@ -2780,6 +2852,7 @@ execute( TC_lu_and_mo_ussd_during_mt_call() ); execute( TC_lu_and_mt_ussd_during_mt_call() ); execute( TC_lu_and_mo_ussd_mo_release() ); + execute( TC_lu_and_ss_session_timeout() ); /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 8d9180f..4a9529e 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -68,6 +68,7 @@ + -- To view, visit https://gerrit.osmocom.org/11985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3e1791773d56617172ae27a46889a1ae4d400e2f Gerrit-Change-Number: 11985 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:14:37 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Fri, 30 Nov 2018 21:14:37 +0000 Subject: Change in osmo-trx[master]: UHDDevice.cpp uhd_device::open() uhd::usrp::multi_usrp::make() added ... Message-ID: d0gtail has uploaded this change for review. ( https://gerrit.osmocom.org/12051 Change subject: UHDDevice.cpp uhd_device::open() uhd::usrp::multi_usrp::make() added actual exception from uhd::key_error to extend debugging ...................................................................... UHDDevice.cpp uhd_device::open() uhd::usrp::multi_usrp::make() added actual exception from uhd::key_error to extend debugging Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/51/12051/1 diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 3db09a8..e0ea0c9 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -635,8 +635,9 @@ LOGC(DDEV, INFO) << "Using discovered UHD device " << dev_addrs[0].to_string(); try { usrp_dev = uhd::usrp::multi_usrp::make(addr); - } catch(...) { + } catch(uhd::key_error::exception &e) { LOGC(DDEV, ALERT) << "UHD make failed, device " << args; + LOGC(DDEV, ALERT) << "UHD make execption output:\n" << e.what(); return -1; } -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 1 Gerrit-Owner: d0gtail -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:08 +0000 Subject: Change in osmo-msc[master]: move gsm_cbfn to gsm_subscriber.h, the only user In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12038 ) Change subject: move gsm_cbfn to gsm_subscriber.h, the only user ...................................................................... move gsm_cbfn to gsm_subscriber.h, the only user (with two less line feeds) Change-Id: I375e5b021e643f6b1986ea35ebaf3a6d60e189f5 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h 2 files changed, 4 insertions(+), 6 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 30a3c79..d3cb7d8 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -36,12 +36,6 @@ #define tmsi_from_string(str) strtoul(str, NULL, 10) -struct msgb; -typedef int gsm_cbfn(unsigned int hooknum, - unsigned int event, - struct msgb *msg, - void *data, void *param); - enum { MSC_CTR_LOC_UPDATE_TYPE_ATTACH, MSC_CTR_LOC_UPDATE_TYPE_NORMAL, diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index f8d8ef0..2051067 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -9,6 +9,10 @@ #include struct ran_conn; +struct msgb; + +typedef int gsm_cbfn(unsigned int hooknum, unsigned int event, struct msgb *msg, + void *data, void *param); /* * Struct for pending channel requests. This is managed in the -- To view, visit https://gerrit.osmocom.org/12038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I375e5b021e643f6b1986ea35ebaf3a6d60e189f5 Gerrit-Change-Number: 12038 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:09 +0000 Subject: Change in osmo-msc[master]: drop cruft from gsm_subscriber.h In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12037 ) Change subject: drop cruft from gsm_subscriber.h ...................................................................... drop cruft from gsm_subscriber.h Change-Id: If6e2252486fe8d932f229a70ce5a4b6f22f6fc52 --- M include/osmocom/msc/gsm_subscriber.h 1 file changed, 0 insertions(+), 23 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index 00d7b98..f8d8ef0 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -10,25 +10,6 @@ struct ran_conn; -#define GSM_MIN_EXTEN 20000 -#define GSM_MAX_EXTEN 49999 - -#define GSM_SUBSCRIBER_FIRST_CONTACT 0x00000001 -/* gprs_sgsn.h defines additional flags including and above bit 16 (0x10000) */ - -enum gsm_subscriber_field { - GSM_SUBSCRIBER_IMSI, - GSM_SUBSCRIBER_TMSI, - GSM_SUBSCRIBER_EXTENSION, - GSM_SUBSCRIBER_ID, -}; - -enum gsm_subscriber_update_reason { - GSM_SUBSCRIBER_UPDATE_ATTACHED, - GSM_SUBSCRIBER_UPDATE_DETACHED, - GSM_SUBSCRIBER_UPDATE_EQUIPMENT, -}; - /* * Struct for pending channel requests. This is managed in the * llist_head requests of each subscriber. The reference counting @@ -46,8 +27,6 @@ void *param; }; -int subscr_update(struct vlr_subscr *vsub, int reason); - /* * Paging handling with authentication */ @@ -56,8 +35,6 @@ const char *label); void subscr_remove_request(struct subscr_request *req); -int subscr_rx_paging_response(struct msgb *msg, - struct ran_conn *conn); void subscr_paging_cancel(struct vlr_subscr *vsub, enum gsm_paging_event event); int subscr_paging_dispatch(unsigned int hooknum, unsigned int event, -- To view, visit https://gerrit.osmocom.org/12037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If6e2252486fe8d932f229a70ce5a4b6f22f6fc52 Gerrit-Change-Number: 12037 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:09 +0000 Subject: Change in osmo-msc[master]: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12036 ) Change subject: GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH ...................................................................... GSM_EXTENSION_LENGTH -> VLR_MSISDN_LENGTH gsm_subscriber.h contains some legacy cruft, part of which is that the VLR's max MSISDN length should rather be defined in vlr.h. Same for GSM_NAME_LENGTH -> VLR_NAME_LENGTH. Adjust some sms_queue stuff that anyway includes vlr.h already. Drop gsm_subscriber.h from vlr.h. Add other (more concise) includes that thus become necessary, since the include chain vlr.h->gsm_subscriber.h->gsm_data.h is no longer in place. Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/sms_queue.c M tests/sms_queue/sms_queue_test.c 4 files changed, 9 insertions(+), 9 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index 428b889..00d7b98 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -10,9 +10,6 @@ struct ran_conn; -#define GSM_NAME_LENGTH 160 - -#define GSM_EXTENSION_LENGTH 15 /* MSISDN can only be 15 digits length */ #define GSM_MIN_EXTEN 20000 #define GSM_MAX_EXTEN 49999 diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 1865618..c0e4864 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -10,8 +10,7 @@ #include #include #include -// for GSM_NAME_LENGTH -#include +#include #include #define LOGGSUPP(level, gsup, fmt, args...) \ @@ -111,6 +110,9 @@ struct sgsn_mm_ctx; struct vlr_instance; +#define VLR_NAME_LENGTH 160 +#define VLR_MSISDN_LENGTH 15 + /* The VLR subscriber is the part of the GSM subscriber state in VLR (CS) or * SGSN (PS), particularly while interacting with the HLR via GSUP */ struct vlr_subscr { @@ -123,8 +125,8 @@ /* Data from HLR */ /* 3GPP TS 23.008 */ /* Always use vlr_subscr_set_imsi() to write to imsi[] */ char imsi[GSM23003_IMSI_MAX_DIGITS+1]; /* 2.1.1.1 */ - char msisdn[GSM_EXTENSION_LENGTH+1]; /* 2.1.2 */ - char name[GSM_NAME_LENGTH+1]; /* proprietary */ + char msisdn[VLR_MSISDN_LENGTH+1]; /* 2.1.2 */ + char name[VLR_NAME_LENGTH+1]; /* proprietary */ OSMO_LBUF_DECL(hlr, 16); /* 2.4.7 */ uint32_t periodic_lu_timer; /* 2.4.24 */ uint32_t age_indicator; /* 2.17.1 */ diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 9907f4f..c5d2fc2 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -65,7 +65,7 @@ struct llist_head pending_sms; - char last_msisdn[GSM_EXTENSION_LENGTH+1]; + char last_msisdn[VLR_MSISDN_LENGTH+1]; }; static int sms_subscr_cb(unsigned int, unsigned int, void *, void *); diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index 6ce0b88..68819b9 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -25,6 +25,7 @@ #include #include +#include static void *talloc_ctx = NULL; @@ -129,7 +130,7 @@ static void test_next_sms() { int i; - char last_msisdn[GSM_EXTENSION_LENGTH+1] = ""; + char last_msisdn[VLR_MSISDN_LENGTH+1] = ""; printf("Testing smsq_take_next_sms()\n"); -- To view, visit https://gerrit.osmocom.org/12036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iab5c507ec04fc2884187cf946f6ae2240e4a31f8 Gerrit-Change-Number: 12036 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:09 +0000 Subject: Change in osmo-msc[master]: move gsm_auth_tuple to vlr.h as vlr_auth_tuple In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12035 ) Change subject: move gsm_auth_tuple to vlr.h as vlr_auth_tuple ...................................................................... move gsm_auth_tuple to vlr.h as vlr_auth_tuple Along goes GSM_KEYSEQ_INVAL as VLR_*. It's where it logically belongs, and is almost the only reason why vlr.h includes gsm_data.h. The remaining reason, GSM_EXTENSION_LENGTH, will be moved by upcoming patch. Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libvlr/vlr.c M src/libvlr/vlr_auth_fsm.c M tests/msc_vlr/msc_vlr_tests.c 7 files changed, 27 insertions(+), 26 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 3ffa100..30a3c79 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -42,13 +42,6 @@ struct msgb *msg, void *data, void *param); -struct gsm_auth_tuple { - int use_count; - int key_seq; - struct osmo_auth_vector vec; -}; -#define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ - enum { MSC_CTR_LOC_UPDATE_TYPE_ATTACH, MSC_CTR_LOC_UPDATE_TYPE_NORMAL, diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 1168c32..1865618 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -77,6 +77,14 @@ VLR_CIPH_COMPL, }; +struct vlr_auth_tuple { + int use_count; + int key_seq; + struct osmo_auth_vector vec; +}; +#define VLR_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ + + struct vlr_ciph_result { enum vlr_ciph_result_cause cause; char imeisv[GSM48_MI_SIZE]; @@ -122,8 +130,8 @@ uint32_t age_indicator; /* 2.17.1 */ /* Authentication Data */ - struct gsm_auth_tuple auth_tuples[5]; /* 2.3.1-2.3.4 */ - struct gsm_auth_tuple *last_tuple; + struct vlr_auth_tuple auth_tuples[5]; /* 2.3.1-2.3.4 */ + struct vlr_auth_tuple *last_tuple; enum vlr_subscr_security_context sec_ctx; /* Data local to VLR is below */ @@ -205,7 +213,7 @@ * \param[in] at auth tuple providing rand, key_seq and autn. * \param[in] send_autn True to send AUTN, for r99 UMTS auth. */ - int (*tx_auth_req)(void *msc_conn_ref, struct gsm_auth_tuple *at, + int (*tx_auth_req)(void *msc_conn_ref, struct vlr_auth_tuple *at, bool send_autn); /* encode + transmit an AUTH REJECT towards the MS */ int (*tx_auth_rej)(void *msc_conn_ref); diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 38376d0..2962760 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1514,7 +1514,7 @@ ***********************************************************************/ /* VLR asks us to send an authentication request */ -static int msc_vlr_tx_auth_req(void *msc_conn_ref, struct gsm_auth_tuple *at, +static int msc_vlr_tx_auth_req(void *msc_conn_ref, struct vlr_auth_tuple *at, bool send_autn) { struct ran_conn *conn = msc_conn_ref; @@ -1600,7 +1600,7 @@ int i, j = 0; int request_classmark = 0; int request_classmark_for_a5_n = 0; - struct gsm_auth_tuple *tuple = conn->vsub->last_tuple; + struct vlr_auth_tuple *tuple = conn->vsub->last_tuple; if (!conn || !conn->vsub || !conn->vsub->last_tuple) { /* This should really never happen, because we checked this in msc_vlr_set_ciph_mode() @@ -1680,7 +1680,7 @@ { struct ran_conn *conn = msc_conn_ref; struct vlr_subscr *vsub; - struct gsm_auth_tuple *tuple; + struct vlr_auth_tuple *tuple; if (!conn || !conn->vsub) { LOGP(DMM, LOGL_ERROR, "Cannot send Ciphering Mode Command to" diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index b632117..aaefb0b 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -602,7 +602,7 @@ #endif if (vsub->last_tuple) { - struct gsm_auth_tuple *t = vsub->last_tuple; + struct vlr_auth_tuple *t = vsub->last_tuple; vty_out(vty, " A3A8 last tuple (used %d times):%s", t->use_count, VTY_NEWLINE); vty_out(vty, " seq # : %d%s", diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 189cb66..76c84de 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -242,7 +242,7 @@ vsub->tmsi_new = GSM_RESERVED_TMSI; for (i = 0; i < ARRAY_SIZE(vsub->auth_tuples); i++) - vsub->auth_tuples[i].key_seq = GSM_KEY_SEQ_INVAL; + vsub->auth_tuples[i].key_seq = VLR_KEY_SEQ_INVAL; INIT_LLIST_HEAD(&vsub->cs.requests); INIT_LLIST_HEAD(&vsub->ps.pdp_list); @@ -661,7 +661,7 @@ if (gsup->num_auth_vectors) { memset(&vsub->auth_tuples, 0, sizeof(vsub->auth_tuples)); for (i = 0; i < ARRAY_SIZE(vsub->auth_tuples); i++) - vsub->auth_tuples[i].key_seq = GSM_KEY_SEQ_INVAL; + vsub->auth_tuples[i].key_seq = VLR_KEY_SEQ_INVAL; } got_tuples = 0; diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index d5a8555..8419696 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -65,13 +65,13 @@ * least used auth tuple without enforcing a maximum use count. If there are * no auth tuples, return NULL. */ -static struct gsm_auth_tuple * +static struct vlr_auth_tuple * _vlr_subscr_next_auth_tuple(struct vlr_subscr *vsub, int max_reuse_count) { unsigned int count; unsigned int idx; - struct gsm_auth_tuple *at = NULL; - unsigned int key_seq = GSM_KEY_SEQ_INVAL; + struct vlr_auth_tuple *at = NULL; + unsigned int key_seq = VLR_KEY_SEQ_INVAL; if (!vsub) return NULL; @@ -79,7 +79,7 @@ if (vsub->last_tuple) key_seq = vsub->last_tuple->key_seq; - if (key_seq == GSM_KEY_SEQ_INVAL) + if (key_seq == VLR_KEY_SEQ_INVAL) /* Start with 0 after increment modulo array size */ idx = ARRAY_SIZE(vsub->auth_tuples) - 1; else @@ -88,7 +88,7 @@ for (count = ARRAY_SIZE(vsub->auth_tuples); count > 0; count--) { idx = (idx + 1) % ARRAY_SIZE(vsub->auth_tuples); - if (vsub->auth_tuples[idx].key_seq == GSM_KEY_SEQ_INVAL) + if (vsub->auth_tuples[idx].key_seq == VLR_KEY_SEQ_INVAL) continue; if (!at || vsub->auth_tuples[idx].use_count < at->use_count) @@ -102,10 +102,10 @@ } /* Return an auth tuple and increment its use count. */ -static struct gsm_auth_tuple * +static struct vlr_auth_tuple * vlr_subscr_get_auth_tuple(struct vlr_subscr *vsub, int max_reuse_count) { - struct gsm_auth_tuple *at = _vlr_subscr_next_auth_tuple(vsub, + struct vlr_auth_tuple *at = _vlr_subscr_next_auth_tuple(vsub, max_reuse_count); if (!at) return NULL; @@ -124,7 +124,7 @@ bool is_utran, const uint8_t *res, uint8_t res_len) { - struct gsm_auth_tuple *at = vsub->last_tuple; + struct vlr_auth_tuple *at = vsub->last_tuple; struct osmo_auth_vector *vec = &at->vec; bool check_umts; bool res_is_umts_aka; @@ -263,7 +263,7 @@ { struct auth_fsm_priv *afp = fi->priv; struct vlr_subscr *vsub = afp->vsub; - struct gsm_auth_tuple *at; + struct vlr_auth_tuple *at; bool use_umts_aka; /* Caller ensures we have vectors available */ diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 2443e31..29ffdbf 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -714,7 +714,7 @@ return 0; } -static int fake_vlr_tx_auth_req(void *msc_conn_ref, struct gsm_auth_tuple *at, +static int fake_vlr_tx_auth_req(void *msc_conn_ref, struct vlr_auth_tuple *at, bool send_autn) { struct ran_conn *conn = msc_conn_ref; -- To view, visit https://gerrit.osmocom.org/12035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I122feae7ee3cbc59e941daef35a954bce29fec76 Gerrit-Change-Number: 12035 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:09 +0000 Subject: Change in osmo-msc[master]: cosmetic: drop some unused opaque struct defs In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12034 ) Change subject: cosmetic: drop some unused opaque struct defs ...................................................................... cosmetic: drop some unused opaque struct defs Change-Id: I4d461dd39d0abdc4f2327445671459340ca1c946 --- M include/osmocom/msc/db.h M include/osmocom/msc/iu_dummy.h M src/libmsc/iu_dummy.c 3 files changed, 0 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/include/osmocom/msc/db.h b/include/osmocom/msc/db.h index a1de7d6..6d07055 100644 --- a/include/osmocom/msc/db.h +++ b/include/osmocom/msc/db.h @@ -24,10 +24,7 @@ #include "gsm_subscriber.h" -struct gsm_equipment; struct gsm_network; -struct gsm_auth_info; -struct gsm_auth_tuple; struct gsm_sms; /* one time initialisation */ diff --git a/include/osmocom/msc/iu_dummy.h b/include/osmocom/msc/iu_dummy.h index d5e1428..01a8aa6 100644 --- a/include/osmocom/msc/iu_dummy.h +++ b/include/osmocom/msc/iu_dummy.h @@ -29,7 +29,6 @@ #include struct msgb; -struct gsm_auth_tuple; struct RANAP_Cause; struct osmo_auth_vector; diff --git a/src/libmsc/iu_dummy.c b/src/libmsc/iu_dummy.c index bb53367..3f11d94 100644 --- a/src/libmsc/iu_dummy.c +++ b/src/libmsc/iu_dummy.c @@ -34,7 +34,6 @@ struct msgb; struct ranap_ue_conn_ctx; -struct gsm_auth_tuple; struct RANAP_Cause; struct osmo_auth_vector; -- To view, visit https://gerrit.osmocom.org/12034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4d461dd39d0abdc4f2327445671459340ca1c946 Gerrit-Change-Number: 12034 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:10 +0000 Subject: Change in osmo-msc[master]: combine several small .h in msc_common.h In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12033 ) Change subject: combine several small .h in msc_common.h ...................................................................... combine several small .h in msc_common.h For hysterical raisins, there are some header files that contain few declarations, and where the name doesn't reflect the content. Combine them to new msc_common.h: - common.h - common_cs.h - osmo_msc.h Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 --- M include/osmocom/msc/Makefile.am D include/osmocom/msc/common.h D include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_data_shared.h A include/osmocom/msc/msc_common.h D include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/a_reset.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_tests.h 23 files changed, 26 insertions(+), 53 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index 9fa58c7..d98bc9c 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -1,8 +1,6 @@ noinst_HEADERS = \ a_iface.h \ a_iface_bssap.h \ - common.h \ - common_cs.h \ db.h \ debug.h \ gsm_04_08.h \ @@ -18,10 +16,10 @@ iu_dummy.h \ mncc.h \ mncc_int.h \ + msc_common.h \ msc_ifaces.h \ msc_mgcp.h \ a_reset.h \ - osmo_msc.h \ ran_conn.h \ rrlp.h \ signal.h \ diff --git a/include/osmocom/msc/common.h b/include/osmocom/msc/common.h deleted file mode 100644 index d91b3d3..0000000 --- a/include/osmocom/msc/common.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -enum nsap_addr_enc { - NSAP_ADDR_ENC_X213, - NSAP_ADDR_ENC_V4RAW, -}; diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h deleted file mode 100644 index 097d3b1..0000000 --- a/include/osmocom/msc/common_cs.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include - -struct msgb; -struct gsm_network; - -typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); - -struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 35ec752..3ffa100 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -13,10 +13,10 @@ #include #include -#include -#include #include +#include + #include "gsm_data_shared.h" /* TS 48.008 DLCI containing DCCH/ACCH + SAPI */ diff --git a/include/osmocom/msc/gsm_data_shared.h b/include/osmocom/msc/gsm_data_shared.h index f71e92b..732607b 100644 --- a/include/osmocom/msc/gsm_data_shared.h +++ b/include/osmocom/msc/gsm_data_shared.h @@ -12,8 +12,6 @@ #include #include -#include - struct osmo_bsc_data; struct osmo_bsc_sccp_con; diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h new file mode 100644 index 0000000..ffe8902 --- /dev/null +++ b/include/osmocom/msc/msc_common.h @@ -0,0 +1,22 @@ +#pragma once + +struct msgb; +struct gsm_network; +struct vlr_subscr; + +#define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" +#define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT + +enum nsap_addr_enc { + NSAP_ADDR_ENC_X213, + NSAP_ADDR_ENC_V4RAW, +}; + +typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); + +struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); + +int msc_vlr_alloc(struct gsm_network *net); +int msc_vlr_start(struct gsm_network *net); + +void msc_stop_paging(struct vlr_subscr *vsub); diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h deleted file mode 100644 index 1512017..0000000 --- a/include/osmocom/msc/osmo_msc.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -/* Routines for the MSC handling */ - -struct gsm_network; -struct vlr_subscr; - -#define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" -#define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT - -int msc_vlr_alloc(struct gsm_network *net); -int msc_vlr_start(struct gsm_network *net); - -void msc_stop_paging(struct vlr_subscr *vsub); diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 82519d6..66644ee 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 4d03d23..a10bd42 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libmsc/a_reset.c b/src/libmsc/a_reset.c index 1e35a10..d6d4a1c 100644 --- a/src/libmsc/a_reset.c +++ b/src/libmsc/a_reset.c @@ -27,6 +27,7 @@ #include #include #include +#include #define RESET_RESEND_INTERVAL 2 /* sec */ #define RESET_RESEND_TIMER_NO 16 /* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.2 */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 97a632b..38376d0 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 8ac87c1..a172b47 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index d012443..62f3bba 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #ifdef BUILD_SMPP diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index c0a0bdd..43bf48c 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index a5bf745..c3b8a95 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -46,7 +46,6 @@ #include #include #include -#include #include #include diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index 1e4ab19..a96b4c2 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c index a657857..f1221c0 100644 --- a/src/libmsc/iucs_ranap.c +++ b/src/libmsc/iucs_ranap.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 589eca0..b632117 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -43,7 +43,6 @@ #endif #include -#include #include #include #include diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 45dfd73..52277b7 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -21,12 +21,10 @@ * */ -#include #include #include #include #include -#include #include #include #include diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index c6c31a0..b4fc154 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -29,7 +29,6 @@ #include #include #include -#include #include /* paging of the requested subscriber has completed */ diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index cf12066..47124a0 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -25,7 +25,6 @@ #include #include #include -#include #include void *tall_trans_ctx; diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index a139046..afab417 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index f308a03..f7ff940 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -27,7 +27,6 @@ #include #include -#include #include #include -- To view, visit https://gerrit.osmocom.org/12033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28 Gerrit-Change-Number: 12033 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:10 +0000 Subject: Change in osmo-msc[master]: move ran_conn declarations to new ran_conn.h In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12032 ) Change subject: move ran_conn declarations to new ran_conn.h ...................................................................... move ran_conn declarations to new ran_conn.h With the dawn of inter-BSC,MSC handover, adopting the MSC-A,-I,-T roles from 3GPP TS 49.008, the RAN connection shall soon be a neatly separated corner of osmo-msc, so gravitate ran_conn decarations to files of matching name. Also, the current chaos of API defined in files with mismatching/meaningless names drives me crazy. Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 --- M include/osmocom/msc/Makefile.am M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h A include/osmocom/msc/ran_conn.h M include/osmocom/msc/vlr.h M src/libmsc/ran_conn.c M src/libmsc/rrlp.c 11 files changed, 252 insertions(+), 244 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index 28e4b14..9fa58c7 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -22,6 +22,7 @@ msc_mgcp.h \ a_reset.h \ osmo_msc.h \ + ran_conn.h \ rrlp.h \ signal.h \ silent_call.h \ diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h index 410f102..097d3b1 100644 --- a/include/osmocom/msc/common_cs.h +++ b/include/osmocom/msc/common_cs.h @@ -7,12 +7,4 @@ typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); -#define MAX_A5_KEY_LEN (128/8) - -struct geran_encr { - uint8_t alg_id; - uint8_t key_len; - uint8_t key[MAX_A5_KEY_LEN]; -}; - struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv); diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 12a02bd..35ec752 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -34,7 +33,6 @@ struct mncc_sock_state; struct vlr_instance; struct vlr_subscr; -struct ranap_ue_conn_ctx; #define tmsi_from_string(str) strtoul(str, NULL, 10) @@ -51,140 +49,6 @@ }; #define GSM_KEY_SEQ_INVAL 7 /* GSM 04.08 - 10.5.1.2 */ -enum ran_type { - RAN_UNKNOWN, - RAN_GERAN_A, /* 2G / A-interface */ - RAN_UTRAN_IU, /* 3G / Iu-interface (IuCS or IuPS) */ -}; - -extern const struct value_string ran_type_names[]; -static inline const char *ran_type_name(enum ran_type val) -{ return get_value_string(ran_type_names, val); } - -struct gsm_classmark { - bool classmark1_set; - struct gsm48_classmark1 classmark1; - uint8_t classmark2_len; - uint8_t classmark2[3]; - uint8_t classmark3_len; - uint8_t classmark3[14]; /* if cm3 gets extended by spec, it will be truncated */ -}; - -enum integrity_protection_state { - INTEGRITY_PROTECTION_NONE = 0, - INTEGRITY_PROTECTION_IK = 1, - INTEGRITY_PROTECTION_IK_CK = 2, -}; - -enum complete_layer3_type { - COMPLETE_LAYER3_NONE, - COMPLETE_LAYER3_LU, - COMPLETE_LAYER3_CM_SERVICE_REQ, - COMPLETE_LAYER3_PAGING_RESP, -}; - -extern const struct value_string complete_layer3_type_names[]; -static inline const char *complete_layer3_type_name(enum complete_layer3_type val) -{ - return get_value_string(complete_layer3_type_names, val); -} - -/* active radio connection of a mobile subscriber */ -struct ran_conn { - /* global linked list of ran_conn instances */ - struct llist_head entry; - - /* FSM instance to control the RAN connection's permissions and lifetime. */ - struct osmo_fsm_inst *fi; - enum complete_layer3_type complete_layer3_type; - - /* usage count. If this drops to zero, we start the release - * towards A/Iu */ - uint32_t use_count; - uint32_t use_tokens; - - /* The MS has opened the conn with a CM Service Request, and we shall - * keep it open for an actual request (or until timeout). */ - bool received_cm_service_request; - - /* libmsc/libvlr subscriber information (if available) */ - struct vlr_subscr *vsub; - - /* LU expiration handling */ - uint8_t expire_timer_stopped; - /* SMS helpers for libmsc */ - uint8_t next_rp_ref; - - /* Are we part of a special "silent" call */ - int silent_call; - - /* back pointers */ - struct gsm_network *network; - - /* connected via 2G or 3G? */ - enum ran_type via_ran; - - uint16_t lac; - struct geran_encr geran_encr; - - /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still - * wants to request a Classmark Update first. */ - struct { - bool umts_aka; - bool retrieve_imeisv; - } geran_set_cipher_mode; - - /* N(SD) expected in the received frame, per flow (TS 24.007 11.2.3.2.3.2.2) */ - uint8_t n_sd_next[4]; - - struct { - struct mgcp_ctx *mgcp_ctx; - unsigned int mgcp_rtp_endpoint; - - uint16_t local_port_ran; - char local_addr_ran[INET_ADDRSTRLEN]; - uint16_t remote_port_ran; - char remote_addr_ran[INET_ADDRSTRLEN]; - enum mgcp_codecs codec_ran; - - uint16_t local_port_cn; - char local_addr_cn[INET_ADDRSTRLEN]; - uint16_t remote_port_cn; - char remote_addr_cn[INET_ADDRSTRLEN]; - enum mgcp_codecs codec_cn; - } rtp; - - /* which Iu-CS connection, if any. */ - struct { - struct ranap_ue_conn_ctx *ue_ctx; - uint8_t rab_id; - bool waiting_for_release_complete; - } iu; - - struct { - /* A pointer to the SCCP user that handles - * the SCCP connections for this subscriber - * connection */ - struct osmo_sccp_user *scu; - - /* The address of the BSC that is associated - * with this RAN connection */ - struct osmo_sccp_addr bsc_addr; - - /* The connection identifier that is used - * to reference the SCCP connection that is - * associated with this RAN connection */ - uint32_t conn_id; - - bool waiting_for_clear_complete; - } a; - - /* Temporary storage for Classmark Information for times when a connection has no VLR subscriber - * associated yet. It will get copied to the VLR subscriber upon msc_vlr_subscr_assoc(). */ - struct gsm_classmark temporary_classmark; -}; - - enum { MSC_CTR_LOC_UPDATE_TYPE_ATTACH, MSC_CTR_LOC_UPDATE_TYPE_NORMAL, diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index ec2d3a4..428b889 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -8,6 +8,8 @@ #include +struct ran_conn; + #define GSM_NAME_LENGTH 160 #define GSM_EXTENSION_LENGTH 15 /* MSISDN can only be 15 digits length */ diff --git a/include/osmocom/msc/iucs.h b/include/osmocom/msc/iucs.h index 2a70c65..302edc0 100644 --- a/include/osmocom/msc/iucs.h +++ b/include/osmocom/msc/iucs.h @@ -2,6 +2,8 @@ #include +struct ranap_ue_conn_ctx; + int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg, uint16_t *lac); diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h index ddd8837..9d8b01d 100644 --- a/include/osmocom/msc/msc_mgcp.h +++ b/include/osmocom/msc/msc_mgcp.h @@ -23,6 +23,8 @@ #include #include +struct ran_conn; + /* MGCP state handler context. This context information stores all information * to handle the direction of the RTP streams via MGCP. There is one instance * of this context struct per RAN connection. diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index fe6e0cd..1512017 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -1,108 +1,14 @@ +#pragma once + /* Routines for the MSC handling */ -#ifndef OSMO_MSC_H -#define OSMO_MSC_H - -#include -#include - -#include +struct gsm_network; +struct vlr_subscr; #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1" #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT -enum ran_conn_fsm_event { - /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ - RAN_CONN_E_COMPLETE_LAYER_3, - /* Received Classmark Update, typically neede for Ciphering Mode Command */ - RAN_CONN_E_CLASSMARK_UPDATE, - /* LU or Process Access FSM has determined that this conn is good */ - RAN_CONN_E_ACCEPTED, - /* received first reply from MS in "real" CC, SMS, USSD communication */ - RAN_CONN_E_COMMUNICATING, - /* Some async action has completed, check again whether all is done */ - RAN_CONN_E_RELEASE_WHEN_UNUSED, - /* MS/BTS/BSC originated close request */ - RAN_CONN_E_MO_CLOSE, - /* MSC originated close request, e.g. failed authentication */ - RAN_CONN_E_CN_CLOSE, - /* The usage count for the conn has reached zero */ - RAN_CONN_E_UNUSED, -}; - -enum ran_conn_fsm_state { - RAN_CONN_S_NEW, - RAN_CONN_S_AUTH_CIPH, - RAN_CONN_S_WAIT_CLASSMARK_UPDATE, - RAN_CONN_S_ACCEPTED, - RAN_CONN_S_COMMUNICATING, - RAN_CONN_S_RELEASING, - RAN_CONN_S_RELEASED, -}; - -struct ran_conn *ran_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac); - -void ran_conn_update_id(struct ran_conn *conn, enum complete_layer3_type from, const char *id); -char *ran_conn_get_conn_id(struct ran_conn *conn); - -void ran_conn_complete_layer_3(struct ran_conn *conn); - int msc_vlr_alloc(struct gsm_network *net); int msc_vlr_start(struct gsm_network *net); -void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci); -int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause); -void ran_conn_compl_l3(struct ran_conn *conn, - struct msgb *msg, uint16_t chosen_channel); -void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg); -int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, - bool retrieve_imeisv); -int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); -void ran_conn_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id); -void ran_conn_rx_sec_mode_compl(struct ran_conn *conn); -void ran_conn_classmark_chg(struct ran_conn *conn, - const uint8_t *cm2, uint8_t cm2_len, - const uint8_t *cm3, uint8_t cm3_len); -void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause); - -void ran_conn_init(void); -bool ran_conn_is_accepted(const struct ran_conn *conn); -bool ran_conn_is_establishing_auth_ciph(const struct ran_conn *conn); -void ran_conn_communicating(struct ran_conn *conn); -void ran_conn_close(struct ran_conn *conn, uint32_t cause); -void ran_conn_mo_close(struct ran_conn *conn, uint32_t cause); -bool ran_conn_in_release(struct ran_conn *conn); - -void ran_conn_rx_bssmap_clear_complete(struct ran_conn *conn); -void ran_conn_rx_iu_release_complete(struct ran_conn *conn); - -enum ran_conn_use { - RAN_CONN_USE_UNTRACKED = -1, - RAN_CONN_USE_COMPL_L3, - RAN_CONN_USE_DTAP, - RAN_CONN_USE_AUTH_CIPH, - RAN_CONN_USE_CM_SERVICE, - RAN_CONN_USE_TRANS_CC, - RAN_CONN_USE_TRANS_SMS, - RAN_CONN_USE_TRANS_NC_SS, - RAN_CONN_USE_SILENT_CALL, - RAN_CONN_USE_RELEASE, -}; - -extern const struct value_string ran_conn_use_names[]; -static inline const char *ran_conn_use_name(enum ran_conn_use val) -{ return get_value_string(ran_conn_use_names, val); } - -#define ran_conn_get(conn, balance_token) \ - _ran_conn_get(conn, balance_token, __FILE__, __LINE__) -#define ran_conn_put(conn, balance_token) \ - _ran_conn_put(conn, balance_token, __FILE__, __LINE__) -struct ran_conn * _ran_conn_get(struct ran_conn *conn, enum ran_conn_use balance_token, - const char *file, int line); -void _ran_conn_put(struct ran_conn *conn, enum ran_conn_use balance_token, - const char *file, int line); -bool ran_conn_used_by(struct ran_conn *conn, enum ran_conn_use token); - void msc_stop_paging(struct vlr_subscr *vsub); - -#endif diff --git a/include/osmocom/msc/ran_conn.h b/include/osmocom/msc/ran_conn.h new file mode 100644 index 0000000..d71872e --- /dev/null +++ b/include/osmocom/msc/ran_conn.h @@ -0,0 +1,238 @@ +#pragma once +/* MSC RAN connection implementation */ + +#include + +#include +#include +#include + +enum ran_type { + RAN_UNKNOWN, + RAN_GERAN_A, /* 2G / A-interface */ + RAN_UTRAN_IU, /* 3G / Iu-interface (IuCS or IuPS) */ +}; + +extern const struct value_string ran_type_names[]; +static inline const char *ran_type_name(enum ran_type val) +{ return get_value_string(ran_type_names, val); } + +enum ran_conn_fsm_event { + /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ + RAN_CONN_E_COMPLETE_LAYER_3, + /* Received Classmark Update, typically neede for Ciphering Mode Command */ + RAN_CONN_E_CLASSMARK_UPDATE, + /* LU or Process Access FSM has determined that this conn is good */ + RAN_CONN_E_ACCEPTED, + /* received first reply from MS in "real" CC, SMS, USSD communication */ + RAN_CONN_E_COMMUNICATING, + /* Some async action has completed, check again whether all is done */ + RAN_CONN_E_RELEASE_WHEN_UNUSED, + /* MS/BTS/BSC originated close request */ + RAN_CONN_E_MO_CLOSE, + /* MSC originated close request, e.g. failed authentication */ + RAN_CONN_E_CN_CLOSE, + /* The usage count for the conn has reached zero */ + RAN_CONN_E_UNUSED, +}; + +enum ran_conn_fsm_state { + RAN_CONN_S_NEW, + RAN_CONN_S_AUTH_CIPH, + RAN_CONN_S_WAIT_CLASSMARK_UPDATE, + RAN_CONN_S_ACCEPTED, + RAN_CONN_S_COMMUNICATING, + RAN_CONN_S_RELEASING, + RAN_CONN_S_RELEASED, +}; + +enum integrity_protection_state { + INTEGRITY_PROTECTION_NONE = 0, + INTEGRITY_PROTECTION_IK = 1, + INTEGRITY_PROTECTION_IK_CK = 2, +}; + +enum complete_layer3_type { + COMPLETE_LAYER3_NONE, + COMPLETE_LAYER3_LU, + COMPLETE_LAYER3_CM_SERVICE_REQ, + COMPLETE_LAYER3_PAGING_RESP, +}; + +#define MAX_A5_KEY_LEN (128/8) + +struct geran_encr { + uint8_t alg_id; + uint8_t key_len; + uint8_t key[MAX_A5_KEY_LEN]; +}; + +extern const struct value_string complete_layer3_type_names[]; +static inline const char *complete_layer3_type_name(enum complete_layer3_type val) +{ + return get_value_string(complete_layer3_type_names, val); +} + +struct gsm_classmark { + bool classmark1_set; + struct gsm48_classmark1 classmark1; + uint8_t classmark2_len; + uint8_t classmark2[3]; + uint8_t classmark3_len; + uint8_t classmark3[14]; /* if cm3 gets extended by spec, it will be truncated */ +}; + +/* active radio connection of a mobile subscriber */ +struct ran_conn { + /* global linked list of ran_conn instances */ + struct llist_head entry; + + /* FSM instance to control the RAN connection's permissions and lifetime. */ + struct osmo_fsm_inst *fi; + enum complete_layer3_type complete_layer3_type; + + /* usage count. If this drops to zero, we start the release + * towards A/Iu */ + uint32_t use_count; + uint32_t use_tokens; + + /* The MS has opened the conn with a CM Service Request, and we shall + * keep it open for an actual request (or until timeout). */ + bool received_cm_service_request; + + /* libmsc/libvlr subscriber information (if available) */ + struct vlr_subscr *vsub; + + /* LU expiration handling */ + uint8_t expire_timer_stopped; + /* SMS helpers for libmsc */ + uint8_t next_rp_ref; + + /* Are we part of a special "silent" call */ + int silent_call; + + /* back pointers */ + struct gsm_network *network; + + /* connected via 2G or 3G? */ + enum ran_type via_ran; + + uint16_t lac; + struct geran_encr geran_encr; + + /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still + * wants to request a Classmark Update first. */ + struct { + bool umts_aka; + bool retrieve_imeisv; + } geran_set_cipher_mode; + + /* N(SD) expected in the received frame, per flow (TS 24.007 11.2.3.2.3.2.2) */ + uint8_t n_sd_next[4]; + + struct { + struct mgcp_ctx *mgcp_ctx; + unsigned int mgcp_rtp_endpoint; + + uint16_t local_port_ran; + char local_addr_ran[INET_ADDRSTRLEN]; + uint16_t remote_port_ran; + char remote_addr_ran[INET_ADDRSTRLEN]; + enum mgcp_codecs codec_ran; + + uint16_t local_port_cn; + char local_addr_cn[INET_ADDRSTRLEN]; + uint16_t remote_port_cn; + char remote_addr_cn[INET_ADDRSTRLEN]; + enum mgcp_codecs codec_cn; + } rtp; + + /* which Iu-CS connection, if any. */ + struct { + struct ranap_ue_conn_ctx *ue_ctx; + uint8_t rab_id; + bool waiting_for_release_complete; + } iu; + + struct { + /* A pointer to the SCCP user that handles + * the SCCP connections for this subscriber + * connection */ + struct osmo_sccp_user *scu; + + /* The address of the BSC that is associated + * with this RAN connection */ + struct osmo_sccp_addr bsc_addr; + + /* The connection identifier that is used + * to reference the SCCP connection that is + * associated with this RAN connection */ + uint32_t conn_id; + + bool waiting_for_clear_complete; + } a; + + /* Temporary storage for Classmark Information for times when a connection has no VLR subscriber + * associated yet. It will get copied to the VLR subscriber upon msc_vlr_subscr_assoc(). */ + struct gsm_classmark temporary_classmark; +}; + +struct ran_conn *ran_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac); + +void ran_conn_update_id(struct ran_conn *conn, enum complete_layer3_type from, const char *id); +char *ran_conn_get_conn_id(struct ran_conn *conn); + +void ran_conn_complete_layer_3(struct ran_conn *conn); + +void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci); +int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause); +void ran_conn_compl_l3(struct ran_conn *conn, + struct msgb *msg, uint16_t chosen_channel); +void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg); +int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, + bool retrieve_imeisv); +int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); +void ran_conn_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id); +void ran_conn_rx_sec_mode_compl(struct ran_conn *conn); +void ran_conn_classmark_chg(struct ran_conn *conn, + const uint8_t *cm2, uint8_t cm2_len, + const uint8_t *cm3, uint8_t cm3_len); +void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause); + +void ran_conn_init(void); +bool ran_conn_is_accepted(const struct ran_conn *conn); +bool ran_conn_is_establishing_auth_ciph(const struct ran_conn *conn); +void ran_conn_communicating(struct ran_conn *conn); +void ran_conn_close(struct ran_conn *conn, uint32_t cause); +void ran_conn_mo_close(struct ran_conn *conn, uint32_t cause); +bool ran_conn_in_release(struct ran_conn *conn); + +void ran_conn_rx_bssmap_clear_complete(struct ran_conn *conn); +void ran_conn_rx_iu_release_complete(struct ran_conn *conn); + +enum ran_conn_use { + RAN_CONN_USE_UNTRACKED = -1, + RAN_CONN_USE_COMPL_L3, + RAN_CONN_USE_DTAP, + RAN_CONN_USE_AUTH_CIPH, + RAN_CONN_USE_CM_SERVICE, + RAN_CONN_USE_TRANS_CC, + RAN_CONN_USE_TRANS_SMS, + RAN_CONN_USE_TRANS_NC_SS, + RAN_CONN_USE_SILENT_CALL, + RAN_CONN_USE_RELEASE, +}; + +extern const struct value_string ran_conn_use_names[]; +static inline const char *ran_conn_use_name(enum ran_conn_use val) +{ return get_value_string(ran_conn_use_names, val); } + +#define ran_conn_get(conn, balance_token) \ + _ran_conn_get(conn, balance_token, __FILE__, __LINE__) +#define ran_conn_put(conn, balance_token) \ + _ran_conn_put(conn, balance_token, __FILE__, __LINE__) +struct ran_conn * _ran_conn_get(struct ran_conn *conn, enum ran_conn_use balance_token, + const char *file, int line); +void _ran_conn_put(struct ran_conn *conn, enum ran_conn_use balance_token, + const char *file, int line); +bool ran_conn_used_by(struct ran_conn *conn, enum ran_conn_use token); diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 6e16903..1168c32 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include // for GSM_NAME_LENGTH #include #include diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index 5fab1c6..9b63f16 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c index c0747cd..6ff30b7 100644 --- a/src/libmsc/rrlp.c +++ b/src/libmsc/rrlp.c @@ -27,6 +27,7 @@ #include #include #include +#include /* RRLP msPositionReq, nsBased, * Accuracy=60, Method=gps, ResponseTime=2, oneSet */ -- To view, visit https://gerrit.osmocom.org/12032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice31e6c43e46678538c65261f150c67e1d0845e5 Gerrit-Change-Number: 12032 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:10 +0000 Subject: Change in osmo-msc[master]: move subscr_conn.c to ran_conn.c In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12031 ) Change subject: move subscr_conn.c to ran_conn.c ...................................................................... move subscr_conn.c to ran_conn.c subscr_conn.c exclusively defines ran_conn related things. Rename the file. Change-Id: I6aa6b335842116c717a554c981083a914724ee21 --- M src/libmsc/Makefile.am R src/libmsc/ran_conn.c 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index 90bbbf8..9183ff9 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -44,13 +44,13 @@ mncc_sock.c \ msc_ifaces.c \ msc_mgcp.c \ + ran_conn.c \ rrlp.c \ silent_call.c \ sms_queue.c \ transaction.c \ osmo_msc.c \ ctrl_commands.c \ - subscr_conn.c \ $(NULL) if BUILD_IU libmsc_a_SOURCES += \ diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/ran_conn.c similarity index 100% rename from src/libmsc/subscr_conn.c rename to src/libmsc/ran_conn.c -- To view, visit https://gerrit.osmocom.org/12031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6aa6b335842116c717a554c981083a914724ee21 Gerrit-Change-Number: 12031 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:08 +0000 Subject: Change in osmo-msc[master]: rename some RAN conn related stuff to ran_conn_* In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12030 to look at the new patch set (#7). Change subject: rename some RAN conn related stuff to ran_conn_* ...................................................................... rename some RAN conn related stuff to ran_conn_* Following previous rename of gsm_subscriber_connection: Some functions and #defines are still called like "msc_conn" or just "msc_", while they are clearly about a RAN conn. To avoid confusion with the future separate concepts of MSC roles and a RAN connection, rename all those to match the common "ran_conn" prefix. Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_tests.c 15 files changed, 104 insertions(+), 109 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/12030/7 -- To view, visit https://gerrit.osmocom.org/12030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 Gerrit-Change-Number: 12030 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:11 +0000 Subject: Change in osmo-msc[master]: rename some RAN conn related stuff to ran_conn_* In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12030 ) Change subject: rename some RAN conn related stuff to ran_conn_* ...................................................................... rename some RAN conn related stuff to ran_conn_* Following previous rename of gsm_subscriber_connection: Some functions and #defines are still called like "msc_conn" or just "msc_", while they are clearly about a RAN conn. To avoid confusion with the future separate concepts of MSC roles and a RAN connection, rename all those to match the common "ran_conn" prefix. Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_09_11.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_tests.c 15 files changed, 104 insertions(+), 109 deletions(-) diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index 38cb497..fe6e0cd 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -50,22 +50,20 @@ int msc_vlr_alloc(struct gsm_network *net); int msc_vlr_start(struct gsm_network *net); -void msc_sapi_n_reject(struct ran_conn *conn, int dlci); -int msc_clear_request(struct ran_conn *conn, uint32_t cause); -void msc_compl_l3(struct ran_conn *conn, - struct msgb *msg, uint16_t chosen_channel); -void msc_dtap(struct ran_conn *conn, struct msgb *msg); -int msc_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, - bool retrieve_imeisv); -int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); -void msc_cipher_mode_compl(struct ran_conn *conn, - struct msgb *msg, uint8_t alg_id); -void msc_rx_sec_mode_compl(struct ran_conn *conn); -void msc_classmark_chg(struct ran_conn *conn, - const uint8_t *cm2, uint8_t cm2_len, - const uint8_t *cm3, uint8_t cm3_len); -void msc_assign_fail(struct ran_conn *conn, - uint8_t cause, uint8_t *rr_cause); +void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci); +int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause); +void ran_conn_compl_l3(struct ran_conn *conn, + struct msgb *msg, uint16_t chosen_channel); +void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg); +int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, + bool retrieve_imeisv); +int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv); +void ran_conn_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id); +void ran_conn_rx_sec_mode_compl(struct ran_conn *conn); +void ran_conn_classmark_chg(struct ran_conn *conn, + const uint8_t *cm2, uint8_t cm2_len, + const uint8_t *cm3, uint8_t cm3_len); +void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause); void ran_conn_init(void); bool ran_conn_is_accepted(const struct ran_conn *conn); @@ -79,16 +77,16 @@ void ran_conn_rx_iu_release_complete(struct ran_conn *conn); enum ran_conn_use { - MSC_CONN_USE_UNTRACKED = -1, - MSC_CONN_USE_COMPL_L3, - MSC_CONN_USE_DTAP, - MSC_CONN_USE_AUTH_CIPH, - MSC_CONN_USE_CM_SERVICE, - MSC_CONN_USE_TRANS_CC, - MSC_CONN_USE_TRANS_SMS, - MSC_CONN_USE_TRANS_NC_SS, - MSC_CONN_USE_SILENT_CALL, - MSC_CONN_USE_RELEASE, + RAN_CONN_USE_UNTRACKED = -1, + RAN_CONN_USE_COMPL_L3, + RAN_CONN_USE_DTAP, + RAN_CONN_USE_AUTH_CIPH, + RAN_CONN_USE_CM_SERVICE, + RAN_CONN_USE_TRANS_CC, + RAN_CONN_USE_TRANS_SMS, + RAN_CONN_USE_TRANS_NC_SS, + RAN_CONN_USE_SILENT_CALL, + RAN_CONN_USE_RELEASE, }; extern const struct value_string ran_conn_use_names[]; diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index fa0cb5f..82519d6 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -629,7 +629,7 @@ uint32_t conn_id = conn->a.conn_id; LOGPCONN(conn, LOGL_NOTICE, "Dropping orphaned RAN connection\n"); /* This call will/may talloc_free(conn), so we must save conn_id above */ - msc_clear_request(conn, GSM48_CC_CAUSE_SWITCH_CONG); + ran_conn_clear_request(conn, GSM48_CC_CAUSE_SWITCH_CONG); /* If there is still an SCCP connection active, remove it now */ if (check_connection_active(conn_id)) { diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 31cdb06..4d03d23 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -343,7 +343,7 @@ conn = ran_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id); /* Handover location update to the MSC code */ - msc_compl_l3(conn, msg, 0); + ran_conn_compl_l3(conn, msg, 0); return 0; } @@ -372,7 +372,7 @@ } /* Inform MSC about the classmark change */ - msc_classmark_chg(conn, cm2, cm2_len, cm3, cm3_len); + ran_conn_classmark_chg(conn, cm2, cm2_len, cm3, cm3_len); return 0; } @@ -383,9 +383,9 @@ { /* FIXME: The field GSM0808_IE_LAYER_3_MESSAGE_CONTENTS is optional by * means of the specification. So there can be messages without L3 info. - * In this case, the code will crash becrause msc_cipher_mode_compl() + * In this case, the code will crash becrause ran_conn_cipher_mode_compl() * is not able to deal with msg = NULL and apperently - * msc_cipher_mode_compl() was never meant to be used without L3 data. + * ran_conn_cipher_mode_compl() was never meant to be used without L3 data. * This needs to be discussed further! */ uint8_t alg_id = 1; @@ -407,7 +407,7 @@ rate_ctr_inc(&msc->ctr[MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE]); /* Hand over cipher mode complete message to the MSC */ - msc_cipher_mode_compl(conn, msg, alg_id); + ran_conn_cipher_mode_compl(conn, msg, alg_id); return 0; } @@ -462,12 +462,12 @@ /* FIXME: In AoIP, the Assignment failure will carry also an optional * Codec List (BSS Supported) element. It has to be discussed if we - * can ignore this element. If not, The msc_assign_fail() function - * call has to change. However msc_assign_fail() does nothing in the + * can ignore this element. If not, The ran_conn_assign_fail() function + * call has to change. However ran_conn_assign_fail() does nothing in the * end. So probably we can just leave it as it is. Even for AoIP */ /* Inform the MSC about the assignment failure event */ - msc_assign_fail(conn, cause, rr_cause_ptr); + ran_conn_assign_fail(conn, cause, rr_cause_ptr); return 0; } @@ -494,7 +494,7 @@ dlci = TLVP_VAL(tp, GSM0808_IE_DLCI)[0]; /* Inform the MSC about the sapi "n" reject event */ - msc_sapi_n_reject(conn, dlci); + ran_conn_sapi_n_reject(conn, dlci); return 0; } @@ -582,7 +582,7 @@ /* FIXME: Seems to be related to authentication or, encryption. Is this really in the right place? */ - msc_rx_sec_mode_compl(conn); + ran_conn_rx_sec_mode_compl(conn); return 0; } @@ -670,12 +670,12 @@ LOGPCONN(conn, LOGL_DEBUG, "Rx DTAP %s\n", msgb_hexdump_l2(msg)); - /* msc_dtap expects the dtap payload in l3h */ + /* ran_conn_dtap expects the dtap payload in l3h */ msg->l3h = msg->l2h + 3; OMSC_LINKID_CB(msg) = dtap->link_id; /* Forward dtap payload into the msc */ - msc_dtap(conn, msg); + ran_conn_dtap(conn, msg); return 0; } diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 407144e..97a632b 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -687,7 +687,7 @@ if (!conn->received_cm_service_request) { conn->received_cm_service_request = true; - ran_conn_get(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_get(conn, RAN_CONN_USE_CM_SERVICE); } ran_conn_update_id(conn, conn->complete_layer3_type, mi_string); return conn->network->vlr->ops.tx_cm_serv_acc(conn); @@ -1332,7 +1332,7 @@ gsm48_pdisc_msgtype_name(pdisc, msg_type)); } conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); } /* TS 24.007 11.2.3.2.3 Message Type Octet / Duplicate Detection */ @@ -1584,7 +1584,7 @@ if (conn->received_cm_service_request) { conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); } return rc; @@ -1594,7 +1594,7 @@ osmo_static_assert(sizeof(((struct gsm0808_encrypt_info*)0)->key) >= sizeof(((struct osmo_auth_vector*)0)->kc), gsm0808_encrypt_info_key_fits_osmo_auth_vec_kc); -int msc_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) +int ran_conn_geran_set_cipher_mode(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { struct gsm_network *net = conn->network; struct gsm0808_encrypt_info ei; @@ -1640,7 +1640,7 @@ vlr_subscr_name(conn->vsub), request_classmark_for_a5_n, request_classmark); - return msc_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv); + return ran_conn_classmark_request_then_cipher_mode_cmd(conn, umts_aka, retrieve_imeisv); } if (ei.perm_algo_len == 0) { @@ -1701,7 +1701,7 @@ switch (conn->via_ran) { case RAN_GERAN_A: - return msc_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv); + return ran_conn_geran_set_cipher_mode(conn, umts_aka, retrieve_imeisv); case RAN_UTRAN_IU: #ifdef BUILD_IU @@ -1723,7 +1723,7 @@ return -ENOTSUP; } -void msc_rx_sec_mode_compl(struct ran_conn *conn) +void ran_conn_rx_sec_mode_compl(struct ran_conn *conn) { struct vlr_ciph_result vlr_res = {}; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 516fc51..8ac87c1 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -322,7 +322,7 @@ vlr_subscr_msisdn_or_name(transt->vsub)); OSMO_ASSERT(conn); /* Assign conn */ - transt->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC); + transt->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC); transt->paging_request = NULL; /* send SETUP request to called party */ gsm48_cc_tx_setup(transt, &transt->cc.msg); @@ -2005,7 +2005,7 @@ } /* Assign conn */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC); trans->dlci = 0x00; /* SAPI=0, not SACCH */ vlr_subscr_put(vsub); } else { @@ -2160,7 +2160,7 @@ return -ENOMEM; } /* Assign transaction */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_CC); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_CC); trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */ cm_service_request_concludes(conn, msg); } diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index d214f2e..d012443 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -148,7 +148,7 @@ switch (event) { case GSM_PAGING_SUCCEEDED: /* Associate transaction with established connection */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); /* Confirm successful connection establishment */ gsm411_smc_recv(&trans->sms.smc_inst, GSM411_MMSMS_EST_CNF, NULL, 0); @@ -1010,7 +1010,7 @@ conn = connection_for_subscr(vsub); if (conn) { /* Associate transaction with connection */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); /* Generate unique RP Message Reference */ trans->sms.sm_rp_mr = conn->next_rp_ref++; } @@ -1140,7 +1140,7 @@ gsm411_smr_init(&trans->sms.smr_inst, 0, 1, gsm411_rl_recv, gsm411_mn_send); - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_SMS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_SMS); trans->dlci = OMSC_LINKID_CB(msg); /* DLCI as received from BSC */ new_trans = 1; diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index e1ea681..c0a0bdd 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -113,7 +113,7 @@ /* Count active NC SS/USSD sessions */ osmo_counter_inc(conn->network->active_nc_ss); - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS); trans->dlci = OMSC_LINKID_CB(msg); cm_service_request_concludes(conn, msg); } @@ -232,7 +232,7 @@ vlr_subscr_msisdn_or_name(transt->vsub)); /* Assign connection */ - transt->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS); + transt->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS); transt->paging_request = NULL; /* Send stored message */ @@ -324,7 +324,7 @@ conn = connection_for_subscr(vsub); if (conn) { /* Assign connection */ - trans->conn = ran_conn_get(conn, MSC_CONN_USE_TRANS_NC_SS); + trans->conn = ran_conn_get(conn, RAN_CONN_USE_TRANS_NC_SS); trans->dlci = 0x00; /* SAPI=0, not SACCH */ return trans; } diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index f9ed759..1e4ab19 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -172,7 +172,7 @@ uint8_t pdisc = gh->proto_discr & 0x0f; OSMO_ASSERT(pdisc != GSM48_PDISC_RR); - msc_dtap(conn, msg); + ran_conn_dtap(conn, msg); } else { /* allocate a new connection */ @@ -189,7 +189,7 @@ abort(); /* ownership of conn hereby goes to the MSC: */ - msc_compl_l3(conn, msg, 0); + ran_conn_compl_l3(conn, msg, 0); } return 0; diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c index 7358080..a657857 100644 --- a/src/libmsc/iucs_ranap.c +++ b/src/libmsc/iucs_ranap.c @@ -96,7 +96,7 @@ /* TODO evalute ies */ - msc_rx_sec_mode_compl(conn); + ran_conn_rx_sec_mode_compl(conn); return 0; } diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index f2fe85c..45dfd73 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -79,7 +79,7 @@ } /* Receive a SAPI-N-REJECT from BSC */ -void msc_sapi_n_reject(struct ran_conn *conn, int dlci) +void ran_conn_sapi_n_reject(struct ran_conn *conn, int dlci) { int sapi = dlci & 0x7; @@ -90,21 +90,21 @@ /* receive a Level 3 Complete message. * Ownership of the conn is completely passed to the conn FSM, i.e. for both acceptance and rejection, * the conn FSM shall decide when to release this conn. It may already be discarded before this exits. */ -void msc_compl_l3(struct ran_conn *conn, - struct msgb *msg, uint16_t chosen_channel) +void ran_conn_compl_l3(struct ran_conn *conn, + struct msgb *msg, uint16_t chosen_channel) { - ran_conn_get(conn, MSC_CONN_USE_COMPL_L3); + ran_conn_get(conn, RAN_CONN_USE_COMPL_L3); gsm0408_dispatch(conn, msg); - ran_conn_put(conn, MSC_CONN_USE_COMPL_L3); + ran_conn_put(conn, RAN_CONN_USE_COMPL_L3); } /* Receive a DTAP message from BSC */ -void msc_dtap(struct ran_conn *conn, struct msgb *msg) +void ran_conn_dtap(struct ran_conn *conn, struct msgb *msg) { - ran_conn_get(conn, MSC_CONN_USE_DTAP); + ran_conn_get(conn, RAN_CONN_USE_DTAP); gsm0408_dispatch(conn, msg); - ran_conn_put(conn, MSC_CONN_USE_DTAP); + ran_conn_put(conn, RAN_CONN_USE_DTAP); } /* Receive an ASSIGNMENT COMPLETE from BSC */ @@ -116,16 +116,15 @@ } /* Receive an ASSIGNMENT FAILURE from BSC */ -void msc_assign_fail(struct ran_conn *conn, - uint8_t cause, uint8_t *rr_cause) +void ran_conn_assign_fail(struct ran_conn *conn, uint8_t cause, uint8_t *rr_cause) { LOGP(DRR, LOGL_DEBUG, "MSC assign failure (do nothing).\n"); } /* Receive a CLASSMARK CHANGE from BSC */ -void msc_classmark_chg(struct ran_conn *conn, - const uint8_t *cm2, uint8_t cm2_len, - const uint8_t *cm3, uint8_t cm3_len) +void ran_conn_classmark_chg(struct ran_conn *conn, + const uint8_t *cm2, uint8_t cm2_len, + const uint8_t *cm3, uint8_t cm3_len) { struct gsm_classmark *cm; @@ -159,8 +158,7 @@ } /* Receive a CIPHERING MODE COMPLETE from BSC */ -void msc_cipher_mode_compl(struct ran_conn *conn, - struct msgb *msg, uint8_t alg_id) +void ran_conn_cipher_mode_compl(struct ran_conn *conn, struct msgb *msg, uint8_t alg_id) { struct vlr_ciph_result ciph_res = { .cause = VLR_CIPH_REJECT }; @@ -207,7 +205,7 @@ } /* Receive a CLEAR REQUEST from BSC */ -int msc_clear_request(struct ran_conn *conn, uint32_t cause) +int ran_conn_clear_request(struct ran_conn *conn, uint32_t cause) { ran_conn_close(conn, cause); return 1; @@ -250,7 +248,7 @@ { OSMO_ASSERT(conn); - if (balance_token != MSC_CONN_USE_UNTRACKED) { + if (balance_token != RAN_CONN_USE_UNTRACKED) { uint32_t flag = 1 << balance_token; OSMO_ASSERT(balance_token < 32); if (conn->use_tokens & flag) @@ -271,13 +269,12 @@ } /* decrement the ref-count. Once it reaches zero, we release */ -void _ran_conn_put(struct ran_conn *conn, - enum ran_conn_use balance_token, - const char *file, int line) +void _ran_conn_put(struct ran_conn *conn, enum ran_conn_use balance_token, + const char *file, int line) { OSMO_ASSERT(conn); - if (balance_token != MSC_CONN_USE_UNTRACKED) { + if (balance_token != RAN_CONN_USE_UNTRACKED) { uint32_t flag = 1 << balance_token; OSMO_ASSERT(balance_token < 32); if (!(conn->use_tokens & flag)) @@ -312,16 +309,16 @@ } const struct value_string ran_conn_use_names[] = { - {MSC_CONN_USE_UNTRACKED, "UNTRACKED"}, - {MSC_CONN_USE_COMPL_L3, "compl_l3"}, - {MSC_CONN_USE_DTAP, "dtap"}, - {MSC_CONN_USE_AUTH_CIPH, "auth+ciph"}, - {MSC_CONN_USE_CM_SERVICE, "cm_service"}, - {MSC_CONN_USE_TRANS_CC, "trans_cc"}, - {MSC_CONN_USE_TRANS_SMS, "trans_sms"}, - {MSC_CONN_USE_TRANS_NC_SS, "trans_nc_ss"}, - {MSC_CONN_USE_SILENT_CALL, "silent_call"}, - {MSC_CONN_USE_RELEASE, "release"}, + {RAN_CONN_USE_UNTRACKED, "UNTRACKED"}, + {RAN_CONN_USE_COMPL_L3, "compl_l3"}, + {RAN_CONN_USE_DTAP, "dtap"}, + {RAN_CONN_USE_AUTH_CIPH, "auth+ciph"}, + {RAN_CONN_USE_CM_SERVICE, "cm_service"}, + {RAN_CONN_USE_TRANS_CC, "trans_cc"}, + {RAN_CONN_USE_TRANS_SMS, "trans_sms"}, + {RAN_CONN_USE_TRANS_NC_SS, "trans_nc_ss"}, + {RAN_CONN_USE_SILENT_CALL, "silent_call"}, + {RAN_CONN_USE_RELEASE, "release"}, {0, NULL}, }; diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index 6c6e217..c6c31a0 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -57,7 +57,7 @@ conn->lchan->ts->nr, conn->lchan->ts->trx->arfcn); #endif conn->silent_call = 1; - ran_conn_get(conn, MSC_CONN_USE_SILENT_CALL); + ran_conn_get(conn, RAN_CONN_USE_SILENT_CALL); /* increment lchan reference count */ osmo_signal_dispatch(SS_SCALL, S_SCALL_SUCCESS, &sigdata); break; @@ -162,7 +162,7 @@ #endif conn->silent_call = 0; - ran_conn_put(conn, MSC_CONN_USE_SILENT_CALL); + ran_conn_put(conn, RAN_CONN_USE_SILENT_CALL); return 0; } diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index b1c8bc9..5fab1c6 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -94,7 +94,7 @@ if (conn->complete_layer3_type == COMPLETE_LAYER3_CM_SERVICE_REQ && conn_accepted) { conn->received_cm_service_request = true; - ran_conn_get(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_get(conn, RAN_CONN_USE_CM_SERVICE); } if (conn_accepted) @@ -163,7 +163,7 @@ } } -int msc_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, +int ran_conn_classmark_request_then_cipher_mode_cmd(struct ran_conn *conn, bool umts_aka, bool retrieve_imeisv) { int rc; @@ -190,14 +190,14 @@ * So far though, the only time we send a Classmark Request is during Ciphering. As soon * as more such situations arise, we need to add state to indicate what action should * follow after a Classmark Update is received (e.g. - * msc_classmark_request_then_cipher_mode_cmd() sets an enum value to indicate that + * ran_conn_classmark_request_then_cipher_mode_cmd() sets an enum value to indicate that * Ciphering should continue afterwards). But right now, it is accurate to always * continue with Ciphering: */ /* During Ciphering, we needed Classmark information. The Classmark Update has come in, * go back into the Set Ciphering Command procedure. */ osmo_fsm_inst_state_chg(fi, RAN_CONN_S_AUTH_CIPH, RAN_CONN_TIMEOUT, 0); - if (msc_geran_set_cipher_mode(conn, conn->geran_set_cipher_mode.umts_aka, + if (ran_conn_geran_set_cipher_mode(conn, conn->geran_set_cipher_mode.umts_aka, conn->geran_set_cipher_mode.retrieve_imeisv)) { LOGPFSML(fi, LOGL_ERROR, "Sending Cipher Mode Command failed, aborting attach\n"); @@ -341,13 +341,13 @@ /* Use count for either conn->a.waiting_for_clear_complete or * conn->iu.waiting_for_release_complete. 'get' it early, so we don't deallocate after tearing * down active transactions. Safeguard against double-get (though it shouldn't happen). */ - if (!ran_conn_used_by(conn, MSC_CONN_USE_RELEASE)) - ran_conn_get(conn, MSC_CONN_USE_RELEASE); + if (!ran_conn_used_by(conn, RAN_CONN_USE_RELEASE)) + ran_conn_get(conn, RAN_CONN_USE_RELEASE); /* Cancel pending CM Service Requests */ if (conn->received_cm_service_request) { conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); } /* Cancel all VLR FSMs, if any */ @@ -693,7 +693,7 @@ } if (*flag) { *flag = false; - ran_conn_put(conn, MSC_CONN_USE_RELEASE); + ran_conn_put(conn, RAN_CONN_USE_RELEASE); } } diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 5c80e5f..cf12066 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -140,21 +140,21 @@ */ void trans_free(struct gsm_trans *trans) { - enum ran_conn_use conn_usage_token = MSC_CONN_USE_UNTRACKED; + enum ran_conn_use conn_usage_token = RAN_CONN_USE_UNTRACKED; struct ran_conn *conn; switch (trans->protocol) { case GSM48_PDISC_CC: _gsm48_cc_trans_free(trans); - conn_usage_token = MSC_CONN_USE_TRANS_CC; + conn_usage_token = RAN_CONN_USE_TRANS_CC; break; case GSM48_PDISC_SMS: _gsm411_sms_trans_free(trans); - conn_usage_token = MSC_CONN_USE_TRANS_SMS; + conn_usage_token = RAN_CONN_USE_TRANS_SMS; break; case GSM48_PDISC_NC_SS: _gsm911_nc_ss_trans_free(trans); - conn_usage_token = MSC_CONN_USE_TRANS_NC_SS; + conn_usage_token = RAN_CONN_USE_TRANS_NC_SS; break; } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 5819e51..ef88c5a 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -404,7 +404,7 @@ cc_to_mncc_expect_tx("", MNCC_REL_CNF); dtap_expect_tx("032d"); /* CC: Release */ expect_iu_release(); - msc_clear_request(g_conn, 0); + ran_conn_clear_request(g_conn, 0); OSMO_ASSERT(cc_to_mncc_tx_confirmed); OSMO_ASSERT(iu_release_sent); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 92e0acc..2443e31 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -186,7 +186,7 @@ OSMO_ASSERT(conn->received_cm_service_request); conn->received_cm_service_request = false; - ran_conn_put(conn, MSC_CONN_USE_CM_SERVICE); + ran_conn_put(conn, RAN_CONN_USE_CM_SERVICE); ASSERT_RELEASE_CLEAR(via_ran); } @@ -225,14 +225,14 @@ g_conn = conn_new(); reset_l3_seq_nr(); patch_l3_seq_nr(msg); - msc_compl_l3(g_conn, msg, 23); + ran_conn_compl_l3(g_conn, msg, 23); } else { patch_l3_seq_nr(msg); if ((gsm48_hdr_pdisc(gh) == GSM48_PDISC_RR) && (gsm48_hdr_msg_type(gh) == GSM48_MT_RR_CIPH_M_COMPL)) - msc_cipher_mode_compl(g_conn, msg, 0); + ran_conn_cipher_mode_compl(g_conn, msg, 0); else - msc_dtap(g_conn, msg); + ran_conn_dtap(g_conn, msg); } if (!conn_exists(g_conn)) @@ -842,7 +842,7 @@ OSMO_ASSERT(g_conn); OSMO_ASSERT(g_conn->via_ran == RAN_UTRAN_IU); OSMO_ASSERT(g_conn->iu.ue_ctx); - msc_rx_sec_mode_compl(g_conn); + ran_conn_rx_sec_mode_compl(g_conn); } void bss_sends_clear_complete() -- To view, visit https://gerrit.osmocom.org/12030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia17a0a35f11911e00e19cafb5d7828d729a69640 Gerrit-Change-Number: 12030 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:08 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Vadim Yanitskiy, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12015 to look at the new patch set (#10). Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... rename gsm_subscriber_connection to ran_conn In preparation for inter-BSC and inter-MSC handover, we need to separate the subscriber management logic from the actual RAN connections. What better time to finally rename gsm_subscriber_connection. * Name choice: In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it "bss_conn": in 3G a BSS is called RNS, IIUC. The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network. * Rationale: A subscriber in the MSC so far has only one RAN connection, but e.g. for inter-BSC handover, a second one needs to be created to handover to. Most of the items in the former gsm_subscriber_connection are actually related to the RAN, with only a few MM and RTP related items. So, as a first step, just rename it to ran_conn, to cosmetically prepare for moving the not strictly RAN related items away later. Also: - Rename some functions from msc_subscr_conn_* to ran_conn_* - Rename "Subscr_Conn" FSM instance name to "RAN_conn" - Rename SUBSCR_CONN_* to RAN_CONN_* Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_14.h M include/osmocom/msc/gsm_04_80.h M include/osmocom/msc/gsm_09_11.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_ifaces.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/signal.h M include/osmocom/msc/silent_call.h M include/osmocom/msc/transaction.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M src/libvlr/vlr.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 57 files changed, 3,841 insertions(+), 3,850 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/12015/10 -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:11 +0000 Subject: Change in osmo-msc[master]: rename gsm_subscriber_connection to ran_conn In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12015 ) Change subject: rename gsm_subscriber_connection to ran_conn ...................................................................... rename gsm_subscriber_connection to ran_conn In preparation for inter-BSC and inter-MSC handover, we need to separate the subscriber management logic from the actual RAN connections. What better time to finally rename gsm_subscriber_connection. * Name choice: In 2G, this is a connection to the BSS, but even though 3GPP TS commonly talk of "BSS-A" and "BSS-B" when explaining handover, it's not good to call it "bss_conn": in 3G a BSS is called RNS, IIUC. The overall term for 2G (GERAN) and 3G (UTRAN) is RAN: Radio Access Network. * Rationale: A subscriber in the MSC so far has only one RAN connection, but e.g. for inter-BSC handover, a second one needs to be created to handover to. Most of the items in the former gsm_subscriber_connection are actually related to the RAN, with only a few MM and RTP related items. So, as a first step, just rename it to ran_conn, to cosmetically prepare for moving the not strictly RAN related items away later. Also: - Rename some functions from msc_subscr_conn_* to ran_conn_* - Rename "Subscr_Conn" FSM instance name to "RAN_conn" - Rename SUBSCR_CONN_* to RAN_CONN_* Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/gsm_04_11.h M include/osmocom/msc/gsm_04_14.h M include/osmocom/msc/gsm_04_80.h M include/osmocom/msc/gsm_09_11.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/iucs.h M include/osmocom/msc/msc_ifaces.h M include/osmocom/msc/msc_mgcp.h M include/osmocom/msc/osmo_msc.h M include/osmocom/msc/signal.h M include/osmocom/msc/silent_call.h M include/osmocom/msc/transaction.h M include/osmocom/msc/vlr.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_14.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_09_11.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_mgcp.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/rrlp.c M src/libmsc/silent_call.c M src/libmsc/smpp_openbsc.c M src/libmsc/smpp_smsc.h M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M src/libvlr/vlr.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 57 files changed, 3,841 insertions(+), 3,850 deletions(-) -- To view, visit https://gerrit.osmocom.org/12015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic595f7a558d3553c067f77dc67543ab59659707a Gerrit-Change-Number: 12015 Gerrit-PatchSet: 10 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:12 +0000 Subject: Change in osmo-msc[master]: drop msc_compl_l3() return value In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12029 ) Change subject: drop msc_compl_l3() return value ...................................................................... drop msc_compl_l3() return value msc_compl_l3() always returns MSC_CONN_ACCEPT, because the conn FSM handles (or should handle) all reject cases. The accept/reject return value is a legacy from libbsc internally passing a conn over to libmsc, in osmo-nitb. Drop enum msc_compl_l3_rc. Change msc_compl_l3_rc() to return void. Change all callers to always act like for acceptance, as they always did anyway. Drop some local variables now no longer needed. Adjust the comment to msc_compl_l3(). Drop a bunch of #if-0'd code from msc_compl_l3(). Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/a_iface_bssap.c M src/libmsc/iucs.c M src/libmsc/osmo_msc.c 4 files changed, 11 insertions(+), 51 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index ad81da5..674de3b 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -40,11 +40,6 @@ SUBSCR_CONN_S_RELEASED, }; -enum msc_compl_l3_rc { - MSC_CONN_ACCEPT = 0, - MSC_CONN_REJECT = 1, -}; - struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network *network, enum ran_type via_ran, uint16_t lac); @@ -59,8 +54,8 @@ void msc_sapi_n_reject(struct gsm_subscriber_connection *conn, int dlci); int msc_clear_request(struct gsm_subscriber_connection *conn, uint32_t cause); -int msc_compl_l3(struct gsm_subscriber_connection *conn, - struct msgb *msg, uint16_t chosen_channel); +void msc_compl_l3(struct gsm_subscriber_connection *conn, + struct msgb *msg, uint16_t chosen_channel); void msc_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg); int msc_classmark_request_then_cipher_mode_cmd(struct gsm_subscriber_connection *conn, bool umts_aka, bool retrieve_imeisv); diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 9a2333d..77d84b3 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -260,8 +260,6 @@ uint16_t lac = 0; uint8_t data_length; const uint8_t *data; - int rc; - struct gsm_network *network = a_conn_info->network; struct gsm_subscriber_connection *conn; @@ -345,17 +343,8 @@ conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id); /* Handover location update to the MSC code */ - rc = msc_compl_l3(conn, msg, 0); - - if (rc == MSC_CONN_ACCEPT) { - LOGP(DMSC, LOGL_INFO, "User has been accepted by MSC.\n"); - return 0; - } else if (rc == MSC_CONN_REJECT) - LOGP(DMSC, LOGL_INFO, "User has been rejected by MSC.\n"); - else - LOGP(DMSC, LOGL_INFO, "User has been rejected by MSC (unknown error)\n"); - - return -EINVAL; + msc_compl_l3(conn, msg, 0); + return 0; } /* Endpoint to handle BSSMAP classmark update */ diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index 95bbbee..c3fea0d 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -142,7 +142,6 @@ int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg, uint16_t *lac) { - int rc; struct ranap_ue_conn_ctx *ue_ctx; struct gsm_subscriber_connection *conn; @@ -174,7 +173,6 @@ OSMO_ASSERT(pdisc != GSM48_PDISC_RR); msc_dtap(conn, msg); - rc = 0; } else { /* allocate a new connection */ @@ -191,10 +189,10 @@ abort(); /* ownership of conn hereby goes to the MSC: */ - rc = msc_compl_l3(conn, msg, 0); + msc_compl_l3(conn, msg, 0); } - return rc; + return 0; } int iu_rab_act_cs(struct gsm_trans *trans) diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 88a3dbb..05ac845 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -87,37 +87,15 @@ gsm411_sapi_n_reject(conn); } -/* receive a Level 3 Complete message and return MSC_CONN_ACCEPT or - * MSC_CONN_REJECT */ -int msc_compl_l3(struct gsm_subscriber_connection *conn, - struct msgb *msg, uint16_t chosen_channel) +/* receive a Level 3 Complete message. + * Ownership of the conn is completely passed to the conn FSM, i.e. for both acceptance and rejection, + * the conn FSM shall decide when to release this conn. It may already be discarded before this exits. */ +void msc_compl_l3(struct gsm_subscriber_connection *conn, + struct msgb *msg, uint16_t chosen_channel) { msc_subscr_conn_get(conn, MSC_CONN_USE_COMPL_L3); gsm0408_dispatch(conn, msg); - msc_subscr_conn_put(conn, MSC_CONN_USE_COMPL_L3); - - /* Always return acceptance, because even if the conn was not accepted, - * we assumed ownership of it and the caller shall not interfere with - * that. We may even already have discarded the conn. */ - return MSC_CONN_ACCEPT; - -#if 0 - /* - * If this is a silent call we want the channel to remain open as long as - * possible and this is why we accept this connection regardless of any - * pending transaction or ongoing operation. - */ - if (conn->silent_call) - return MSC_CONN_ACCEPT; - if (conn->loc_operation || conn->sec_operation || conn->anch_operation) - return MSC_CONN_ACCEPT; - if (trans_has_conn(conn)) - return MSC_CONN_ACCEPT; - - LOGP(DRR, LOGL_INFO, "MSC Complete L3: Rejecting connection.\n"); - return MSC_CONN_REJECT; -#endif } /* Receive a DTAP message from BSC */ -- To view, visit https://gerrit.osmocom.org/12029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I759d15f4e820d5fc16397ed7210ce92308e52a09 Gerrit-Change-Number: 12029 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:12 +0000 Subject: Change in osmo-msc[master]: rename gsm_encr to geran_encr, it is only applicable on GERAN In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12039 ) Change subject: rename gsm_encr to geran_encr, it is only applicable on GERAN ...................................................................... rename gsm_encr to geran_encr, it is only applicable on GERAN On UTRAN, Security Mode is used instead of Ciphering Command, which does not feature an A5 algorithm id. Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 --- M include/osmocom/msc/common_cs.h M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c 5 files changed, 9 insertions(+), 9 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h index fddc6ec..410f102 100644 --- a/include/osmocom/msc/common_cs.h +++ b/include/osmocom/msc/common_cs.h @@ -9,7 +9,7 @@ #define MAX_A5_KEY_LEN (128/8) -struct gsm_encr { +struct geran_encr { uint8_t alg_id; uint8_t key_len; uint8_t key[MAX_A5_KEY_LEN]; diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 94a6ffd..864bc0a 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -125,7 +125,7 @@ enum ran_type via_ran; uint16_t lac; - struct gsm_encr encr; + struct geran_encr geran_encr; /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still * wants to request a Classmark Update first. */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 7dd303f..6569a9a 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1663,12 +1663,12 @@ memcpy(ei.key, tuple->vec.kc, sizeof(tuple->vec.kc)); ei.key_len = sizeof(tuple->vec.kc); - conn->encr = (struct gsm_encr){}; - if (ei.key_len <= sizeof(conn->encr.key)) { - memcpy(conn->encr.key, ei.key, ei.key_len); - conn->encr.key_len = ei.key_len; + conn->geran_encr = (struct geran_encr){}; + if (ei.key_len <= sizeof(conn->geran_encr.key)) { + memcpy(conn->geran_encr.key, ei.key, ei.key_len); + conn->geran_encr.key_len = ei.key_len; } - /* conn->encr.alg_id remains unknown until we receive a Cipher Mode Complete from the BSC */ + /* conn->geran_encr.alg_id remains unknown until we receive a Cipher Mode Complete from the BSC */ return a_iface_tx_cipher_mode(conn, &ei, retrieve_imeisv); } diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 4f3ac04..401586e 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -499,7 +499,7 @@ conn->use_count, conn->use_tokens, conn->received_cm_service_request ? 'C' : '-', - conn->encr.alg_id, + conn->geran_encr.alg_id, conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-", VTY_NEWLINE); } diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index e3d7055..88a3dbb 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -222,7 +222,7 @@ } } - conn->encr.alg_id = alg_id; + conn->geran_encr.alg_id = alg_id; ciph_res.cause = VLR_CIPH_COMPL; vlr_subscr_rx_ciph_res(conn->vsub, &ciph_res); -- To view, visit https://gerrit.osmocom.org/12039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 Gerrit-Change-Number: 12039 Gerrit-PatchSet: 5 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:12 +0000 Subject: Change in osmo-msc[master]: populate gsm_subscriber_connection->encr during Ciph In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12016 ) Change subject: populate gsm_subscriber_connection->encr during Ciph ...................................................................... populate gsm_subscriber_connection->encr during Ciph The gsm_subscriber_connection->encr is never used. Use it. When sending the Ciphering Mode Command, populate the encryption key. When receivint the Ciphering Mode Complete, populate the chosen alg_id. Out of paranoia, store the enc key only if the size is large enough. Hence the vty_dump_one_conn() now reports the actually chosen A5 algorithm ID used. For 3G connections, though, this will still remain 0 in the VTY, since there is no explicit A5 algorithm negotiated on UTRAN. (Security Mode Command and Security Mode Complete instead of the GERAN Ciphering.) (Note, 'struct gsm_encr encr' will be renamed to 'struct geran_encr geran_encr' in Idc7ca9da1aa13ae16f5db2cb1024676cbc770820) Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce --- M src/libmsc/gsm_04_08.c M src/libmsc/osmo_msc.c 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index d5cc212..7dd303f 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1663,6 +1663,13 @@ memcpy(ei.key, tuple->vec.kc, sizeof(tuple->vec.kc)); ei.key_len = sizeof(tuple->vec.kc); + conn->encr = (struct gsm_encr){}; + if (ei.key_len <= sizeof(conn->encr.key)) { + memcpy(conn->encr.key, ei.key, ei.key_len); + conn->encr.key_len = ei.key_len; + } + /* conn->encr.alg_id remains unknown until we receive a Cipher Mode Complete from the BSC */ + return a_iface_tx_cipher_mode(conn, &ei, retrieve_imeisv); } diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index f2c84e6..e3d7055 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -222,6 +222,8 @@ } } + conn->encr.alg_id = alg_id; + ciph_res.cause = VLR_CIPH_COMPL; vlr_subscr_rx_ciph_res(conn->vsub, &ciph_res); } -- To view, visit https://gerrit.osmocom.org/12016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice2c470c360612249f97301944c6fdf9443c7dce Gerrit-Change-Number: 12016 Gerrit-PatchSet: 8 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:13 +0000 Subject: Change in osmo-msc[master]: adjust copyright in subscr_conn.c In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12028 ) Change subject: adjust copyright in subscr_conn.c ...................................................................... adjust copyright in subscr_conn.c Change-Id: Ia89e2d343a850234557e365457705a11d26fd925 --- M src/libmsc/subscr_conn.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index a63297f..f9e1985 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -1,7 +1,7 @@ /* MSC subscriber connection implementation */ /* - * (C) 2016 by sysmocom s.m.f.c. + * (C) 2016-2018 by sysmocom s.m.f.c. * All Rights Reserved * * Author: Neels Hofmeyr -- To view, visit https://gerrit.osmocom.org/12028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia89e2d343a850234557e365457705a11d26fd925 Gerrit-Change-Number: 12028 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:14 +0000 Subject: Change in osmo-msc[master]: cosmetic: subscr_conn_fsm_auth_ciph() should be static In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12021 ) Change subject: cosmetic: subscr_conn_fsm_auth_ciph() should be static ...................................................................... cosmetic: subscr_conn_fsm_auth_ciph() should be static Only used in subscr_conn.c. Change-Id: Iaa2c63d2b06f59d34e0465c40a98741f56ec526a --- M src/libmsc/subscr_conn.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index 78af274..a63297f 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -136,7 +136,7 @@ } } -void subscr_conn_fsm_auth_ciph(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void subscr_conn_fsm_auth_ciph(struct osmo_fsm_inst *fi, uint32_t event, void *data) { /* If accepted, transition the state, all other cases mean failure. */ switch (event) { -- To view, visit https://gerrit.osmocom.org/12021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaa2c63d2b06f59d34e0465c40a98741f56ec526a Gerrit-Change-Number: 12021 Gerrit-PatchSet: 8 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:14 +0000 Subject: Change in osmo-msc[master]: drop unused tests/db/* In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12027 ) Change subject: drop unused tests/db/* ...................................................................... drop unused tests/db/* Another one of those "what is this still doing here". Not mentioned in configure.ac nor Makefile.am SUBDIR... Change-Id: I05880507d9bf029f0ec451efda0ebe54ac09ef12 --- D tests/db/Makefile.am D tests/db/db_test.c D tests/db/db_test.err D tests/db/db_test.ok D tests/db/hlr.sqlite3 5 files changed, 0 insertions(+), 337 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am deleted file mode 100644 index 249a873..0000000 --- a/tests/db/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -AM_CPPFLAGS = \ - $(all_includes) \ - -I$(top_srcdir)/include \ - $(NULL) - -AM_CFLAGS = \ - -Wall \ - -ggdb3 \ - $(LIBOSMOCORE_CFLAGS) \ - $(LIBOSMOGSM_CFLAGS) \ - $(LIBOSMOABIS_CFLAGS) \ - $(LIBSMPP34_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(NULL) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -EXTRA_DIST = \ - db_test.ok \ - db_test.err \ - hlr.sqlite3 \ - $(NULL) - -noinst_PROGRAMS = \ - db_test \ - $(NULL) - -db_test_SOURCES = \ - db_test.c \ - $(NULL) - -db_test_LDADD = \ - $(top_builddir)/src/libmsc/libmsc.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/tests/libiudummy/libiudummy.a \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBSMPP34_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - -ldbi \ - $(NULL) diff --git a/tests/db/db_test.c b/tests/db/db_test.c deleted file mode 100644 index 63099f6..0000000 --- a/tests/db/db_test.c +++ /dev/null @@ -1,286 +0,0 @@ -/* (C) 2008 by Jan Luebbe - * (C) 2009-2016 by Holger Hans Peter Freyther - * (C) 2014 by Alexander Chemeris - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -static struct gsm_network dummy_net; -static struct gsm_subscriber_group dummy_sgrp; - -#define SUBSCR_PUT(sub) \ - sub->group = &dummy_sgrp; \ - subscr_put(sub); - -#define COMPARE(original, copy) \ - if (original->id != copy->id) \ - printf("Ids do not match in %s:%d %llu %llu\n", \ - __FUNCTION__, __LINE__, original->id, copy->id); \ - if (original->lac != copy->lac) \ - printf("LAC do not match in %s:%d %d %d\n", \ - __FUNCTION__, __LINE__, original->lac, copy->lac); \ - if (original->authorized != copy->authorized) \ - printf("Authorize do not match in %s:%d %d %d\n", \ - __FUNCTION__, __LINE__, original->authorized, \ - copy->authorized); \ - if (strcmp(original->imsi, copy->imsi) != 0) \ - printf("IMSIs do not match in %s:%d '%s' '%s'\n", \ - __FUNCTION__, __LINE__, original->imsi, copy->imsi); \ - if (original->tmsi != copy->tmsi) \ - printf("TMSIs do not match in %s:%d '%u' '%u'\n", \ - __FUNCTION__, __LINE__, original->tmsi, copy->tmsi); \ - if (strcmp(original->name, copy->name) != 0) \ - printf("names do not match in %s:%d '%s' '%s'\n", \ - __FUNCTION__, __LINE__, original->name, copy->name); \ - if (strcmp(original->extension, copy->extension) != 0) \ - printf("Extensions do not match in %s:%d '%s' '%s'\n", \ - __FUNCTION__, __LINE__, original->extension, copy->extension); \ - -/* - * Create/Store a SMS and then try to load it. - */ -static void test_sms(void) -{ - int rc; - struct gsm_sms *sms; - struct gsm_subscriber *subscr; - subscr = db_get_subscriber(GSM_SUBSCRIBER_IMSI, "9993245423445"); - OSMO_ASSERT(subscr); - subscr->group = &dummy_sgrp; - - sms = sms_alloc(); - sms->receiver = subscr_get(subscr); - - sms->src.ton = 0x23; - sms->src.npi = 0x24; - memcpy(sms->src.addr, "1234", strlen("1234") + 1); - - sms->dst.ton = 0x32; - sms->dst.npi = 0x42; - memcpy(sms->dst.addr, subscr->extension, sizeof(subscr->extension)); - - memcpy(sms->text, "Text123", strlen("Text123") + 1); - memcpy(sms->user_data, "UserData123", strlen("UserData123") + 1); - sms->user_data_len = strlen("UserData123"); - - /* random values */ - sms->reply_path_req = 1; - sms->status_rep_req = 2; - sms->ud_hdr_ind = 3; - sms->protocol_id = 4; - sms->data_coding_scheme = 5; - - rc = db_sms_store(sms); - sms_free(sms); - OSMO_ASSERT(rc == 0); - - /* now query */ - sms = db_sms_get_unsent_for_subscr(subscr); - OSMO_ASSERT(sms); - OSMO_ASSERT(sms->receiver == subscr); - OSMO_ASSERT(sms->reply_path_req == 1); - OSMO_ASSERT(sms->status_rep_req == 2); - OSMO_ASSERT(sms->ud_hdr_ind == 3); - OSMO_ASSERT(sms->protocol_id == 4); - OSMO_ASSERT(sms->data_coding_scheme == 5); - OSMO_ASSERT(sms->src.ton == 0x23); - OSMO_ASSERT(sms->src.npi == 0x24); - OSMO_ASSERT(sms->dst.ton == 0x32); - OSMO_ASSERT(sms->dst.npi == 0x42); - OSMO_ASSERT(strcmp((char *) sms->text, "Text123") == 0); - OSMO_ASSERT(sms->user_data_len == strlen("UserData123")); - OSMO_ASSERT(strcmp((char *) sms->user_data, "UserData123") == 0); - - /* Mark the SMS as delivered */ - db_sms_mark_delivered(sms); - sms_free(sms); - - sms = db_sms_get_unsent_for_subscr(subscr); - OSMO_ASSERT(!sms); - - subscr_put(subscr); -} - -static void test_sms_migrate(void) -{ - struct gsm_subscriber *rcv_subscr; - struct gsm_sms *sms; - static const uint8_t user_data_1[] = { - 0x41, 0xf1, 0xd8, 0x05, 0x22, 0x96, 0xcd, 0x2e, - 0x90, 0xf1, 0xfd, 0x06, 0x00 }; - static const uint8_t user_data_2[] = { - 0x41, 0xf1, 0xd8, 0x05, 0x22, 0x96, 0xcd, 0x2e, - 0xd0, 0xf1, 0xfd, 0x06, 0x00 }; - - rcv_subscr = db_get_subscriber(GSM_SUBSCRIBER_IMSI, "901010000001111"); - rcv_subscr->group = &dummy_sgrp; - - sms = db_sms_get(&dummy_net, 1); - OSMO_ASSERT(sms->id == 1); - OSMO_ASSERT(sms->receiver == rcv_subscr); - OSMO_ASSERT(strcmp(sms->text, "Abc. Def. Foo") == 0); - OSMO_ASSERT(sms->user_data_len == ARRAY_SIZE(user_data_1)); - OSMO_ASSERT(memcmp(sms->user_data, user_data_1, ARRAY_SIZE(user_data_1)) == 0); - sms_free(sms); - - sms = db_sms_get(&dummy_net, 2); - OSMO_ASSERT(sms->id == 2); - OSMO_ASSERT(sms->receiver == rcv_subscr); - OSMO_ASSERT(strcmp(sms->text, "Abc. Def. Goo") == 0); - OSMO_ASSERT(sms->user_data_len == ARRAY_SIZE(user_data_2)); - OSMO_ASSERT(memcmp(sms->user_data, user_data_2, ARRAY_SIZE(user_data_2)) == 0); - sms_free(sms); - - subscr_put(rcv_subscr); -} - -static void test_subs(const char *imsi, char *imei1, char *imei2, bool make_ext) -{ - struct gsm_subscriber *alice = NULL, *alice_db; - char scratch_str[256]; - - alice = db_create_subscriber(imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, - make_ext); - db_subscriber_assoc_imei(alice, imei1); - if (imei2) - db_subscriber_assoc_imei(alice, imei2); - db_subscriber_alloc_tmsi(alice); - alice->lac=42; - db_sync_subscriber(alice); - /* Get by TMSI */ - snprintf(scratch_str, sizeof(scratch_str), "%"PRIu32, alice->tmsi); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_TMSI, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by IMSI */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by id */ - snprintf(scratch_str, sizeof(scratch_str), "%llu", alice->id); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_ID, scratch_str); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - /* Get by extension */ - alice_db = db_get_subscriber(GSM_SUBSCRIBER_EXTENSION, alice->extension); - if (alice_db) { - if (!make_ext) - printf("FAIL: bogus extension created for IMSI %s\n", - imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - } else if (make_ext) - printf("FAIL: no subscriber extension for IMSI %s\n", imsi); - SUBSCR_PUT(alice); -} - -int main() -{ - printf("Testing subscriber database code.\n"); - osmo_init_logging(&log_info); - log_set_print_filename(osmo_stderr_target, 0); - - dummy_net.subscr_group = &dummy_sgrp; - dummy_sgrp.net = &dummy_net; - - if (db_init("hlr.sqlite3")) { - printf("DB: Failed to init database. Please check the option settings.\n"); - return 1; - } - printf("DB: Database initialized.\n"); - - if (db_prepare()) { - printf("DB: Failed to prepare database.\n"); - return 1; - } - printf("DB: Database prepared.\n"); - - struct gsm_subscriber *alice = NULL; - struct gsm_subscriber *alice_db; - - char *alice_imsi = "3243245432345"; - alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, - true); - db_sync_subscriber(alice); - alice_db = db_get_subscriber(GSM_SUBSCRIBER_IMSI, alice->imsi); - COMPARE(alice, alice_db); - SUBSCR_PUT(alice_db); - SUBSCR_PUT(alice); - - test_subs("3693245423445", "1234567890", NULL, true); - test_subs("9993245423445", "1234567890", "6543560920", true); - test_subs("3123122223445", "1234567890", NULL, false); - test_subs("9123121223445", "1234567890", "6543560920", false); - - /* create it again and see it fails */ - alice = db_create_subscriber(alice_imsi, GSM_MIN_EXTEN, GSM_MAX_EXTEN, - true); - OSMO_ASSERT(!alice); - - test_sms(); - test_sms_migrate(); - - db_fini(); - - printf("Done\n"); - return 0; -} - -/* stubs */ -void vty_out() {} -void vlr_subscr_disconnected() {} -void vlr_subscr_rx_tmsi_reall_compl() {} -void vlr_subscr_rx_id_resp() {} -void vlr_subscr_rx_auth_resp() {} -void vlr_loc_update() {} -void vlr_proc_acc_req() {} -void vlr_init() {} -unsigned int mgcpgw_client_next_endpoint(struct mgcpgw_client *client) -{ return 0; } -struct msgb *mgcp_msg_crcx(struct mgcpgw_client *mgcp, - uint16_t rtp_endpoint, unsigned int call_id, - enum mgcp_connection_mode mode) -{ return NULL; } -struct msgb *mgcp_msg_mdcx(struct mgcpgw_client *mgcp, - uint16_t rtp_endpoint, const char *rtp_conn_addr, - uint16_t rtp_port, enum mgcp_connection_mode mode) -{ return NULL; } -int mgcpgw_client_tx(struct mgcpgw_client *mgcp, struct msgb *msg, - mgcp_response_cb_t response_cb, void *priv) -{ return -EINVAL; } -const char *mgcpgw_client_remote_addr_str(struct mgcpgw_client *mgcp) -{ return "0.0.0.0"; } -uint32_t mgcpgw_client_remote_addr_n(struct mgcpgw_client *mgcp) -{ return 0; } -int mgcp_response_parse_params(struct mgcp_response *r) -{ return -EINVAL; } -struct RANAP_Cause; -int iu_tx_release(struct ue_conn_ctx *ctx, const struct RANAP_Cause *cause) -{ return 0; } diff --git a/tests/db/db_test.err b/tests/db/db_test.err deleted file mode 100644 index 27e5703..0000000 --- a/tests/db/db_test.err +++ /dev/null @@ -1,3 +0,0 @@ -Going to migrate from revision 3 -Going to migrate from revision 4 - \ No newline at end of file diff --git a/tests/db/db_test.ok b/tests/db/db_test.ok deleted file mode 100644 index 2632a8c..0000000 --- a/tests/db/db_test.ok +++ /dev/null @@ -1,4 +0,0 @@ -Testing subscriber database code. -DB: Database initialized. -DB: Database prepared. -Done diff --git a/tests/db/hlr.sqlite3 b/tests/db/hlr.sqlite3 deleted file mode 100644 index e59dcdc..0000000 --- a/tests/db/hlr.sqlite3 +++ /dev/null Binary files differ -- To view, visit https://gerrit.osmocom.org/12027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I05880507d9bf029f0ec451efda0ebe54ac09ef12 Gerrit-Change-Number: 12027 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:14 +0000 Subject: Change in osmo-msc[master]: drop unused gsm0408_allow_everyone() declaration In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12026 ) Change subject: drop unused gsm0408_allow_everyone() declaration ...................................................................... drop unused gsm0408_allow_everyone() declaration Change-Id: Id56ea492594edc38d1f9d31d94a1679c0cb61fa0 --- M include/osmocom/msc/gsm_04_08.h 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/msc/gsm_04_08.h b/include/osmocom/msc/gsm_04_08.h index 8767070..0692e09 100644 --- a/include/osmocom/msc/gsm_04_08.h +++ b/include/osmocom/msc/gsm_04_08.h @@ -26,7 +26,6 @@ struct msgb *msg); /* config options controlling the behaviour of the lower leves */ -void gsm0408_allow_everyone(int allow); void gsm0408_clear_all_trans(struct gsm_network *net, int protocol); int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/12026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id56ea492594edc38d1f9d31d94a1679c0cb61fa0 Gerrit-Change-Number: 12026 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:14 +0000 Subject: Change in osmo-msc[master]: drop unused SUBSCR_CONN_E_INVALID In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12025 ) Change subject: drop unused SUBSCR_CONN_E_INVALID ...................................................................... drop unused SUBSCR_CONN_E_INVALID The idea to catch uninitialized vars was completely moot. We pass events by constants anyway. Change-Id: I6f3c964ee04fec9a96f385199fb3141ac8d672d4 --- M include/osmocom/msc/osmo_msc.h M src/libmsc/subscr_conn.c 2 files changed, 0 insertions(+), 3 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h index a757a99..ad81da5 100644 --- a/include/osmocom/msc/osmo_msc.h +++ b/include/osmocom/msc/osmo_msc.h @@ -12,8 +12,6 @@ #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT enum subscr_conn_fsm_event { - /* Mark 0 as invalid to catch uninitialized vars */ - SUBSCR_CONN_E_INVALID = 0, /* Accepted the initial Complete Layer 3 (starting to evaluate Authentication and Ciphering) */ SUBSCR_CONN_E_COMPLETE_LAYER_3, /* Received Classmark Update, typically neede for Ciphering Mode Command */ diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index e6fa7e1..78af274 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -43,7 +43,6 @@ #define SUBSCR_CONN_TIMEOUT 5 /* seconds */ static const struct value_string subscr_conn_fsm_event_names[] = { - OSMO_VALUE_STRING(SUBSCR_CONN_E_INVALID), OSMO_VALUE_STRING(SUBSCR_CONN_E_COMPLETE_LAYER_3), OSMO_VALUE_STRING(SUBSCR_CONN_E_CLASSMARK_UPDATE), OSMO_VALUE_STRING(SUBSCR_CONN_E_ACCEPTED), -- To view, visit https://gerrit.osmocom.org/12025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6f3c964ee04fec9a96f385199fb3141ac8d672d4 Gerrit-Change-Number: 12025 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 21:49:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 30 Nov 2018 21:49:15 +0000 Subject: Change in osmo-msc[master]: drop unused openbscdefines.h In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/12024 ) Change subject: drop unused openbscdefines.h ...................................................................... drop unused openbscdefines.h Change-Id: If35cd49baa4d0a3b38f31736e1696f481babba9c --- M include/osmocom/msc/Makefile.am D include/osmocom/msc/openbscdefines.h 2 files changed, 0 insertions(+), 35 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index ebc946a..28e4b14 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -20,7 +20,6 @@ mncc_int.h \ msc_ifaces.h \ msc_mgcp.h \ - openbscdefines.h \ a_reset.h \ osmo_msc.h \ rrlp.h \ diff --git a/include/osmocom/msc/openbscdefines.h b/include/osmocom/msc/openbscdefines.h deleted file mode 100644 index c6ac153..0000000 --- a/include/osmocom/msc/openbscdefines.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * (C) 2009 by Holger Hans Peter Freyther - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#ifndef OPENBSCDEFINES_H -#define OPENBSCDEFINES_H - -#ifdef BUILDING_ON_WINDOWS - #ifdef BUILDING_OPENBSC - #define BSC_API __declspec(dllexport) - #else - #define BSC_API __declspec(dllimport) - #endif -#else - #define BSC_API __attribute__((visibility("default"))) -#endif - -#endif -- To view, visit https://gerrit.osmocom.org/12024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If35cd49baa4d0a3b38f31736e1696f481babba9c Gerrit-Change-Number: 12024 Gerrit-PatchSet: 7 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 22:03:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 30 Nov 2018 22:03:46 +0000 Subject: Change in osmo-trx[master]: UHDDevice.cpp uhd_device::open() uhd::usrp::multi_usrp::make() added ... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/12051 ) Change subject: UHDDevice.cpp uhd_device::open() uhd::usrp::multi_usrp::make() added actual exception from uhd::key_error to extend debugging ...................................................................... Patch Set 1: Code-Review-1 (2 comments) Please, re-submit the patch (remember to keep the same Change-Id!) with the changes requested applied so we can merge it. Thanks for contributing! https://gerrit.osmocom.org/#/c/12051/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/12051/1//COMMIT_MSG at 7 PS1, Line 7: UHDDevice.cpp uhd_device::open() uhd::usrp::multi_usrp::make() added actual exception from uhd::key_error to extend debugging First line of commit is way to long. What about: UHDDevice: log exception information on device open failure https://gerrit.osmocom.org/#/c/12051/1/Transceiver52M/device/uhd/UHDDevice.cpp File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/#/c/12051/1/Transceiver52M/device/uhd/UHDDevice.cpp at 640 PS1, Line 640: LOGC(DDEV, ALERT) << "UHD make execption output:\n" << e.what(); typo: exception -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 1 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 30 Nov 2018 22:03:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 22:28:42 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Fri, 30 Nov 2018 22:28:42 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure Message-ID: d0gtail has uploaded this change for review. ( https://gerrit.osmocom.org/12052 Change subject: UHDDevice: log exception information on device open failure ...................................................................... UHDDevice: log exception information on device open failure Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/52/12052/1 diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index e0ea0c9..cd243c1 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -637,7 +637,7 @@ usrp_dev = uhd::usrp::multi_usrp::make(addr); } catch(uhd::key_error::exception &e) { LOGC(DDEV, ALERT) << "UHD make failed, device " << args; - LOGC(DDEV, ALERT) << "UHD make execption output:\n" << e.what(); + LOGC(DDEV, ALERT) << "UHD make exception output:\n" << e.what(); return -1; } -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 1 Gerrit-Owner: d0gtail -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 22:29:56 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Fri, 30 Nov 2018 22:29:56 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has abandoned this change. ( https://gerrit.osmocom.org/12052 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Abandoned messed up the change-id -- To view, visit https://gerrit.osmocom.org/12052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia84ddcf50cc83f9326b22bfdfb4f259b4e0bc5f1 Gerrit-Change-Number: 12052 Gerrit-PatchSet: 1 Gerrit-Owner: d0gtail Gerrit-CC: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 22:34:09 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Fri, 30 Nov 2018 22:34:09 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12051 to look at the new patch set (#2). Change subject: UHDDevice: log exception information on device open failure ...................................................................... UHDDevice: log exception information on device open failure Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/51/12051/2 -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 2 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 22:50:03 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Fri, 30 Nov 2018 22:50:03 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12051 to look at the new patch set (#3). Change subject: UHDDevice: log exception information on device open failure ...................................................................... UHDDevice: log exception information on device open failure Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/51/12051/3 -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 3 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 23:02:00 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Fri, 30 Nov 2018 23:02:00 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/12051 to look at the new patch set (#4). Change subject: UHDDevice: log exception information on device open failure ...................................................................... UHDDevice: log exception information on device open failure Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 cosmetic: UDHDevice: fixed typo Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/51/12051/4 -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 4 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Nov 30 23:07:43 2018 From: gerrit-no-reply at lists.osmocom.org (d0gtail) Date: Fri, 30 Nov 2018 23:07:43 +0000 Subject: Change in osmo-trx[master]: UHDDevice: log exception information on device open failure In-Reply-To: References: Message-ID: d0gtail has posted comments on this change. ( https://gerrit.osmocom.org/12051 ) Change subject: UHDDevice: log exception information on device open failure ...................................................................... Patch Set 4: > Patch Set 1: Code-Review-1 > > (2 comments) > > Please, re-submit the patch (remember to keep the same Change-Id!) with the changes requested applied so we can merge it. > > Thanks for contributing! It's a pleasure to contribute! I implemented your recommendations, sorry for uploading two additional patch-versions: forgot how to git... THX -- To view, visit https://gerrit.osmocom.org/12051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic33f4068d40cac3221960634185b697e10288dd1 Gerrit-Change-Number: 12051 Gerrit-PatchSet: 4 Gerrit-Owner: d0gtail Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: d0gtail Gerrit-Comment-Date: Fri, 30 Nov 2018 23:07:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Nov 12 10:22:40 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 12 Nov 2018 10:22:40 -0000 Subject: Change in osmo-msc[master]: move project specific manuals to their own repos Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11726 Change subject: move project specific manuals to their own repos ...................................................................... move project specific manuals to their own repos Build manuals when ./configure --enable-man is specified. Requires osmo-gsm-manuals to be installed. Related: OS#3385 Depends: I8e7036fae062ee783cb132b14608827a82c5e7c7 (osmo-gsm-manuals) Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 --- M .gitignore M configure.ac M doc/Makefile.am A doc/man/Makefile.am A doc/man/chapters/control.adoc A doc/man/chapters/counters.adoc A doc/man/chapters/counters_generated.adoc A doc/man/chapters/net.adoc A doc/man/chapters/overview.adoc A doc/man/chapters/running.adoc A doc/man/images/sgs-imsi_attach_lu.msc A doc/man/images/sgs-mo_call_no_ps_ho.msc A doc/man/images/sgs-mo_sms_idle.msc A doc/man/images/sgs-mt_call_idle.msc A doc/man/images/sgs-mt_sms_idle.msc A doc/man/osmomsc-usermanual-docinfo.xml A doc/man/osmomsc-usermanual.adoc A doc/man/osmomsc-vty-reference.xml A doc/man/vty/msc_vty_additions.xml A doc/man/vty/msc_vty_reference.xml 20 files changed, 3,315 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/11726/1 diff --git a/.gitignore b/.gitignore index 2424c1f..d6a4fc4 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,13 @@ tests/testsuite.log writtenconfig/ + +# manuals +*.html +*.svg +*.pdf +*__*.png +*.check +generated/ +osmomsc-usermanual.xml +doc/man/common diff --git a/configure.ac b/configure.ac index 2d8dc42..076b81e 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,23 @@ CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" fi +# Generate manuals +AC_ARG_ENABLE(man, + [AS_HELP_STRING( + [--enable-man], + [Generate manuals [default=no]], + )], + [osmo_ac_build_man=$enableval], [osmo_ac_build_man="no"]) +if test x"$osmo_ac_build_man" = x"yes" +then + PKG_CHECK_MODULES(OSMOGSMMANUALS, osmo-gsm-manuals) + if ! osmo-gsm-manuals-check-depends + then + AC_MSG_ERROR("missing dependencies for --enable-man") + fi +fi +AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_man" = x"yes"]) + # Enable/disable smpp support in the msc? AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) @@ -219,6 +236,7 @@ tests/msc_vlr/Makefile doc/Makefile doc/examples/Makefile + doc/man/Makefile contrib/Makefile contrib/systemd/Makefile Makefile) diff --git a/doc/Makefile.am b/doc/Makefile.am index 5a23107..138a78d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ examples \ + man \ $(NULL) diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am new file mode 100644 index 0000000..bbd987a --- /dev/null +++ b/doc/man/Makefile.am @@ -0,0 +1,11 @@ +if BUILD_MANUALS + TOPDIR = $(shell $(PKG_CONFIG) osmo-gsm-manuals --variable=topdir) + ASCIIDOC = osmomsc-usermanual.adoc + ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc + include $(TOPDIR)/build/Makefile.asciidoc.inc + + VTY_REFERENCE = osmomsc-vty-reference.xml + include $(TOPDIR)/build/Makefile.vty-reference.inc + + include $(TOPDIR)/build/Makefile.common.inc +endif diff --git a/doc/man/chapters/control.adoc b/doc/man/chapters/control.adoc new file mode 100644 index 0000000..af03be7 --- /dev/null +++ b/doc/man/chapters/control.adoc @@ -0,0 +1,31 @@ +[[control]] +== Control interface + +The actual protocol is described in <>, the variables common +to all programs using it are described in <>. This section +describes the CTRL interface variables specific to OsmoMSC. + +.Variables available on OsmoMSC's Control interface +[options="header",width="100%",cols="20%,5%,5%,50%,20%"] +|=== +|Name|Access|Trap|Value|Comment +|subscriber-list-active-v1|RO|No||Return list of active subscribers. +|=== + +=== subscriber-list-active-v1 + +Return a list of subscribers that are successfully attached (including full +successful authentication and ciphering if those are enabled). + +The reply comprises of one subscriber per line, of the format + +---- +,\n[,\n[...]] +---- + +For example: + +---- +901700000015252,22801 +901700000015253,22802 +---- diff --git a/doc/man/chapters/counters.adoc b/doc/man/chapters/counters.adoc new file mode 100644 index 0000000..7fbb10c --- /dev/null +++ b/doc/man/chapters/counters.adoc @@ -0,0 +1,4 @@ +[[counters]] +== Counters + +include::./counters_generated.adoc[] diff --git a/doc/man/chapters/counters_generated.adoc b/doc/man/chapters/counters_generated.adoc new file mode 100644 index 0000000..afeb8ff --- /dev/null +++ b/doc/man/chapters/counters_generated.adoc @@ -0,0 +1,40 @@ +// autogenerated by show asciidoc counters +These counters and their description based on OsmoMSC UNKNOWN (OsmoMSC). + +// generating tables for rate_ctr_group +// rate_ctr_group table mobile switching center +.msc - mobile switching center +[options="header"] +|=== +| Name | Reference | Description +| loc_update_type:attach | <> | Received location update imsi attach requests. +| loc_update_type:normal | <> | Received location update normal requests. +| loc_update_type:periodic | <> | Received location update periodic requests. +| loc_update_type:detach | <> | Received location update detach indication. +| loc_update_resp:failed | <> | Rejected location updates. +| loc_update_resp:completed | <> | Successful location updates. +| sms:submitted | <> | Received a RPDU from a MS (MO). +| sms:no_receiver | <> | Counts SMS which couldn't routed because no receiver found. +| sms:delivered | <> | Global SMS Deliver attempts. +| sms:rp_err_mem | <> | CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt. +| sms:rp_err_other | <> | Other error of MS responses on a sms delive attempt. +| sms:deliver_unknown_error | <> | Unknown error occured during sms delivery. +| call:mo_setup | <> | Received setup requests from a MS to init a MO call. +| call:mo_connect_ack | <> | Received a connect ack from MS of a MO call. Call is now succesful connected up. +| call:mt_setup | <> | Sent setup requests to the MS (MT). +| call:mt_connect | <> | Sent a connect to the MS (MT). +| call:active | <> | Count total amount of calls that ever reached active state. +| call:complete | <> | Count total amount of calls which got terminated by disconnect req or ind after reaching active state. +| call:incomplete | <> | Count total amount of call which got terminated by any other reason after reaching active state. +|=== +// generating tables for osmo_stat_items +// generating tables for osmo_counters +// ungrouped osmo_counters +.ungrouped osmo counters +[options="header"] +|=== +| Name | Reference | Description +| msc.active_calls | <> | +|=== + + diff --git a/doc/man/chapters/net.adoc b/doc/man/chapters/net.adoc new file mode 100644 index 0000000..06be4ba --- /dev/null +++ b/doc/man/chapters/net.adoc @@ -0,0 +1,154 @@ +[[net]] +== Configuring the Core Network + +The core network parameters are configured by the config file (as in `osmo-msc +-c osmo-msc.cfg`). The config file is parsed by the VTY, which is also +available via telnet in the running `osmo-msc` instance. Be aware that even +though you may be able to change these parameters without restarting +`osmo-msc`, some may not take immediate effect, and it is safest to use the +config file to have these parameters set at startup time. + +The core network parameters are found in the `config` / `network`. + +A full reference to the available commands can be found in the _OsmoMSC VTY +reference manual_ <>. This section describes only the most +commonly used settings. + +Here is an overview of the config items, described in more detail below: + +---- +network + network country code 262 + mobile network code 89 + mm info 1 + short name OsmoMSC + long name OsmoMSC + authentication required + encryption a5 3 +---- + +[TIP] +==== +Use the telnet VTY interface to query the current configuration of a running +`osmo-msc` process: + +---- +$ telnet localhost 4254 +OsmoMSC> enable +OsmoMSC# show running-config +---- + +Some parameters may be changed without restarting `osmo-msc`. To reach the +`network` node, enter: + +---- +OsmoMSC> enable +OsmoMSC# configure terminal +OsmoMSC(config)# network +OsmoMSC(config-net)# short name Example-Name +OsmoMSC(config-net)# exit +OsmoMSC(config)# +---- + +The telnet VTY features tab-completion as well as context sensitive help shown +when entering a `?` question mark. + +You can always use the `list` VTY command or enter `?` on the blank prompt to +get a list of all possible commands at the current node. +==== + + +=== MCC/MNC + +The key identities of every GSM PLMN is the Mobile Country Code and the Mobile +Network Code. They are identical over the entire network. In most cases, the +MCC/MNC will be allocated to the operator by the respective local regulatory +authority. For example, to set the MCC/MNC of 262-89, have this in your +osmo-msc.cfg: + +---- +network + network country code 262 + mobile network code 89 +---- + + +=== Configuring MM INFO + +The _MM INFO_ procedure can be used after a successful _LOCATION UPDATE_ in +order to transmit the human-readable network name as well as local time zone +information to the MS. By default, _MM INFO_ is not active, i.e. `0`. Set to `1` +to activate this feature: + +---- +network + mm info 1 + short name OsmoMSC + long name OsmoMSC +---- + +[NOTE] +==== +Not all phones support the MM INFO procedure. If a phone is not +factory-programmed to contain the name for your MCC/MNC, it will likely only +provide a numeric display of the network name, such as _262-89_, or show the +country code transformed into a letter, such as _D 89_. +==== + +The time information transmitted is determined by the local system time of the +operating system on which OsmoMSC is running. + + +=== Authentication + +Authorized subscribers must be entered in the HLR database, see the _OsmoHLR +reference manual_ <>. If authentication tokens (such as KI for +2G, or K and OP/OPC for UMTS) are present in the HLR, OsmoMSC will only attach +a subscriber after successful authentication. + +If no authentication keys are present in the HLR for a given subscriber, +OsmoMSC will attach the subscriber _without_ authentication. You can reject +subscribers that lack authentication info in the HLR with this setting: + +---- +network + authentication required +---- + +=== Ciphering + +To enable ciphering on the radio link, authentication must take place first: +the Kc resulting from authentication is the key used for ciphering. Hence, all +subscribers must have authentication tokens available in the HLR for ciphering. + +The MS, BTS and MSC must agree on a ciphering algorithm to use. + +- The MS sends its supported ciphering algorithms via Classmark IEs during + Location Updating. +- Typically the BSC needs to know which A5 ciphers are supported by connected + BTSes. +- Finally, OsmoMSC may impose that specific A5 ciphers shall not be considered. + +It is the responsibility of the BSC to then pick an A5 cipher that satisfies +all requirements. + +- In OsmoMSC, A5/0 means that ciphering is turned off. ++ +---- +network + encryption a5 0 +---- + +- A5/1 and A5/3 are currently supported by Osmocom. ++ +---- +network + encryption a5 3 +---- + +- Never use A5/2: it is an "export grade cipher" and has been deprecated for + its low ciphering strength. + +NOTE: At the time of writing, OsmoMSC supports setting only a single A5 cipher, +while it should be able to allow a set of ciphers. This is subject to ongoing +development. diff --git a/doc/man/chapters/overview.adoc b/doc/man/chapters/overview.adoc new file mode 100644 index 0000000..0bb47d7 --- /dev/null +++ b/doc/man/chapters/overview.adoc @@ -0,0 +1,127 @@ +[[overview]] +== Overview + +This manual should help you getting started with OsmoMSC. It will cover +aspects of configuring and running the OsmoMSC. + +[[intro_overview]] +=== About OsmoMSC + +OsmoMSC is the Osmocom implementation of a Mobile Switching Center (MSC) for 2G +and 3G GSM and UMTS mobile networks. Its interfaces are: + +- GSUP towards OsmoHLR (or a MAP proxy); +- A over IP towards a BSC (e.g. OsmoBSC); +- IuCS towards an RNC or HNB-GW (e.g. OsmoHNBGW) for 3G voice; +- MNCC (Mobile Network Call Control derived from GSM TS 04.07); +- SMPP 3.4 (Short Message Peer-to-Peer); +- The Osmocom typical telnet VTY and CTRL interfaces. + +OsmoMSC originated from the OpenBSC project, which started as a minimalistic +all-in-one implementation of the GSM Network. In 2017, OpenBSC had reached +maturity and diversity (including M3UA SIGTRAN and 3G support in the form of +IuCS and IuPS interfaces) that naturally lead to a separation of the all-in-one +approach to fully independent separate programs as in typical GSM networks. +Before it was split off, OsmoMSC originated from libmsc of the old openbsc.git. +Since a true _A_ interface and IuCS for 3G support is available, OsmoMSC +exists only as a separate standalone entity. + +Key differences of the new OsmoMSC compared to the old OsmoNITB are: + +- The complete VLR implementation that communicates with the separate HLR + (OsmoHLR) for subscriber management. In contrast to the OsmoNITB, HLR queries + are fully asynchronous, and the separate HLR allows using centralized + subscriber management for both circuit-switched and packet-switched domains + (i.e. one OsmoHLR for both OsmoMSC and OsmoSGSN). + +- VLR and HLR brought full UMTS AKA (Authentication and Key Agreement) support, + i.e. Milenage authentication in both the full 3G variant as well as the + backwards compatible 2G variant. + +- Addition of a true _A_ interface for 2G voice services. Previously, OsmoBSC + had an SCCPlite based _A_ interface towards 3rd party MSC implementations. + OsmoMSC features a true SCCP/M3UA _A_ interface, which allows running OsmoBSC + against this Osmocom based MSC implementation. The new SCCP/M3UA SIGTRAN for + the _A_ interface is implemented in libosmo-sccp, which is used by OsmoMSC + and OsmoBSC (and others), to establish a link via an STP (e.g. OsmoSTP). + +- Addition of an _IuCS_ interface to allow operating 3G voice services, also + via SCCP/M3UA SIGTRAN, for example connecting via OsmoHNBGW to a 3G small + cell device. + +Find the OsmoMSC issue tracker and wiki online at + +- https://osmocom.org/projects/osmomsc +- https://osmocom.org/projects/osmomsc/wiki + + +[[fig-gsm]] +.Typical GSM network architecture used with OsmoMSC +[graphviz] +---- +digraph G { + rankdir=LR; + MS0 [label="MS"] + MS1 [label="MS"] + MS2 [label="MS"] + MS3 [label="MS"] + UE0 [label="UE"] + UE1 [label="UE"] + BTS0 [label="BTS"] + BTS1 [label="BTS"] + STP [label="STP\n(SCCP routing)"] + HLR [label="HLR+AUC+EIR"] + HNB [label="RNC or hNodeB"] + MGW + MS0->BTS0 [label="Um"] + MS1->BTS0 [label="Um"] + MS2->BTS1 [label="Um"] + MS3->BTS1 [label="Um"] + UE0->HNB + UE1->HNB + BTS0->BSC [label="Abis"] + BTS1->BSC [label="Abis"] + BSC->STP [label="A/SCCP/M3UA"] + STP->MSC [label="A/SCCP/M3UA"] + STP->MSC [label="IuCS/SCCP/M3UA"] + VLR->HLR [label="GSUP"] + HNB->HNBGW [label="Iuh"] + HNBGW->STP [label="IuCS/SCCP/M3UA"] + MSC->MGW [label="MGCP"] + BTS0->MGW [label="RTP"] + BTS1->MGW [label="RTP"] + subgraph cluster_msc { + label = "OsmoMSC"; + MSC->SMSC; + MSC->VLR + } +} +---- + + +=== Software Components + +This is a brief description of OsmoMSC's internal software components. + +==== SMSC + +A minimal store-and-forward server for SMS, supporting both MO and MT +SMS service, as well as multi-part messages. + +The built-in SMSC also supports an external SMSC interface. For more +information, see <>. + +==== MSC + +The MSC component implements the mobility management (MM) functions of the TS +04.08 and delegates to SMSC for SMS message handling and the VLR for subscriber +management. + +Furthermore, it can handle TS 04.08 Call Control (CC), either by use of +an internal MNCC handler, or by use of an external MNCC agent. For more +information see <>. + +==== VLR + +A fully featured Visitor Location Register handles the subscriber management +and authentication, and interfaces via GSUP to the external HLR. diff --git a/doc/man/chapters/running.adoc b/doc/man/chapters/running.adoc new file mode 100644 index 0000000..8656a58 --- /dev/null +++ b/doc/man/chapters/running.adoc @@ -0,0 +1,148 @@ +== Running OsmoMSC + +The OsmoMSC executable (`osmo-msc`) offers the following command-line +arguments: + +=== SYNOPSIS + +*osmo-msc* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE'] [-M 'SOCKETPATH'] [-C] + +=== OPTIONS + +*-h, --help*:: + Print a short help message about the supported options +*-V, --version*:: + Print the compile-time version number of the OsmoBTS program +*-d, --debug 'DBGMASK','DBGLEVELS'*:: + Set the log subsystems and levels for logging to stderr. This + has mostly been superseded by VTY-based logging configuration, + see <> for further information. +*-D, --daemonize*:: + Fork the process as a daemon into background. +*-c, --config-file 'CONFIGFILE'*:: + Specify the file and path name of the configuration file to be + used. If none is specified, use `openbsc.cfg` in the current + working directory. +*-s, --disable-color*:: + Disable colors for logging to stderr. This has mostly been + deprecated by VTY based logging configuration, see <> + for more information. +*-T, --timestamp*:: + Enable time-stamping of log messages to stderr. This has mostly + been deprecated by VTY based logging configuration, see + <> for more information. +*-e, --log-level 'LOGLEVEL'*:: + Set the global log level for logging to stderr. This has mostly + been deprecated by VTY based logging configuration, see + <> for more information. +*-l, --database 'DATABASE'*:: + Specify the file name of the SQLite3 database to use as SMS storage +*-M, --mncc-sock-path*:: + Enable the MNCC socket for an external MNCC handler. See + <> for further information. +*-m, --mncc-sock*:: + Same as option -M (deprecated). +*-C, --no-dbcounter*:: + Disable the regular periodic synchronization of statistics + counters to the database. + + +=== Multiple instances + +Running multiple instances of `osmo-msc` on the same computer is possible if all +interfaces (VTY, CTRL) are separated using the appropriate configuration +options. The IP based interfaces are binding to local host by default. In order +to separate the processes, the user has to bind those services to specific but +different IP addresses and/or ports. + +The VTY and the Control interface can be bound to IP addresses from the loopback +address range, for example: + +---- +line vty + bind 127.0.0.2 +ctrl + bind 127.0.0.2 +---- + +If external SMPP is enabled, you may bind it to a different interface using: + +---- +smpp + local-tcp-ip 10.23.42.1 2775 +---- + +More on SMPP configuration in <>. + +The external MNCC handler is configured by the `--mncc-sock` commandline +argument. Choose a different such socket path for each OsmoMSC instance running +on the same file system. See more in <>. + +For the following links, OsmoMSC acts as a client and does not listen/bind to a +specific interface, and will hence not encounter conflicts for multiple instances +running on the same interface: + +- The SCCP/M3UA links are established by OsmoMSC contacting an STP. +- The GSUP link is established by OsmoMSC contacting an HLR. + + +=== Configure primary links + +==== Configure SCCP/M3UA to accept _A_ and _IuCS_ links + +OsmoMSC will contact an STP instance to establish an SCCP/M3UA link. BSC and +HNBGW will then reach the MSC via this link. By default, an STP instance is +assumed to listen on the default M3UA port (2905) on the local host. + +Establishing an SCCP/M3UA link towards an STP instance not on the local host +can be configured as follows: + +---- +cs7 instance 0 + asp my-OsmoMSC 2905 0 m3ua + ! IP address of the remote STP: + remote-ip 10.23.24.1 +---- + +Note that _A_ and _IuCS_ may use different SCCP instances, if so desired: + +---- +cs7 instance 0 + asp my-OsmoMSC-A 2905 0 m3ua + remote-ip 10.23.42.1 +cs7 instance 1 + asp my-OsmoMSC-Iu 2905 0 m3ua + remote-ip 10.23.42.2 +msc + cs7-instance-a 0 + cs7-instance-iu 1 +---- + +A full configuration needs an `asp` on an `as` -- an Application Server Process +running on an Application Server -- as well as a local point code and routing +configuration. The SCCP VTY automatically creates those parts that are missing, +by assuming sane defaults. A complete configuration would look like this: + +---- +cs7 instance 0 + point-code 0.23.1 + asp my-OsmoMSC-A-Iu 2905 0 m3ua + remote-ip 127.0.0.1 + as my-as-for-OsmoMSC-A-Iu m3ua + asp my-OsmoMSC-A-Iu + routing-key 0 0.23.1 +---- + +==== Configure GSUP to reach the HLR + +OsmoMSC will assume a GSUP server (OsmoHLR) to run on the local host and the +default GSUP port (4222). Contacting an HLR at a different IP address can be +configured as follows: + +---- +hlr + ! IP address of the remote HLR: + remote-ip 10.23.42.1 + ! default port is 4222, optionally configurable by: + remote-port 1234 +---- diff --git a/doc/man/images/sgs-imsi_attach_lu.msc b/doc/man/images/sgs-imsi_attach_lu.msc new file mode 100644 index 0000000..e62c2b8 --- /dev/null +++ b/doc/man/images/sgs-imsi_attach_lu.msc @@ -0,0 +1,15 @@ +msc { + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"]; + + UE => MME [label="Attach Request"]; + UE box HSS [label="Steps 3..16 of LTE Attach procedure TS 23.401"]; + MME box MME [label="Derive VLR Number"]; + MME => VLR [label="LU Request"]; + VLR box VLR [label="Create SGs Association"]; + VLR box HSS [label="MAP/GSUP UL / ISD"]; + MME <= VLR [label="LU Accept"]; + UE box HSS [label="Steps 17..16 of LTE Attach procedure TS 23.401"]; + |||; + ...; + MME <= VLR [label="Paging Request"]; +} diff --git a/doc/man/images/sgs-mo_call_no_ps_ho.msc b/doc/man/images/sgs-mo_call_no_ps_ho.msc new file mode 100644 index 0000000..f886c89 --- /dev/null +++ b/doc/man/images/sgs-mo_call_no_ps_ho.msc @@ -0,0 +1,18 @@ +msc { + hscale=2; + UE, ENB [label="eNodeB"], BSS, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"]; + + UE => MME [label="NAS Extended Service Request"]; + ENB <= MME [label="S1-AP UE Context Mod Req with CSFB"]; + ENB => MME [label="S1-AP UE Context Mod Resp"]; + UE <= ENB [label="NACC (Network Assisted Cell Change)"]; + ENB => MME [label="S1-AP S1 UE Context Release Req"]; + UE box MME [label="S1 UE Context Release"]; + + UE box HSS [label="UE changes RAT then LA and/or RA update"]; + UE <=> HSS [label="PS Suspend (TS 23.060)"]; + + UE => BSS [label="CM SERV REQ"]; + BSS => VLR [label="COMPL L3 (CM SERV REQ)"]; + UE <=> VLR [label="Normal 2G Voice Call"]; +} diff --git a/doc/man/images/sgs-mo_sms_idle.msc b/doc/man/images/sgs-mo_sms_idle.msc new file mode 100644 index 0000000..5acc0e8 --- /dev/null +++ b/doc/man/images/sgs-mo_sms_idle.msc @@ -0,0 +1,21 @@ +msc { + hscale=2; + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"], SMSC; + + UE box HSS [label="EPS/IMSI attach procedure"]; + ...; + UE box MME [label="UE triggered Service Request"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UPLINK UNITDATA\n(CP-DATA/RP-DATA/TPDU)"]; + VLR => SMSC [label="MAP/GSUP Forward SM"]; + MME <= VLR [label="SGsAP DOWNLINK UNITDATA"]; + UE <= MME [label="DL NAS Transport"]; + ...; + + VLR <= SMSC [label="Delivery Report"]; + MME <= VLR [label="SGsAP DOWNLINK UNITDATA"]; + UE <= MME [label="DL NAS Transport"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UPLINK UNITDATA"]; + MME <= VLR [label="SGsAP RELEASE REQ"]; +} diff --git a/doc/man/images/sgs-mt_call_idle.msc b/doc/man/images/sgs-mt_call_idle.msc new file mode 100644 index 0000000..b3cff3c --- /dev/null +++ b/doc/man/images/sgs-mt_call_idle.msc @@ -0,0 +1,17 @@ +msc { + hscale=2; + UE, ENB [label="eNodeB"], BSS, MME, VLR [label="MSC/VLR"], PSTN; + + VLR <= PSTN [label="ISUP IAM or SIP INVITE"]; + MME <= VLR [label="SGsAP PAGING REQUEST"]; + ENB <= MME [label="Paging"]; + UE <= MME [label="Paging"]; + + UE => MME [label="Extended Service Req"]; + MME => VLR [label="SGsAP SERVICE REQUEST"]; + ENB <= MME [label="Initial UE Ctx Setup"]; + + UE => BSS [label="Paging Response"]; + BSS => VLR [label="COMPL L3 (PAGING RESP)"]; + UE <=> VLR [label="Normal 2G Voice Call"]; +} diff --git a/doc/man/images/sgs-mt_sms_idle.msc b/doc/man/images/sgs-mt_sms_idle.msc new file mode 100644 index 0000000..7b453e0 --- /dev/null +++ b/doc/man/images/sgs-mt_sms_idle.msc @@ -0,0 +1,22 @@ +msc { + hscale=2; + UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"], SMSC; + + UE box HSS [label="EPS/IMSI attach procedure"]; + ...; + + VLR <= SMSC [label="MAP/GSUP ForwardSM"]; + MME <= VLR [label="SGsAP PAGING"]; + UE <= MME [label="Paging"]; + UE box MME [label="Service Request"]; + MME => VLR [label="SGsAP SERVICE REQ"]; + MME <= VLR [label="SGsAP DL UNITDATA\n(CP-DATA/RP-DATA/TPDU)"]; + UE <= MME [label="DL NAS Transport"]; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UL UNITDATA"]; + ...; + UE => MME [label="UL NAS Transport"]; + MME => VLR [label="SGsAP UL UNITDATA"]; + VLR => SMSC [label="Delivery report"]; + MME <= VLR [label="SGsAP RELEASE REQ"]; +} diff --git a/doc/man/osmomsc-usermanual-docinfo.xml b/doc/man/osmomsc-usermanual-docinfo.xml new file mode 100644 index 0000000..d99bba7 --- /dev/null +++ b/doc/man/osmomsc-usermanual-docinfo.xml @@ -0,0 +1,47 @@ + + + 1 + September 18th, 2017 + NH + + Initial version; based on OsmoNITB manual version 2. + + + + + + + Neels + Hofmeyr + nhofmeyr at sysmocom.de + NH + + sysmocom + sysmocom - s.f.m.c. GmbH + Senior Developer + + + + + + 2017 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/doc/man/osmomsc-usermanual.adoc b/doc/man/osmomsc-usermanual.adoc new file mode 100644 index 0000000..c4839dd --- /dev/null +++ b/doc/man/osmomsc-usermanual.adoc @@ -0,0 +1,40 @@ +:gfdl-enabled: +:program-name: OsmoMSC + +OsmoMSC User Manual +==================== +Neels Hofmeyr + + +include::{common}/chapters/preface.adoc[] + +include::chapters/overview.adoc[] + +include::chapters/running.adoc[] + +include::chapters/control.adoc[] + +include::chapters/counters.adoc[] + +include::{common}/chapters/vty.adoc[] + +include::{common}/chapters/logging.adoc[] + +include::chapters/net.adoc[] + +include::{common}/chapters/smpp.adoc[] + +include::{common}/chapters/mncc.adoc[] + +include::{common}/chapters/control_if.adoc[] + +include::{common}/chapters/gsup.adoc[] + +include::{common}/chapters/port_numbers.adoc[] + +include::{common}/chapters/bibliography.adoc[] + +include::{common}/chapters/glossary.adoc[] + +include::{common}/chapters/gfdl.adoc[] + diff --git a/doc/man/osmomsc-vty-reference.xml b/doc/man/osmomsc-vty-reference.xml new file mode 100644 index 0000000..8e4f0a7 --- /dev/null +++ b/doc/man/osmomsc-vty-reference.xml @@ -0,0 +1,38 @@ + + + + +]> + + + + + + v1 + 18th September 2017 + nh + Initial + + + + OsmoMSC VTY Reference + + + 2017 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/doc/man/vty/msc_vty_additions.xml b/doc/man/vty/msc_vty_additions.xml new file mode 100644 index 0000000..adc0f7e --- /dev/null +++ b/doc/man/vty/msc_vty_additions.xml @@ -0,0 +1,21 @@ + + + MNCC Internal Configuration + This node allows to configure the default codecs for + the internal call control handling. + + + SMPP Configuration + This node allows to configure the SMPP interface + for interfacing with external SMS applications. This section + contains generic/common SMPP related configuration, and no + per-ESME specific parameters. + + + ESME Configuration + This node allows to configure one particular SMPP + ESME, which is an External SMS Entity such as a SMS based + application server. You can define any number of ESME within + the SMPP node of the OsmoNITB VTY. + + diff --git a/doc/man/vty/msc_vty_reference.xml b/doc/man/vty/msc_vty_reference.xml new file mode 100644 index 0000000..7cf57c0 --- /dev/null +++ b/doc/man/vty/msc_vty_reference.xml @@ -0,0 +1,2532 @@ + + + Common Commands + These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + view + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-log + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line + + + + + + + + + + + + + + + + + + + + config-ctrl + + + + + + + + + config-cs7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-cs7-as + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-cs7-asp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-cs7-sccpaddr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-cs7-sccpaddr-gt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-net + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-msc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-mncc-int + + + + + + + + + + + + + + + + + + + + config-smpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-smpp-esme + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-hlr + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/11726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2f9c27f81940b02414f0e618483bffade72e8cf7 Gerrit-Change-Number: 11726 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 10:00:16 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 28 Nov 2018 10:00:16 -0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSGSN files (now avail in osmo-sgsn.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/11967 Change subject: remove OsmoSGSN files (now avail in osmo-sgsn.git) ...................................................................... remove OsmoSGSN files (now avail in osmo-sgsn.git) Files were added in osmo-sgsn.git Change-Id I0477d7c871413bd90b365d3064bac3cba23a0883 Depends: osmo-sgsn.git Change-Id I0477d7c871413bd90b365d3064bac3cba23a0883 Related: OS#3385 Change-Id: Ia6fae983bbcabceb3f470af750c724e12c96423e --- M Makefile.am D OsmoSGSN/Makefile.am D OsmoSGSN/chapters/configuration.adoc D OsmoSGSN/chapters/control.adoc D OsmoSGSN/chapters/counters.adoc D OsmoSGSN/chapters/counters_generated.adoc D OsmoSGSN/chapters/overview.adoc D OsmoSGSN/chapters/running.adoc D OsmoSGSN/osmosgsn-usermanual-docinfo.xml D OsmoSGSN/osmosgsn-usermanual.adoc D OsmoSGSN/osmosgsn-vty-reference.xml D OsmoSGSN/vty/sgsn_vty_additions.xml D OsmoSGSN/vty/sgsn_vty_reference.xml M configure.ac 14 files changed, 0 insertions(+), 3,298 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/67/11967/1 diff --git a/Makefile.am b/Makefile.am index 422df72..da712fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoSGSN \ OsmoSIPConnector \ OsmoSTP \ OsmoTRX \ diff --git a/OsmoSGSN/Makefile.am b/OsmoSGSN/Makefile.am deleted file mode 100644 index 775fa1d..0000000 --- a/OsmoSGSN/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmosgsn-usermanual.adoc \ - osmosgsn-usermanual-docinfo.xml \ - osmosgsn-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmosgsn-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmosgsn-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSGSN/chapters/configuration.adoc b/OsmoSGSN/chapters/configuration.adoc deleted file mode 100644 index 2828987..0000000 --- a/OsmoSGSN/chapters/configuration.adoc +++ /dev/null @@ -1,329 +0,0 @@ -== Configuring OsmoSGSN - -Contrary to other network elements (like OsmoBSC, OsmoNITB), the -OsmoSGSN has a relatively simple configuration. - -On the one hand, this is primary because the PCU configuration happens -from the BSC side. - -On the other hand, it is because the Gb interface does not need an -explicit configuration of all each PCU connecting to the SGSN. The -administrator only has to ensure that the NS and BSSGP layer identities -(NSEI, NSVCI, BVCI) are unique for each PCU connecting to the SGSN. - -=== Configuring the Gp interface - -The Gp interface is the GTP-C and GTP-U based interface between the SGSN -and the GGSNs. It is implemented via UDP on well-known source and -destination ports. - -When a MS requests establishment of a PDP context, it specifies the APN -(Access Point Name) to which the context shall be established. This APN -determines which GGSN shall be used, and that in turn determines which -external IP network the MS will be connected to. - -There are two modes in which GGSNs can be configured: - -. static GGSN/APN configuration -. dynamic GGSN/APN configuration - -==== Static GGSN/APN configuration - -In this mode, there is a static list of GGSNs and APNs configured in -OsmoSGSN via the VTY / config file. - -This is a non-standard method outside of the 3GPP specifications for the -SGSN, and is typically only used in private/small GPRS networks without -any access to a GRX. - -.Example: Static GGSN/APN configuration (single catch-all GGSN) ----- -OsmoSGSN(config-sgsn)# gtp local-ip 172.0.0.1 <1> -OsmoSGSN(config-sgsn)# ggsn 0 remote-ip 127.0.0.2 <2> -OsmoSGSN(config-sgsn)# ggsn 0 gtp-version 1 <3> -OsmoSGSN(config-sgsn)# apn * ggsn 0 <4> ----- -<1> Configure the local IP address at the SGSN used for Gp/GTP -<2> Specify the remote IP address of the GGSN (for GGSN 0) -<3> Specify the GTP protocol version used for GGSN 0 -<4> Route all APN names to GGSN 0 - - -==== Dynamic GGSN/APN configuration - -In this mode, the SGSN will use a DNS-based method to perform the lookup -from the APN (as specified by the MS) towards the GGSN IP address. - -This is the official method as per the 3GPP specifications for the SGSN, -and what is used on GRX. - -.Example: Dynamic GGSN/APN configuration ----- -OsmoSGSN(config-sgsn)# gtp local-ip 192.168.0.11 <1> -OsmoSGSN(config-sgsn)# ggsn dynamic <2> -OsmoSGSN(config-sgsn)# grx-dns-add 1.2.3.4 <3> ----- -<1> Configure the local IP address at the SGSN used for Gp/GTP -<2> Enable the dynamic GGSN resolving mode -<3> Specify the IP address of a DNS server for APN resolution - -[[auth-pol]] -=== Authorization Policy - -The authorization policy controls by which rules a subscriber is accepted or -rejected. The possible options range from accepting just all subscribers without -further checking, to a fine grained access-control, handled by an external HLR. - -accept-all:: All subscribers that attempt to attach to the GPRS network are -accepted without further checking. This option is intended to be used for -testing in a controlled environment only. A wide-open network may attract -subscribers from foreign networks and disrupt their service. It is highly -recommended to pick one of the options below. - -remote:: This option allows to connect OsmoSGSN to an external HLR via the -GSUP protocol. This will be the preferred option in larger networks. - -acl-only:: If no external HLR is available, the network operator has the -option to control the access using an access control list. The access control -list contains the IMSI numbers of the allowed subscribers. This method offers -fine grained access control and is ideal for small networks and lab test -environments. - -closed:: This policy mode softens the strict *acl-only* only mode by also -implicitly accepting home network subscribers. The decision is made by the MCC -and MNC part of the IMSI number. The combination of MCC and MNC fully identifies -a subscribers home network, also known as a Home Network Identity (HNI, i.e. -MCC and MNC found at the start of the IMSI, e.g. MCC 901 and MNC 700 with -IMSI 901700000003080). - -NOTE: The policy mode *closed* must not be confused with the equally named -policy that is defined for osmo-nitb! - - -.Example: Assign or change authorization policy: ----- -OsmoSGSN> enable -OsmoSGSN# configure terminal -OsmoSGSN(config)# sgsn -OsmoSGSN(config-sgsn)# auth-policy acl-only <1> -OsmoSGSN(config-sgsn)# write <2> -Configuration saved to sgsn.cfg -OsmoSGSN(config-sgsn)# end -OsmoSGSN# disable -OsmoSGSN> ----- -<1> 'acl-only' is selected as authorization policy -<2> Saves current changes to cofiguration to make this policy -persistent - -.Example: Access control list: ----- -sgsn - auth-policy acl-only <1> - imsi-acl add 001010000000003 - imsi-acl add 001010000000002 - imsi-acl add 001010000000001 - imsi-acl add 901700000000068 <2> ----- -<1> Set the authorization policy -<2> Add as many subscribers as required - -=== Subscriber Configuration - -As opposed to OsmoNITB, OsmoSGSN does not feature a built-in HLR. - -It can thus operate only in the following two modes: - -. Accessing an external HLR (or HLR gateway) via the GSUP protocol -. Accepting subscribers based on internal ACL (access control list), - see also <> - -==== Accessing an external HLR via GSUP - -The non-standard GSUP protocol was created to provide OsmoSGSN with -access to an external HLR while avoiding the complexities of the -TCAP/MAP protocol stack commonly used by HLRs. - -A custom HLR could either directly implement GSUP, or an external gateway -can be used to convert GSUP to the respective MAP operations. - -The primitives/operations of GSUP are modelled to have a 1:1 -correspondence to their MAP counterparts. However, the encoding is much -simplified by use of a binary TLV encoding similar to Layer 3 of -GSM/GPRS. - -GSUP performs a challenge-response authentication protocol called OAP, -which uses the standard MILEAGE algorithm for mutual authentication -between OsmoSGSN and the HLR/HLR-GW. - -[[sgsn-ex-gsup]] -.Example: Using an external HLR via GSUP ----- -OsmoSGSN(config-sgsn)# gsup remote-ip 2.3.4.5 <1> -OsmoSGSN(config-sgsn)# gsup remote-port 10000 <2> -OsmoSGSN(config-sgsn)# gsup oap-k 000102030405060708090a0b0c0d0e0f <3> -OsmoSGSN(config-sgsn)# gsup oap-opc 101112131415161718191a1b1c1d1e1f <4> ----- -<1> Configure the IP address of the (remote) HLR or HLR-GW -<2> Configure the TCP port of the (remote) HLR or HLR-GW -<3> Specify the OAP shared key -<4> Specify the OAP shared OPC - - -=== CDR configuration - -OsmoSGSN can write a text log file containing CDR (call data records), -which are commonly used for accounting/billing purpose. - -.Example: CDR log file configuration ----- -OsmoSGSN(config-sgsn)# cdr filename /var/log/osmosgsn.cdr -OsmoSGSN(config-sgsn)# cdr interval 600 <1> ----- -<1> Periodically log existing PDP contexts every 600 seconds (10 min) - -The CDR file is a simple CSV file including a header line naming the -individual fields of each CSV line. - -==== CDR CTRL interface - -Independently of whether logging CDR to a file is enabled or not, OsmoSGSN can -also provide delivery of CDR through the CTRL interface. CDR are sent by means -of TRAP messages with variable name _cdr-v1_, and its value is filled using the -same CSV line format as in the log file, but without CSV header line. - -.Example: CDR delivery through CTRL TRAP messages ----- -OsmoSGSN(config-sgsn)# cdr trap ----- - -==== CDR Format - -[[sgsn-cdr]] -.Description of CSV fields in OsmoSGSN CDR file -[options="header",cols="15%,85%"] -|=== -|Field Name|Description -|timestamp|Timestamp in YYYYMMDDhhmmssXXX where XXX are milli-seconds -|imsi|IMSI causing this CDR -|imei|IMEI causing this CDR -|msisdn|MSISDN causing this CDR (if known) -|cell_id|Cell ID in which the MS was registered last -|lac|Location Area Code in which the MS was registered last -|hlr|HLR of the subscriber -|event|Possible events are explained below in <> -|=== - -If the _event_ field describes a pdp context related action (starts with -_pdp-_), then the following extra CSV fields are appended to the line: - -[[sgsn-cdr-pdp]] -.Description of extra CSV fields for pdp context related events -[options="header",cols="15%,85%"] -|=== -|Field Name|Description -|pdp_duration|duration of the PDP context so far -|ggsn_addr|GGSN related to the PDP context -|sgsn_addr|SGSN related to the PDP context -|apni|APN identifier of the PDP context -|eua_addr|IP address allocated to the PDP context -|vol_in|Number of bytes in MO direction -|vol_out|Number of bytes in MT direction -|charging_id|Related charging ID -|=== - -[[sgsn-cdr-event]] -.Description of OsmoSGSN CDR Events -[options="header",cols="15%,85%"] -|=== -|Event|Description -|attach|GMM ATTACH COMPLETE about to be sent to MS -|update|GMM ROUTING AREA UPDATE COMPLETE about to be sent to MS -|detach|GMM DETACH REQUEST received from MS -|free|Release of the MM context memory -|pdp-act|GTP CREATE PDP CONTEXT CONFIRM received from GGSN -|pdp-deact|GTP DELETE PDP CONTEXT CONFIRM received from GGSN -|pdp-terminate|Forced PDP context termination during MM context release -|pdp-free|Release of the PDP context memory -|pdp-periodic|Triggered by periodic timer, see VTY cmd _cdr interval_ -|=== - - -=== User traffic compression - -In order to save optimize GPRS bandwith, OsmoSGSN implements header and data -compression schemes. The compression will reduce the packet length in order -to save radio bandwith. - -==== Header compression - -On TCP/IP connections, each packet is prepended with a fairly long TCP/IP -header. The header contains a lot of static information that never changes -throughout the connection. (source and destination address, port numbers etc.) -OsmoSGSN implements a TCP/IP header compression scheme called RFC1144, also -known as SLHC. This type of header compression removes the TCP/IP header -entirely and replaces it with a shorter version, that only contains the -information that is absolutely necessary to identify and check the packet. -The receiving part then restores the original header and forwards it to higher -layers. - -*compression rfc1144 passive*:: -TCP/IP header compression has to be actively requested by the modem. The -network will not promote compression by itself. This is the recommended mode -of operation. - -*compression rfc1144 active slots <1-256>*:: -TCP/IP header compression is actively promoted by the network. Modems may still -actively request different compression parameters or reject the offered -compression parameters entirely. The number of slots is the maximum number -of packet headers per subscriber that can be stored in the codebook. - -.Example: Accept compression if requested: ----- -sgsn - compression rfc1144 passive ----- - -.Example: Actively promote compression: ----- -sgsn - compression rfc1144 active slots 8 ----- - -NOTE: The usage of TCP/IP options may disturb the RFC1144 header compression -scheme. TCP/IP options may render RFC1144 ineffective if variable data is -encoded into the option section of the TCP/IP packet. (e.g. TCP option 8, -Timestamp) - - -==== Data compression - -Data compression works on the raw packet data, including the header part of the -packet. If enabled, header compression is applied before first data compression -is applied. OsmoSGSN implements the V.42bis data compression scheme. - -*compression rfc1144 passive*:: -V42bis data compression has to be actively requested by the modem. The network -will not promote compression by itself. This is the recommended mode of -operation. - -*compression v42bis active direction (ms|sgsn|both) codewords <512-65535> strlen <6-250>*:: -V42bis data compression is actively promoted by the network. Modems may still -actively request different compression parameters or reject the offered -compression parameters entirely. The direction configures which sides are -allowed to send compressed packets. For most cases, compressing 'both' -directions will be the preferred option. The following to parameters configure -the codebook size by the maxium number ('codewords') and size ('strlen') of -entries. - -.Example: Accept compression if requested: ----- -sgsn - compression v42bis passive ----- - -.Example: Actively promote compression: ----- -sgsn - compression v42bis active direction both codewords 512 strlen 20 ----- diff --git a/OsmoSGSN/chapters/control.adoc b/OsmoSGSN/chapters/control.adoc deleted file mode 100644 index 0f2bfae..0000000 --- a/OsmoSGSN/chapters/control.adoc +++ /dev/null @@ -1,23 +0,0 @@ -[[control]] -== Control interface - -The actual protocol is described in <>, the variables -common to all programs using it are described in <>. Here we -describe variables specific to OsmoSGSN. - -.Variables available over control interface -[options="header",width="100%",cols="20%,5%,5%,50%,20%"] -|=== -|Name|Access|Trap|Value|Comment -|subscriber-list-active-v1|RO|No|","|See <> for details. -|=== - -[[subs]] -=== subscriber-list-active-v1 - -Return the list of active subscribers as a concatenated set of pairs "", -"addr" where first element of the pair is subscriber's IMSI and the second -element (which might be empty) is the subscriber's address. The address value -might be "none", "invalid" and "PPP" in addition to actual IP address. In case -of IP address it will be prefixed with "IPv4" or "IPv6" string depending on the -version of IP protocol. diff --git a/OsmoSGSN/chapters/counters.adoc b/OsmoSGSN/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoSGSN/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoSGSN/chapters/counters_generated.adoc b/OsmoSGSN/chapters/counters_generated.adoc deleted file mode 100644 index 756a4a5..0000000 --- a/OsmoSGSN/chapters/counters_generated.adoc +++ /dev/null @@ -1,121 +0,0 @@ -// autogenerated by show asciidoc counters -These counters and their description based on OsmoSGSN UNKNOWN (OsmoSGSN). - -// generating tables for rate_ctr_group -// rate_ctr_group table BSSGP Peer Statistics -.bssgp:bss_ctx - BSSGP Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at BSSGP Level ( In) -| packets:out | <> | Packets at BSSGP Level (Out) -| bytes:in | <> | Bytes at BSSGP Level ( In) -| bytes:out | <> | Bytes at BSSGP Level (Out) -| blocked | <> | BVC Blocking count -| discarded | <> | BVC LLC Discarded count -| status | <> | BVC Status count -|=== -// rate_ctr_group table BSSGP Peer Statistics -.bssgp:bss_ctx - BSSGP Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at BSSGP Level ( In) -| packets:out | <> | Packets at BSSGP Level (Out) -| bytes:in | <> | Bytes at BSSGP Level ( In) -| bytes:out | <> | Bytes at BSSGP Level (Out) -| blocked | <> | BVC Blocking count -| discarded | <> | BVC LLC Discarded count -| status | <> | BVC Status count -|=== -// rate_ctr_group table NSVC Peer Statistics -.ns:nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at NS Level ( In) -| packets:out | <> | Packets at NS Level (Out) -| bytes:in | <> | Bytes at NS Level ( In) -| bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count -| replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count -|=== -// rate_ctr_group table SGSN Overall Statistics -.sgsn - SGSN Overall Statistics -[options="header"] -|=== -| Name | Reference | Description -| llc:dl_bytes | <> | Count sent LLC bytes before giving it to the bssgp layer -| llc:ul_bytes | <> | Count sucessful received LLC bytes (encrypt & fcs correct) -| llc:dl_packets | <> | Count sucessful sent LLC packets before giving it to the bssgp layer -| llc:ul_packets | <> | Count sucessful received LLC packets (encrypt & fcs correct) -| gprs:attach_requested | <> | Received attach requests -| gprs:attach_accepted | <> | Sent attach accepts -| gprs:attach_rejected | <> | Sent attach rejects -| gprs:detach_requested | <> | Received detach requests -| gprs:detach_acked | <> | Sent detach acks -| gprs:routing_area_requested | <> | Received routing area requests -| gprs:routing_area_requested | <> | Sent routing area acks -| gprs:routing_area_requested | <> | Sent routing area rejects -| pdp:activate_requested | <> | Received activate requests -| pdp:activate_rejected | <> | Sent activate rejects -| pdp:activate_accepted | <> | Sent activate accepts -| pdp:request_activated | <> | unused -| pdp:request_activate_rejected | <> | unused -| pdp:modify_requested | <> | unused -| pdp:modify_accepted | <> | unused -| pdp:dl_deactivate_requested | <> | Sent deactivate requests -| pdp:dl_deactivate_accepted | <> | Sent deactivate accepted -| pdp:ul_deactivate_requested | <> | Received deactivate requests -| pdp:ul_deactivate_accepted | <> | Received deactivate accepts -|=== -// rate_ctr_group table NSVC Peer Statistics -.ns:nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at NS Level ( In) -| packets:out | <> | Packets at NS Level (Out) -| bytes:in | <> | Bytes at NS Level ( In) -| bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count -| replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count -|=== -// generating tables for osmo_stat_items -NSVC Peer Statistics -// osmo_stat_item_group table NSVC Peer Statistics -.ns.nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| alive.delay | <> | ALIVE response time | ms -|=== -NSVC Peer Statistics -// osmo_stat_item_group table NSVC Peer Statistics -.ns.nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| alive.delay | <> | ALIVE response time | ms -|=== -// generating tables for osmo_counters -// ungrouped osmo_counters -.ungrouped osmo counters -[options="header"] -|=== -| Name | Reference | Description -|=== - - diff --git a/OsmoSGSN/chapters/overview.adoc b/OsmoSGSN/chapters/overview.adoc deleted file mode 100644 index abc7496..0000000 --- a/OsmoSGSN/chapters/overview.adoc +++ /dev/null @@ -1,118 +0,0 @@ -[[chapter_introduction]] -== Overview - -[[intro_overview]] -=== About OsmoSGSN - -OsmoSGSN is the Osmocom implementation of the GPRS SGSN (Serving Gprs -Support Node) element inside the GPRS network. The SGSN plays a similar -central function to the GPRS network as the MSC plays in the GSM -network. - -The SGSN is connected on the downlink side to Gb interfaces of the BSS, -specifically the PCU inside the BSS. The SGSN is further connected by -the GTP protocol to the GGSN which terminates the tunnels towards the -external packet data network (e.g. IPv4). - -OsmoSGSN supports both a PCU that is co-located with(in) the BTS, as -well as a PCU that is co-located with(in) the BSC. In combination with -OsmoNITB/OsmoBSC/OsmoBTS, the PCU is co-located within the BTS. - -[[fig-gprs-pcubts]] -.GPRS network architecture with PCU in BTS -[graphviz] ----- -digraph G { - rankdir=LR; - MS0 [label="MS"]; - MS1 [label="MS"]; - MS0->BTS [label="Um"]; - MS1->BTS [label="Um"]; - BTS->BSC [label="Abis"]; - BSC->MSC [label="A"]; - BTS->PCU [label="pcu_sock"]; - PCU->SGSN [label="Gb"]; - SGSN->GGSN [label="GTP"]; -} ----- - -=== Software Components - -OsmoSGSN contains a variety of different software components, which -we'll quickly describe in this section. - -==== Gb Implementation - -OsmoSGSN implements the ETSI/3GPP specified Gb interface, including TS -08.16 (NS), TS 08.18 (BSSGP) and TS 08.64 (LLC) protocols. As transport -layers for NS, it supports NS/IP (NS encapsulated in UDP/IP), as well as -NS/FR/GRE/IP. The latter is provided in order to use a Router with -Ethernet and Frame Relay interface to convert to actual physical Frame -Relay medium, which is not directly supported by OsmoSGSN. - -The actual Gb Implementation is part of the libosmogb library, which is -in turn part of the libosmocore software package. This allows the same -Gb implementation to be used from osmo-pcu, osmo-gbproxy as well as -OsmoSGSN. - - -==== GTP Implementation - -OsmoSGSN uses the libgtp implementation originating from OsmoGGSN. It -supports both GTPv0 and GTPv1. - - -==== GMM Implementation - -The GPRS Mobility Management implementation is quite simplistic at this -point. It supports the GPRS ATTACH and GPRS ROUTING AREA UPDATE -procedures, as well as GPRS ATTACH and GPRS DETACH. - -==== LLC Implementation - -The LLC (Logical Link Control) implementation of OsmoSGSN only supports -non-acknowledged mode, as this is the most common use case in real-world -GPRS networks. - -Furthermore, it does not support IP header nor payload compression at -this point. Addition of those features is subject to customer demand or -user/customer contributions. - -The LLC implementation does support LLC encryption. However, as no HLR -access is implemented yet, there is no way to enable/configure -per-subscriber specific keys. - - -==== Session Management Implementation - -The session management procedures ACTIVATE PDP CONTEXT and DEACTIVATE -PDP CONTEXT are supported. However, no MODIFY PDP CONTEXT and no -Network-initiated PDP context activation is possible. This is again -covering the predominant use cases and configurations in GPRS real-world -networks while skipping the more esoteric features. - -Multiple PDP contexts can be attached by a single MS. - -Currently, all PDP contexts are routed to the same GGSN, irrespective of -the APN used/configured in the MS. This is sufficient (and actually -desirable) for small autonomous networks, but of course not suitable for -real networks in roaming scenarios. Please contact sysmocom in case you -require additional features such as DNS-based APN resolving. - -=== Limitations - -At the time of writing, OsmoSGSN still has a number of limitations, -which are a result of the demand-driven Open Source development model. -If you require any of those features, please consider implementing and -contributing them, or contracting the existing OsmoSGSN developers for -performing that work. - -Known Limitations include: - -* No LLC encryption support -* No interface to the OsmoNITB HLR -* No paging coordination between SGSN and MSC -* No SMS over Ps support -* No IuPS interface for 3G (in progress) -* No IP header compression -* No payload compression diff --git a/OsmoSGSN/chapters/running.adoc b/OsmoSGSN/chapters/running.adoc deleted file mode 100644 index d758b28..0000000 --- a/OsmoSGSN/chapters/running.adoc +++ /dev/null @@ -1,35 +0,0 @@ -== Running OsmoSGSN - -The OsmoSGSN executable (`osmo-sgsn`) offers the following command-line -options: - - -=== SYNOPSIS - -*osmo-sgsn* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-e 'LOGLEVEL'] - - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-d, --debug 'DBGMASK','DBGLEVELS'*:: - Set the log subsystems and levels for logging to stderr. This - has mostly been superseded by VTY-based logging configuration, - see <> for further information. -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo_sgsn.cfg` in the current - working directory. -*-s, --disable-color*:: - Disable colors for logging to stderr. This has mostly been - deprecated by VTY based logging configuration, see <> - for more information. -*-e, --log-level 'LOGLEVEL'*:: - Set the global log level for logging to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. diff --git a/OsmoSGSN/osmosgsn-usermanual-docinfo.xml b/OsmoSGSN/osmosgsn-usermanual-docinfo.xml deleted file mode 100644 index afbf109..0000000 --- a/OsmoSGSN/osmosgsn-usermanual-docinfo.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 1 - January 13, 2013 - HW - - Initial version. - - - - 2 - February 2016 - HW - - Conversion to asciidoc, removal of sysmoBTS specific parts. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2013-2016 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoSGSN/osmosgsn-usermanual.adoc b/OsmoSGSN/osmosgsn-usermanual.adoc deleted file mode 100644 index dea91a9..0000000 --- a/OsmoSGSN/osmosgsn-usermanual.adoc +++ /dev/null @@ -1,38 +0,0 @@ -:gfdl-enabled: - -OsmoSGSN User Manual -==================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::./common/chapters/gb.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::./common/chapters/oap.adoc[] - -include::./common/chapters/gsup.adoc[] - -include::{srcdir}/chapters/counters.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoSGSN/osmosgsn-vty-reference.xml b/OsmoSGSN/osmosgsn-vty-reference.xml deleted file mode 100644 index 82b666a..0000000 --- a/OsmoSGSN/osmosgsn-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th January 2013 - hw - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoSGSN VTY Reference - - - 2013-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoSGSN/vty/sgsn_vty_additions.xml b/OsmoSGSN/vty/sgsn_vty_additions.xml deleted file mode 100644 index 660b695..0000000 --- a/OsmoSGSN/vty/sgsn_vty_additions.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Configure the remote GGSN, access-control and other - attributes of the SGSN - - diff --git a/OsmoSGSN/vty/sgsn_vty_reference.xml b/OsmoSGSN/vty/sgsn_vty_reference.xml deleted file mode 100644 index 52d4213..0000000 --- a/OsmoSGSN/vty/sgsn_vty_reference.xml +++ /dev/null @@ -1,2509 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-bssgp - - - config-ctrl - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-sgsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index fff6a4f..7eabd3a 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoSGSN/Makefile OsmoSIPConnector/Makefile OsmoSTP/Makefile OsmoTRX/Makefile -- To view, visit https://gerrit.osmocom.org/11967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6fae983bbcabceb3f470af750c724e12c96423e Gerrit-Change-Number: 11967 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:40 -0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoSGSN files (now avail in osmo-sgsn.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11967 ) Change subject: remove OsmoSGSN files (now avail in osmo-sgsn.git) ...................................................................... remove OsmoSGSN files (now avail in osmo-sgsn.git) Files were added in osmo-sgsn.git Change-Id I0477d7c871413bd90b365d3064bac3cba23a0883 Depends: osmo-sgsn.git Change-Id I0477d7c871413bd90b365d3064bac3cba23a0883 Related: OS#3385 Change-Id: Ia6fae983bbcabceb3f470af750c724e12c96423e --- M Makefile.am D OsmoSGSN/Makefile.am D OsmoSGSN/chapters/configuration.adoc D OsmoSGSN/chapters/control.adoc D OsmoSGSN/chapters/counters.adoc D OsmoSGSN/chapters/counters_generated.adoc D OsmoSGSN/chapters/overview.adoc D OsmoSGSN/chapters/running.adoc D OsmoSGSN/osmosgsn-usermanual-docinfo.xml D OsmoSGSN/osmosgsn-usermanual.adoc D OsmoSGSN/osmosgsn-vty-reference.xml D OsmoSGSN/vty/sgsn_vty_additions.xml D OsmoSGSN/vty/sgsn_vty_reference.xml M configure.ac 14 files changed, 0 insertions(+), 3,298 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index 422df72..da712fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ OsmoMGCP \ OsmoNAT \ OsmoNITB \ - OsmoSGSN \ OsmoSIPConnector \ OsmoSTP \ OsmoTRX \ diff --git a/OsmoSGSN/Makefile.am b/OsmoSGSN/Makefile.am deleted file mode 100644 index 775fa1d..0000000 --- a/OsmoSGSN/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmosgsn-usermanual.adoc \ - osmosgsn-usermanual-docinfo.xml \ - osmosgsn-vty-reference.xml \ - chapters \ - vty - -ASCIIDOC = osmosgsn-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmosgsn-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoSGSN/chapters/configuration.adoc b/OsmoSGSN/chapters/configuration.adoc deleted file mode 100644 index 2828987..0000000 --- a/OsmoSGSN/chapters/configuration.adoc +++ /dev/null @@ -1,329 +0,0 @@ -== Configuring OsmoSGSN - -Contrary to other network elements (like OsmoBSC, OsmoNITB), the -OsmoSGSN has a relatively simple configuration. - -On the one hand, this is primary because the PCU configuration happens -from the BSC side. - -On the other hand, it is because the Gb interface does not need an -explicit configuration of all each PCU connecting to the SGSN. The -administrator only has to ensure that the NS and BSSGP layer identities -(NSEI, NSVCI, BVCI) are unique for each PCU connecting to the SGSN. - -=== Configuring the Gp interface - -The Gp interface is the GTP-C and GTP-U based interface between the SGSN -and the GGSNs. It is implemented via UDP on well-known source and -destination ports. - -When a MS requests establishment of a PDP context, it specifies the APN -(Access Point Name) to which the context shall be established. This APN -determines which GGSN shall be used, and that in turn determines which -external IP network the MS will be connected to. - -There are two modes in which GGSNs can be configured: - -. static GGSN/APN configuration -. dynamic GGSN/APN configuration - -==== Static GGSN/APN configuration - -In this mode, there is a static list of GGSNs and APNs configured in -OsmoSGSN via the VTY / config file. - -This is a non-standard method outside of the 3GPP specifications for the -SGSN, and is typically only used in private/small GPRS networks without -any access to a GRX. - -.Example: Static GGSN/APN configuration (single catch-all GGSN) ----- -OsmoSGSN(config-sgsn)# gtp local-ip 172.0.0.1 <1> -OsmoSGSN(config-sgsn)# ggsn 0 remote-ip 127.0.0.2 <2> -OsmoSGSN(config-sgsn)# ggsn 0 gtp-version 1 <3> -OsmoSGSN(config-sgsn)# apn * ggsn 0 <4> ----- -<1> Configure the local IP address at the SGSN used for Gp/GTP -<2> Specify the remote IP address of the GGSN (for GGSN 0) -<3> Specify the GTP protocol version used for GGSN 0 -<4> Route all APN names to GGSN 0 - - -==== Dynamic GGSN/APN configuration - -In this mode, the SGSN will use a DNS-based method to perform the lookup -from the APN (as specified by the MS) towards the GGSN IP address. - -This is the official method as per the 3GPP specifications for the SGSN, -and what is used on GRX. - -.Example: Dynamic GGSN/APN configuration ----- -OsmoSGSN(config-sgsn)# gtp local-ip 192.168.0.11 <1> -OsmoSGSN(config-sgsn)# ggsn dynamic <2> -OsmoSGSN(config-sgsn)# grx-dns-add 1.2.3.4 <3> ----- -<1> Configure the local IP address at the SGSN used for Gp/GTP -<2> Enable the dynamic GGSN resolving mode -<3> Specify the IP address of a DNS server for APN resolution - -[[auth-pol]] -=== Authorization Policy - -The authorization policy controls by which rules a subscriber is accepted or -rejected. The possible options range from accepting just all subscribers without -further checking, to a fine grained access-control, handled by an external HLR. - -accept-all:: All subscribers that attempt to attach to the GPRS network are -accepted without further checking. This option is intended to be used for -testing in a controlled environment only. A wide-open network may attract -subscribers from foreign networks and disrupt their service. It is highly -recommended to pick one of the options below. - -remote:: This option allows to connect OsmoSGSN to an external HLR via the -GSUP protocol. This will be the preferred option in larger networks. - -acl-only:: If no external HLR is available, the network operator has the -option to control the access using an access control list. The access control -list contains the IMSI numbers of the allowed subscribers. This method offers -fine grained access control and is ideal for small networks and lab test -environments. - -closed:: This policy mode softens the strict *acl-only* only mode by also -implicitly accepting home network subscribers. The decision is made by the MCC -and MNC part of the IMSI number. The combination of MCC and MNC fully identifies -a subscribers home network, also known as a Home Network Identity (HNI, i.e. -MCC and MNC found at the start of the IMSI, e.g. MCC 901 and MNC 700 with -IMSI 901700000003080). - -NOTE: The policy mode *closed* must not be confused with the equally named -policy that is defined for osmo-nitb! - - -.Example: Assign or change authorization policy: ----- -OsmoSGSN> enable -OsmoSGSN# configure terminal -OsmoSGSN(config)# sgsn -OsmoSGSN(config-sgsn)# auth-policy acl-only <1> -OsmoSGSN(config-sgsn)# write <2> -Configuration saved to sgsn.cfg -OsmoSGSN(config-sgsn)# end -OsmoSGSN# disable -OsmoSGSN> ----- -<1> 'acl-only' is selected as authorization policy -<2> Saves current changes to cofiguration to make this policy -persistent - -.Example: Access control list: ----- -sgsn - auth-policy acl-only <1> - imsi-acl add 001010000000003 - imsi-acl add 001010000000002 - imsi-acl add 001010000000001 - imsi-acl add 901700000000068 <2> ----- -<1> Set the authorization policy -<2> Add as many subscribers as required - -=== Subscriber Configuration - -As opposed to OsmoNITB, OsmoSGSN does not feature a built-in HLR. - -It can thus operate only in the following two modes: - -. Accessing an external HLR (or HLR gateway) via the GSUP protocol -. Accepting subscribers based on internal ACL (access control list), - see also <> - -==== Accessing an external HLR via GSUP - -The non-standard GSUP protocol was created to provide OsmoSGSN with -access to an external HLR while avoiding the complexities of the -TCAP/MAP protocol stack commonly used by HLRs. - -A custom HLR could either directly implement GSUP, or an external gateway -can be used to convert GSUP to the respective MAP operations. - -The primitives/operations of GSUP are modelled to have a 1:1 -correspondence to their MAP counterparts. However, the encoding is much -simplified by use of a binary TLV encoding similar to Layer 3 of -GSM/GPRS. - -GSUP performs a challenge-response authentication protocol called OAP, -which uses the standard MILEAGE algorithm for mutual authentication -between OsmoSGSN and the HLR/HLR-GW. - -[[sgsn-ex-gsup]] -.Example: Using an external HLR via GSUP ----- -OsmoSGSN(config-sgsn)# gsup remote-ip 2.3.4.5 <1> -OsmoSGSN(config-sgsn)# gsup remote-port 10000 <2> -OsmoSGSN(config-sgsn)# gsup oap-k 000102030405060708090a0b0c0d0e0f <3> -OsmoSGSN(config-sgsn)# gsup oap-opc 101112131415161718191a1b1c1d1e1f <4> ----- -<1> Configure the IP address of the (remote) HLR or HLR-GW -<2> Configure the TCP port of the (remote) HLR or HLR-GW -<3> Specify the OAP shared key -<4> Specify the OAP shared OPC - - -=== CDR configuration - -OsmoSGSN can write a text log file containing CDR (call data records), -which are commonly used for accounting/billing purpose. - -.Example: CDR log file configuration ----- -OsmoSGSN(config-sgsn)# cdr filename /var/log/osmosgsn.cdr -OsmoSGSN(config-sgsn)# cdr interval 600 <1> ----- -<1> Periodically log existing PDP contexts every 600 seconds (10 min) - -The CDR file is a simple CSV file including a header line naming the -individual fields of each CSV line. - -==== CDR CTRL interface - -Independently of whether logging CDR to a file is enabled or not, OsmoSGSN can -also provide delivery of CDR through the CTRL interface. CDR are sent by means -of TRAP messages with variable name _cdr-v1_, and its value is filled using the -same CSV line format as in the log file, but without CSV header line. - -.Example: CDR delivery through CTRL TRAP messages ----- -OsmoSGSN(config-sgsn)# cdr trap ----- - -==== CDR Format - -[[sgsn-cdr]] -.Description of CSV fields in OsmoSGSN CDR file -[options="header",cols="15%,85%"] -|=== -|Field Name|Description -|timestamp|Timestamp in YYYYMMDDhhmmssXXX where XXX are milli-seconds -|imsi|IMSI causing this CDR -|imei|IMEI causing this CDR -|msisdn|MSISDN causing this CDR (if known) -|cell_id|Cell ID in which the MS was registered last -|lac|Location Area Code in which the MS was registered last -|hlr|HLR of the subscriber -|event|Possible events are explained below in <> -|=== - -If the _event_ field describes a pdp context related action (starts with -_pdp-_), then the following extra CSV fields are appended to the line: - -[[sgsn-cdr-pdp]] -.Description of extra CSV fields for pdp context related events -[options="header",cols="15%,85%"] -|=== -|Field Name|Description -|pdp_duration|duration of the PDP context so far -|ggsn_addr|GGSN related to the PDP context -|sgsn_addr|SGSN related to the PDP context -|apni|APN identifier of the PDP context -|eua_addr|IP address allocated to the PDP context -|vol_in|Number of bytes in MO direction -|vol_out|Number of bytes in MT direction -|charging_id|Related charging ID -|=== - -[[sgsn-cdr-event]] -.Description of OsmoSGSN CDR Events -[options="header",cols="15%,85%"] -|=== -|Event|Description -|attach|GMM ATTACH COMPLETE about to be sent to MS -|update|GMM ROUTING AREA UPDATE COMPLETE about to be sent to MS -|detach|GMM DETACH REQUEST received from MS -|free|Release of the MM context memory -|pdp-act|GTP CREATE PDP CONTEXT CONFIRM received from GGSN -|pdp-deact|GTP DELETE PDP CONTEXT CONFIRM received from GGSN -|pdp-terminate|Forced PDP context termination during MM context release -|pdp-free|Release of the PDP context memory -|pdp-periodic|Triggered by periodic timer, see VTY cmd _cdr interval_ -|=== - - -=== User traffic compression - -In order to save optimize GPRS bandwith, OsmoSGSN implements header and data -compression schemes. The compression will reduce the packet length in order -to save radio bandwith. - -==== Header compression - -On TCP/IP connections, each packet is prepended with a fairly long TCP/IP -header. The header contains a lot of static information that never changes -throughout the connection. (source and destination address, port numbers etc.) -OsmoSGSN implements a TCP/IP header compression scheme called RFC1144, also -known as SLHC. This type of header compression removes the TCP/IP header -entirely and replaces it with a shorter version, that only contains the -information that is absolutely necessary to identify and check the packet. -The receiving part then restores the original header and forwards it to higher -layers. - -*compression rfc1144 passive*:: -TCP/IP header compression has to be actively requested by the modem. The -network will not promote compression by itself. This is the recommended mode -of operation. - -*compression rfc1144 active slots <1-256>*:: -TCP/IP header compression is actively promoted by the network. Modems may still -actively request different compression parameters or reject the offered -compression parameters entirely. The number of slots is the maximum number -of packet headers per subscriber that can be stored in the codebook. - -.Example: Accept compression if requested: ----- -sgsn - compression rfc1144 passive ----- - -.Example: Actively promote compression: ----- -sgsn - compression rfc1144 active slots 8 ----- - -NOTE: The usage of TCP/IP options may disturb the RFC1144 header compression -scheme. TCP/IP options may render RFC1144 ineffective if variable data is -encoded into the option section of the TCP/IP packet. (e.g. TCP option 8, -Timestamp) - - -==== Data compression - -Data compression works on the raw packet data, including the header part of the -packet. If enabled, header compression is applied before first data compression -is applied. OsmoSGSN implements the V.42bis data compression scheme. - -*compression rfc1144 passive*:: -V42bis data compression has to be actively requested by the modem. The network -will not promote compression by itself. This is the recommended mode of -operation. - -*compression v42bis active direction (ms|sgsn|both) codewords <512-65535> strlen <6-250>*:: -V42bis data compression is actively promoted by the network. Modems may still -actively request different compression parameters or reject the offered -compression parameters entirely. The direction configures which sides are -allowed to send compressed packets. For most cases, compressing 'both' -directions will be the preferred option. The following to parameters configure -the codebook size by the maxium number ('codewords') and size ('strlen') of -entries. - -.Example: Accept compression if requested: ----- -sgsn - compression v42bis passive ----- - -.Example: Actively promote compression: ----- -sgsn - compression v42bis active direction both codewords 512 strlen 20 ----- diff --git a/OsmoSGSN/chapters/control.adoc b/OsmoSGSN/chapters/control.adoc deleted file mode 100644 index 0f2bfae..0000000 --- a/OsmoSGSN/chapters/control.adoc +++ /dev/null @@ -1,23 +0,0 @@ -[[control]] -== Control interface - -The actual protocol is described in <>, the variables -common to all programs using it are described in <>. Here we -describe variables specific to OsmoSGSN. - -.Variables available over control interface -[options="header",width="100%",cols="20%,5%,5%,50%,20%"] -|=== -|Name|Access|Trap|Value|Comment -|subscriber-list-active-v1|RO|No|","|See <> for details. -|=== - -[[subs]] -=== subscriber-list-active-v1 - -Return the list of active subscribers as a concatenated set of pairs "", -"addr" where first element of the pair is subscriber's IMSI and the second -element (which might be empty) is the subscriber's address. The address value -might be "none", "invalid" and "PPP" in addition to actual IP address. In case -of IP address it will be prefixed with "IPv4" or "IPv6" string depending on the -version of IP protocol. diff --git a/OsmoSGSN/chapters/counters.adoc b/OsmoSGSN/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoSGSN/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoSGSN/chapters/counters_generated.adoc b/OsmoSGSN/chapters/counters_generated.adoc deleted file mode 100644 index 756a4a5..0000000 --- a/OsmoSGSN/chapters/counters_generated.adoc +++ /dev/null @@ -1,121 +0,0 @@ -// autogenerated by show asciidoc counters -These counters and their description based on OsmoSGSN UNKNOWN (OsmoSGSN). - -// generating tables for rate_ctr_group -// rate_ctr_group table BSSGP Peer Statistics -.bssgp:bss_ctx - BSSGP Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at BSSGP Level ( In) -| packets:out | <> | Packets at BSSGP Level (Out) -| bytes:in | <> | Bytes at BSSGP Level ( In) -| bytes:out | <> | Bytes at BSSGP Level (Out) -| blocked | <> | BVC Blocking count -| discarded | <> | BVC LLC Discarded count -| status | <> | BVC Status count -|=== -// rate_ctr_group table BSSGP Peer Statistics -.bssgp:bss_ctx - BSSGP Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at BSSGP Level ( In) -| packets:out | <> | Packets at BSSGP Level (Out) -| bytes:in | <> | Bytes at BSSGP Level ( In) -| bytes:out | <> | Bytes at BSSGP Level (Out) -| blocked | <> | BVC Blocking count -| discarded | <> | BVC LLC Discarded count -| status | <> | BVC Status count -|=== -// rate_ctr_group table NSVC Peer Statistics -.ns:nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at NS Level ( In) -| packets:out | <> | Packets at NS Level (Out) -| bytes:in | <> | Bytes at NS Level ( In) -| bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count -| replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count -|=== -// rate_ctr_group table SGSN Overall Statistics -.sgsn - SGSN Overall Statistics -[options="header"] -|=== -| Name | Reference | Description -| llc:dl_bytes | <> | Count sent LLC bytes before giving it to the bssgp layer -| llc:ul_bytes | <> | Count sucessful received LLC bytes (encrypt & fcs correct) -| llc:dl_packets | <> | Count sucessful sent LLC packets before giving it to the bssgp layer -| llc:ul_packets | <> | Count sucessful received LLC packets (encrypt & fcs correct) -| gprs:attach_requested | <> | Received attach requests -| gprs:attach_accepted | <> | Sent attach accepts -| gprs:attach_rejected | <> | Sent attach rejects -| gprs:detach_requested | <> | Received detach requests -| gprs:detach_acked | <> | Sent detach acks -| gprs:routing_area_requested | <> | Received routing area requests -| gprs:routing_area_requested | <> | Sent routing area acks -| gprs:routing_area_requested | <> | Sent routing area rejects -| pdp:activate_requested | <> | Received activate requests -| pdp:activate_rejected | <> | Sent activate rejects -| pdp:activate_accepted | <> | Sent activate accepts -| pdp:request_activated | <> | unused -| pdp:request_activate_rejected | <> | unused -| pdp:modify_requested | <> | unused -| pdp:modify_accepted | <> | unused -| pdp:dl_deactivate_requested | <> | Sent deactivate requests -| pdp:dl_deactivate_accepted | <> | Sent deactivate accepted -| pdp:ul_deactivate_requested | <> | Received deactivate requests -| pdp:ul_deactivate_accepted | <> | Received deactivate accepts -|=== -// rate_ctr_group table NSVC Peer Statistics -.ns:nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description -| packets:in | <> | Packets at NS Level ( In) -| packets:out | <> | Packets at NS Level (Out) -| bytes:in | <> | Bytes at NS Level ( In) -| bytes:out | <> | Bytes at NS Level (Out) -| blocked | <> | NS-VC Block count -| dead | <> | NS-VC gone dead count -| replaced | <> | NS-VC replaced other count -| nsei-chg | <> | NS-VC changed NSEI count -| inv-nsvci | <> | NS-VCI was invalid count -| inv-nsei | <> | NSEI was invalid count -| lost:alive | <> | ALIVE ACK missing count -| lost:reset | <> | RESET ACK missing count -|=== -// generating tables for osmo_stat_items -NSVC Peer Statistics -// osmo_stat_item_group table NSVC Peer Statistics -.ns.nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| alive.delay | <> | ALIVE response time | ms -|=== -NSVC Peer Statistics -// osmo_stat_item_group table NSVC Peer Statistics -.ns.nsvc - NSVC Peer Statistics -[options="header"] -|=== -| Name | Reference | Description | Unit -| alive.delay | <> | ALIVE response time | ms -|=== -// generating tables for osmo_counters -// ungrouped osmo_counters -.ungrouped osmo counters -[options="header"] -|=== -| Name | Reference | Description -|=== - - diff --git a/OsmoSGSN/chapters/overview.adoc b/OsmoSGSN/chapters/overview.adoc deleted file mode 100644 index abc7496..0000000 --- a/OsmoSGSN/chapters/overview.adoc +++ /dev/null @@ -1,118 +0,0 @@ -[[chapter_introduction]] -== Overview - -[[intro_overview]] -=== About OsmoSGSN - -OsmoSGSN is the Osmocom implementation of the GPRS SGSN (Serving Gprs -Support Node) element inside the GPRS network. The SGSN plays a similar -central function to the GPRS network as the MSC plays in the GSM -network. - -The SGSN is connected on the downlink side to Gb interfaces of the BSS, -specifically the PCU inside the BSS. The SGSN is further connected by -the GTP protocol to the GGSN which terminates the tunnels towards the -external packet data network (e.g. IPv4). - -OsmoSGSN supports both a PCU that is co-located with(in) the BTS, as -well as a PCU that is co-located with(in) the BSC. In combination with -OsmoNITB/OsmoBSC/OsmoBTS, the PCU is co-located within the BTS. - -[[fig-gprs-pcubts]] -.GPRS network architecture with PCU in BTS -[graphviz] ----- -digraph G { - rankdir=LR; - MS0 [label="MS"]; - MS1 [label="MS"]; - MS0->BTS [label="Um"]; - MS1->BTS [label="Um"]; - BTS->BSC [label="Abis"]; - BSC->MSC [label="A"]; - BTS->PCU [label="pcu_sock"]; - PCU->SGSN [label="Gb"]; - SGSN->GGSN [label="GTP"]; -} ----- - -=== Software Components - -OsmoSGSN contains a variety of different software components, which -we'll quickly describe in this section. - -==== Gb Implementation - -OsmoSGSN implements the ETSI/3GPP specified Gb interface, including TS -08.16 (NS), TS 08.18 (BSSGP) and TS 08.64 (LLC) protocols. As transport -layers for NS, it supports NS/IP (NS encapsulated in UDP/IP), as well as -NS/FR/GRE/IP. The latter is provided in order to use a Router with -Ethernet and Frame Relay interface to convert to actual physical Frame -Relay medium, which is not directly supported by OsmoSGSN. - -The actual Gb Implementation is part of the libosmogb library, which is -in turn part of the libosmocore software package. This allows the same -Gb implementation to be used from osmo-pcu, osmo-gbproxy as well as -OsmoSGSN. - - -==== GTP Implementation - -OsmoSGSN uses the libgtp implementation originating from OsmoGGSN. It -supports both GTPv0 and GTPv1. - - -==== GMM Implementation - -The GPRS Mobility Management implementation is quite simplistic at this -point. It supports the GPRS ATTACH and GPRS ROUTING AREA UPDATE -procedures, as well as GPRS ATTACH and GPRS DETACH. - -==== LLC Implementation - -The LLC (Logical Link Control) implementation of OsmoSGSN only supports -non-acknowledged mode, as this is the most common use case in real-world -GPRS networks. - -Furthermore, it does not support IP header nor payload compression at -this point. Addition of those features is subject to customer demand or -user/customer contributions. - -The LLC implementation does support LLC encryption. However, as no HLR -access is implemented yet, there is no way to enable/configure -per-subscriber specific keys. - - -==== Session Management Implementation - -The session management procedures ACTIVATE PDP CONTEXT and DEACTIVATE -PDP CONTEXT are supported. However, no MODIFY PDP CONTEXT and no -Network-initiated PDP context activation is possible. This is again -covering the predominant use cases and configurations in GPRS real-world -networks while skipping the more esoteric features. - -Multiple PDP contexts can be attached by a single MS. - -Currently, all PDP contexts are routed to the same GGSN, irrespective of -the APN used/configured in the MS. This is sufficient (and actually -desirable) for small autonomous networks, but of course not suitable for -real networks in roaming scenarios. Please contact sysmocom in case you -require additional features such as DNS-based APN resolving. - -=== Limitations - -At the time of writing, OsmoSGSN still has a number of limitations, -which are a result of the demand-driven Open Source development model. -If you require any of those features, please consider implementing and -contributing them, or contracting the existing OsmoSGSN developers for -performing that work. - -Known Limitations include: - -* No LLC encryption support -* No interface to the OsmoNITB HLR -* No paging coordination between SGSN and MSC -* No SMS over Ps support -* No IuPS interface for 3G (in progress) -* No IP header compression -* No payload compression diff --git a/OsmoSGSN/chapters/running.adoc b/OsmoSGSN/chapters/running.adoc deleted file mode 100644 index d758b28..0000000 --- a/OsmoSGSN/chapters/running.adoc +++ /dev/null @@ -1,35 +0,0 @@ -== Running OsmoSGSN - -The OsmoSGSN executable (`osmo-sgsn`) offers the following command-line -options: - - -=== SYNOPSIS - -*osmo-sgsn* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-e 'LOGLEVEL'] - - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-d, --debug 'DBGMASK','DBGLEVELS'*:: - Set the log subsystems and levels for logging to stderr. This - has mostly been superseded by VTY-based logging configuration, - see <> for further information. -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo_sgsn.cfg` in the current - working directory. -*-s, --disable-color*:: - Disable colors for logging to stderr. This has mostly been - deprecated by VTY based logging configuration, see <> - for more information. -*-e, --log-level 'LOGLEVEL'*:: - Set the global log level for logging to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. diff --git a/OsmoSGSN/osmosgsn-usermanual-docinfo.xml b/OsmoSGSN/osmosgsn-usermanual-docinfo.xml deleted file mode 100644 index afbf109..0000000 --- a/OsmoSGSN/osmosgsn-usermanual-docinfo.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 1 - January 13, 2013 - HW - - Initial version. - - - - 2 - February 2016 - HW - - Conversion to asciidoc, removal of sysmoBTS specific parts. - - - - - - - Harald - Welte - hwelte at sysmocom.de - HW - - sysmocom - sysmocom - s.f.m.c. GmbH - Managing Director - - - - - - 2013-2016 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoSGSN/osmosgsn-usermanual.adoc b/OsmoSGSN/osmosgsn-usermanual.adoc deleted file mode 100644 index dea91a9..0000000 --- a/OsmoSGSN/osmosgsn-usermanual.adoc +++ /dev/null @@ -1,38 +0,0 @@ -:gfdl-enabled: - -OsmoSGSN User Manual -==================== -Harald Welte - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::{srcdir}/chapters/control.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/configuration.adoc[] - -include::./common/chapters/gb.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::./common/chapters/oap.adoc[] - -include::./common/chapters/gsup.adoc[] - -include::{srcdir}/chapters/counters.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] diff --git a/OsmoSGSN/osmosgsn-vty-reference.xml b/OsmoSGSN/osmosgsn-vty-reference.xml deleted file mode 100644 index 82b666a..0000000 --- a/OsmoSGSN/osmosgsn-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th January 2013 - hw - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoSGSN VTY Reference - - - 2013-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoSGSN/vty/sgsn_vty_additions.xml b/OsmoSGSN/vty/sgsn_vty_additions.xml deleted file mode 100644 index 660b695..0000000 --- a/OsmoSGSN/vty/sgsn_vty_additions.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Configure the remote GGSN, access-control and other - attributes of the SGSN - - diff --git a/OsmoSGSN/vty/sgsn_vty_reference.xml b/OsmoSGSN/vty/sgsn_vty_reference.xml deleted file mode 100644 index 52d4213..0000000 --- a/OsmoSGSN/vty/sgsn_vty_reference.xml +++ /dev/null @@ -1,2509 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-bssgp - - - config-ctrl - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-sgsn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index fff6a4f..7eabd3a 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ OsmoMGCP/Makefile OsmoNAT/Makefile OsmoNITB/Makefile - OsmoSGSN/Makefile OsmoSIPConnector/Makefile OsmoSTP/Makefile OsmoTRX/Makefile -- To view, visit https://gerrit.osmocom.org/11967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia6fae983bbcabceb3f470af750c724e12c96423e Gerrit-Change-Number: 11967 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Nov 28 13:40:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 28 Nov 2018 13:40:44 -0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMSC files (now avail in osmo-msc.git) In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11738 ) Change subject: remove OsmoMSC files (now avail in osmo-msc.git) ...................................................................... remove OsmoMSC files (now avail in osmo-msc.git) Files were added in osmo-msc.git Change-Id Ic3c5add3c87f0aadb1ffab668ce16be6d0805d33. The other project specific files will be moved in future commits. One commit per dir. Depends: osmo-msc.git Change-Id Ic3c5add3c87f0aadb1ffab668ce16be6d0805d33 Related: OS#3385 Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc --- M Makefile.am D OsmoMSC/chapters/control.adoc D OsmoMSC/chapters/counters.adoc D OsmoMSC/chapters/counters_generated.adoc D OsmoMSC/chapters/net.adoc D OsmoMSC/chapters/overview.adoc D OsmoMSC/chapters/running.adoc D OsmoMSC/images/sgs-imsi_attach_lu.msc D OsmoMSC/images/sgs-mo_call_no_ps_ho.msc D OsmoMSC/images/sgs-mo_sms_idle.msc D OsmoMSC/images/sgs-mt_call_idle.msc D OsmoMSC/images/sgs-mt_sms_idle.msc D OsmoMSC/osmomsc-usermanual-docinfo.xml D OsmoMSC/osmomsc-usermanual.adoc D OsmoMSC/osmomsc-vty-reference.xml D OsmoMSC/vty/msc_vty_additions.xml D OsmoMSC/vty/msc_vty_reference.xml M configure.ac 18 files changed, 0 insertions(+), 3,431 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index dc8f1ca..952834a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,6 @@ OsmoHLR \ OsmoMGCP \ OsmoMGW \ - OsmoMSC \ OsmoNAT \ OsmoNITB \ OsmoPCU \ diff --git a/OsmoMSC/chapters/control.adoc b/OsmoMSC/chapters/control.adoc deleted file mode 100644 index af03be7..0000000 --- a/OsmoMSC/chapters/control.adoc +++ /dev/null @@ -1,31 +0,0 @@ -[[control]] -== Control interface - -The actual protocol is described in <>, the variables common -to all programs using it are described in <>. This section -describes the CTRL interface variables specific to OsmoMSC. - -.Variables available on OsmoMSC's Control interface -[options="header",width="100%",cols="20%,5%,5%,50%,20%"] -|=== -|Name|Access|Trap|Value|Comment -|subscriber-list-active-v1|RO|No||Return list of active subscribers. -|=== - -=== subscriber-list-active-v1 - -Return a list of subscribers that are successfully attached (including full -successful authentication and ciphering if those are enabled). - -The reply comprises of one subscriber per line, of the format - ----- -,\n[,\n[...]] ----- - -For example: - ----- -901700000015252,22801 -901700000015253,22802 ----- diff --git a/OsmoMSC/chapters/counters.adoc b/OsmoMSC/chapters/counters.adoc deleted file mode 100644 index 7fbb10c..0000000 --- a/OsmoMSC/chapters/counters.adoc +++ /dev/null @@ -1,4 +0,0 @@ -[[counters]] -== Counters - -include::./counters_generated.adoc[] diff --git a/OsmoMSC/chapters/counters_generated.adoc b/OsmoMSC/chapters/counters_generated.adoc deleted file mode 100644 index afeb8ff..0000000 --- a/OsmoMSC/chapters/counters_generated.adoc +++ /dev/null @@ -1,40 +0,0 @@ -// autogenerated by show asciidoc counters -These counters and their description based on OsmoMSC UNKNOWN (OsmoMSC). - -// generating tables for rate_ctr_group -// rate_ctr_group table mobile switching center -.msc - mobile switching center -[options="header"] -|=== -| Name | Reference | Description -| loc_update_type:attach | <> | Received location update imsi attach requests. -| loc_update_type:normal | <> | Received location update normal requests. -| loc_update_type:periodic | <> | Received location update periodic requests. -| loc_update_type:detach | <> | Received location update detach indication. -| loc_update_resp:failed | <> | Rejected location updates. -| loc_update_resp:completed | <> | Successful location updates. -| sms:submitted | <> | Received a RPDU from a MS (MO). -| sms:no_receiver | <> | Counts SMS which couldn't routed because no receiver found. -| sms:delivered | <> | Global SMS Deliver attempts. -| sms:rp_err_mem | <> | CAUSE_MT_MEM_EXCEEDED errors of MS responses on a sms deliver attempt. -| sms:rp_err_other | <> | Other error of MS responses on a sms delive attempt. -| sms:deliver_unknown_error | <> | Unknown error occured during sms delivery. -| call:mo_setup | <> | Received setup requests from a MS to init a MO call. -| call:mo_connect_ack | <> | Received a connect ack from MS of a MO call. Call is now succesful connected up. -| call:mt_setup | <> | Sent setup requests to the MS (MT). -| call:mt_connect | <> | Sent a connect to the MS (MT). -| call:active | <> | Count total amount of calls that ever reached active state. -| call:complete | <> | Count total amount of calls which got terminated by disconnect req or ind after reaching active state. -| call:incomplete | <> | Count total amount of call which got terminated by any other reason after reaching active state. -|=== -// generating tables for osmo_stat_items -// generating tables for osmo_counters -// ungrouped osmo_counters -.ungrouped osmo counters -[options="header"] -|=== -| Name | Reference | Description -| msc.active_calls | <> | -|=== - - diff --git a/OsmoMSC/chapters/net.adoc b/OsmoMSC/chapters/net.adoc deleted file mode 100644 index 06be4ba..0000000 --- a/OsmoMSC/chapters/net.adoc +++ /dev/null @@ -1,154 +0,0 @@ -[[net]] -== Configuring the Core Network - -The core network parameters are configured by the config file (as in `osmo-msc --c osmo-msc.cfg`). The config file is parsed by the VTY, which is also -available via telnet in the running `osmo-msc` instance. Be aware that even -though you may be able to change these parameters without restarting -`osmo-msc`, some may not take immediate effect, and it is safest to use the -config file to have these parameters set at startup time. - -The core network parameters are found in the `config` / `network`. - -A full reference to the available commands can be found in the _OsmoMSC VTY -reference manual_ <>. This section describes only the most -commonly used settings. - -Here is an overview of the config items, described in more detail below: - ----- -network - network country code 262 - mobile network code 89 - mm info 1 - short name OsmoMSC - long name OsmoMSC - authentication required - encryption a5 3 ----- - -[TIP] -==== -Use the telnet VTY interface to query the current configuration of a running -`osmo-msc` process: - ----- -$ telnet localhost 4254 -OsmoMSC> enable -OsmoMSC# show running-config ----- - -Some parameters may be changed without restarting `osmo-msc`. To reach the -`network` node, enter: - ----- -OsmoMSC> enable -OsmoMSC# configure terminal -OsmoMSC(config)# network -OsmoMSC(config-net)# short name Example-Name -OsmoMSC(config-net)# exit -OsmoMSC(config)# ----- - -The telnet VTY features tab-completion as well as context sensitive help shown -when entering a `?` question mark. - -You can always use the `list` VTY command or enter `?` on the blank prompt to -get a list of all possible commands at the current node. -==== - - -=== MCC/MNC - -The key identities of every GSM PLMN is the Mobile Country Code and the Mobile -Network Code. They are identical over the entire network. In most cases, the -MCC/MNC will be allocated to the operator by the respective local regulatory -authority. For example, to set the MCC/MNC of 262-89, have this in your -osmo-msc.cfg: - ----- -network - network country code 262 - mobile network code 89 ----- - - -=== Configuring MM INFO - -The _MM INFO_ procedure can be used after a successful _LOCATION UPDATE_ in -order to transmit the human-readable network name as well as local time zone -information to the MS. By default, _MM INFO_ is not active, i.e. `0`. Set to `1` -to activate this feature: - ----- -network - mm info 1 - short name OsmoMSC - long name OsmoMSC ----- - -[NOTE] -==== -Not all phones support the MM INFO procedure. If a phone is not -factory-programmed to contain the name for your MCC/MNC, it will likely only -provide a numeric display of the network name, such as _262-89_, or show the -country code transformed into a letter, such as _D 89_. -==== - -The time information transmitted is determined by the local system time of the -operating system on which OsmoMSC is running. - - -=== Authentication - -Authorized subscribers must be entered in the HLR database, see the _OsmoHLR -reference manual_ <>. If authentication tokens (such as KI for -2G, or K and OP/OPC for UMTS) are present in the HLR, OsmoMSC will only attach -a subscriber after successful authentication. - -If no authentication keys are present in the HLR for a given subscriber, -OsmoMSC will attach the subscriber _without_ authentication. You can reject -subscribers that lack authentication info in the HLR with this setting: - ----- -network - authentication required ----- - -=== Ciphering - -To enable ciphering on the radio link, authentication must take place first: -the Kc resulting from authentication is the key used for ciphering. Hence, all -subscribers must have authentication tokens available in the HLR for ciphering. - -The MS, BTS and MSC must agree on a ciphering algorithm to use. - -- The MS sends its supported ciphering algorithms via Classmark IEs during - Location Updating. -- Typically the BSC needs to know which A5 ciphers are supported by connected - BTSes. -- Finally, OsmoMSC may impose that specific A5 ciphers shall not be considered. - -It is the responsibility of the BSC to then pick an A5 cipher that satisfies -all requirements. - -- In OsmoMSC, A5/0 means that ciphering is turned off. -+ ----- -network - encryption a5 0 ----- - -- A5/1 and A5/3 are currently supported by Osmocom. -+ ----- -network - encryption a5 3 ----- - -- Never use A5/2: it is an "export grade cipher" and has been deprecated for - its low ciphering strength. - -NOTE: At the time of writing, OsmoMSC supports setting only a single A5 cipher, -while it should be able to allow a set of ciphers. This is subject to ongoing -development. diff --git a/OsmoMSC/chapters/overview.adoc b/OsmoMSC/chapters/overview.adoc deleted file mode 100644 index 0bb47d7..0000000 --- a/OsmoMSC/chapters/overview.adoc +++ /dev/null @@ -1,127 +0,0 @@ -[[overview]] -== Overview - -This manual should help you getting started with OsmoMSC. It will cover -aspects of configuring and running the OsmoMSC. - -[[intro_overview]] -=== About OsmoMSC - -OsmoMSC is the Osmocom implementation of a Mobile Switching Center (MSC) for 2G -and 3G GSM and UMTS mobile networks. Its interfaces are: - -- GSUP towards OsmoHLR (or a MAP proxy); -- A over IP towards a BSC (e.g. OsmoBSC); -- IuCS towards an RNC or HNB-GW (e.g. OsmoHNBGW) for 3G voice; -- MNCC (Mobile Network Call Control derived from GSM TS 04.07); -- SMPP 3.4 (Short Message Peer-to-Peer); -- The Osmocom typical telnet VTY and CTRL interfaces. - -OsmoMSC originated from the OpenBSC project, which started as a minimalistic -all-in-one implementation of the GSM Network. In 2017, OpenBSC had reached -maturity and diversity (including M3UA SIGTRAN and 3G support in the form of -IuCS and IuPS interfaces) that naturally lead to a separation of the all-in-one -approach to fully independent separate programs as in typical GSM networks. -Before it was split off, OsmoMSC originated from libmsc of the old openbsc.git. -Since a true _A_ interface and IuCS for 3G support is available, OsmoMSC -exists only as a separate standalone entity. - -Key differences of the new OsmoMSC compared to the old OsmoNITB are: - -- The complete VLR implementation that communicates with the separate HLR - (OsmoHLR) for subscriber management. In contrast to the OsmoNITB, HLR queries - are fully asynchronous, and the separate HLR allows using centralized - subscriber management for both circuit-switched and packet-switched domains - (i.e. one OsmoHLR for both OsmoMSC and OsmoSGSN). - -- VLR and HLR brought full UMTS AKA (Authentication and Key Agreement) support, - i.e. Milenage authentication in both the full 3G variant as well as the - backwards compatible 2G variant. - -- Addition of a true _A_ interface for 2G voice services. Previously, OsmoBSC - had an SCCPlite based _A_ interface towards 3rd party MSC implementations. - OsmoMSC features a true SCCP/M3UA _A_ interface, which allows running OsmoBSC - against this Osmocom based MSC implementation. The new SCCP/M3UA SIGTRAN for - the _A_ interface is implemented in libosmo-sccp, which is used by OsmoMSC - and OsmoBSC (and others), to establish a link via an STP (e.g. OsmoSTP). - -- Addition of an _IuCS_ interface to allow operating 3G voice services, also - via SCCP/M3UA SIGTRAN, for example connecting via OsmoHNBGW to a 3G small - cell device. - -Find the OsmoMSC issue tracker and wiki online at - -- https://osmocom.org/projects/osmomsc -- https://osmocom.org/projects/osmomsc/wiki - - -[[fig-gsm]] -.Typical GSM network architecture used with OsmoMSC -[graphviz] ----- -digraph G { - rankdir=LR; - MS0 [label="MS"] - MS1 [label="MS"] - MS2 [label="MS"] - MS3 [label="MS"] - UE0 [label="UE"] - UE1 [label="UE"] - BTS0 [label="BTS"] - BTS1 [label="BTS"] - STP [label="STP\n(SCCP routing)"] - HLR [label="HLR+AUC+EIR"] - HNB [label="RNC or hNodeB"] - MGW - MS0->BTS0 [label="Um"] - MS1->BTS0 [label="Um"] - MS2->BTS1 [label="Um"] - MS3->BTS1 [label="Um"] - UE0->HNB - UE1->HNB - BTS0->BSC [label="Abis"] - BTS1->BSC [label="Abis"] - BSC->STP [label="A/SCCP/M3UA"] - STP->MSC [label="A/SCCP/M3UA"] - STP->MSC [label="IuCS/SCCP/M3UA"] - VLR->HLR [label="GSUP"] - HNB->HNBGW [label="Iuh"] - HNBGW->STP [label="IuCS/SCCP/M3UA"] - MSC->MGW [label="MGCP"] - BTS0->MGW [label="RTP"] - BTS1->MGW [label="RTP"] - subgraph cluster_msc { - label = "OsmoMSC"; - MSC->SMSC; - MSC->VLR - } -} ----- - - -=== Software Components - -This is a brief description of OsmoMSC's internal software components. - -==== SMSC - -A minimal store-and-forward server for SMS, supporting both MO and MT -SMS service, as well as multi-part messages. - -The built-in SMSC also supports an external SMSC interface. For more -information, see <>. - -==== MSC - -The MSC component implements the mobility management (MM) functions of the TS -04.08 and delegates to SMSC for SMS message handling and the VLR for subscriber -management. - -Furthermore, it can handle TS 04.08 Call Control (CC), either by use of -an internal MNCC handler, or by use of an external MNCC agent. For more -information see <>. - -==== VLR - -A fully featured Visitor Location Register handles the subscriber management -and authentication, and interfaces via GSUP to the external HLR. diff --git a/OsmoMSC/chapters/running.adoc b/OsmoMSC/chapters/running.adoc deleted file mode 100644 index cb68157..0000000 --- a/OsmoMSC/chapters/running.adoc +++ /dev/null @@ -1,148 +0,0 @@ -== Running OsmoMSC - -The OsmoMSC executable (`osmo-msc`) offers the following command-line -arguments: - -=== SYNOPSIS - -*osmo-msc* [-h|-V] [-d 'DBGMASK'] [-D] [-c 'CONFIGFILE'] [-s] [-T] [-e 'LOGLEVEL'] [-l 'DATABASE'] [-M 'SOCKETPATH'] [-C] - -=== OPTIONS - -*-h, --help*:: - Print a short help message about the supported options -*-V, --version*:: - Print the compile-time version number of the OsmoBTS program -*-d, --debug 'DBGMASK','DBGLEVELS'*:: - Set the log subsystems and levels for logging to stderr. This - has mostly been superseded by VTY-based logging configuration, - see <> for further information. -*-D, --daemonize*:: - Fork the process as a daemon into background. -*-c, --config-file 'CONFIGFILE'*:: - Specify the file and path name of the configuration file to be - used. If none is specified, use `osmo-msc.cfg` in the current - working directory. -*-s, --disable-color*:: - Disable colors for logging to stderr. This has mostly been - deprecated by VTY based logging configuration, see <> - for more information. -*-T, --timestamp*:: - Enable time-stamping of log messages to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. -*-e, --log-level 'LOGLEVEL'*:: - Set the global log level for logging to stderr. This has mostly - been deprecated by VTY based logging configuration, see - <> for more information. -*-l, --database 'DATABASE'*:: - Specify the file name of the SQLite3 database to use as SMS storage -*-M, --mncc-sock-path*:: - Enable the MNCC socket for an external MNCC handler. See - <> for further information. -*-m, --mncc-sock*:: - Same as option -M (deprecated). -*-C, --no-dbcounter*:: - Disable the regular periodic synchronization of statistics - counters to the database. - - -=== Multiple instances - -Running multiple instances of `osmo-msc` on the same computer is possible if all -interfaces (VTY, CTRL) are separated using the appropriate configuration -options. The IP based interfaces are binding to local host by default. In order -to separate the processes, the user has to bind those services to specific but -different IP addresses and/or ports. - -The VTY and the Control interface can be bound to IP addresses from the loopback -address range, for example: - ----- -line vty - bind 127.0.0.2 -ctrl - bind 127.0.0.2 ----- - -If external SMPP is enabled, you may bind it to a different interface using: - ----- -smpp - local-tcp-ip 10.23.42.1 2775 ----- - -More on SMPP configuration in <>. - -The external MNCC handler is configured by the `--mncc-sock` commandline -argument. Choose a different such socket path for each OsmoMSC instance running -on the same file system. See more in <>. - -For the following links, OsmoMSC acts as a client and does not listen/bind to a -specific interface, and will hence not encounter conflicts for multiple instances -running on the same interface: - -- The SCCP/M3UA links are established by OsmoMSC contacting an STP. -- The GSUP link is established by OsmoMSC contacting an HLR. - - -=== Configure primary links - -==== Configure SCCP/M3UA to accept _A_ and _IuCS_ links - -OsmoMSC will contact an STP instance to establish an SCCP/M3UA link. BSC and -HNBGW will then reach the MSC via this link. By default, an STP instance is -assumed to listen on the default M3UA port (2905) on the local host. - -Establishing an SCCP/M3UA link towards an STP instance not on the local host -can be configured as follows: - ----- -cs7 instance 0 - asp my-OsmoMSC 2905 0 m3ua - ! IP address of the remote STP: - remote-ip 10.23.24.1 ----- - -Note that _A_ and _IuCS_ may use different SCCP instances, if so desired: - ----- -cs7 instance 0 - asp my-OsmoMSC-A 2905 0 m3ua - remote-ip 10.23.42.1 -cs7 instance 1 - asp my-OsmoMSC-Iu 2905 0 m3ua - remote-ip 10.23.42.2 -msc - cs7-instance-a 0 - cs7-instance-iu 1 ----- - -A full configuration needs an `asp` on an `as` -- an Application Server Process -running on an Application Server -- as well as a local point code and routing -configuration. The SCCP VTY automatically creates those parts that are missing, -by assuming sane defaults. A complete configuration would look like this: - ----- -cs7 instance 0 - point-code 0.23.1 - asp my-OsmoMSC-A-Iu 2905 0 m3ua - remote-ip 127.0.0.1 - as my-as-for-OsmoMSC-A-Iu m3ua - asp my-OsmoMSC-A-Iu - routing-key 0 0.23.1 ----- - -==== Configure GSUP to reach the HLR - -OsmoMSC will assume a GSUP server (OsmoHLR) to run on the local host and the -default GSUP port (4222). Contacting an HLR at a different IP address can be -configured as follows: - ----- -hlr - ! IP address of the remote HLR: - remote-ip 10.23.42.1 - ! default port is 4222, optionally configurable by: - remote-port 1234 ----- diff --git a/OsmoMSC/images/sgs-imsi_attach_lu.msc b/OsmoMSC/images/sgs-imsi_attach_lu.msc deleted file mode 100644 index e62c2b8..0000000 --- a/OsmoMSC/images/sgs-imsi_attach_lu.msc +++ /dev/null @@ -1,15 +0,0 @@ -msc { - UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"]; - - UE => MME [label="Attach Request"]; - UE box HSS [label="Steps 3..16 of LTE Attach procedure TS 23.401"]; - MME box MME [label="Derive VLR Number"]; - MME => VLR [label="LU Request"]; - VLR box VLR [label="Create SGs Association"]; - VLR box HSS [label="MAP/GSUP UL / ISD"]; - MME <= VLR [label="LU Accept"]; - UE box HSS [label="Steps 17..16 of LTE Attach procedure TS 23.401"]; - |||; - ...; - MME <= VLR [label="Paging Request"]; -} diff --git a/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc b/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc deleted file mode 100644 index f886c89..0000000 --- a/OsmoMSC/images/sgs-mo_call_no_ps_ho.msc +++ /dev/null @@ -1,18 +0,0 @@ -msc { - hscale=2; - UE, ENB [label="eNodeB"], BSS, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"]; - - UE => MME [label="NAS Extended Service Request"]; - ENB <= MME [label="S1-AP UE Context Mod Req with CSFB"]; - ENB => MME [label="S1-AP UE Context Mod Resp"]; - UE <= ENB [label="NACC (Network Assisted Cell Change)"]; - ENB => MME [label="S1-AP S1 UE Context Release Req"]; - UE box MME [label="S1 UE Context Release"]; - - UE box HSS [label="UE changes RAT then LA and/or RA update"]; - UE <=> HSS [label="PS Suspend (TS 23.060)"]; - - UE => BSS [label="CM SERV REQ"]; - BSS => VLR [label="COMPL L3 (CM SERV REQ)"]; - UE <=> VLR [label="Normal 2G Voice Call"]; -} diff --git a/OsmoMSC/images/sgs-mo_sms_idle.msc b/OsmoMSC/images/sgs-mo_sms_idle.msc deleted file mode 100644 index 5acc0e8..0000000 --- a/OsmoMSC/images/sgs-mo_sms_idle.msc +++ /dev/null @@ -1,21 +0,0 @@ -msc { - hscale=2; - UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"], SMSC; - - UE box HSS [label="EPS/IMSI attach procedure"]; - ...; - UE box MME [label="UE triggered Service Request"]; - UE => MME [label="UL NAS Transport"]; - MME => VLR [label="SGsAP UPLINK UNITDATA\n(CP-DATA/RP-DATA/TPDU)"]; - VLR => SMSC [label="MAP/GSUP Forward SM"]; - MME <= VLR [label="SGsAP DOWNLINK UNITDATA"]; - UE <= MME [label="DL NAS Transport"]; - ...; - - VLR <= SMSC [label="Delivery Report"]; - MME <= VLR [label="SGsAP DOWNLINK UNITDATA"]; - UE <= MME [label="DL NAS Transport"]; - UE => MME [label="UL NAS Transport"]; - MME => VLR [label="SGsAP UPLINK UNITDATA"]; - MME <= VLR [label="SGsAP RELEASE REQ"]; -} diff --git a/OsmoMSC/images/sgs-mt_call_idle.msc b/OsmoMSC/images/sgs-mt_call_idle.msc deleted file mode 100644 index b3cff3c..0000000 --- a/OsmoMSC/images/sgs-mt_call_idle.msc +++ /dev/null @@ -1,17 +0,0 @@ -msc { - hscale=2; - UE, ENB [label="eNodeB"], BSS, MME, VLR [label="MSC/VLR"], PSTN; - - VLR <= PSTN [label="ISUP IAM or SIP INVITE"]; - MME <= VLR [label="SGsAP PAGING REQUEST"]; - ENB <= MME [label="Paging"]; - UE <= MME [label="Paging"]; - - UE => MME [label="Extended Service Req"]; - MME => VLR [label="SGsAP SERVICE REQUEST"]; - ENB <= MME [label="Initial UE Ctx Setup"]; - - UE => BSS [label="Paging Response"]; - BSS => VLR [label="COMPL L3 (PAGING RESP)"]; - UE <=> VLR [label="Normal 2G Voice Call"]; -} diff --git a/OsmoMSC/images/sgs-mt_sms_idle.msc b/OsmoMSC/images/sgs-mt_sms_idle.msc deleted file mode 100644 index 7b453e0..0000000 --- a/OsmoMSC/images/sgs-mt_sms_idle.msc +++ /dev/null @@ -1,22 +0,0 @@ -msc { - hscale=2; - UE, MME, VLR [label="MSC/VLR"], HSS [label="HSS/HLR"], SMSC; - - UE box HSS [label="EPS/IMSI attach procedure"]; - ...; - - VLR <= SMSC [label="MAP/GSUP ForwardSM"]; - MME <= VLR [label="SGsAP PAGING"]; - UE <= MME [label="Paging"]; - UE box MME [label="Service Request"]; - MME => VLR [label="SGsAP SERVICE REQ"]; - MME <= VLR [label="SGsAP DL UNITDATA\n(CP-DATA/RP-DATA/TPDU)"]; - UE <= MME [label="DL NAS Transport"]; - UE => MME [label="UL NAS Transport"]; - MME => VLR [label="SGsAP UL UNITDATA"]; - ...; - UE => MME [label="UL NAS Transport"]; - MME => VLR [label="SGsAP UL UNITDATA"]; - VLR => SMSC [label="Delivery report"]; - MME <= VLR [label="SGsAP RELEASE REQ"]; -} diff --git a/OsmoMSC/osmomsc-usermanual-docinfo.xml b/OsmoMSC/osmomsc-usermanual-docinfo.xml deleted file mode 100644 index d99bba7..0000000 --- a/OsmoMSC/osmomsc-usermanual-docinfo.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 1 - September 18th, 2017 - NH - - Initial version; based on OsmoNITB manual version 2. - - - - - - - Neels - Hofmeyr - nhofmeyr at sysmocom.de - NH - - sysmocom - sysmocom - s.f.m.c. GmbH - Senior Developer - - - - - - 2017 - sysmocom - s.f.m.c. GmbH - - - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with the Invariant Sections being just 'Foreword', - 'Acknowledgements' and 'Preface', with no Front-Cover Texts, - and no Back-Cover Texts. A copy of the license is included in - the section entitled "GNU Free Documentation License". - - - The Asciidoc source code of this manual can be found at - - http://git.osmocom.org/osmo-gsm-manuals/ - - - diff --git a/OsmoMSC/osmomsc-usermanual.adoc b/OsmoMSC/osmomsc-usermanual.adoc deleted file mode 100644 index 4fd0cc7..0000000 --- a/OsmoMSC/osmomsc-usermanual.adoc +++ /dev/null @@ -1,40 +0,0 @@ -:gfdl-enabled: -:program-name: OsmoMSC - -OsmoMSC User Manual -==================== -Neels Hofmeyr - - -include::./common/chapters/preface.adoc[] - -include::{srcdir}/chapters/overview.adoc[] - -include::{srcdir}/chapters/running.adoc[] - -include::{srcdir}/chapters/control.adoc[] - -include::{srcdir}/chapters/counters.adoc[] - -include::./common/chapters/vty.adoc[] - -include::./common/chapters/logging.adoc[] - -include::{srcdir}/chapters/net.adoc[] - -include::./common/chapters/smpp.adoc[] - -include::./common/chapters/mncc.adoc[] - -include::./common/chapters/control_if.adoc[] - -include::./common/chapters/gsup.adoc[] - -include::./common/chapters/port_numbers.adoc[] - -include::./common/chapters/bibliography.adoc[] - -include::./common/chapters/glossary.adoc[] - -include::./common/chapters/gfdl.adoc[] - diff --git a/OsmoMSC/osmomsc-vty-reference.xml b/OsmoMSC/osmomsc-vty-reference.xml deleted file mode 100644 index 132f200..0000000 --- a/OsmoMSC/osmomsc-vty-reference.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - -]> - - - - - - v1 - 18th September 2017 - nh - Initial - - - - OsmoMSC VTY Reference - - - 2017 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoMSC/vty/msc_vty_additions.xml b/OsmoMSC/vty/msc_vty_additions.xml deleted file mode 100644 index adc0f7e..0000000 --- a/OsmoMSC/vty/msc_vty_additions.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - MNCC Internal Configuration - This node allows to configure the default codecs for - the internal call control handling. - - - SMPP Configuration - This node allows to configure the SMPP interface - for interfacing with external SMS applications. This section - contains generic/common SMPP related configuration, and no - per-ESME specific parameters. - - - ESME Configuration - This node allows to configure one particular SMPP - ESME, which is an External SMS Entity such as a SMS based - application server. You can define any number of ESME within - the SMPP node of the OsmoNITB VTY. - - diff --git a/OsmoMSC/vty/msc_vty_reference.xml b/OsmoMSC/vty/msc_vty_reference.xml deleted file mode 100644 index bb7e958..0000000 --- a/OsmoMSC/vty/msc_vty_reference.xml +++ /dev/null @@ -1,2686 +0,0 @@ - - - Common Commands - These commands are available on all VTY nodes. They are listed here only once, to unclutter the VTY reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - view - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - enable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-log - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-stats - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-line - - - - - - - - - - - - - - - - - - - - config-ctrl - - - - - - - - - config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-as - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-asp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-cs7-sccpaddr-gt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-net - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-msc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-mncc-int - - - - - - - - - - - - - - - - - - - - config-smpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-smpp-esme - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config-hlr - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index e890b3e..48570a8 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,6 @@ OsmoHLR/Makefile OsmoMGCP/Makefile OsmoMGW/Makefile - OsmoMSC/Makefile OsmoNAT/Makefile OsmoNITB/Makefile OsmoPCU/Makefile -- To view, visit https://gerrit.osmocom.org/11738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc Gerrit-Change-Number: 11738 Gerrit-PatchSet: 9 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 10:05:38 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 10:05:38 -0000 Subject: Change in osmo-gsm-manuals[master]: remove obsolete project files and leftovers Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12003 Change subject: remove obsolete project files and leftovers ...................................................................... remove obsolete project files and leftovers Remove OsmoMGCP and OsmoNAT: old vty references from the initial checkin in 2016, which could easily be re-generated if needed. Remove leftover OsmoMSC/Makefile.am, which should have been deleted already in Ib234fe4f4ac36c27a4ad8a8d0050c1d6874232bc ("remove OsmoMSC files (now avail in osmo-msc.git)"). Remove the upload taget in Makefile.am, as there are not project specific files anymore. Related: OS#3385 Change-Id: I8716c41b03b09250e61e6a29fe9589454258fe03 --- M Makefile.am D OsmoMGCP/Makefile.am D OsmoMGCP/osmomgcp-vty-reference.xml D OsmoMGCP/vty/mgcp_vty_additions.xml D OsmoMGCP/vty/mgcp_vty_reference.xml D OsmoMSC/Makefile.am D OsmoNAT/Makefile.am D OsmoNAT/osmonat-vty-reference.xml D OsmoNAT/vty/nat_vty_additions.xml D OsmoNAT/vty/nat_vty_reference.xml M configure.ac 11 files changed, 2 insertions(+), 3,635 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/03/12003/1 diff --git a/Makefile.am b/Makefile.am index 64623af..2a7b881 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,9 +5,7 @@ pkgconfig_DATA = osmo-gsm-manuals.pc BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) -SUBDIRS = tests \ - OsmoMGCP \ - OsmoNAT +SUBDIRS = tests $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ @@ -30,8 +28,3 @@ uninstall-local: rm -rv "$(share_path)" "$(DESTDIR)$(prefix)/bin/osmo-gsm-manuals-check-depends" - -upload: - for i in Osmo*; do \ - $(MAKE) -C "$$i" upload || exit 1; \ - done diff --git a/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am deleted file mode 100644 index 2c14728..0000000 --- a/OsmoMGCP/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmomgcp-vty-reference.xml \ - vty - -VTY_REFERENCE = osmomgcp-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMGCP/osmomgcp-vty-reference.xml b/OsmoMGCP/osmomgcp-vty-reference.xml deleted file mode 100644 index e9cc898..0000000 --- a/OsmoMGCP/osmomgcp-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th August 2012 - hf - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoMGCP VTY Reference - - - 2012-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoMGCP/vty/mgcp_vty_additions.xml b/OsmoMGCP/vty/mgcp_vty_additions.xml deleted file mode 100644 index a11cdf0..0000000 --- a/OsmoMGCP/vty/mgcp_vty_additions.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - MGCP Global Commands - This node allows to configure global MGCP settings. These include - the various port numbers. - - - - MGCP Trunk Command - This node allows to configure a MGCP trunk. These include the number, - the local binding ports, SDP configuration. - - diff --git a/OsmoMGCP/vty/mgcp_vty_reference.xml b/OsmoMGCP/vty/mgcp_vty_reference.xml deleted file mode 100644 index 6ea76a5..0000000 --- a/OsmoMGCP/vty/mgcp_vty_reference.xml +++ /dev/null @@ -1,1397 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OsmoMSC/Makefile.am b/OsmoMSC/Makefile.am deleted file mode 100644 index 0fcd1ff..0000000 --- a/OsmoMSC/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmomsc-usermanual.adoc \ - osmomsc-usermanual-docinfo.xml \ - osmomsc-vty-reference.xml \ - chapters \ - images \ - vty - -ASCIIDOC = osmomsc-usermanual.adoc -ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc - -VTY_REFERENCE = osmomsc-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am deleted file mode 100644 index a7b0430..0000000 --- a/OsmoNAT/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmonat-vty-reference.xml \ - vty - -VTY_REFERENCE = osmonat-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoNAT/osmonat-vty-reference.xml b/OsmoNAT/osmonat-vty-reference.xml deleted file mode 100644 index 8f8b096..0000000 --- a/OsmoNAT/osmonat-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th August 2012 - hf - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoNAT VTY Reference - - - 2012-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoNAT/vty/nat_vty_additions.xml b/OsmoNAT/vty/nat_vty_additions.xml deleted file mode 100644 index 4aa67f6..0000000 --- a/OsmoNAT/vty/nat_vty_additions.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - MGCP Commands - This node allows to configure global MGCP settings. These include - the various port numbers. - - - - - NAT Commands - This node allows to configure the global NAT settings. These include - the destination address of the MSC, the filter and rewriting rules to use. - - - - BSC Commands - This node allows to configure a BSC. A BSC has a list of - LACs, an access token associated to it. - - - - - - - Paging Group Commands - This node allows to configure a Paging Group. A Paging Group - holds the LACs of several destinations and a BSC can refer to a Paging - Group. This way several BSCs can receive the paging for a shared LAC. - - - diff --git a/OsmoNAT/vty/nat_vty_reference.xml b/OsmoNAT/vty/nat_vty_reference.xml deleted file mode 100644 index 80fe08f..0000000 --- a/OsmoNAT/vty/nat_vty_reference.xml +++ /dev/null @@ -1,2061 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/configure.ac b/configure.ac index 764da31..d2858e4 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,4 @@ AC_OUTPUT( osmo-gsm-manuals.pc Makefile - tests/Makefile - OsmoMGCP/Makefile - OsmoNAT/Makefile) + tests/Makefile) -- To view, visit https://gerrit.osmocom.org/12003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8716c41b03b09250e61e6a29fe9589454258fe03 Gerrit-Change-Number: 12003 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:26:53 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 15:26:53 -0000 Subject: Change in openbsc[master]: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12010 Change subject: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git ...................................................................... OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git Add both manuals to manuals/OsmoMGCP and manuals/OsmoNAT. Build them just like the existing OsmoNITB manual: $ cd manuals/OsmoMGCP $ make The commit history only consisted of the initial commit and was not imported. Related: OS#3385 Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 --- A manuals/OsmoMGCP/Makefile A manuals/OsmoMGCP/osmomgcp-vty-reference.xml A manuals/OsmoMGCP/vty/mgcp_vty_additions.xml A manuals/OsmoMGCP/vty/mgcp_vty_reference.xml A manuals/OsmoNAT/Makefile A manuals/OsmoNAT/osmonat-vty-reference.xml A manuals/OsmoNAT/vty/nat_vty_additions.xml A manuals/OsmoNAT/vty/nat_vty_reference.xml 8 files changed, 3,606 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/10/12010/1 diff --git a/manuals/OsmoMGCP/Makefile b/manuals/OsmoMGCP/Makefile new file mode 100644 index 0000000..022f6d4 --- /dev/null +++ b/manuals/OsmoMGCP/Makefile @@ -0,0 +1,7 @@ +OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) + +VTY_REFERENCE = osmomgcp-vty-reference.xml +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml b/manuals/OsmoMGCP/osmomgcp-vty-reference.xml new file mode 100644 index 0000000..e9cc898 --- /dev/null +++ b/manuals/OsmoMGCP/osmomgcp-vty-reference.xml @@ -0,0 +1,44 @@ + + + + +]> + + + + + + v1 + 13th August 2012 + hf + Initial + + + v2 + 5th March 2014 + hf + Update to match osmo-bsc version 0.13.0-305 + + + + OsmoMGCP VTY Reference + + + 2012-2014 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/manuals/OsmoMGCP/vty/mgcp_vty_additions.xml b/manuals/OsmoMGCP/vty/mgcp_vty_additions.xml new file mode 100644 index 0000000..a11cdf0 --- /dev/null +++ b/manuals/OsmoMGCP/vty/mgcp_vty_additions.xml @@ -0,0 +1,14 @@ + + + + MGCP Global Commands + This node allows to configure global MGCP settings. These include + the various port numbers. + + + + MGCP Trunk Command + This node allows to configure a MGCP trunk. These include the number, + the local binding ports, SDP configuration. + + diff --git a/manuals/OsmoMGCP/vty/mgcp_vty_reference.xml b/manuals/OsmoMGCP/vty/mgcp_vty_reference.xml new file mode 100644 index 0000000..6ea76a5 --- /dev/null +++ b/manuals/OsmoMGCP/vty/mgcp_vty_reference.xml @@ -0,0 +1,1397 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/manuals/OsmoNAT/Makefile b/manuals/OsmoNAT/Makefile new file mode 100644 index 0000000..9c380a2 --- /dev/null +++ b/manuals/OsmoNAT/Makefile @@ -0,0 +1,7 @@ +OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) + +VTY_REFERENCE = osmonat-vty-reference.xml +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/manuals/OsmoNAT/osmonat-vty-reference.xml b/manuals/OsmoNAT/osmonat-vty-reference.xml new file mode 100644 index 0000000..8f8b096 --- /dev/null +++ b/manuals/OsmoNAT/osmonat-vty-reference.xml @@ -0,0 +1,44 @@ + + + + +]> + + + + + + v1 + 13th August 2012 + hf + Initial + + + v2 + 5th March 2014 + hf + Update to match osmo-bsc version 0.13.0-305 + + + + OsmoNAT VTY Reference + + + 2012-2014 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/manuals/OsmoNAT/vty/nat_vty_additions.xml b/manuals/OsmoNAT/vty/nat_vty_additions.xml new file mode 100644 index 0000000..4aa67f6 --- /dev/null +++ b/manuals/OsmoNAT/vty/nat_vty_additions.xml @@ -0,0 +1,32 @@ + + + + MGCP Commands + This node allows to configure global MGCP settings. These include + the various port numbers. + + + + + NAT Commands + This node allows to configure the global NAT settings. These include + the destination address of the MSC, the filter and rewriting rules to use. + + + + BSC Commands + This node allows to configure a BSC. A BSC has a list of + LACs, an access token associated to it. + + + + + + + Paging Group Commands + This node allows to configure a Paging Group. A Paging Group + holds the LACs of several destinations and a BSC can refer to a Paging + Group. This way several BSCs can receive the paging for a shared LAC. + + + diff --git a/manuals/OsmoNAT/vty/nat_vty_reference.xml b/manuals/OsmoNAT/vty/nat_vty_reference.xml new file mode 100644 index 0000000..80fe08f --- /dev/null +++ b/manuals/OsmoNAT/vty/nat_vty_reference.xml @@ -0,0 +1,2061 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/12010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 Gerrit-Change-Number: 12010 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 15:33:41 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 15:33:41 -0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMGCP, OsmoNAT files (now avail in openbsc.git) Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/12011 Change subject: remove OsmoMGCP, OsmoNAT files (now avail in openbsc.git) ...................................................................... remove OsmoMGCP, OsmoNAT files (now avail in openbsc.git) Files were added in openbsc.git Change-Id Ibace91bc518079765e12529596a1763b6c5a04b5 Depends: openbsc.git Change-Id Ibace91bc518079765e12529596a1763b6c5a04b5 Related: OS#3385 Change-Id: Icdbdc4518b049135f18ac4a569ff5ffe4f3d5a86 --- M Makefile.am D OsmoMGCP/Makefile.am D OsmoMGCP/osmomgcp-vty-reference.xml D OsmoMGCP/vty/mgcp_vty_additions.xml D OsmoMGCP/vty/mgcp_vty_reference.xml D OsmoNAT/Makefile.am D OsmoNAT/osmonat-vty-reference.xml D OsmoNAT/vty/nat_vty_additions.xml D OsmoNAT/vty/nat_vty_reference.xml M configure.ac 10 files changed, 2 insertions(+), 3,614 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/11/12011/1 diff --git a/Makefile.am b/Makefile.am index 64623af..5386b5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,9 +5,7 @@ pkgconfig_DATA = osmo-gsm-manuals.pc BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) -SUBDIRS = tests \ - OsmoMGCP \ - OsmoNAT +SUBDIRS = tests $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ diff --git a/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am deleted file mode 100644 index 2c14728..0000000 --- a/OsmoMGCP/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmomgcp-vty-reference.xml \ - vty - -VTY_REFERENCE = osmomgcp-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMGCP/osmomgcp-vty-reference.xml b/OsmoMGCP/osmomgcp-vty-reference.xml deleted file mode 100644 index e9cc898..0000000 --- a/OsmoMGCP/osmomgcp-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th August 2012 - hf - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoMGCP VTY Reference - - - 2012-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoMGCP/vty/mgcp_vty_additions.xml b/OsmoMGCP/vty/mgcp_vty_additions.xml deleted file mode 100644 index a11cdf0..0000000 --- a/OsmoMGCP/vty/mgcp_vty_additions.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - MGCP Global Commands - This node allows to configure global MGCP settings. These include - the various port numbers. - - - - MGCP Trunk Command - This node allows to configure a MGCP trunk. These include the number, - the local binding ports, SDP configuration. - - diff --git a/OsmoMGCP/vty/mgcp_vty_reference.xml b/OsmoMGCP/vty/mgcp_vty_reference.xml deleted file mode 100644 index 6ea76a5..0000000 --- a/OsmoMGCP/vty/mgcp_vty_reference.xml +++ /dev/null @@ -1,1397 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am deleted file mode 100644 index a7b0430..0000000 --- a/OsmoNAT/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmonat-vty-reference.xml \ - vty - -VTY_REFERENCE = osmonat-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoNAT/osmonat-vty-reference.xml b/OsmoNAT/osmonat-vty-reference.xml deleted file mode 100644 index 8f8b096..0000000 --- a/OsmoNAT/osmonat-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th August 2012 - hf - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoNAT VTY Reference - - - 2012-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoNAT/vty/nat_vty_additions.xml b/OsmoNAT/vty/nat_vty_additions.xml deleted file mode 100644 index 4aa67f6..0000000 --- a/OsmoNAT/vty/nat_vty_additions.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - MGCP Commands - This node allows to configure global MGCP settings. These include - the various port numbers. - - - - - NAT Commands - This node allows to configure the global NAT settings. These include - the destination address of the MSC, the filter and rewriting rules to use. - - - - BSC Commands - This node allows to configure a BSC. A BSC has a list of - LACs, an access token associated to it. - - - - - - - Paging Group Commands - This node allows to configure a Paging Group. A Paging Group - holds the LACs of several destinations and a BSC can refer to a Paging - Group. This way several BSCs can receive the paging for a shared LAC. - - - diff --git a/OsmoNAT/vty/nat_vty_reference.xml b/OsmoNAT/vty/nat_vty_reference.xml deleted file mode 100644 index 80fe08f..0000000 --- a/OsmoNAT/vty/nat_vty_reference.xml +++ /dev/null @@ -1,2061 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/configure.ac b/configure.ac index 764da31..d2858e4 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,4 @@ AC_OUTPUT( osmo-gsm-manuals.pc Makefile - tests/Makefile - OsmoMGCP/Makefile - OsmoNAT/Makefile) + tests/Makefile) -- To view, visit https://gerrit.osmocom.org/12011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icdbdc4518b049135f18ac4a569ff5ffe4f3d5a86 Gerrit-Change-Number: 12011 Gerrit-PatchSet: 1 Gerrit-Owner: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:19:23 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 16:19:23 -0000 Subject: Change in osmo-gsm-manuals[master]: remove OsmoMGCP, OsmoNAT files (now avail in openbsc.git) In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12011 ) Change subject: remove OsmoMGCP, OsmoNAT files (now avail in openbsc.git) ...................................................................... remove OsmoMGCP, OsmoNAT files (now avail in openbsc.git) Files were added in openbsc.git Change-Id Ibace91bc518079765e12529596a1763b6c5a04b5 Depends: openbsc.git Change-Id Ibace91bc518079765e12529596a1763b6c5a04b5 Related: OS#3385 Change-Id: Icdbdc4518b049135f18ac4a569ff5ffe4f3d5a86 --- M Makefile.am D OsmoMGCP/Makefile.am D OsmoMGCP/osmomgcp-vty-reference.xml D OsmoMGCP/vty/mgcp_vty_additions.xml D OsmoMGCP/vty/mgcp_vty_reference.xml D OsmoNAT/Makefile.am D OsmoNAT/osmonat-vty-reference.xml D OsmoNAT/vty/nat_vty_additions.xml D OsmoNAT/vty/nat_vty_reference.xml M configure.ac 10 files changed, 2 insertions(+), 3,614 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 64623af..5386b5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,9 +5,7 @@ pkgconfig_DATA = osmo-gsm-manuals.pc BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version check-depends.sh $(share_files) -SUBDIRS = tests \ - OsmoMGCP \ - OsmoNAT +SUBDIRS = tests $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ diff --git a/OsmoMGCP/Makefile.am b/OsmoMGCP/Makefile.am deleted file mode 100644 index 2c14728..0000000 --- a/OsmoMGCP/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmomgcp-vty-reference.xml \ - vty - -VTY_REFERENCE = osmomgcp-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoMGCP/osmomgcp-vty-reference.xml b/OsmoMGCP/osmomgcp-vty-reference.xml deleted file mode 100644 index e9cc898..0000000 --- a/OsmoMGCP/osmomgcp-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th August 2012 - hf - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoMGCP VTY Reference - - - 2012-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoMGCP/vty/mgcp_vty_additions.xml b/OsmoMGCP/vty/mgcp_vty_additions.xml deleted file mode 100644 index a11cdf0..0000000 --- a/OsmoMGCP/vty/mgcp_vty_additions.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - MGCP Global Commands - This node allows to configure global MGCP settings. These include - the various port numbers. - - - - MGCP Trunk Command - This node allows to configure a MGCP trunk. These include the number, - the local binding ports, SDP configuration. - - diff --git a/OsmoMGCP/vty/mgcp_vty_reference.xml b/OsmoMGCP/vty/mgcp_vty_reference.xml deleted file mode 100644 index 6ea76a5..0000000 --- a/OsmoMGCP/vty/mgcp_vty_reference.xml +++ /dev/null @@ -1,1397 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OsmoNAT/Makefile.am b/OsmoNAT/Makefile.am deleted file mode 100644 index a7b0430..0000000 --- a/OsmoNAT/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmonat-vty-reference.xml \ - vty - -VTY_REFERENCE = osmonat-vty-reference.xml -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc - -include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/OsmoNAT/osmonat-vty-reference.xml b/OsmoNAT/osmonat-vty-reference.xml deleted file mode 100644 index 8f8b096..0000000 --- a/OsmoNAT/osmonat-vty-reference.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - -]> - - - - - - v1 - 13th August 2012 - hf - Initial - - - v2 - 5th March 2014 - hf - Update to match osmo-bsc version 0.13.0-305 - - - - OsmoNAT VTY Reference - - - 2012-2014 - - - - This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. - - - - - - &chapter-vty; - - diff --git a/OsmoNAT/vty/nat_vty_additions.xml b/OsmoNAT/vty/nat_vty_additions.xml deleted file mode 100644 index 4aa67f6..0000000 --- a/OsmoNAT/vty/nat_vty_additions.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - MGCP Commands - This node allows to configure global MGCP settings. These include - the various port numbers. - - - - - NAT Commands - This node allows to configure the global NAT settings. These include - the destination address of the MSC, the filter and rewriting rules to use. - - - - BSC Commands - This node allows to configure a BSC. A BSC has a list of - LACs, an access token associated to it. - - - - - - - Paging Group Commands - This node allows to configure a Paging Group. A Paging Group - holds the LACs of several destinations and a BSC can refer to a Paging - Group. This way several BSCs can receive the paging for a shared LAC. - - - diff --git a/OsmoNAT/vty/nat_vty_reference.xml b/OsmoNAT/vty/nat_vty_reference.xml deleted file mode 100644 index 80fe08f..0000000 --- a/OsmoNAT/vty/nat_vty_reference.xml +++ /dev/null @@ -1,2061 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/configure.ac b/configure.ac index 764da31..d2858e4 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,4 @@ AC_OUTPUT( osmo-gsm-manuals.pc Makefile - tests/Makefile - OsmoMGCP/Makefile - OsmoNAT/Makefile) + tests/Makefile) -- To view, visit https://gerrit.osmocom.org/12011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icdbdc4518b049135f18ac4a569ff5ffe4f3d5a86 Gerrit-Change-Number: 12011 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Nov 29 16:19:45 2018 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 29 Nov 2018 16:19:45 -0000 Subject: Change in openbsc[master]: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git In-Reply-To: References: Message-ID: osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12010 ) Change subject: OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git ...................................................................... OsmoMGCP and OsmoNAT manuals moved from osmo-gsm-manuals.git Add both manuals to manuals/OsmoMGCP and manuals/OsmoNAT. Build them just like the existing OsmoNITB manual: $ cd manuals/OsmoMGCP $ make The commit history only consisted of the initial commit and was not imported. Related: OS#3385 Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 --- A manuals/OsmoMGCP/Makefile A manuals/OsmoMGCP/osmomgcp-vty-reference.xml A manuals/OsmoMGCP/vty/mgcp_vty_additions.xml A manuals/OsmoMGCP/vty/mgcp_vty_reference.xml A manuals/OsmoNAT/Makefile A manuals/OsmoNAT/osmonat-vty-reference.xml A manuals/OsmoNAT/vty/nat_vty_additions.xml A manuals/OsmoNAT/vty/nat_vty_reference.xml 8 files changed, 3,606 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved Harald Welte: Looks good to me, but someone else must approve diff --git a/manuals/OsmoMGCP/Makefile b/manuals/OsmoMGCP/Makefile new file mode 100644 index 0000000..022f6d4 --- /dev/null +++ b/manuals/OsmoMGCP/Makefile @@ -0,0 +1,7 @@ +OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) + +VTY_REFERENCE = osmomgcp-vty-reference.xml +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/manuals/OsmoMGCP/osmomgcp-vty-reference.xml b/manuals/OsmoMGCP/osmomgcp-vty-reference.xml new file mode 100644 index 0000000..e9cc898 --- /dev/null +++ b/manuals/OsmoMGCP/osmomgcp-vty-reference.xml @@ -0,0 +1,44 @@ + + + + +]> + + + + + + v1 + 13th August 2012 + hf + Initial + + + v2 + 5th March 2014 + hf + Update to match osmo-bsc version 0.13.0-305 + + + + OsmoMGCP VTY Reference + + + 2012-2014 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/manuals/OsmoMGCP/vty/mgcp_vty_additions.xml b/manuals/OsmoMGCP/vty/mgcp_vty_additions.xml new file mode 100644 index 0000000..a11cdf0 --- /dev/null +++ b/manuals/OsmoMGCP/vty/mgcp_vty_additions.xml @@ -0,0 +1,14 @@ + + + + MGCP Global Commands + This node allows to configure global MGCP settings. These include + the various port numbers. + + + + MGCP Trunk Command + This node allows to configure a MGCP trunk. These include the number, + the local binding ports, SDP configuration. + + diff --git a/manuals/OsmoMGCP/vty/mgcp_vty_reference.xml b/manuals/OsmoMGCP/vty/mgcp_vty_reference.xml new file mode 100644 index 0000000..6ea76a5 --- /dev/null +++ b/manuals/OsmoMGCP/vty/mgcp_vty_reference.xml @@ -0,0 +1,1397 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/manuals/OsmoNAT/Makefile b/manuals/OsmoNAT/Makefile new file mode 100644 index 0000000..9c380a2 --- /dev/null +++ b/manuals/OsmoNAT/Makefile @@ -0,0 +1,7 @@ +OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) + +VTY_REFERENCE = osmonat-vty-reference.xml +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc diff --git a/manuals/OsmoNAT/osmonat-vty-reference.xml b/manuals/OsmoNAT/osmonat-vty-reference.xml new file mode 100644 index 0000000..8f8b096 --- /dev/null +++ b/manuals/OsmoNAT/osmonat-vty-reference.xml @@ -0,0 +1,44 @@ + + + + +]> + + + + + + v1 + 13th August 2012 + hf + Initial + + + v2 + 5th March 2014 + hf + Update to match osmo-bsc version 0.13.0-305 + + + + OsmoNAT VTY Reference + + + 2012-2014 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + + diff --git a/manuals/OsmoNAT/vty/nat_vty_additions.xml b/manuals/OsmoNAT/vty/nat_vty_additions.xml new file mode 100644 index 0000000..4aa67f6 --- /dev/null +++ b/manuals/OsmoNAT/vty/nat_vty_additions.xml @@ -0,0 +1,32 @@ + + + + MGCP Commands + This node allows to configure global MGCP settings. These include + the various port numbers. + + + + + NAT Commands + This node allows to configure the global NAT settings. These include + the destination address of the MSC, the filter and rewriting rules to use. + + + + BSC Commands + This node allows to configure a BSC. A BSC has a list of + LACs, an access token associated to it. + + + + + + + Paging Group Commands + This node allows to configure a Paging Group. A Paging Group + holds the LACs of several destinations and a BSC can refer to a Paging + Group. This way several BSCs can receive the paging for a shared LAC. + + + diff --git a/manuals/OsmoNAT/vty/nat_vty_reference.xml b/manuals/OsmoNAT/vty/nat_vty_reference.xml new file mode 100644 index 0000000..80fe08f --- /dev/null +++ b/manuals/OsmoNAT/vty/nat_vty_reference.xml @@ -0,0 +1,2061 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/12010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibace91bc518079765e12529596a1763b6c5a04b5 Gerrit-Change-Number: 12010 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith -------------- next part -------------- An HTML attachment was scrubbed... URL: