Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 283s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 283s] [COMPILING libboard/qmod/source/card_pres.c] [ 284s] [COMPILING libboard/qmod/source/wwan_led.c] [ 284s] [COMPILING libboard/qmod/source/i2c.c] [ 284s] [COMPILING libboard/qmod/source/board_qmod.c] [ 284s] [COMPILING apps/dfu/main.c] [ 285s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 285s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 285s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 286s] Memory region Used Size Region Size %age Used [ 286s] rom: 16588 B16 KB101.25% [ 286s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 286s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 286s] collect2: error: ld returned 1 exit status [ 286s] % [ 286s] make[2]: *** [Makefile:234: flash] Error 1 [ 286s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 286s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 286s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 286s] dh_auto_build: error: make -j1 returned exit code 2 [ 286s] make: *** [debian/rules:16: build] Error 25 [ 286s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 286s] ### VM INTERACTION START ### [ 289s] [ 270.828229] sysrq: Power Off [ 289s] [ 270.844828] reboot: Power down [ 289s] ### VM INTERACTION END ### [ 289s] [ 289s] cloud102 failed "build simtrace2_0.7.0.69.aadd.dsc" at Fri Jan 22 01:57:46 UTC 2021. [ 289s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 301s] [COMPILING apps/dfu/main.c] [ 301s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 301s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 301s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 302s] Memory region Used Size Region Size %age Used [ 302s] rom: 16580 B16 KB101.20% [ 302s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 302s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 302s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 302s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 302s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 302s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 302s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 302s] collect2: error: ld returned 1 exit status [ 302s] % [ 302s] make[2]: *** [Makefile:234: flash] Error 1 [ 302s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 302s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 302s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 302s] dh_auto_build: error: make -j1 returned exit code 2 [ 302s] make: *** [debian/rules:16: build] Error 25 [ 302s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 302s] ### VM INTERACTION START ### [ 305s] [ 250.595882] sysrq: Power Off [ 305s] [ 250.636891] reboot: Power down [ 305s] ### VM INTERACTION END ### [ 305s] [ 305s] lamb16 failed "build simtrace2_0.7.0.69.aadd.dsc" at Fri Jan 22 01:56:41 UTC 2021. [ 305s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369/1/library/PCUIF_Types.ttcn File library/PCUIF_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369/1/library/PCUIF_Types.ttcn@220 PS1, Line 220: record length(23) of uint8_t Also, this is basically 'octetstring'? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 22 Jan 2021 01:30:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 ) Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si .. Patch Set 1: Code-Review-2 We cannot just bump the protocol version here, as we also need to test the 'latest' osmo-pcu. See my comments to the related changes for osmo-pcu. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9054ab0e969c0fbfdc671c92d44cc61360959adc Gerrit-Change-Number: 22369 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 22 Jan 2021 01:29:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22367 ) Change subject: pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/22367/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/22367/2//COMMIT_MSG@18 PS2, Line 18: Change-Id: Ie8c3467b6cf8b8bfdeee9a281412d814cbc379b8 Two Change-Ids? How do you do that? :D -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie8c3467b6cf8b8bfdeee9a281412d814cbc379b8 Gerrit-Change-Number: 22367 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 22 Jan 2021 01:26:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22367 ) Change subject: pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication .. Patch Set 2: Maybe using a separate message type for delivering System Information would be easier? This would not require you to bump the protocol version and care about backwards compatibility in ttcn3-pcu-test. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie8c3467b6cf8b8bfdeee9a281412d814cbc379b8 Gerrit-Change-Number: 22367 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 22 Jan 2021 01:25:52 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22369 )
Change subject: PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and
_no_si
..
PCU_Tests: add testcase TC_rim_ran_info_req_single_rep and _no_si
Perform a full RAN information request (single report) against the PCU
and check the results. Also test what happens when the request is issued
at a time where osmo-bts has no system information available.
Depends: osmo-pcu Id72118120c14984d2fb1b918b41fac4868150d41
Depends: osmo-bts I1726c9e29cc59c499dfabbdaf63c0f1a09984764
Related: SYS#5103
Change-Id: I9054ab0e969c0fbfdc671c92d44cc61360959adc
---
M library/Osmocom_Gb_Types.ttcn
M library/PCUIF_Types.ttcn
M pcu/PCU_Tests.ttcn
M pcu/PCU_Tests_SNS.cfg
M pcu/PCU_Tests_SNSv6.cfg
5 files changed, 288 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/69/22369/1
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 9065097..5d753b2 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -2493,7 +2493,14 @@
},
rIMApplicationIdentity := app_id
}
-
+ template RIM_Application_Identity tr_RIM_Application_Identity(template
OCT1 app_id := ?) := {
+iEI := '4B'O,
+ext := '1'B,
+lengthIndicator := {
+ length1 := 1
+},
+rIMApplicationIdentity := app_id
+ }
/* 3GPP TS 48.018 11.3.62 */
template (value) RIM_Sequence_Number ts_RIM_Sequence_Number(integer
seq) := {
@@ -2504,6 +2511,20 @@
},
rIMSequenceNumber := int2oct(seq, 4)
}
+ function tr_RIM_Sequence_Number(template integer seq := ?) return
template RIM_Sequence_Number {
+var template RIM_Sequence_Number ret;
+ret.iEI := '4C'O;
+ret.ext := '1'B;
+ret.lengthIndicator := { length1 := 4 };
+if (istemplatekind(seq, "*")) {
+ ret.rIMSequenceNumber := *;
+} else if (istemplatekind(seq, "?")) {
+ ret.rIMSequenceNumber := ?;
+} else {
+ ret.rIMSequenceNumber := int2oct(valueof(seq), 4);
+}
+return ret;
+ }
/* 3GPP TS 48.018 11.3.62a.1 */
template (value) RAN_Information_Request_RIM_Container
@@ -2567,10 +2588,34 @@
applContainer_or_ApplErrContainer := app_cont_or_app_err,
sON_Transfer_Application_Identity := son_app_id
}
+ template RAN_Information_RIM_Container
+ tr_RAN_Information_RIM_Container(template RIM_Application_Identity
app_id := ?,
+template RIM_Sequence_Number seq := ?,
+template RIM_PDU_Indications ind := ?,
+template RIM_Protocol_Version_Number
ver := omit,
+template
ApplContainer_or_ApplErrContainer app_cont_or_app_err := omit,
+template
SON_Transfer_Application_Identity_TLV son_app_id := omit) := {
+
+iEI := '58'O,
+ext := '1'B,
+lengthIndicator := {
+ length1 := ?
+},
+rIM_Application_Identity := app_id,
+rIM_Sequence_Number := seq,
+rIM_PDU_Indications := ind,
+rIM_Protocol_Version_Number := ver,
+applContainer_or_ApplErrContainer := app_cont_or_app_err,
+sON_Transfer_Application_Identity := son_app_id
+ }
template (value) ApplContainer_or_ApplErrContainer
tsu_ApplContainer_or_ApplErrContainer_NACC(template (value)
ApplContainer_or_ApplErrContainer_NACC cont) := {
nacc := cont
}
+ template ApplContainer_or_ApplErrContainer
+ tru_ApplContainer_or_ApplErrContainer_NACC(template
ApplContainer_or_ApplErrContainer_NACC cont := ?) := {
+ nacc := cont
+ }
template (value) ApplContainer_or_ApplErrContainer
tsu_ApplContainer_or_ApplErrContainer_SI3(template (value)
ApplContainer_or_ApplErrContainer_SI3 cont) := {
si3 := cont
@@ -2583,6 +2628,10 @@
tsu_ApplContainer_NACC(template (value) BssgpCellId cid, boolean
psi_type, integer si_psi_num, octetstring si_psi) := {
application_Container :=
ts_RAN_Information_Application_Container_NACC(cid, psi_type, si_psi_num, si_psi)
}
+ template ApplContainer_or_ApplErrContainer_NACC
+ tru_ApplContainer_NACC(template BssgpCellId cid := ?, template boolean
psi_type := ?, template integer si_psi_num := ?, template octetstr
Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22368 ) Change subject: gprs_bssgp_rim: add serving BSS NACC application .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41 Gerrit-Change-Number: 22368 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Jan 2021 00:02:55 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22367 ) Change subject: pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie8c3467b6cf8b8bfdeee9a281412d814cbc379b8 Gerrit-Change-Number: 22367 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 22 Jan 2021 00:01:54 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: fix nullpointer dereference when sending uintdata
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22349 )
Change subject: gprs_ns2_vc_fsm: fix nullpointer dereference when sending
uintdata
..
Patch Set 2:
(2 comments)
https://gerrit.osmocom.org/c/libosmocore/+/22349/1/src/gb/gprs_ns2_vc_fsm.c
File src/gb/gprs_ns2_vc_fsm.c:
https://gerrit.osmocom.org/c/libosmocore/+/22349/1/src/gb/gprs_ns2_vc_fsm.c@759
PS1, Line 759: if (nsh->pdu_type == NS_PDUT_UNITDATA) {
: /* UNITDATA have to free msg because it might send the
msg layer upwards */
: osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNITDATA,
msg);
: return 0;
: }
> why are we moving this block before the call to gprs_ns2_validate() ? If the
> validation fails, why i […]
I have moved it since gprs_ns2_validate() also get a tp pointer, which is NULL
on unit-data. gprs_ns2_validate() would segfault then. (See also gprs_ns2.c
line 1102, however I do not know if this is allowed though)
https://gerrit.osmocom.org/c/libosmocore/+/22349/1/src/gb/gprs_ns2_vc_fsm.c@765
PS1, Line 765: if (!tp) {
> do OSMO_ASSERT(tp). A NULL tp should never happen except for UNITDATA. Only
> UNITDATA is special.
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22349
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7d7c95604ba4af4ed4b6019f1d432970225f8d7a
Gerrit-Change-Number: 22349
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Assignee: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus
Gerrit-CC: laforge
Gerrit-Comment-Date: Thu, 21 Jan 2021 22:15:13 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Comment-In-Reply-To: lynxis lazus
Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: fix nullpointer dereference when sending uintdata
Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22349 to look at the new patch set (#2). Change subject: gprs_ns2_vc_fsm: fix nullpointer dereference when sending uintdata .. gprs_ns2_vc_fsm: fix nullpointer dereference when sending uintdata the function gprs_ns2_vc_rx() is called from gprs_ns2.c with tp=NULL. This leads into a null pointer dereference because gprs_ns2_vc_rx() is accessing tp several times. tp is also handed up into the FSM, with the exception of unitdata. Apparently for unitdata tp does not exist, so we can move up the part where unitdata is handed up into the FSM and after that we can check if tp is NULL to make sure the code which is accessing it is not executed. Change-Id: I7d7c95604ba4af4ed4b6019f1d432970225f8d7a --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/22349/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7d7c95604ba4af4ed4b6019f1d432970225f8d7a Gerrit-Change-Number: 22349 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Initial handling support for RIM messages
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22364 ) Change subject: Initial handling support for RIM messages .. Patch Set 2: Code-Review+2 I have now re-inserted the related bits that add the serving BSS part of the RIM code. See also: https://gerrit.osmocom.org/c/osmo-pcu/+/22368 So far everything looks good. My TTCN3 tests pass as they should. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0ade0e97ea781ec655439c008b6cefaf3e90dec Gerrit-Change-Number: 22364 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 21 Jan 2021 21:57:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: gprs_bssgp_rim: add serving BSS NACC application
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/22368 )
Change subject: gprs_bssgp_rim: add serving BSS NACC application
..
gprs_bssgp_rim: add serving BSS NACC application
Answer an incoming RAN INFORMATION REQUEST RIM PDU with RAN INFORMATION
PDU that contains system information type 1, 3 and 13
Depends: osmo-pcu TODO!!!
Change-Id: Id72118120c14984d2fb1b918b41fac4868150d41
Related: SYS#5103
---
M include/osmocom/pcu/pcuif_proto.h
M src/bts.h
M src/gprs_bssgp_rim.c
M src/pcu_l1_if.cpp
4 files changed, 100 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/68/22368/1
diff --git a/include/osmocom/pcu/pcuif_proto.h
b/include/osmocom/pcu/pcuif_proto.h
index cdd73d9..6ac9a02 100644
--- a/include/osmocom/pcu/pcuif_proto.h
+++ b/include/osmocom/pcu/pcuif_proto.h
@@ -1,12 +1,13 @@
#ifndef _PCUIF_PROTO_H
#define _PCUIF_PROTO_H
+#include
#include
#include
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
-#define PCU_IF_VERSION 0x0a
+#define PCU_IF_VERSION 0x0b
#define TXT_MAX_LEN128
/* msg_type */
@@ -177,6 +178,13 @@
struct in_addr v4;
struct in6_addr v6;
} remote_ip[PCU_IF_NUM_NSVC];
+ /* RIM */
+ uint8_t si1[GSM_MACBLOCK_LEN];
+ uint8_t si1_is_set;
+ uint8_t si3[GSM_MACBLOCK_LEN];
+ uint8_t si3_is_set;
+ uint8_t si13[GSM_MACBLOCK_LEN];
+ uint8_t si13_is_set;
} __attribute__ ((packed));
struct gsm_pcu_if_act_req {
diff --git a/src/bts.h b/src/bts.h
index 7f437e3..195c44f 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -215,6 +215,10 @@
uint8_t n3105;
struct gprs_rlcmac_trx trx[8];
+ uint8_t si1[GSM_MACBLOCK_LEN];
+ bool si1_is_set;
+ uint8_t si3[GSM_MACBLOCK_LEN];
+ bool si3_is_set;
uint8_t si13[GSM_MACBLOCK_LEN];
bool si13_is_set;
diff --git a/src/gprs_bssgp_rim.c b/src/gprs_bssgp_rim.c
index 8cb330f..3d4b7a9 100644
--- a/src/gprs_bssgp_rim.c
+++ b/src/gprs_bssgp_rim.c
@@ -23,6 +23,9 @@
#include
#include
#include
+#include
+#include
+#include
#include "gprs_debug.h"
#include "gprs_pcu.h"
@@ -48,6 +51,60 @@
memcpy(&resp_pdu->routing_info_src, &req_pdu->routing_info_dest,
sizeof(resp_pdu->routing_info_src));
}
+/* Fill NACC application container with data (cell identifier, sysinfo) */
+static void fill_app_cont_nacc(struct bssgp_ran_inf_app_cont_nacc *app_cont,
const struct gprs_rlcmac_bts *bts)
+{
+ struct bssgp_bvc_ctx *bctx = gprs_bssgp_pcu_current_bctx();
+
+ app_cont->reprt_cell.rai.lac.plmn.mcc = bctx->ra_id.mcc;
+ app_cont->reprt_cell.rai.lac.plmn.mnc = bctx->ra_id.mnc;
+ app_cont->reprt_cell.rai.lac.plmn.mnc_3_digits =
bctx->ra_id.mnc_3_digits;
+ app_cont->reprt_cell.rai.lac.lac = bctx->ra_id.lac;
+ app_cont->reprt_cell.rai.rac = bctx->ra_id.rac;
+ app_cont->reprt_cell.cell_identity = bctx->cell_id;
+ app_cont->num_si = 0;
+
+ if (bts->si1_is_set) {
+ app_cont->si[app_cont->num_si] = bts->si1 + 2;
+ app_cont->num_si++;
+ }
+
+ if (bts->si3_is_set) {
+ app_cont->si[app_cont->num_si] = bts->si3 + 2;
+ app_cont->num_si++;
+ }
+
+ if (bts->si13_is_set) {
+ app_cont->si[app_cont->num_si] = bts->si13 + 2;
+ app_cont->num_si++;
+ }
+
+ /* Note: It is possible that the resulting PDU will not contain any
system information, even if this is
+* an unlikely case since the BTS immediately updates the system
information after startup. The
+* specification permits to send zero system information, see also:
3GPP TS 48.018 section 11.3.63.2.1 */
+}
+
+/* Format a RAN INFORMATION PDU that contains the requested system information
*/
+static void format_response_pdu(struct bssgp_ran_information_pdu *resp_pdu,
struct bssgp_ran_information_pdu *req_pdu,
+ const struct gprs_rlcmac_bts *bts)
+{
+ memset(resp_pdu, 0, sizeof(*resp_pdu));
+ mirror_rim_routing_info(resp_pdu, req_pdu);
+
+ resp_pdu->decoded.rim_cont = (struct bssgp_ran_inf_rim_cont) {
+ .app_id = BSSGP_RAN_INF_APP_ID_NACC,
+ .seq_num = 1, /* single report has only one message in
response */
+ .pdu_ind = {
+ .pdu_type_ext = RIM_PDU_TYPE_SING_REP,
+},
+ .prot_ver = 1,
+ };
+
+ fill_app_cont_nacc(&resp_pdu->decoded.rim_cont.u.app_cont_nacc, bts);
+ resp_pdu->decoded_present = true;
+ resp_pdu->rim_cont_iei = BSSGP_IE_RI_RIM_CONTAINER;
+}
+
/* Format a RAN INFORMATION ERROR PDU */
static void format_response_pdu_err(struct bssgp_ran_information_pdu *resp_pdu,
Change in docker-playground[master]: ttcn3-gbproxy-test: s/sgsn/gbproxy/
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22366 ) Change subject: ttcn3-gbproxy-test: s/sgsn/gbproxy/ .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8709121d8501da4afc1c8dda70356096d331a9b0 Gerrit-Change-Number: 22366 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 20:34:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: sgsn_rim: Add routing for (GERAN) BSSGP RIM messages
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22110 ) Change subject: sgsn_rim: Add routing for (GERAN) BSSGP RIM messages .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6fde8ab8955660b48000ca1b650cfc7c7b2e24ba Gerrit-Change-Number: 22110 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 20:34:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: sgsn_rim: Add routing for (GERAN) BSSGP RIM messages
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22110 to look at the new patch set (#4). Change subject: sgsn_rim: Add routing for (GERAN) BSSGP RIM messages .. sgsn_rim: Add routing for (GERAN) BSSGP RIM messages The SGSN currently does not forward BSSGP RIM messages. Related: SYS#5103 Depends: libosmocore Icd667f41d5735de56cd9fb257670337c679dd258 Change-Id: I6fde8ab8955660b48000ca1b650cfc7c7b2e24ba --- M include/osmocom/sgsn/Makefile.am M include/osmocom/sgsn/debug.h A include/osmocom/sgsn/sgsn_rim.h M src/sgsn/Makefile.am M src/sgsn/sgsn_main.c A src/sgsn/sgsn_rim.c 6 files changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/10/22110/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6fde8ab8955660b48000ca1b650cfc7c7b2e24ba Gerrit-Change-Number: 22110 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22367 )
Change subject: pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication
..
pcu_sock: send SI1, SI3 and SI3 along with PCUIF info indication
The new version (0x0b) of the PCUIF offers fields to transfer system
information 1, 3 and 13 with the info indication that is sent by
osmo-bts on startup. The system information is needed by the NACC RIM
application which runs inside osmo-pcu.
Depends osmo-pcu TODO!
Change-Id: I1726c9e29cc59c499dfabbdaf63c0f1a09984764
Related: SYS#5103
Change-Id: Ie8c3467b6cf8b8bfdeee9a281412d814cbc379b8
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 25 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/22367/1
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index 8f72602..7c48835 100644
--- a/include/osmo-bts/pcuif_proto.h
+++ b/include/osmo-bts/pcuif_proto.h
@@ -6,7 +6,7 @@
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
-#define PCU_IF_VERSION 0x0a
+#define PCU_IF_VERSION 0x0b
#define TXT_MAX_LEN128
/* msg_type */
@@ -175,6 +175,13 @@
struct in_addr v4;
struct in6_addr v6;
} remote_ip[2];
+ /* RIM */
+ uint8_t si1[GSM_MACBLOCK_LEN];
+ uint8_t si1_is_set;
+ uint8_t si3[GSM_MACBLOCK_LEN];
+ uint8_t si3_is_set;
+ uint8_t si13[GSM_MACBLOCK_LEN];
+ uint8_t si13_is_set;
} __attribute__ ((packed));
struct gsm_pcu_if_act_req {
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 0466698..b5c5f4b 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -348,6 +348,23 @@
}
}
+ /* RIM */
+ if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_1)) {
+ memcpy(info_ind->si1, GSM_BTS_SI(bts, SYSINFO_TYPE_1),
+ sizeof(info_ind->si1));
+ info_ind->si1_is_set = true;
+ }
+ if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_3)) {
+ memcpy(info_ind->si3, GSM_BTS_SI(bts, SYSINFO_TYPE_3),
+ sizeof(info_ind->si3));
+ info_ind->si3_is_set = true;
+ }
+ if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_13)) {
+ memcpy(info_ind->si13, GSM_BTS_SI(bts, SYSINFO_TYPE_13),
+ sizeof(info_ind->si13));
+ info_ind->si13_is_set = true;
+ }
+
llist_for_each_entry(trx, &bts->trx_list, list) {
if (trx->nr >= ARRAY_SIZE(info_ind->trx)) {
LOGPTRX(trx, DPCU, LOGL_NOTICE, "PCU interface (version
%u) "
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22367
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ie8c3467b6cf8b8bfdeee9a281412d814cbc379b8
Gerrit-Change-Number: 22367
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-gbproxy-test: s/sgsn/gbproxy/
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/22366 )
Change subject: ttcn3-gbproxy-test: s/sgsn/gbproxy/
..
ttcn3-gbproxy-test: s/sgsn/gbproxy/
the jenkins.sh script was copied from the SGSN test suite and still
mentioned sgsn at several places when actually intending to mention
gbproxy.
Change-Id: I8709121d8501da4afc1c8dda70356096d331a9b0
---
M ttcn3-gbproxy-test/jenkins.sh
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/66/22366/1
diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh
index 8150430..2120f90 100755
--- a/ttcn3-gbproxy-test/jenkins.sh
+++ b/ttcn3-gbproxy-test/jenkins.sh
@@ -15,8 +15,8 @@
cp GBProxy_Tests.cfg $VOL_BASE_DIR/gbproxy-tester/
-mkdir $VOL_BASE_DIR/sgsn
-cp osmo-gbproxy.cfg $VOL_BASE_DIR/sgsn/
+mkdir $VOL_BASE_DIR/gbproxy
+cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/
# Disable features not in latest yet
if [ "$IMAGE_SUFFIX" = "latest" ]; then
@@ -25,17 +25,17 @@
mkdir $VOL_BASE_DIR/unix
-echo Starting container with SGSN
+echo Starting container with gbproxy
docker run --rm \
$(docker_network_params $SUBNET 10) \
--ulimit core=-1 \
- -v $VOL_BASE_DIR/sgsn:/data \
- --name ${BUILD_TAG}-sgsn -d \
+ -v $VOL_BASE_DIR/gbproxy:/data \
+ --name ${BUILD_TAG}-gbproxy -d \
$DOCKER_ARGS \
$REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \
/bin/sh -c "osmo-gbproxy -c /data/osmo-gbproxy.cfg
>/data/osmo-gbproxy.log 2>&1"
-echo Starting container with SGSN testsuite
+echo Starting container with gbproxy testsuite
docker run --rm \
$(docker_network_params $SUBNET 103) \
--ulimit core=-1 \
@@ -57,7 +57,7 @@
$REPO_USER/ttcn3-gbproxy-test
echo Stopping containers
-docker container kill ${BUILD_TAG}-sgsn
+docker container kill ${BUILD_TAG}-gbproxy
network_remove
collect_logs
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22366
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I8709121d8501da4afc1c8dda70356096d331a9b0
Gerrit-Change-Number: 22366
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in docker-playground[master]: osmo-gbproxy: fix configuration
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/22365 )
Change subject: osmo-gbproxy: fix configuration
..
osmo-gbproxy: fix configuration
also, only change those values from their default values that are
neccessary to change; fall-back on the defaults whenever possible.
Change-Id: I5fba21ddf1854ed2b4f829785ab016dfa284456e
---
M ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
M ttcn3-gbproxy-test/GBProxy_Tests.cfg
M ttcn3-gbproxy-test/osmo-gbproxy.cfg
4 files changed, 15 insertions(+), 56 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
index 8a95e2e..361b32c 100644
--- a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
@@ -20,23 +20,15 @@
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 23000,
- remote_ip := "172.18.25.10",
- data_weight := 1,
- signalling_weight := 0
+ remote_ip := "172.18.25.10"
}
}
}, {
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 23000,
- remote_ip := "172.18.25.10",
- data_weight := 0,
- signalling_weight := 1
+ remote_ip := "172.18.25.10"
}
}
}
@@ -47,23 +39,15 @@
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 24000,
- remote_ip := "172.18.25.10",
- data_weight := 1,
- signalling_weight := 0
+ remote_ip := "172.18.25.10"
}
}
}, {
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 24000,
- remote_ip := "172.18.25.10",
- data_weight := 0,
- signalling_weight := 1
+ remote_ip := "172.18.25.10"
}
}
}
diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
index a4a241d..7d26b3c 100644
--- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
+++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
@@ -31,9 +31,9 @@
bind udp local
listen 172.18.25.10 23000
nse 101
- ip-sns 172.18.25.103 23000
+ ip-sns 172.18.25.103
nse 102
- ip-sns 172.18.25.103 24000
+ ip-sns 172.18.25.103
bind fr hdlcnet1
fr hdlcnet1 frnet
bind fr hdlcnet2
diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
index 8638586..3ad875c 100644
--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
@@ -19,23 +19,15 @@
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- local_udp_port := 23000,
- remote_ip := "172.18.24.10",
-
Change in docker-playground[master]: osmo-gbproxy: fix configuration
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22365 ) Change subject: osmo-gbproxy: fix configuration .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5fba21ddf1854ed2b4f829785ab016dfa284456e Gerrit-Change-Number: 22365 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Jan 2021 19:54:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: osmo-gbproxy: fix configuration
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/22365 )
Change subject: osmo-gbproxy: fix configuration
..
osmo-gbproxy: fix configuration
also, only change those values from their default values that are
neccessary to change; fall-back on the defaults whenever possible.
Change-Id: I5fba21ddf1854ed2b4f829785ab016dfa284456e
---
M ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
M ttcn3-gbproxy-test/GBProxy_Tests.cfg
M ttcn3-gbproxy-test/osmo-gbproxy.cfg
4 files changed, 15 insertions(+), 56 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/65/22365/1
diff --git a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
index 8a95e2e..361b32c 100644
--- a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
@@ -20,23 +20,15 @@
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 23000,
- remote_ip := "172.18.25.10",
- data_weight := 1,
- signalling_weight := 0
+ remote_ip := "172.18.25.10"
}
}
}, {
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 23000,
- remote_ip := "172.18.25.10",
- data_weight := 0,
- signalling_weight := 1
+ remote_ip := "172.18.25.10"
}
}
}
@@ -47,23 +39,15 @@
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 24000,
- remote_ip := "172.18.25.10",
- data_weight := 1,
- signalling_weight := 0
+ remote_ip := "172.18.25.10"
}
}
}, {
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 24000,
- remote_ip := "172.18.25.10",
- data_weight := 0,
- signalling_weight := 1
+ remote_ip := "172.18.25.10"
}
}
}
diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
index a4a241d..7d26b3c 100644
--- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
+++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
@@ -31,9 +31,9 @@
bind udp local
listen 172.18.25.10 23000
nse 101
- ip-sns 172.18.25.103 23000
+ ip-sns 172.18.25.103
nse 102
- ip-sns 172.18.25.103 24000
+ ip-sns 172.18.25.103
bind fr hdlcnet1
fr hdlcnet1 frnet
bind fr hdlcnet2
diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
index 8638586..3ad875c 100644
--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
@@ -19,23 +19,15 @@
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- local_udp_port := 23000,
-
Change in osmo-pcu[master]: Initial handling support for RIM messages
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22364 ) Change subject: Initial handling support for RIM messages .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia0ade0e97ea781ec655439c008b6cefaf3e90dec Gerrit-Change-Number: 22364 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Jan 2021 17:59:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Initial handling support for RIM messages
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/22364 )
Change subject: Initial handling support for RIM messages
..
Initial handling support for RIM messages
This code doesn't do anything yet app-related with the received RIM
messages, but already provides the initial infrastructure to handle them
in the future, and does first checkings.
Related: SYS#5103
Change-Id: Ia0ade0e97ea781ec655439c008b6cefaf3e90dec
---
M src/Makefile.am
M src/gprs_bssgp_pcu.c
A src/gprs_bssgp_rim.c
A src/gprs_bssgp_rim.h
M src/gprs_debug.cpp
M src/gprs_debug.h
M src/gprs_pcu.c
M src/gprs_pcu.h
8 files changed, 230 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/64/22364/1
diff --git a/src/Makefile.am b/src/Makefile.am
index de924a6..f85a456 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,6 +43,7 @@
csn1.c \
gsm_rlcmac.c \
gprs_bssgp_pcu.c \
+ gprs_bssgp_rim.c \
gprs_rlcmac.cpp \
gprs_rlcmac_sched.cpp \
gprs_rlcmac_meas.cpp \
@@ -81,6 +82,7 @@
csn1.h \
gsm_rlcmac.h \
gprs_bssgp_pcu.h \
+ gprs_bssgp_rim.h \
gprs_rlcmac.h \
gprs_ms.h \
gprs_ms_storage.h \
diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c
index c5cc39d..c24aa4d 100644
--- a/src/gprs_bssgp_pcu.c
+++ b/src/gprs_bssgp_pcu.c
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
#include
@@ -419,10 +420,22 @@
int rc = 0;
struct bssgp_bvc_ctx *bctx;
- if (pdu_type == BSSGP_PDUT_STATUS)
+ switch (pdu_type) {
+ case BSSGP_PDUT_STATUS:
/* Pass the message to the generic BSSGP parser, which handles
* STATUS and RESET messages in either direction. */
+ case BSSGP_PDUT_RAN_INFO:
+ case BSSGP_PDUT_RAN_INFO_REQ:
+ case BSSGP_PDUT_RAN_INFO_ACK:
+ case BSSGP_PDUT_RAN_INFO_ERROR:
+ case BSSGP_PDUT_RAN_INFO_APP_ERROR:
+ /* Also pass all RIM related messages to the generic BSSGP
+* parser so that it can deliver primitive to the RIM SAP
+* (SAP_BSSGP_RIM) */
return bssgp_rcvmsg(msg);
+ default:
+ break;
+ }
/* Identifiers from DOWN: NSEI, BVCI (both in msg->cb) */
@@ -551,7 +564,8 @@
case SAP_BSSGP_NM:
if (oph->primitive == PRIM_NM_STATUS)
handle_nm_status(bp);
- break;
+ case SAP_BSSGP_RIM:
+ return handle_rim(bp);
default:
break;
}
diff --git a/src/gprs_bssgp_rim.c b/src/gprs_bssgp_rim.c
new file mode 100644
index 000..8cb330f
--- /dev/null
+++ b/src/gprs_bssgp_rim.c
@@ -0,0 +1,169 @@
+/* gprs_bssgp_pcu.cpp
+ *
+ * Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "gprs_debug.h"
+#include "gprs_pcu.h"
+
+static inline void gprs_ra_id_ci_to_cgi_ps(struct osmo_cell_global_id_ps
*cgi_ps,
+ struct gprs_ra_id *raid, uint16_t
cid)
+{
+ *cgi_ps = (struct osmo_cell_global_id_ps) {
+ .rai.lac.plmn.mcc = raid->mcc,
+ .rai.lac.plmn.mnc = raid->mnc,
+ .rai.lac.plmn.mnc_3_digits = raid->mnc_3_digits,
+ .rai.lac.lac = raid->lac,
+ .rai.rac = raid->rac,
+ .cell_identity = cid,
+ };
+}
+
+/* Mirror RIM routing information of a given PDU, see also 3GPP TS 48.018,
section 8c.1.4.3 */
+static void mirror_rim_routing_info(struct bssgp_ran_information_pdu *resp_pdu,
+ struct bssgp_ran_information_pdu *req_pdu)
+{
+ memcpy(&resp_pdu->routing_info_dest, &req_pdu->routing_info_src,
sizeof(resp_pdu->routing_info_dest));
+ memcpy(&resp_pdu->routing_info_src, &req_pdu->routing_info_dest,
sizeof(resp_pdu->routing_info_src));
+}
+
+/* Format a RAN INFORMATION ERROR PDU */
+static void format_response_pdu_err(struct bssgp_ran_information_pdu *resp_pdu,
+ struct bssgp_ran_information_pdu
Change in osmo-sgsn[master]: gbproxy: Improve log messages in gbproxy_select_sgsn
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22362 ) Change subject: gbproxy: Improve log messages in gbproxy_select_sgsn .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/22362/1/src/gbproxy/gb_proxy.c File src/gbproxy/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/22362/1/src/gbproxy/gb_proxy.c@257 PS1, Line 257: LOGP(DGPRS, LOGL_INFO, "TLLI %08x is neither local nor foreign\n"); so it's trapped at the airport? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id7bc755b90c35ed7c8cfa8408073e2866d639f2d Gerrit-Change-Number: 22362 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Jan 2021 17:52:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Fix radio status routing by TMSI
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/22363 ) Change subject: gbproxy: Fix radio status routing by TMSI .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/22363/1/src/gbproxy/gb_proxy.c File src/gbproxy/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/22363/1/src/gbproxy/gb_proxy.c@a424 PS1, Line 424: /* rc = gbprox_bss2sgsn_hashed(bss_bvc->cell, msg, NULL); */ non-related -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd64f02fa16b44f8e2e19eb8ba973f50a829ead5 Gerrit-Change-Number: 22363 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Jan 2021 17:51:32 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Fix radio status routing by TMSI
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/22363 )
Change subject: gbproxy: Fix radio status routing by TMSI
..
gbproxy: Fix radio status routing by TMSI
If a radio status message contains a TMSI it should be routed as if it
was a TLLI. Convert the TMSI to (foreign) TLLI so NRI-routing works.
Both foreign and local TLLIs are routed the same.
Fixes: OS#4954
Change-Id: Ifd64f02fa16b44f8e2e19eb8ba973f50a829ead5
---
M src/gbproxy/gb_proxy.c
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/22363/1
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index be8602e..99efa4e 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -417,11 +417,12 @@
} else if (TLVP_PRESENT(&tp, BSSGP_IE_TMSI)) {
/* we treat the TMSI like a TLLI and extract the NRI
from it */
tlli = osmo_load32be(TLVP_VAL(&tp, BSSGP_IE_TMSI));
+ /* Convert the TMSI into a FOREIGN TLLI so it is routed
appropriately */
+ tlli = gprs_tmsi2tlli(tlli, TLLI_FOREIGN);
rc = gbprox_bss2sgsn_tlli(bss_bvc->cell, msg, &tlli,
false);
} else if (TLVP_PRESENT(&tp, BSSGP_IE_IMSI)) {
/* FIXME: Use the IMSI as selector? */
rc = gbprox_bss2sgsn_tlli(bss_bvc->cell, msg, NULL,
false);
- /* rc = gbprox_bss2sgsn_hashed(bss_bvc->cell, msg,
NULL); */
} else
LOGPBVC(bss_bvc, LOGL_ERROR, "Rx RADIO-STATUS without
any of the conditional IEs\n");
break;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22363
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ifd64f02fa16b44f8e2e19eb8ba973f50a829ead5
Gerrit-Change-Number: 22363
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: gbproxy: Improve log messages in gbproxy_select_sgsn
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/22362 )
Change subject: gbproxy: Improve log messages in gbproxy_select_sgsn
..
gbproxy: Improve log messages in gbproxy_select_sgsn
Change-Id: Id7bc755b90c35ed7c8cfa8408073e2866d639f2d
Related: OS#4954
---
M src/gbproxy/gb_proxy.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/62/22362/1
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index edd9f29..be8602e 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -251,8 +251,10 @@
}
} else {
/* We couldn't get the NRI from the TLLI */
- LOGP(DGPRS, LOGL_ERROR, "Could not extract NRI
from local TLLI %u\n", *tlli);
+ LOGP(DGPRS, LOGL_ERROR, "Could not extract NRI
from local TLLI %08x\n", *tlli);
}
+ } else {
+ LOGP(DGPRS, LOGL_INFO, "TLLI %08x is neither local nor
foreign\n");
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/22362
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Id7bc755b90c35ed7c8cfa8408073e2866d639f2d
Gerrit-Change-Number: 22362
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in libosmocore[master]: bssgp_rim: add encoder/decoder for NACC related RIM containers
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21862 ) Change subject: bssgp_rim: add encoder/decoder for NACC related RIM containers .. Patch Set 13: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/21862/13/src/gb/gprs_bssgp_rim.c File src/gb/gprs_bssgp_rim.c: https://gerrit.osmocom.org/c/libosmocore/+/21862/13/src/gb/gprs_bssgp_rim.c@343 PS13, Line 343: buf_ptr[1] = len & 0xff; > Something is definitely wrong here: you store (x >> 8) and then overwrite it > by (x & 0xff). […] Thanks for pointing this out. This is a bug. A fix is already merged, see: I3cce0b2796793554a421fd3ce8e749c52d22eaea -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibbc7fd67658e3040c12abb5706fe9d1f31894352 Gerrit-Change-Number: 21862 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 21 Jan 2021 17:21:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Fix pooling expectations of TC_bvc_reset_*_from_bss
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22361 )
Change subject: gbproxy: Fix pooling expectations of TC_bvc_reset_*_from_bss
..
gbproxy: Fix pooling expectations of TC_bvc_reset_*_from_bss
With pooling enabled these tests now need to verify that the reset/block
is propagated to all SGSNs in the pool.
Change-Id: I34ed4bffce564dbaf08f9388bd5247351dd0725e
Fixes: OS#4964
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 61 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/61/22361/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index e3e61f4..ddcd9cb 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -342,6 +342,7 @@
var boolean g_use_echo := false;
var ro_integer g_roi := {};
+ var roro_integer g_roroi := {};
timer g_Tguard;
};
@@ -2464,7 +2465,14 @@
/***
* BVC-RESET procedure
***/
-
+private altstep as_count_bvc_reset(integer sgsn_idx, BssgpBvci bvci, inout
roro_integer roroi)
+runs on test_CT {
+ var BSSGP_BVC_CT sgsn_bvc_ct := f_get_sgsn_bvc_ct(sgsn_idx, bvci);
+ [] SGSN_MGMT.receive(BssgpResetIndication:{bvci}) from sgsn_bvc_ct {
+ roroi[sgsn_idx] := roroi[sgsn_idx] & { bvci };
+ repeat;
+ }
+}
private altstep as_ignore_status(BSSGP_BVC_MGMT_PT pt) {
[] pt.receive(BssgpStatusIndication:?) { repeat; }
}
@@ -2481,22 +2489,51 @@
var BSSGP_BVC_CT pcu_bvc_ct := g_pcu[pcu_idx].vc_BSSGP_BVC[bvc_idx];
var BssgpBvcConfig bvc_cfg := g_pcu[pcu_idx].cfg.bvc[bvc_idx];
var Nsei nsei_pcu := g_pcu[pcu_idx].cfg.nsei;
- var BSSGP_BVC_CT sgsn_bvc_ct := f_get_sgsn_bvc_ct(0, bvc_cfg.bvci);
- var default d;
+ var ro_default defaults;
+ var integer i;
SGSN_MGMT.clear;
PCU_MGMT.clear;
+ for (i := 0; i < lengthof(mp_nsconfig_sgsn); i := i+1) {
+ g_roroi[i] := {};
+ }
+
/* block the PTP BVC from the PCU side */
PCU_MGMT.send(BssgpResetRequest:{cause:=BSSGP_CAUSE_OM_INTERVENTION})
to pcu_bvc_ct;
+
/* expect state on both PCU and SGSN side to change */
- d := activate(as_ignore_status(SGSN_MGMT));
- interleave {
- [] PCU_MGMT.receive(tr_BssgpStsInd(nsei_pcu, bvc_cfg.bvci,
BVC_S_BLOCKED)) from pcu_bvc_ct;
- [] SGSN_MGMT.receive(BssgpResetIndication:{bvc_cfg.bvci}) from
sgsn_bvc_ct;
+ defaults := { activate(as_ignore_status(SGSN_MGMT)) };
+
+ /* Activate altsteps: One for each SGSN */
+ for (i := 0; i < lengthof(g_sgsn); i := i+1) {
+ var default d := activate(as_count_bvc_reset(i, bvc_cfg.bvci,
g_roroi));
+ defaults := defaults & { d };
}
- deactivate(d);
+
+ timer T := 3.0;
+ T.start;
+ alt {
+ [] PCU_MGMT.receive(tr_BssgpStsInd(nsei_pcu, bvc_cfg.bvci,
BVC_S_BLOCKED)) from pcu_bvc_ct {
+ g_roi := g_roi & { bvc_cfg.bvci };
+ repeat;
+ }
+ [] T.timeout;
+ }
+
+ for (i := 0; i < lengthof(defaults); i := i+1) {
+ deactivate(defaults[i]);
+ }
+
+ /* Check if BVC-RESET was received at all SGSNs */
+ for (i := 0; i < lengthof(g_sgsn); i := i+1) {
+ if (not ro_integer_contains(g_roroi[i], bvc_cfg.bvci)) {
+ setverdict(fail, "Missing SGSN[", i, "] BVC-BLOCK of
BVCI=", bvc_cfg.bvci);
+ }
+ }
+
setverdict(pass);
+ f_cleanup();
}
/* Send a BVC-RESET for a PTP BVC from the BSS side: expect it to propagate */
testcase TC_bvc_reset_ptp_from_bss() runs on test_CT
@@ -2507,11 +2544,11 @@
f_cleanup();
}
-private altstep as_count_bvc_block(integer sgsn_idx, BssgpBvci bvci, inout
ro_integer roi)
+private altstep as_count_bvc_block(integer sgsn_idx, BssgpBvci bvci, inout
roro_integer roroi)
runs on test_CT {
var BSSGP_BVC_CT sgsn_bvc_ct := f_get_sgsn_bvc_ct(sgsn_idx, bvci);
[] SGSN_MGMT.receive(tr_BssgpStsInd(?, bvci, BVC_S_BLOCKED)) from
sgsn_bvc_ct {
- roi := roi & { bvci };
+ roroi[sgsn_idx] := roroi[sgsn_idx] & { bvci };
repeat;
}
}
@@ -2521,15 +2558,21 @@
f_init();
f_sleep(3.0);
+ for (var integer i := 0; i < lengthof(mp_nsconfig_sgsn); i := i+1) {
+ g_roroi[i] := {};
+ }
+
/* Start BVC-RESET procedure for BVCI=0 */
PCU_MGMT.send(BssgpResetRequest:{cause:=BSSGP_CAUSE_OM_INTERVENTION})
to g_pcu[0].vc_BSSGP;
- /* Activate altsteps: One for each PTP BVC within that PCUs NSE */
+ /* Activate altsteps: One for each PTP BVC and SGSN within that PCUs
NSE */
Change in osmo-pcu[master]: Get rid of singleton gprs_bssgp_pcu_current_bctx()
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/22360 )
Change subject: Get rid of singleton gprs_bssgp_pcu_current_bctx()
..
Get rid of singleton gprs_bssgp_pcu_current_bctx()
Access it from existing pointers instead.
Change-Id: I77455da5221090ebea142ecd49d5dba0065bfc5c
---
M src/gprs_bssgp_pcu.c
M src/gprs_bssgp_pcu.h
M src/pcu_l1_if.cpp
M src/tbf_dl.cpp
M src/tbf_ul.cpp
5 files changed, 4 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/60/22360/1
diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c
index 956fb66..c5cc39d 100644
--- a/src/gprs_bssgp_pcu.c
+++ b/src/gprs_bssgp_pcu.c
@@ -515,7 +515,7 @@
if (!TLVP_PRESENT(bp->tp, BSSGP_IE_BVCI))
return;
- if (gprs_bssgp_pcu_current_bctx()->bvci != bp->bvci) {
+ if (the_pcu->bssgp.bctx->bvci != bp->bvci) {
LOGP(DPCU, LOGL_NOTICE,
"Received BSSGP STATUS message for an unknown BVCI
(%d), "
"ignored\n",
@@ -1181,11 +1181,6 @@
bts->nse = NULL;
}
-struct bssgp_bvc_ctx *gprs_bssgp_pcu_current_bctx(void)
-{
- return the_pcu->bssgp.bctx;
-}
-
void gprs_bssgp_update_frames_sent()
{
the_pcu->bssgp.queue_frames_sent += 1;
diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h
index df22541..4b0e0aa 100644
--- a/src/gprs_bssgp_pcu.h
+++ b/src/gprs_bssgp_pcu.h
@@ -78,7 +78,6 @@
};
int gprs_gp_send_cb(void *ctx, struct msgb *msg);
-struct bssgp_bvc_ctx *gprs_bssgp_pcu_current_bctx(void);
int gprs_ns_prim_cb(struct osmo_prim_hdr *oph, void *ctx);
void gprs_bssgp_update_queue_delay(const struct timespec *tv_recv,
const struct timespec *tv_now);
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 8ae74d5..d7590e1 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -782,7 +782,7 @@
static int pcu_rx_susp_req(struct gprs_rlcmac_bts *bts, struct
gsm_pcu_if_susp_req *susp_req)
{
- struct bssgp_bvc_ctx *bctx = gprs_bssgp_pcu_current_bctx();
+ struct bssgp_bvc_ctx *bctx = bts->pcu->bssgp.bctx;
GprsMs *ms;
struct gprs_rlcmac_dl_tbf *dl_tbf;
struct gprs_rlcmac_ul_tbf *ul_tbf;
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 87c897f..de43349 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -641,7 +641,7 @@
return;
/* dequeue next LLC frame, if any */
- msg = llc_dequeue(gprs_bssgp_pcu_current_bctx());
+ msg = llc_dequeue(bts->pcu->bssgp.bctx);
if (!msg)
return;
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp
index 0c59a50..a5fc376 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -560,7 +560,7 @@
uint8_t qos_profile[3];
struct msgb *llc_pdu;
unsigned msg_len = NS_HDR_LEN + BSSGP_HDR_LEN +
llc_frame_length(&m_llc);
- struct bssgp_bvc_ctx *bctx = gprs_bssgp_pcu_current_bctx();
+ struct bssgp_bvc_ctx *bctx = bts->pcu->bssgp.bctx;
LOGP(DBSSGP, LOGL_INFO, "LLC [PCU -> SGSN] %s len=%d\n",
tbf_name(this), llc_frame_length(&m_llc));
if (!bctx) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22360
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I77455da5221090ebea142ecd49d5dba0065bfc5c
Gerrit-Change-Number: 22360
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-bts[master]: power_control: add test for inc / red step size limitations
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22359 ) Change subject: power_control: add test for inc / red step size limitations .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic2d4e144b0319d86daa9fbe38727b892081f0c37 Gerrit-Change-Number: 22359 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 16:08:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: add test for inc / red step size limitations
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/22359 )
Change subject: power_control: add test for inc / red step size limitations
..
power_control: add test for inc / red step size limitations
Change-Id: Ic2d4e144b0319d86daa9fbe38727b892081f0c37
Related: SYS#4918
---
M tests/power/bs_power_loop_test.c
M tests/power/bs_power_loop_test.err
M tests/power/bs_power_loop_test.ok
3 files changed, 189 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/59/22359/1
diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c
index 7301b7f..5271324 100644
--- a/tests/power/bs_power_loop_test.c
+++ b/tests/power/bs_power_loop_test.c
@@ -56,6 +56,7 @@
PWR_TEST_ST_IND_MEAS = 0,
PWR_TEST_ST_IND_DUMMY,
PWR_TEST_ST_SET_STATE,
+ PWR_TEST_ST_SET_STEP_SIZE,
PWR_TEST_ST_SET_RXLEV_PARAMS,
PWR_TEST_ST_ENABLE_DTXD,
PWR_TEST_ST_DISABLE_DPC,
@@ -78,6 +79,11 @@
uint8_t rxlev_sub;
bool invalid;
} meas;
+ /* Increase / reduce step size */
+ struct {
+ uint8_t inc;
+ uint8_t red;
+ } step_size;
};
/* Expected Tx power reduction */
uint8_t exp_txred;
@@ -153,6 +159,12 @@
printf("#%02u %s() <- Dynamic power control is disabled\n", n,
__func__);
lchan->bs_power_ctrl.dpc_params = NULL;
return 0; /* we're done */
+ case PWR_TEST_ST_SET_STEP_SIZE:
+ printf("#%02u %s() <- Set step size: inc %u dB, red %u dB\n",
+ n, __func__, step->step_size.inc, step->step_size.red);
+ lchan->bs_dpc_params.inc_step_size_db = step->step_size.inc;
+ lchan->bs_dpc_params.red_step_size_db = step->step_size.red;
+ return 0; /* we're done */
case PWR_TEST_ST_SET_RXLEV_PARAMS:
printf("#%02u %s() <- (Re)set RxLev params (thresh %u .. %u, "
"averaging is
%sabled)\n",
@@ -274,6 +286,60 @@
{ .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 0 }, /* min */
};
+/* Verify that delta values never exceed the corresponding step size,
+ * but still can be smaller than the step size if the target is close. */
+static const struct power_test_step TC_inc_red_step_size[] = {
+ /* Initial state: 0 dB, up to 20 dB */
+ { .type = PWR_TEST_ST_SET_STATE,
+ .state = { .current = 0, .max = 2 * 10 } },
+
+ { .type = PWR_TEST_ST_SET_STEP_SIZE,
+ .step_size = { .inc = 6, .red = 4 } },
+
+ /* MS indicates high RxLev values (-50 dBm), red step is 4 dB */
+ { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 4 },
+ { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 8 },
+ { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 12 },
+ { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 16 },
+ { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 20 }, /* max */
+ { .meas = DL_MEAS_FULL_SUB(0, 60), .exp_txred = 20 }, /* max */
+
+ /* MS indicates low RxLev values (-100 dBm), inc step is 6 dB */
+ { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 14 },
+ { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 8 },
+ { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 2 },
+ { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 0 }, /* min */
+ { .meas = DL_MEAS_FULL_SUB(0, 10), .exp_txred = 0 }, /* min */
+
+ /* Reset state: current 10 dB, up to 20 dB */
+ { .type = PWR_TEST_ST_SET_STATE,
+ .state = { .current = 10, .max = 2 * 10 } },
+
+ /* Let's say the current value is now 1 dB greater than the target
(current red 10 dB) */
+ { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET + 1),
.exp_txred = 10 + 1 },
+ { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET + 0),
.exp_txred = 10 + 1 },
+ /* Let's say the current value is now 2 dB greater than the target
(current red 11 dB) */
+ { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET + 2),
.exp_txred = 11 + 2 },
+ { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET + 0),
.exp_txred = 11 + 2 },
+ /* Let's say the current value is now 3 dB greater than the target
(current red 13 dB) */
+ { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET + 3),
.exp_txred = 13 + 3 },
+ { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET + 0),
.exp_txred = 13 + 3 },
+
+ /* Reset state: current 10 dB, up to 20 dB */
+ { .type = PWR_TEST_ST_SET_STATE,
+ .state = { .current = 10, .max = 2 * 10 } },
+
+ /* Let's say the current value is now 1 dB lower than the target
(current
Change in osmo-ttcn3-hacks[master]: pcu: Ignore dummy rlcmac packets in f_ms_rx_pkt_ass_pacch
Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313 to look at the new patch set (#2). Change subject: pcu: Ignore dummy rlcmac packets in f_ms_rx_pkt_ass_pacch .. pcu: Ignore dummy rlcmac packets in f_ms_rx_pkt_ass_pacch Allow ignoring for received dumy packets while waiting for a Pkt Ass on PACCH. This fixes some tests failing sometimes due to race condition where rlcmac packet is requested too quicky, after the PCU has received the BSSGP packet we sent to it. The function is splitted into an internal altestep + a wrap function which is compatible with tests already using it. Related: OS#4779 Change-Id: I0a10d3a7383d8534e9263864b4130a96392e6198 --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 54 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/22313/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0a10d3a7383d8534e9263864b4130a96392e6198 Gerrit-Change-Number: 22313 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Ignore dummy rlcmac packets in f_ms_rx_pkt_ass_pacch
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313 ) Change subject: pcu: Ignore dummy rlcmac packets in f_ms_rx_pkt_ass_pacch .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313/1/pcu/GPRS_Components.ttcn File pcu/GPRS_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313/1/pcu/GPRS_Components.ttcn@506 PS1, Line 506:sapi := PCU_IF_SAPI_PDTCH, fn := 0, > Please fix spacing here, it's broken. Ack https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313/1/pcu/GPRS_Components.ttcn@512 PS1, Line 512: as_ms_rx_pkt_ass_pacch > I am sorry, but this altstep is pretty much useless for anything else than > f_ms_rx_pkt_ass_pacch(). […] I agree it's of now use *now*, but I'm already redoing it as a first step / test for follow-up patches where I start using the new BTS port which allows for matching different RLCMAC block types directly on receive(). So let's go for merging this patch now and get rid of sporadic failures, and I'll finish working on the other patches implementing the new BTS port when I find some time. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0a10d3a7383d8534e9263864b4130a96392e6198 Gerrit-Change-Number: 22313 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 21 Jan 2021 15:44:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in libosmocore[master]: configure.ac: set -std=gnu99
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22355 ) Change subject: configure.ac: set -std=gnu99 .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef Gerrit-Change-Number: 22355 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Thu, 21 Jan 2021 15:13:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: configure.ac: set -std=gnu99
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22355 ) Change subject: configure.ac: set -std=gnu99 .. Patch Set 4: Changed to gnu99. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef Gerrit-Change-Number: 22355 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 13:45:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: configure.ac: set -std=gnu99
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22355 to look at the new patch set (#4). Change subject: configure.ac: set -std=gnu99 .. configure.ac: set -std=gnu99 Avoid using different dialects by accident (and resulting compiler errors if compiler assumes a different dialect), like in I72310886bef4db635078b75715c9d98ee45391cc. Related: https://lists.osmocom.org/pipermail/openbsc/2019-September/013030.html Related: https://lists.osmocom.org/pipermail/openbsc/2021-January/013360.html Related: osmo-pcu Ia57ba101627e3cc0babeca82631e207a3e2e0960 Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef --- M configure.ac 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/22355/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef Gerrit-Change-Number: 22355 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-ci[master]: jobs/repo-install-test: run a few hours later
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22354 ) Change subject: jobs/repo-install-test: run a few hours later .. jobs/repo-install-test: run a few hours later Give OBS more time to build the repository, before verifying that we can install all packages from the repository. Apparently, OBS publishes the repository in WIP state, before all packages for a distribution have been built. This leads to problems in the "nightly" and "next" repositories. In contrary to "latest", we do not bump soname versions when doing ABI changes, so we require the user to have all installed Osmocom packages built from the same timestamp. With recent changes in the OBS scripts, we enforce this by having all packages built from the same timestamp depend on the exact version of a dummy package with that timestamp as version. The repo-install-test installs all packages from the binary repository, and so it fails, as it should, if the repository is in an inconsistent state with some packages built today and some packages built yesterday. Related: OS#4733 Change-Id: I8df9b449d6213b5dca6fd9bf5c06b5c96d468f66 --- M jobs/repo-install-test.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index d16b852..2c26490 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -59,7 +59,7 @@ git-config-name: 'Jenkins Builder' git-config-email: 'jenk...@osmocom.org' triggers: - - timed: "H 04 * * *" # run after osmocom-obs.yml + - timed: "H 10 * * *" # run after osmocom-obs.yml publishers: - email: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8df9b449d6213b5dca6fd9bf5c06b5c96d468f66 Gerrit-Change-Number: 22354 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: Cosmetic: jobs/obs: update repo-install-test name
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22353 ) Change subject: Cosmetic: jobs/obs: update repo-install-test name .. Cosmetic: jobs/obs: update repo-install-test name Change-Id: Ic5712173ec79d286fb3591364636a38f6af74503 --- M jobs/osmocom-obs.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 8152d63..4d165d6 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -36,7 +36,7 @@ git-config-name: 'Jenkins Builder' git-config-email: 'jenk...@osmocom.org' triggers: - - timed: "H 00 * * *" # run before osmocom-debian-install.yml + - timed: "H 00 * * *" # run before repo-install-test.yml publishers: - email: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5712173ec79d286fb3591364636a38f6af74503 Gerrit-Change-Number: 22353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: Cosmetic: jobs/obs: update repo-install-test name
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22353 ) Change subject: Cosmetic: jobs/obs: update repo-install-test name .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5712173ec79d286fb3591364636a38f6af74503 Gerrit-Change-Number: 22353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 12:50:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs/repo-install-test: run a few hours later
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22354 ) Change subject: jobs/repo-install-test: run a few hours later .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8df9b449d6213b5dca6fd9bf5c06b5c96d468f66 Gerrit-Change-Number: 22354 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 12:50:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 270s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 270s] [COMPILING libboard/qmod/source/card_pres.c] [ 270s] [COMPILING libboard/qmod/source/wwan_led.c] [ 270s] [COMPILING libboard/qmod/source/i2c.c] [ 270s] [COMPILING libboard/qmod/source/board_qmod.c] [ 270s] [COMPILING apps/dfu/main.c] [ 270s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 271s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 271s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 271s] Memory region Used Size Region Size %age Used [ 271s] rom: 16588 B16 KB101.25% [ 271s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 271s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 271s] collect2: error: ld returned 1 exit status [ 271s] % [ 271s] make[2]: *** [Makefile:234: flash] Error 1 [ 271s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 271s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 271s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 271s] dh_auto_build: error: make -j1 returned exit code 2 [ 271s] make: *** [debian/rules:16: build] Error 25 [ 271s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 271s] ### VM INTERACTION START ### [ 274s] [ 258.156194] sysrq: Power Off [ 274s] [ 258.160922] reboot: Power down [ 274s] ### VM INTERACTION END ### [ 274s] [ 274s] lamb07 failed "build simtrace2_0.7.0.69.aadd.dsc" at Thu Jan 21 12:49:17 UTC 2021. [ 274s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in libosmocore[master]: configure.ac: set -std=gnu89
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22355 ) Change subject: configure.ac: set -std=gnu89 .. Patch Set 3: I think C99 with GNU extensions (gnu99) is a good choice today. C89 would really only matter if we'd be intrested in supporting super ancient compiler versions. We use several C99 bits anyway, such as __func__ or stdbool.h. So we might as well explicitly ask for it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef Gerrit-Change-Number: 22355 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 12:49:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 165s] [COMPILING apps/dfu/main.c] [ 165s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 165s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 165s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 165s] Memory region Used Size Region Size %age Used [ 165s] rom: 16580 B16 KB101.20% [ 165s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 165s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 165s] collect2: error: ld returned 1 exit status [ 165s] % [ 165s] make[2]: *** [Makefile:234: flash] Error 1 [ 165s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 165s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 165s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 165s] dh_auto_build: error: make -j1 returned exit code 2 [ 165s] make: *** [debian/rules:16: build] Error 25 [ 165s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 165s] ### VM INTERACTION START ### [ 169s] [ 155.484005] sysrq: Power Off [ 169s] [ 155.491003] reboot: Power down [ 169s] ### VM INTERACTION END ### [ 169s] [ 169s] lamb11 failed "build simtrace2_0.7.0.69.aadd.dsc" at Thu Jan 21 12:47:26 UTC 2021. [ 169s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in libosmocore[master]: tests/*: fix control reaches end of non-void func
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22356 ) Change subject: tests/*: fix control reaches end of non-void func .. tests/*: fix control reaches end of non-void func Prepare to set -std=gnu89 in a future commit, which will cause gcc warn about "control reaches end of non-void function" in main(). Change-Id: I7c33cac30e5859060f083813d8433011f5eaf0d0 --- M tests/i460_mux/i460_mux_test.c M tests/it_q/it_q_test.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/i460_mux/i460_mux_test.c b/tests/i460_mux/i460_mux_test.c index 9d5fcf7..7695cb4 100644 --- a/tests/i460_mux/i460_mux_test.c +++ b/tests/i460_mux/i460_mux_test.c @@ -395,4 +395,5 @@ test_16k_subchan(); test_8k_subchan(); test_unused_subchan(); + return 0; } diff --git a/tests/it_q/it_q_test.c b/tests/it_q/it_q_test.c index 0d75452..28e32d8 100644 --- a/tests/it_q/it_q_test.c +++ b/tests/it_q/it_q_test.c @@ -116,4 +116,5 @@ tc_alloc(); tc_queue_length(); tc_eventfd(); + return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7c33cac30e5859060f083813d8433011f5eaf0d0 Gerrit-Change-Number: 22356 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: configure.ac: set -std=gnu89
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22355 ) Change subject: configure.ac: set -std=gnu89 .. Patch Set 2: > Patch Set 2: > > Just in case you didn't see it, there was also a recent thread about it in ML: > > https://lists.osmocom.org/pipermail/openbsc/2021-January/013360.html > > I think it probably makes sense to keep an older std for libosmocore since > it's morprobable to have that in embedded systems which may lack > proper/updated C compiler. Thanks, I didn't see this thread. Adding lynxis as reviewer. lynxis recommended c99 in the thread. Personally I don't have a strong opinion on which standard to use, but I would welcome if we do decide on one, at least for the purpose to avoid build failures on OBS. Right now we are enforcing gnu89 indirectly by correcting whenever debian 8 fails to build on OBS, which has it set as default, and we do have gnu89 set as standard in osmo-pcu already (see related patch). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef Gerrit-Change-Number: 22355 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 12:09:37 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: Revert "gprs_ns2_vc_fsm: check NSEI match the NSE"
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22358 )
Change subject: Revert "gprs_ns2_vc_fsm: check NSEI match the NSE"
..
Revert "gprs_ns2_vc_fsm: check NSEI match the NSE"
This reverts commit 842599ca6252b9d65504fbe55148c6aad86f7025.
Closes: OS#4965
Change-Id: I96882961e179bb63e3f4095571135244148dde20
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 0 insertions(+), 14 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index 3ec6909..fc2a86a 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -750,7 +750,6 @@
struct osmo_fsm_inst *fi = nsvc->fi;
int rc = 0;
uint8_t cause;
- uint16_t nsei;
/* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct,
* if not answer STATUS with "NS-VC unknown" */
@@ -764,19 +763,6 @@
}
}
- if (TLVP_PRESENT(tp, NS_IE_NSEI)) {
- nsei = tlvp_val16be(tp, NS_IE_NSEI);
- if (nsei != nsvc->nse->nsei) {
- /* 48.016 § 7.3.1 send, RESET_ACK to wrong NSVCI +
ignore */
- if (nsh->pdu_type == NS_PDUT_RESET)
- ns2_tx_reset_ack(nsvc);
-
- LOGNSVC(nsvc, LOGL_ERROR, "Rx %s with wrong NSEI=%05u.
Ignoring PDU.\n",
- get_value_string(gprs_ns_pdu_strings,
nsh->pdu_type), nsei);
- goto out;
- }
- }
-
switch (nsh->pdu_type) {
case NS_PDUT_RESET:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22358
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I96882961e179bb63e3f4095571135244148dde20
Gerrit-Change-Number: 22358
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in libosmocore[master]: Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE"
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22357 )
Change subject: Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE"
..
Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE"
This reverts commit 9c1e04e5802dfa25fcab3ca2c947897a1b7e7485.
Related: OS#4965
Change-Id: Ic26e6ee8c225266dc31850e38976460cb0e81ebd
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 2 insertions(+), 14 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index d4f4320..3ec6909 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -750,10 +750,11 @@
struct osmo_fsm_inst *fi = nsvc->fi;
int rc = 0;
uint8_t cause;
- uint16_t nsei, nsvci;
+ uint16_t nsei;
/* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct,
* if not answer STATUS with "NS-VC unknown" */
+ /* TODO: handle RESET with different VCI */
/* TODO: handle BLOCK/UNBLOCK/ALIVE with different VCI */
if (gprs_ns2_validate(nsvc, nsh->pdu_type, msg, tp, &cause)) {
@@ -776,19 +777,6 @@
}
}
- if (nsvc->nsvci_is_valid && TLVP_PRESENT(tp, NS_IE_VCI)) {
- nsvci = tlvp_val16be(tp, NS_IE_VCI);
- if (nsvci != nsvc->nsvci) {
- /* 48.016 § 7.3.1 send RESET_ACK to wrong NSVCI +
ignore */
- if (nsh->pdu_type == NS_PDUT_RESET)
- ns2_tx_reset_ack(nsvc);
-
- LOGNSVC(nsvc, LOGL_ERROR, "Rx %s with wrong NSVCI=%05u.
Ignoring PDU.\n",
- get_value_string(gprs_ns_pdu_strings,
nsh->pdu_type), nsvci);
- goto out;
- }
- }
-
switch (nsh->pdu_type) {
case NS_PDUT_RESET:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22357
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic26e6ee8c225266dc31850e38976460cb0e81ebd
Gerrit-Change-Number: 22357
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in libosmocore[master]: Revert "gprs_ns2_vc_fsm: check NSEI match the NSE"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22358 ) Change subject: Revert "gprs_ns2_vc_fsm: check NSEI match the NSE" .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I96882961e179bb63e3f4095571135244148dde20 Gerrit-Change-Number: 22358 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Jan 2021 11:51:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22357 ) Change subject: Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE" .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic26e6ee8c225266dc31850e38976460cb0e81ebd Gerrit-Change-Number: 22357 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Jan 2021 11:50:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE"
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22357 )
Change subject: Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE"
..
Revert "gprs_ns2_vc_fsm: check NSVCI match the NSE"
This reverts commit 9c1e04e5802dfa25fcab3ca2c947897a1b7e7485.
Related: OS#4965
Change-Id: Ic26e6ee8c225266dc31850e38976460cb0e81ebd
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 2 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/57/22357/1
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index d4f4320..3ec6909 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -750,10 +750,11 @@
struct osmo_fsm_inst *fi = nsvc->fi;
int rc = 0;
uint8_t cause;
- uint16_t nsei, nsvci;
+ uint16_t nsei;
/* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct,
* if not answer STATUS with "NS-VC unknown" */
+ /* TODO: handle RESET with different VCI */
/* TODO: handle BLOCK/UNBLOCK/ALIVE with different VCI */
if (gprs_ns2_validate(nsvc, nsh->pdu_type, msg, tp, &cause)) {
@@ -776,19 +777,6 @@
}
}
- if (nsvc->nsvci_is_valid && TLVP_PRESENT(tp, NS_IE_VCI)) {
- nsvci = tlvp_val16be(tp, NS_IE_VCI);
- if (nsvci != nsvc->nsvci) {
- /* 48.016 § 7.3.1 send RESET_ACK to wrong NSVCI +
ignore */
- if (nsh->pdu_type == NS_PDUT_RESET)
- ns2_tx_reset_ack(nsvc);
-
- LOGNSVC(nsvc, LOGL_ERROR, "Rx %s with wrong NSVCI=%05u.
Ignoring PDU.\n",
- get_value_string(gprs_ns_pdu_strings,
nsh->pdu_type), nsvci);
- goto out;
- }
- }
-
switch (nsh->pdu_type) {
case NS_PDUT_RESET:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22357
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic26e6ee8c225266dc31850e38976460cb0e81ebd
Gerrit-Change-Number: 22357
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in libosmocore[master]: Revert "gprs_ns2_vc_fsm: check NSEI match the NSE"
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22358 )
Change subject: Revert "gprs_ns2_vc_fsm: check NSEI match the NSE"
..
Revert "gprs_ns2_vc_fsm: check NSEI match the NSE"
This reverts commit 842599ca6252b9d65504fbe55148c6aad86f7025.
Closes: OS#4965
Change-Id: I96882961e179bb63e3f4095571135244148dde20
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 0 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/22358/1
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index 3ec6909..fc2a86a 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -750,7 +750,6 @@
struct osmo_fsm_inst *fi = nsvc->fi;
int rc = 0;
uint8_t cause;
- uint16_t nsei;
/* TODO: 7.2: on UNBLOCK/BLOCK: check if NS-VCI is correct,
* if not answer STATUS with "NS-VC unknown" */
@@ -764,19 +763,6 @@
}
}
- if (TLVP_PRESENT(tp, NS_IE_NSEI)) {
- nsei = tlvp_val16be(tp, NS_IE_NSEI);
- if (nsei != nsvc->nse->nsei) {
- /* 48.016 § 7.3.1 send, RESET_ACK to wrong NSVCI +
ignore */
- if (nsh->pdu_type == NS_PDUT_RESET)
- ns2_tx_reset_ack(nsvc);
-
- LOGNSVC(nsvc, LOGL_ERROR, "Rx %s with wrong NSEI=%05u.
Ignoring PDU.\n",
- get_value_string(gprs_ns_pdu_strings,
nsh->pdu_type), nsei);
- goto out;
- }
- }
-
switch (nsh->pdu_type) {
case NS_PDUT_RESET:
osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET, tp);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22358
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I96882961e179bb63e3f4095571135244148dde20
Gerrit-Change-Number: 22358
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in libosmocore[master]: tests/*: fix control reaches end of non-void func
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22356 ) Change subject: tests/*: fix control reaches end of non-void func .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7c33cac30e5859060f083813d8433011f5eaf0d0 Gerrit-Change-Number: 22356 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 11:27:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: configure.ac: set -std=gnu89
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22355 ) Change subject: configure.ac: set -std=gnu89 .. Patch Set 2: I'm looking into why it fails to build for arm now. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef Gerrit-Change-Number: 22355 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Jan 2021 11:25:20 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs/repo-install-test: run a few hours later
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22354 ) Change subject: jobs/repo-install-test: run a few hours later .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8df9b449d6213b5dca6fd9bf5c06b5c96d468f66 Gerrit-Change-Number: 22354 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 11:24:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs/repo-install-test: run a few hours later
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22354 ) Change subject: jobs/repo-install-test: run a few hours later .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8df9b449d6213b5dca6fd9bf5c06b5c96d468f66 Gerrit-Change-Number: 22354 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 11:24:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: Cosmetic: jobs/obs: update repo-install-test name
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22353 ) Change subject: Cosmetic: jobs/obs: update repo-install-test name .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5712173ec79d286fb3591364636a38f6af74503 Gerrit-Change-Number: 22353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 11:23:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: tests/*: fix control reaches end of non-void func
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22356 ) Change subject: tests/*: fix control reaches end of non-void func .. tests/*: fix control reaches end of non-void func Prepare to set -std=gnu89 in a future commit, which will cause gcc warn about "control reaches end of non-void function" in main(). Change-Id: I7c33cac30e5859060f083813d8433011f5eaf0d0 --- M tests/i460_mux/i460_mux_test.c M tests/it_q/it_q_test.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/22356/1 diff --git a/tests/i460_mux/i460_mux_test.c b/tests/i460_mux/i460_mux_test.c index 9d5fcf7..7695cb4 100644 --- a/tests/i460_mux/i460_mux_test.c +++ b/tests/i460_mux/i460_mux_test.c @@ -395,4 +395,5 @@ test_16k_subchan(); test_8k_subchan(); test_unused_subchan(); + return 0; } diff --git a/tests/it_q/it_q_test.c b/tests/it_q/it_q_test.c index 0d75452..28e32d8 100644 --- a/tests/it_q/it_q_test.c +++ b/tests/it_q/it_q_test.c @@ -116,4 +116,5 @@ tc_alloc(); tc_queue_length(); tc_eventfd(); + return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7c33cac30e5859060f083813d8433011f5eaf0d0 Gerrit-Change-Number: 22356 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in libosmocore[master]: configure.ac: set -std=gnu89
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/22355 ) Change subject: configure.ac: set -std=gnu89 .. configure.ac: set -std=gnu89 Avoid using different dialects by accident (and resulting compiler errors if compiler assumes a different dialect), like in I72310886bef4db635078b75715c9d98ee45391cc. Related: https://lists.osmocom.org/pipermail/openbsc/2019-September/013030.html Related: osmo-pcu Ia57ba101627e3cc0babeca82631e207a3e2e0960 Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef --- M configure.ac 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/22355/1 diff --git a/configure.ac b/configure.ac index 32ea7ca..e8b8582 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,8 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6 subdir-objects]) AC_CONFIG_TESTDIR(tests) +CFLAGS="$CFLAGS -std=gnu89" + dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id79b13d3c498acb565f91eba650328fccb5a13ef Gerrit-Change-Number: 22355 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-ci[master]: jobs/repo-install-test: run a few hours later
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22354 ) Change subject: jobs/repo-install-test: run a few hours later .. Patch Set 1: Verified+1 Nightly failing with some packages from yesterday and some from today: https://jenkins.osmocom.org/jenkins/job/Osmocom-repo-install-debian/feed=nightly,label=build2-deb9build-ansible/248/console The following packages have unmet dependencies: libosmo-netif-doc : Depends: osmocom-nightly (= 1.0.0.202101210126) but 1.0.0.202101200126 is to be installed libosmo-sigtran-doc : Depends: osmocom-nightly (= 1.0.0.202101210126) but 1.0.0.202101200126 is to be installed libosmocodec-doc : Depends: osmocom-nightly (= 1.0.0.202101210126) but 1.0.0.202101200126 is to be installed libosmocoding-doc : Depends: osmocom-nightly (= 1.0.0.202101210126) but 1.0.0.202101200126 is to be installed libosmocore-doc : Depends: osmocom-nightly (= 1.0.0.202101210126) but 1.0.0.202101200126 is to be installed libosmoctrl-doc : Depends: osmocom-nightly (= 1.0.0.202101210126) but 1.0.0.202101200126 is to be installed ... Then running the job later, succeeding: https://jenkins.osmocom.org/jenkins/job/Osmocom-repo-install-debian/feed=nightly,label=build2-deb9build-ansible/249/console -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8df9b449d6213b5dca6fd9bf5c06b5c96d468f66 Gerrit-Change-Number: 22354 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 21 Jan 2021 09:52:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: Cosmetic: jobs/obs: update repo-install-test name
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22353 ) Change subject: Cosmetic: jobs/obs: update repo-install-test name .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5712173ec79d286fb3591364636a38f6af74503 Gerrit-Change-Number: 22353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 21 Jan 2021 09:50:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs/repo-install-test: run a few hours later
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22354 ) Change subject: jobs/repo-install-test: run a few hours later .. jobs/repo-install-test: run a few hours later Give OBS more time to build the repository, before verifying that we can install all packages from the repository. Apparently, OBS publishes the repository in WIP state, before all packages for a distribution have been built. This leads to problems in the "nightly" and "next" repositories. In contrary to "latest", we do not bump soname versions when doing ABI changes, so we require the user to have all installed Osmocom packages built from the same timestamp. With recent changes in the OBS scripts, we enforce this by having all packages built from the same timestamp depend on the exact version of a dummy package with that timestamp as version. The repo-install-test installs all packages from the binary repository, and so it fails, as it should, if the repository is in an inconsistent state with some packages built today and some packages built yesterday. Related: OS#4733 Change-Id: I8df9b449d6213b5dca6fd9bf5c06b5c96d468f66 --- M jobs/repo-install-test.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/54/22354/1 diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index d16b852..2c26490 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -59,7 +59,7 @@ git-config-name: 'Jenkins Builder' git-config-email: 'jenk...@osmocom.org' triggers: - - timed: "H 04 * * *" # run after osmocom-obs.yml + - timed: "H 10 * * *" # run after osmocom-obs.yml publishers: - email: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8df9b449d6213b5dca6fd9bf5c06b5c96d468f66 Gerrit-Change-Number: 22354 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-ci[master]: Cosmetic: jobs/obs: update repo-install-test name
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/22353 ) Change subject: Cosmetic: jobs/obs: update repo-install-test name .. Cosmetic: jobs/obs: update repo-install-test name Change-Id: Ic5712173ec79d286fb3591364636a38f6af74503 --- M jobs/osmocom-obs.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/53/22353/1 diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 8152d63..4d165d6 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -36,7 +36,7 @@ git-config-name: 'Jenkins Builder' git-config-email: 'jenk...@osmocom.org' triggers: - - timed: "H 00 * * *" # run before osmocom-debian-install.yml + - timed: "H 00 * * *" # run before repo-install-test.yml publishers: - email: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic5712173ec79d286fb3591364636a38f6af74503 Gerrit-Change-Number: 22353 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in docker-playground[master]: gbproxy: Use separate NS-VC for data + signaling
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22308 ) Change subject: gbproxy: Use separate NS-VC for data + signaling .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I58f8a6d1c8d01551d366bd7d0dbfb892cce512ae Gerrit-Change-Number: 22308 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 09:43:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: gbproxy: Use separate NS-VC for data + signaling
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/22308 )
Change subject: gbproxy: Use separate NS-VC for data + signaling
..
gbproxy: Use separate NS-VC for data + signaling
This follows the change implemented in osmo-ttcn3-hacks.git
If0e404bdf2c30a5e18748695608611be83f61109 to use data-only
and signalling-only NS-VCs on the SGSN side
Change-Id: I58f8a6d1c8d01551d366bd7d0dbfb892cce512ae
Requires: osmo-ttcn3-hacks.git If0e404bdf2c30a5e18748695608611be83f61109
Related: OS#4953
---
M ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
M ttcn3-gbproxy-test/GBProxy_Tests.cfg
2 files changed, 44 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
diff --git a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
index 146d1e4..8a95e2e 100644
--- a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
@@ -25,6 +25,17 @@
local_udp_port := 23000,
remote_ip := "172.18.25.10",
data_weight := 1,
+ signalling_weight := 0
+ }
+ }
+ }, {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.25.103",
+ local_udp_port := 23000,
+ remote_ip := "172.18.25.10",
+ data_weight := 0,
signalling_weight := 1
}
}
@@ -41,6 +52,17 @@
local_udp_port := 24000,
remote_ip := "172.18.25.10",
data_weight := 1,
+ signalling_weight := 0
+ }
+ }
+ }, {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.25.103",
+ local_udp_port := 24000,
+ remote_ip := "172.18.25.10",
+ data_weight := 0,
signalling_weight := 1
}
}
diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
index 89f4fa7..8638586 100644
--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
@@ -24,6 +24,17 @@
local_udp_port := 23000,
remote_ip := "172.18.24.10",
data_weight := 1,
+ signalling_weight := 0
+ }
+ }
+ }, {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.24.103",
+ local_udp_port := 23000,
+ remote_ip := "172.18.24.10",
+ data_weight := 0,
signalling_weight := 1
}
}
@@ -40,6 +51,17 @@
local_udp_port := 24000,
remote_ip := "172.18.24.10",
data_weight := 1,
+ signalling_weight := 0
+ }
+ }
+ }, {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.24.103",
+
Change in docker-playground[master]: gbproxy, pcu, sgsn: Update config files
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/22307 )
Change subject: gbproxy,pcu,sgsn: Update config files
..
gbproxy,pcu,sgsn: Update config files
In upstream I9798e639b4bc8658482945970775b012b5840779 we introduce
two additional fields per NSVC (data_weight, signalling_weight). Make
sure those are specified everywhere.
Related: OS#4953
Requires: osmo-ttcn3-hacks.git I9798e639b4bc8658482945970775b012b5840779
Change-Id: Ic607b3edc3bf724a8b2dbd6be8c806002c229509
---
M ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
M ttcn3-gbproxy-test/GBProxy_Tests.cfg
M ttcn3-pcu-test/PCU_Tests.cfg
M ttcn3-pcu-test/sns/PCU_Tests.cfg
M ttcn3-sgsn-test/SGSN_Tests.cfg
5 files changed, 36 insertions(+), 12 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
diff --git a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
index ce4c698..146d1e4 100644
--- a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
@@ -23,7 +23,9 @@
address_family := AF_INET,
local_ip := "172.18.25.103",
local_udp_port := 23000,
- remote_ip := "172.18.25.10"
+ remote_ip := "172.18.25.10",
+ data_weight := 1,
+ signalling_weight := 1
}
}
}
@@ -37,7 +39,9 @@
address_family := AF_INET,
local_ip := "172.18.25.103",
local_udp_port := 24000,
- remote_ip := "172.18.25.10"
+ remote_ip := "172.18.25.10",
+ data_weight := 1,
+ signalling_weight := 1
}
}
}
diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
index e19084a..89f4fa7 100644
--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
@@ -22,7 +22,9 @@
address_family := AF_INET,
local_ip := "172.18.24.103",
local_udp_port := 23000,
- remote_ip := "172.18.24.10"
+ remote_ip := "172.18.24.10",
+ data_weight := 1,
+ signalling_weight := 1
}
}
}
@@ -36,7 +38,9 @@
address_family := AF_INET,
local_ip := "172.18.24.103",
local_udp_port := 24000,
- remote_ip := "172.18.24.10"
+ remote_ip := "172.18.24.10",
+ data_weight := 1,
+ signalling_weight := 1
}
}
}
@@ -51,7 +55,9 @@
ip := {
address_family := AF_INET,
local_ip := "172.18.24.103",
- remote_ip := "172.18.24.10"
+ remote_ip := "172.18.24.10",
+ data_weight := 1,
+ signalling_weight := 1
}
}
}
@@ -63,7 +69,9 @@
ip := {
address_family := AF_INET,
local_ip := "172.18.24.103",
- remote_ip := "172.18.24.10"
+ remote_ip := "172.18.24.10",
+ data_weight := 1,
+ signa
Change in docker-playground[master]: gbproxy, pcu, sgsn: Update config files
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/22307 ) Change subject: gbproxy,pcu,sgsn: Update config files .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/22307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic607b3edc3bf724a8b2dbd6be8c806002c229509 Gerrit-Change-Number: 22307 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 09:43:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Use separate NS-VC for data / signalling on SGSN side
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22306 )
Change subject: gbproxy: Use separate NS-VC for data / signalling on SGSN side
..
gbproxy: Use separate NS-VC for data / signalling on SGSN side
As we know, many production deployments have SGSN architectures with
clear control / user plane split. In such situations, IP-SNS of the
SGSN informs us of two (classes of) IP endpoints:
some that have control_weight > 0 and data_weight 0
some that have control_weight 0 and data_weight > 0
Let's adjust the GBProxy_Tests.ttcn to use such a configuration for
each of the two simulated SGSNs.
Change-Id: If0e404bdf2c30a5e18748695608611be83f61109
Closes: OS#4953
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 28 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index e1d2e59..e3e61f4 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -68,11 +68,24 @@
local_ip :=
"127.0.0.10",
remote_udp_port :=
23000,
remote_ip :=
"127.0.0.1",
- data_weight := 1,
+ data_weight := 0,
signalling_weight := 1
}
},
nsvci := 101
+ }, {
+ provider := {
+ ip := {
+ address_family :=
AF_INET,
+ local_udp_port := 7770,
+ local_ip :=
"127.0.0.10",
+ remote_udp_port :=
23000,
+ remote_ip :=
"127.0.0.1",
+ data_weight := 1,
+ signalling_weight := 0
+ }
+ },
+ nsvci := 201
}
}
@@ -89,11 +102,24 @@
local_ip :=
"127.0.0.11",
remote_udp_port :=
23000,
remote_ip :=
"127.0.0.1",
- data_weight := 1,
+ data_weight := 0,
signalling_weight := 1
}
},
nsvci := 102
+ }, {
+ provider := {
+ ip := {
+ address_family :=
AF_INET,
+ local_udp_port := 8880,
+ local_ip :=
"127.0.0.11",
+ remote_udp_port :=
23000,
+ remote_ip :=
"127.0.0.1",
+ data_weight := 1,
+ signalling_weight := 0
+ }
+ },
+ nsvci := 202
}
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22306
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: If0e404bdf2c30a5e18748695608611be83f61109
Gerrit-Change-Number: 22306
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: NS_Emulation: Respect data_weight==0 or signalling_weight==0
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305 )
Change subject: NS_Emulation: Respect data_weight==0 or signalling_weight==0
..
NS_Emulation: Respect data_weight==0 or signalling_weight==0
* allow configuration of signalling + data weight for each NS-VC
* advertise per-NSVC signalling/data weight in SNS-CONFIG
* keep track of unblocked NS-VCS separately for data / signalling
* transmit BVCI=0 traffic only over signalling NS-VC
* transmit BVCI>0 traffic only over data NS-VC
* accept incoming BVCI=0 traffic only if signalling_weight > 0
* accept incoming BVCI>0 traffic only if data_weight > 0
Related: OS#4953
Change-Id: I9798e639b4bc8658482945970775b012b5840779
---
M gbproxy/GBProxy_Tests.ttcn
M library/NS_Emulation.ttcnpp
M library/Osmocom_Gb_Types.ttcn
M pcu/PCU_Tests.cfg
M pcu/PCU_Tests_SNS.cfg
M pcu/PCU_Tests_SNSv6.cfg
M sgsn/SGSN_Tests.ttcn
7 files changed, 153 insertions(+), 33 deletions(-)
Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 9fa9c4f..e1d2e59 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -67,11 +67,14 @@
local_udp_port := ,
local_ip :=
"127.0.0.10",
remote_udp_port :=
23000,
- remote_ip := "127.0.0.1"
+ remote_ip :=
"127.0.0.1",
+ data_weight := 1,
+ signalling_weight := 1
}
},
nsvci := 101
}
+
}
}, {
nsei := 102,
@@ -85,7 +88,9 @@
local_udp_port := ,
local_ip :=
"127.0.0.11",
remote_udp_port :=
23000,
- remote_ip := "127.0.0.1"
+ remote_ip :=
"127.0.0.1",
+ data_weight := 1,
+ signalling_weight := 1
}
},
nsvci := 102
@@ -109,7 +114,9 @@
local_udp_port := 21010,
local_ip := "127.0.1.1",
remote_udp_port :=
23000,
- remote_ip := "127.0.0.1"
+ remote_ip :=
"127.0.0.1",
+ data_weight := 1,
+ signalling_weight := 1
}
},
nsvci := 2101
@@ -128,7 +135,9 @@
local_udp_port := 21020,
local_ip := "127.0.2.1",
remote_udp_port :=
23000,
- remote_ip := "127.0.0.1"
+ remote_ip :=
"127.0.0.1",
+ data_weight := 1,
+ signalling_weight := 1
}
},
nsvci := 2102
@@ -147,7 +156,9 @@
local_udp_port := 21030,
local_ip := "127.0.3.1",
remote_udp_port :=
23000,
- remote_ip := "127.0.0.1"
+ remote_ip :=
"127.0.0.1",
+ data_weight := 1,
+ signalling_weight := 1
}
Change in osmo-ttcn3-hacks[master]: NS_Emulation: Add CTRL port to administratively disable a NS-VC
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22315 ) Change subject: NS_Emulation: Add CTRL port to administratively disable a NS-VC .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I742ecf01de15e3edbf0719371f0217a5739b7c8e Gerrit-Change-Number: 22315 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Jan 2021 09:42:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Use separate NS-VC for data / signalling on SGSN side
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22306 ) Change subject: gbproxy: Use separate NS-VC for data / signalling on SGSN side .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If0e404bdf2c30a5e18748695608611be83f61109 Gerrit-Change-Number: 22306 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 21 Jan 2021 09:42:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: NS_Emulation: Respect data_weight==0 or signalling_weight==0
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305 ) Change subject: NS_Emulation: Respect data_weight==0 or signalling_weight==0 .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9798e639b4bc8658482945970775b012b5840779 Gerrit-Change-Number: 22305 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 21 Jan 2021 09:42:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: NS_Emulation: Respect data_weight==0 or signalling_weight==0
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305 ) Change subject: NS_Emulation: Respect data_weight==0 or signalling_weight==0 .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305/1/gbproxy/GBProxy_Tests.ttcn File gbproxy/GBProxy_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305/1/gbproxy/GBProxy_Tests.ttcn@71 PS1, Line 71: data_weight := 0, > Shouldn't you set data_weight 1 here (and below) as well and only change it > in the next commit where […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9798e639b4bc8658482945970775b012b5840779 Gerrit-Change-Number: 22305 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 21 Jan 2021 09:42:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in libosmocore[master]: logging_vty: Fix saving of "logging print file .. last"
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22341 )
Change subject: logging_vty: Fix saving of "logging print file .. last"
..
logging_vty: Fix saving of "logging print file .. last"
Back in 2018 in I393907b3c9e0cc1145e102328adad0a83ee13a9f Neels
introduced "last" as an optional flag to log the file/line number at the
end of the line, rather than at the end of the header. It seems nobody
has been usingi this feature, or at least never tried to save a related
config file, as there was no code whatsoever that would ever save this
optional "last" flag.
Change-Id: I7b6245256aecc425722242aaabc154ac58ba27a0
---
M src/vty/logging_vty.c
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index 0282350..6a7a8f4 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -1010,8 +1010,9 @@
tgt->print_timestamp ? 1 : 0, VTY_NEWLINE);
if (tgt->print_level)
vty_out(vty, " logging print level 1%s", VTY_NEWLINE);
- vty_out(vty, " logging print file %s%s",
+ vty_out(vty, " logging print file %s%s%s",
get_value_string(logging_print_file_args, tgt->print_filename2),
+ tgt->print_filename_pos == LOG_FILENAME_POS_LINE_END ? " last"
: "",
VTY_NEWLINE);
if (tgt->loglevel) {
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22341
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7b6245256aecc425722242aaabc154ac58ba27a0
Gerrit-Change-Number: 22341
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: gprs_ns2_test: Fix compilation on Debian 8
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22352 )
Change subject: gprs_ns2_test: Fix compilation on Debian 8
..
gprs_ns2_test: Fix compilation on Debian 8
[ 352s] gb/gprs_ns2_test.c: In function 'test_block_unblock_nsvc':
[ 352s] gb/gprs_ns2_test.c:200:2: error: 'for' loop initial declarations are
only allowed in C99 or C11 mode
[ 352s] for (int i=0; i<2; i++) {
[ 352s] ^
[ 352s] gb/gprs_ns2_test.c:200:2: note: use option -std=c99, -std=gnu99,
-std=c11 or -std=gnu11 to compile your code
Change-Id: I72310886bef4db635078b75715c9d98ee45391cc
---
M tests/gb/gprs_ns2_test.c
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c
index 315a4d0..44c9ce4 100644
--- a/tests/gb/gprs_ns2_test.c
+++ b/tests/gb/gprs_ns2_test.c
@@ -188,6 +188,7 @@
struct gprs_ns_hdr *nsh;
struct msgb *msg;
char idbuf[32];
+ int i;
printf("--- Testing NSE block unblock nsvc\n");
printf(" Create NSE + Binds\n");
@@ -197,7 +198,7 @@
nse = gprs_ns2_create_nse(nsi, 1001, GPRS_NS2_LL_UDP,
NS2_DIALECT_STATIC_RESETBLOCK);
OSMO_ASSERT(nse);
- for (int i=0; i<2; i++) {
+ for (i=0; i<2; i++) {
printf(" Create NSVC[i]\n");
snprintf(idbuf, sizeof(idbuf), "NSE%05u-dummy-%i", nse->nsei,
i);
nsvc[i] = ns2_vc_alloc(bind[i], nse, false,
NS2_VC_MODE_BLOCKRESET, idbuf);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22352
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I72310886bef4db635078b75715c9d98ee45391cc
Gerrit-Change-Number: 22352
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: add expert commands for MS/BS power control
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/22348 )
Change subject: vty: add expert commands for MS/BS power control
..
vty: add expert commands for MS/BS power control
These new commands are useful for debugging MS/BS power control
loops, e.g. one can change power control mode, overwrite the
current BS power reduction or MS power level at run-time.
Change-Id: I1ebb033b02c2bc3b1fa7de874e0035a07297f266
Related: SYS#4918
---
M src/common/vty.c
1 file changed, 76 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/common/vty.c b/src/common/vty.c
index 07244e7..9dd0c1a 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -2026,6 +2026,80 @@
return CMD_SUCCESS;
}
+#define LCHAN_PWR_CTRL_CMD \
+ BTS_T_T_L_CMD " (bs-power-ctrl|ms-power-ctrl)"
+#define LCHAN_PWR_CTRL_STR \
+ BTS_T_T_L_STR "BS power control\n" "MS power control\n"
+
+DEFUN_ATTR(bts_t_t_l_power_ctrl_mode,
+ bts_t_t_l_power_ctrl_mode_cmd,
+ LCHAN_PWR_CTRL_CMD " mode (static|dynamic)",
+ LCHAN_PWR_CTRL_STR "Change power control mode\n"
+ "Disable the power control loop\n"
+ "Enable the power control loop\n",
+ CMD_ATTR_HIDDEN)
+{
+ struct gsm_network *net = gsmnet_from_vty(vty);
+ const struct gsm_power_ctrl_params *params;
+ struct lchan_power_ctrl_state *state;
+ const char **args = argv + 4;
+ struct gsm_lchan *lchan;
+
+ lchan = resolve_lchan(net, argv, 0);
+ if (!lchan) {
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (strcmp(args[0], "bs-power-ctrl") == 0) {
+ params = &lchan->bs_dpc_params;
+ state = &lchan->bs_power_ctrl;
+ } else { /* ms-power-ctrl */
+ params = &lchan->ms_dpc_params;
+ state = &lchan->ms_power_ctrl;
+ }
+
+ if (strcmp(args[1], "dynamic") == 0)
+ state->dpc_params = params;
+ else
+ state->dpc_params = NULL;
+
+ return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(bts_t_t_l_power_ctrl_current_max,
+ bts_t_t_l_power_ctrl_current_max_cmd,
+ LCHAN_PWR_CTRL_CMD " value (current|max) <0-255>",
+ LCHAN_PWR_CTRL_STR "Change current power value\n"
+ "Current value (for both dynamic and static modes)\n"
+ "Maximum value (for dynamic mode only)\n"
+ "BS power reduction (in dB) or MS power level\n",
+ CMD_ATTR_HIDDEN)
+{
+ struct gsm_network *net = gsmnet_from_vty(vty);
+ struct lchan_power_ctrl_state *state;
+ const char **args = argv + 4;
+ struct gsm_lchan *lchan;
+
+ lchan = resolve_lchan(net, argv, 0);
+ if (!lchan) {
+ vty_out(vty, "%% Could not resolve logical channel%s",
VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (strcmp(args[0], "bs-power-ctrl") == 0)
+ state = &lchan->bs_power_ctrl;
+ else /* ms-power-ctrl */
+ state = &lchan->ms_power_ctrl;
+
+ if (strcmp(args[1], "current") == 0)
+ state->current = atoi(args[2]);
+ else
+ state->max = atoi(args[2]);
+
+ return CMD_SUCCESS;
+}
+
DEFUN(logging_fltr_l1_sapi, logging_fltr_l1_sapi_cmd, "HIDDEN", "HIDDEN")
{
int sapi = get_string_value(l1sap_common_sapi_names, argv[0]);
@@ -2155,6 +2229,8 @@
install_element(ENABLE_NODE, &bts_t_t_l_jitter_buf_cmd);
install_element(ENABLE_NODE, &bts_t_t_l_loopback_cmd);
install_element(ENABLE_NODE, &no_bts_t_t_l_loopback_cmd);
+ install_element(ENABLE_NODE, &bts_t_t_l_power_ctrl_mode_cmd);
+ install_element(ENABLE_NODE, &bts_t_t_l_power_ctrl_current_max_cmd);
install_element(ENABLE_NODE, &test_send_failure_event_report_cmd);
install_element(ENABLE_NODE, &radio_link_timeout_cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22348
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I1ebb033b02c2bc3b1fa7de874e0035a07297f266
Gerrit-Change-Number: 22348
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: make commands related to the loopback mode hidden
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/22347 )
Change subject: vty: make commands related to the loopback mode hidden
..
vty: make commands related to the loopback mode hidden
The loopback mode was added for testing, and may be dangerous if
enabled in production. Let's make it appear only in expert mode.
Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf
---
M src/common/vty.c
1 file changed, 10 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/common/vty.c b/src/common/vty.c
index 846ba4a..07244e7 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1988,10 +1988,11 @@
return CMD_SUCCESS;
}
-DEFUN(bts_t_t_l_loopback,
- bts_t_t_l_loopback_cmd,
- BTS_T_T_L_CMD " loopback",
- BTS_T_T_L_STR "Set loopback\n")
+DEFUN_ATTR(bts_t_t_l_loopback,
+ bts_t_t_l_loopback_cmd,
+ BTS_T_T_L_CMD " loopback",
+ BTS_T_T_L_STR "Set loopback\n",
+ CMD_ATTR_HIDDEN)
{
struct gsm_network *net = gsmnet_from_vty(vty);
struct gsm_lchan *lchan;
@@ -2006,10 +2007,11 @@
return CMD_SUCCESS;
}
-DEFUN(no_bts_t_t_l_loopback,
- no_bts_t_t_l_loopback_cmd,
- "no " BTS_T_T_L_CMD " loopback",
- NO_STR BTS_T_T_L_STR "Set loopback\n")
+DEFUN_ATTR(no_bts_t_t_l_loopback,
+ no_bts_t_t_l_loopback_cmd,
+ "no " BTS_T_T_L_CMD " loopback",
+ NO_STR BTS_T_T_L_STR "Set loopback\n",
+ CMD_ATTR_HIDDEN)
{
struct gsm_network *net = gsmnet_from_vty(vty);
struct gsm_lchan *lchan;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22347
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf
Gerrit-Change-Number: 22347
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: make commands related to the loopback mode hidden
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22347 ) Change subject: vty: make commands related to the loopback mode hidden .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf Gerrit-Change-Number: 22347 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Jan 2021 09:41:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: add expert commands for MS/BS power control
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22348 ) Change subject: vty: add expert commands for MS/BS power control .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ebb033b02c2bc3b1fa7de874e0035a07297f266 Gerrit-Change-Number: 22348 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Jan 2021 09:41:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: make commands related to the loopback mode hidden
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22347 ) Change subject: vty: make commands related to the loopback mode hidden .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3f68acd7f2b0231f78516f59fb5e8ef56fb69dbf Gerrit-Change-Number: 22347 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Jan 2021 09:40:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_vc_fsm: fix nullpointer dereference when sending uintdata
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22349 )
Change subject: gprs_ns2_vc_fsm: fix nullpointer dereference when sending
uintdata
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/c/libosmocore/+/22349/1/src/gb/gprs_ns2_vc_fsm.c
File src/gb/gprs_ns2_vc_fsm.c:
https://gerrit.osmocom.org/c/libosmocore/+/22349/1/src/gb/gprs_ns2_vc_fsm.c@759
PS1, Line 759: if (nsh->pdu_type == NS_PDUT_UNITDATA) {
: /* UNITDATA have to free msg because it might send the
msg layer upwards */
: osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNITDATA,
msg);
: return 0;
: }
why are we moving this block before the call to gprs_ns2_validate() ? If the
validation fails, why is that so? I think we need to fix the validation (or
the message, if it really is wrong) rather than bypassing validation completely.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22349
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7d7c95604ba4af4ed4b6019f1d432970225f8d7a
Gerrit-Change-Number: 22349
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus
Gerrit-CC: laforge
Gerrit-Comment-Date: Thu, 21 Jan 2021 09:40:28 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmo-trx[master]: Transceiver: fix integer division in addRadioVector()
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22350 ) Change subject: Transceiver: fix integer division in addRadioVector() .. Transceiver: fix integer division in addRadioVector() By default, C/C++ compiler does assume integer division. The lack of explicit cast to 'double' causes the transceiver to ignore non-decimal attenuation values (x % 10 > 0): txFullScale * 10 ^ ( -3 / 10) == txFullScale * 10 ^ 0 == txFullScale * 1.0 txFullScale * 10 ^ ( -8 / 10) == txFullScale * 10 ^ 0 == txFullScale * 1.0 txFullScale * 10 ^ (-10 / 10) == txFullScale * 10 ^ -1 == txFullScale * 0.1 txFullScale * 10 ^ (-18 / 10) == txFullScale * 10 ^ -1 == txFullScale * 0.1 Change-Id: I85b1063f57f630d90c6da32827bec4a05afc6514 Related: SYS#4918 --- M Transceiver52M/Transceiver.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 9c93e98..3188c70 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -396,7 +396,7 @@ else burst = modulateBurst(bits, 8 + (wTime.TN() % 4 == 0), cfg->tx_sps); - scaleVector(*burst, txFullScale * pow(10, -RSSI / 10)); + scaleVector(*burst, txFullScale * pow(10, (double) -RSSI / 10)); radio_burst = new radioVector(wTime, burst); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I85b1063f57f630d90c6da32827bec4a05afc6514 Gerrit-Change-Number: 22350 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-trx[master]: Transceiver: fix integer division in addRadioVector()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/22350 ) Change subject: Transceiver: fix integer division in addRadioVector() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/22350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I85b1063f57f630d90c6da32827bec4a05afc6514 Gerrit-Change-Number: 22350 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 09:38:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_udp.c@121 PS2, Line 121: int > In that case do we really have to pass the MTU though a status primitive or > could we just have hard- […] I don't really have a preference either way. I think for the SGSN it is useful to be able to determine it _somehow_, so it can use it for the related SNDCP/LLC XID to ensure no "un-transport-able" NS frames. I don't expect it to change at runtime, unless somebody would switch from FR to IP transport (or vice-versa) at runtime, which is probably the most unlikely of all events ;) The other part where the MTU is needed to be known is inside the NS2 code when generating NS-STATUS, as the inner PDU may need to be truncated. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Jan 2021 09:32:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: rework logging of Rx and Tx NS PDU
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22294 ) Change subject: gprs_ns2: rework logging of Rx and Tx NS PDU .. Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22294/11/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/22294/11/src/gb/gprs_ns2_internal.h@33 PS11, Line 33: #define LOG_NS_TX_MESSAGE(nsvc, pdu_type) LOG_NS_MESSAGE(nsvc, "Tx", pdu_type, LOGL_INFO, "\n") > Could you log NS_PDUT_UNITDATA as LOGL_DEBUG, but everything else INFO? > Otherwise I fear the logs ar […] we could also introduce separate logging sub-systems for data and user plane? Or have log filters for that? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d Gerrit-Change-Number: 22294 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 09:29:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in libosmocore[master]: logging_vty: Fix saving of "logging print file .. last"
laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22341 ) Change subject: logging_vty: Fix saving of "logging print file .. last" .. Removed Verified+1 by laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7b6245256aecc425722242aaabc154ac58ba27a0 Gerrit-Change-Number: 22341 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote
Change in libosmocore[master]: logging_vty: Fix saving of "logging print file .. last"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22341 ) Change subject: logging_vty: Fix saving of "logging print file .. last" .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7b6245256aecc425722242aaabc154ac58ba27a0 Gerrit-Change-Number: 22341 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 09:27:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: logging_vty: Fix saving of "logging print file .. last"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22341 ) Change subject: logging_vty: Fix saving of "logging print file .. last" .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7b6245256aecc425722242aaabc154ac58ba27a0 Gerrit-Change-Number: 22341 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 09:27:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_test: Fix compilation on Debian 8
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22352 ) Change subject: gprs_ns2_test: Fix compilation on Debian 8 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I72310886bef4db635078b75715c9d98ee45391cc Gerrit-Change-Number: 22352 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Jan 2021 09:27:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_test: Fix compilation on Debian 8
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/22352 )
Change subject: gprs_ns2_test: Fix compilation on Debian 8
..
gprs_ns2_test: Fix compilation on Debian 8
[ 352s] gb/gprs_ns2_test.c: In function 'test_block_unblock_nsvc':
[ 352s] gb/gprs_ns2_test.c:200:2: error: 'for' loop initial declarations are
only allowed in C99 or C11 mode
[ 352s] for (int i=0; i<2; i++) {
[ 352s] ^
[ 352s] gb/gprs_ns2_test.c:200:2: note: use option -std=c99, -std=gnu99,
-std=c11 or -std=gnu11 to compile your code
Change-Id: I72310886bef4db635078b75715c9d98ee45391cc
---
M tests/gb/gprs_ns2_test.c
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/22352/1
diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c
index 315a4d0..44c9ce4 100644
--- a/tests/gb/gprs_ns2_test.c
+++ b/tests/gb/gprs_ns2_test.c
@@ -188,6 +188,7 @@
struct gprs_ns_hdr *nsh;
struct msgb *msg;
char idbuf[32];
+ int i;
printf("--- Testing NSE block unblock nsvc\n");
printf(" Create NSE + Binds\n");
@@ -197,7 +198,7 @@
nse = gprs_ns2_create_nse(nsi, 1001, GPRS_NS2_LL_UDP,
NS2_DIALECT_STATIC_RESETBLOCK);
OSMO_ASSERT(nse);
- for (int i=0; i<2; i++) {
+ for (i=0; i<2; i++) {
printf(" Create NSVC[i]\n");
snprintf(idbuf, sizeof(idbuf), "NSE%05u-dummy-%i", nse->nsei,
i);
nsvc[i] = ns2_vc_alloc(bind[i], nse, false,
NS2_VC_MODE_BLOCKRESET, idbuf);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22352
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I72310886bef4db635078b75715c9d98ee45391cc
Gerrit-Change-Number: 22352
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in libosmocore[master]: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22343 ) Change subject: gprs_ns2: inform the NS user (BSSGP) about the MTU of a NSE .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_udp.c File src/gb/gprs_ns2_udp.c: https://gerrit.osmocom.org/c/libosmocore/+/22343/2/src/gb/gprs_ns2_udp.c@121 PS2, Line 121: int > also here I'm not sure if we really should worry about the MTU of the > ethernet. […] In that case do we really have to pass the MTU though a status primitive or could we just have hard-coded values per nse->ll + a function to query those? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5016b295db6185ec131d83089cf6c806e34ef1b6 Gerrit-Change-Number: 22343 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Jan 2021 08:51:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: rework logging of Rx and Tx NS PDU
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22294 ) Change subject: gprs_ns2: rework logging of Rx and Tx NS PDU .. Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22294/11/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/22294/11/src/gb/gprs_ns2_internal.h@33 PS11, Line 33: #define LOG_NS_TX_MESSAGE(nsvc, pdu_type) LOG_NS_MESSAGE(nsvc, "Tx", pdu_type, LOGL_INFO, "\n") Could you log NS_PDUT_UNITDATA as LOGL_DEBUG, but everything else INFO? Otherwise I fear the logs are too verbose. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I34b8fde2955ecc010d1dcd9512e1bba9211e2c0d Gerrit-Change-Number: 22294 Gerrit-PatchSet: 11 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 21 Jan 2021 08:31:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
