Change in osmo-ttcn3-hacks[master]: library: implement mandatory part of SI4 Rest Octets
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010 ) Change subject: library: implement mandatory part of SI4 Rest Octets .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010/1//COMMIT_MSG@12 PS1, Line 12: Signed-off-by: Vadim Yanitskiy > not needed? Ah, I forgot that I have signing (without GPG) enabled by default because a project I am also working on requires every commit to have it. Are you against this signature? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010 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: Ib0814e79f8627f3e2b4746b7e521e06ff82bf2d7 Gerrit-Change-Number: 18010 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 May 2020 05:20:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/armv7l
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/armv7l
Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/armv7l
Check out the package for editing:
osc checkout network:osmocom:nightly libosmocore
Last lines of build log:
[ 889s] | | #define HAVE_PTHREAD_PRIO_INHERIT 1
[ 889s] | | #define HAVE_PTHREAD 1
[ 889s] | | #define HAVE_CLOCK_GETTIME 1
[ 889s] | | #define HAVE_DECL_SYS_GETRANDOM 1
[ 889s] | | #define HAVE_LOCALTIME_R 1
[ 889s] | | #define HAVE_TM_GMTOFF_IN_TM 1
[ 889s] | | #define HAVE_PCSC 1
[ 889s] | | #define USE_GNUTLS 1
[ 889s] | | /* end confdefs.h. */
[ 889s] | |
[ 889s] | | /* Override any GCC internal prototype to avoid an error.
[ 889s] | |Use char because int might match the return type of a GCC
[ 889s] | |builtin and then its argument prototype would still apply. */
[ 889s] | | #ifdef __cplusplus
[ 889s] | | extern "C"
[ 889s] | | #endif
[ 889s] | | char sctp_bindx ();
[ 889s] | | int
[ 889s] | | main ()
[ 889s] | | {
[ 889s] | | return sctp_bindx ();
[ 889s] | | ;
[ 889s] | | return 0;
[ 891s] | [ 860.391959] sysrq: SysRq : Power Off
[ 891s] [ 860.395206] reboot: Power down
[ 891s] ### VM INTERACTION END ###
[ 891s]
[ 891s] armbuild04 failed "build libosmocore_1.3.0.74.98929.dsc" at Mon May 4
01:46:25 UTC 2020.
[ 891s]
--
Configure notifications at https://build.opensuse.org/my/subscriptions
openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-trx[master]: utils: Ensure content of this directory is included in 'make dist'
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/18007 ) Change subject: utils: Ensure content of this directory is included in 'make dist' .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/18007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9814a9a352dbee03177ef9e8dfd19bc2baf0ca07 Gerrit-Change-Number: 18007 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 03 May 2020 19:51:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: prbs-tool: Add error simulation capabilities
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/18006 ) Change subject: prbs-tool: Add error simulation capabilities .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/18006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0b52c2af6d973669ac233bf9868400e497496460 Gerrit-Change-Number: 18006 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 03 May 2020 19:48:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: PRBS tool sending PRBS sequence to TRX
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/18005 ) Change subject: PRBS tool sending PRBS sequence to TRX .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/18005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2300f909bbfda10a7053320edfd1deaea763759a Gerrit-Change-Number: 18005 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 03 May 2020 19:44:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: library: implement mandatory part of SI4 Rest Octets
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010 ) Change subject: library: implement mandatory part of SI4 Rest Octets .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010/1//COMMIT_MSG@12 PS1, Line 12: Signed-off-by: Vadim Yanitskiy not needed? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010 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: Ib0814e79f8627f3e2b4746b7e521e06ff82bf2d7 Gerrit-Change-Number: 18010 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 03 May 2020 19:03:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BTS: refactor f_si3_has_gprs_indicator(): use SI3RestOctets
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17996 ) Change subject: BTS: refactor f_si3_has_gprs_indicator(): use SI3RestOctets .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17996 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: I2dc970d3d34a7d70c6845558544259e387f1d6fc Gerrit-Change-Number: 17996 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 03 May 2020 19:02:05 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: library: clarify length restrictions for SI4 Rest Octets
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18013 )
Change subject: library: clarify length restrictions for SI4 Rest Octets
..
library: clarify length restrictions for SI4 Rest Octets
Change-Id: I54bfe5710f744cdd61752f3e46b1b00e9f2f3e43
Signed-off-by: Vadim Yanitskiy
---
M library/GSM_SystemInformation.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/13/18013/1
diff --git a/library/GSM_SystemInformation.ttcn
b/library/GSM_SystemInformation.ttcn
index 4cabd77..07ca8e6 100644
--- a/library/GSM_SystemInformation.ttcn
+++ b/library/GSM_SystemInformation.ttcn
@@ -179,7 +179,7 @@
RachControlParameters rach_control,
ChannelDescriptionTVcbch_chan_desc optional,
MobileAllocationT cbch_mobile_alloc optional,
- RestOctets rest_octets
+ RestOctets rest_octets /* 0 .. 10 octets
(see 10.5.2.35) */
} with { variant "TAG(cbch_chan_desc, iei = '64'O; cbch_mobile_alloc,
iei = '72'O)" };
/* 44.018 9.1.37 */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18013
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: I54bfe5710f744cdd61752f3e46b1b00e9f2f3e43
Gerrit-Change-Number: 18013
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: BTS: fix f_get_si3(): do not return uninitialized SI value
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18014 )
Change subject: BTS: fix f_get_si3(): do not return uninitialized SI value
..
BTS: fix f_get_si3(): do not return uninitialized SI value
Change-Id: Ie60ef237443043578a218dcf19fe1b474b1d4e10
Signed-off-by: Vadim Yanitskiy
---
M bts/BTS_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/14/18014/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 7191a7d..6f43a44 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -4899,7 +4899,7 @@
repeat;
}
[] T.timeout {
- setverdict(fail, "Timeout waiting for SI3");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout
waiting for SI3");
}
}
return si.payload.si3;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18014
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: Ie60ef237443043578a218dcf19fe1b474b1d4e10
Gerrit-Change-Number: 18014
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: library: get rid of Si1RestOctets and Si3RestOctets
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18011 )
Change subject: library: get rid of Si1RestOctets and Si3RestOctets
..
library: get rid of Si1RestOctets and Si3RestOctets
Both are basically sub-types of GSM_RR_Types.RestOctets with length
constraints. We don't really need to have them as separate symbols,
especially since we have SI3RestOctets and SI4RestOctets now, so
let's apply these constraints within the corresponding records.
Change-Id: I2b126348ae5c5425fea4267ab2b77ea0192795ac
Signed-off-by: Vadim Yanitskiy
---
M library/GSM_SystemInformation.ttcn
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/11/18011/1
diff --git a/library/GSM_SystemInformation.ttcn
b/library/GSM_SystemInformation.ttcn
index f1918c9..a4688cd 100644
--- a/library/GSM_SystemInformation.ttcn
+++ b/library/GSM_SystemInformation.ttcn
@@ -115,16 +115,14 @@
AccessControlClass acc
} with { variant (acc) "FIELDLENGTH(16)" };
- /* 44.018 10.5.2.32 */
- type RestOctets Si1RestOctets with { variant "FIELDLENGTH(1)" };
- type RestOctets Si3RestOctets with { variant "FIELDLENGTH(4)" };
-
/* 44.018 9.1.31 */
type record SystemInformationType1 {
CellChannelDescription cell_chan_desc,
RachControlParameters rach_control,
- Si1RestOctets rest_octets
- } with { variant "" };
+ RestOctets rest_octets
+ } with {
+ variant (rest_octets) "FIELDLENGTH(1)"
+ };
/* 44.018 9.1.32 */
type record SystemInformationType2 {
@@ -154,8 +152,10 @@
CellOptions cell_options,
CellSelectionParameters cell_sel_par,
RachControlParameters rach_control,
- Si3RestOctets rest_octets
- } with { variant "" };
+ RestOctets rest_octets
+ } with {
+ variant (rest_octets) "FIELDLENGTH(4)"
+ };
template SystemInformationType3 t_SI3 := {
cell_id := ?,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18011
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: I2b126348ae5c5425fea4267ab2b77ea0192795ac
Gerrit-Change-Number: 18011
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: library: implement mandatory part of SI4 Rest Octets
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010 )
Change subject: library: implement mandatory part of SI4 Rest Octets
..
library: implement mandatory part of SI4 Rest Octets
Optional "Rest Octets S" part is left for later.
Change-Id: Ib0814e79f8627f3e2b4746b7e521e06ff82bf2d7
Signed-off-by: Vadim Yanitskiy
---
M library/GSM_RestOctets.ttcn
1 file changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/10/18010/1
diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn
index 8f0346d..da3478a 100644
--- a/library/GSM_RestOctets.ttcn
+++ b/library/GSM_RestOctets.ttcn
@@ -41,6 +41,19 @@
variant (si21_ind) "PRESENCE(sched_where.presence = '0'B)"
};
+/* 10.5.2.35 SI 4 Rest Octets (O & S) */
+type record SI4RestOctets {
+ SelectionParamsOpt sel_params,
+ PowerOffsetOpt pwr_offset,
+ GPRSIndicatorOptgprs_ind,
+ BIT1s_presence, // L/H
+ /* TODO: optional "Rest Octets S" part */
+ bitstring s optional
+} with {
+ variant (s_presence) "CSN.1 L/H"
+ variant (s) "PRESENCE(s_presence = '1'B)"
+};
+
/* Selection Parameters */
type record SelectionParams {
boolean cbq,
@@ -115,5 +128,10 @@
external function dec_SI3RestOctets(in octetstring stream) return SI3RestOctets
with { extension "prototype(convert) decode(RAW)" };
+external function enc_SI4RestOctets(in SI4RestOctets ro) return octetstring
+ with { extension "prototype(convert) encode(RAW)" };
+external function dec_SI4RestOctets(in octetstring stream) return SI4RestOctets
+ with { extension "prototype(convert) decode(RAW)" };
+
} with { encode "RAW"; variant "FIELDORDER(msb)" }
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18010
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: Ib0814e79f8627f3e2b4746b7e521e06ff82bf2d7
Gerrit-Change-Number: 18010
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: library: System Information: use RestOctets where possible
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18012 )
Change subject: library: System Information: use RestOctets where possible
..
library: System Information: use RestOctets where possible
The 'RestOctets' is a sub-type of the 'octetstring' with additional
padding attributes. Let's use it for SI2bis, SI2ter, and SI6 too.
Change-Id: I183d3ba9000e3ced8ecce74a4390b80075ddf25d
Signed-off-by: Vadim Yanitskiy
---
M library/GSM_SystemInformation.ttcn
1 file changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/12/18012/1
diff --git a/library/GSM_SystemInformation.ttcn
b/library/GSM_SystemInformation.ttcn
index a4688cd..4cabd77 100644
--- a/library/GSM_SystemInformation.ttcn
+++ b/library/GSM_SystemInformation.ttcn
@@ -135,14 +135,18 @@
type record SystemInformationType2bis {
NeighbourCellDescriptionextd_bcch_freq_list,
RachControlParameters rach_control,
- OCT1rest_octets
- } with { variant "" };
+ RestOctets rest_octets
+ } with {
+ variant (rest_octets) "FIELDLENGTH(1)"
+ };
/* 44.018 9.1.34 */
type record SystemInformationType2ter {
NeighbourCellDescription2 extd_bcch_freq_list,
- OCT4rest_octets
- } with { variant "" };
+ RestOctets rest_octets
+ } with {
+ variant (rest_octets) "FIELDLENGTH(4)"
+ };
/* 44.018 9.1.35 */
type record SystemInformationType3 {
@@ -199,8 +203,10 @@
LocationAreaIdentification lai,
CellOptionsSacchcell_options,
BIT8ncc_permitted,
- OCT7rest_octets
- } with { variant "" };
+ RestOctets rest_octets
+ } with {
+ variant (rest_octets) "FIELDLENGTH(7)"
+ };
type union SystemInformationUnion {
SystemInformationType1 si1,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18012
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: I183d3ba9000e3ced8ecce74a4390b80075ddf25d
Gerrit-Change-Number: 18012
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in libosmo-netif[master]: amr: Fix OA<->BWE conversion.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/17997 ) Change subject: amr: Fix OA<->BWE conversion. .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/17997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9fc5fb92e9bada22a47a82fcfb0925e892e50ced Gerrit-Change-Number: 17997 Gerrit-PatchSet: 7 Gerrit-Owner: ipse Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: ipse Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 03 May 2020 14:58:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: bts_nokia_site: Fix LAPD segfault during reset procedure
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18009 ) Change subject: bts_nokia_site: Fix LAPD segfault during reset procedure .. Patch Set 1: (4 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/18009/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/18009/1/include/osmocom/bsc/gsm_data.h@1144 PS1, Line 1144: bts_reset_timer_cnf,/* timer for BTS RESET */ ugh so this now is 1 bit less? Having no size in this one is really confusing. https://gerrit.osmocom.org/c/osmo-bsc/+/18009/1/src/osmo-bsc/bts_nokia_site.c File src/osmo-bsc/bts_nokia_site.c: https://gerrit.osmocom.org/c/osmo-bsc/+/18009/1/src/osmo-bsc/bts_nokia_site.c@1484 PS1, Line 1484: bts->nokia.wait_reset = 0; Can you add an enum field for 0? https://gerrit.osmocom.org/c/osmo-bsc/+/18009/1/src/osmo-bsc/bts_nokia_site.c@1488 PS1, Line 1488: } Then add a case for the enum val 0 and comment it's already being disabled. https://gerrit.osmocom.org/c/osmo-bsc/+/18009/1/src/osmo-bsc/bts_nokia_site.c@1592 PS1, Line 1592: * the middle of processing an LAPD I framd and are subsequently returning framd/frame? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6270c7210f600e53f845561898245d2fd30a368d Gerrit-Change-Number: 18009 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: tnt Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 03 May 2020 14:58:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: gsm_data.h: Comment the 'nokia' BTS fields
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18008 ) Change subject: gsm_data.h: Comment the 'nokia' BTS fields .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/18008/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/18008/1//COMMIT_MSG@7 PS1, Line 7: gsm_data.h: Comment the 'nokia' BTS fields I thought to wanted to disable them in code. Probably "document" would fit a lot better here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5e3eaf3dee97e2edcd80b20c3acf85bd89b40cdc Gerrit-Change-Number: 18008 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 03 May 2020 14:50:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-uecups in Debian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-uecups failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: [ 554s]^~~ [ 554s] main.c: In function 'main': [ 554s] main.c:776:23: error: implicit declaration of function 'osmo_signalfd_setup' [-Werror=implicit-function-declaration] [ 554s] g_daemon->signalfd = osmo_signalfd_setup(g_daemon, sigset, signal_cb, g_daemon); [ 554s]^~~ [ 554s] main.c:776:21: warning: assignment makes pointer from integer without a cast [-Wint-conversion] [ 554s] g_daemon->signalfd = osmo_signalfd_setup(g_daemon, sigset, signal_cb, g_daemon); [ 554s] ^ [ 554s] cc1: some warnings being treated as errors [ 554s] Makefile:469: recipe for target 'main.o' failed [ 554s] make[3]: *** [main.o] Error 1 [ 554s] make[3]: Leaving directory '/usr/src/packages/BUILD/daemon' [ 554s] Makefile:402: recipe for target 'all-recursive' failed [ 554s] make[2]: *** [all-recursive] Error 1 [ 554s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 554s] Makefile:349: recipe for target 'all' failed [ 554s] make[1]: *** [all] Error 2 [ 554s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 554s] dh_auto_build: make -j1 returned exit code 2 [ 554s] debian/rules:45: recipe for target 'build' failed [ 554s] make: *** [build] Error 2 [ 554s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 554s] ### VM INTERACTION START ### [ 557s] [ 514.091237] sysrq: SysRq : Power Off [ 557s] [ 514.093574] reboot: Power down [ 558s] ### VM INTERACTION END ### [ 558s] [ 558s] armbuild13 failed "build osmo-uecups_0.1.3.1.8362.dsc" at Sun May 3 14:04:30 UTC 2020. [ 558s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-bsc[master]: bts_nokia_site: Fix LAPD segfault during reset procedure
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/18009 )
Change subject: bts_nokia_site: Fix LAPD segfault during reset procedure
..
bts_nokia_site: Fix LAPD segfault during reset procedure
The existing Nokia *Site code destroyed the LAPD SAP instance for OML
while processing an OML message. Once the stack frame returned back
to the LAPD code, the LAPD SAP was gone -> segfault.
Let's work around this by moving deletion of the LAPD SAP out-of-line
by starting a timer 0ms in the future. Not particularly nice, but
effective.
Change-Id: I6270c7210f600e53f845561898245d2fd30a368d
Closes: OS#1761
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bts_nokia_site.c
2 files changed, 29 insertions(+), 25 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/18009/1
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 6996905..1d02e39 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1143,7 +1143,7 @@
no_loc_rel_cnf:1, /* don't wait for RSL
REL CONF */
bts_reset_timer_cnf,/* timer for BTS RESET
*/
did_reset:1,/* we received a RESET
ACK */
- wait_reset:1; /* we are waiting for
reset to complete */
+ wait_reset:2; /* we are waiting for
reset to complete */
struct osmo_timer_list reset_timer;
} nokia;
};
diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c
index 66972c2..7206bdc 100644
--- a/src/osmo-bsc/bts_nokia_site.c
+++ b/src/osmo-bsc/bts_nokia_site.c
@@ -41,6 +41,11 @@
#include
+enum reset_timer_state {
+ RESET_T_STOP_LAPD = 1, /* first timer expiration: stop LAPD
SAP */
+ RESET_T_RESTART_LAPD = 2, /* second timer expiration: restart
LAPD SAP */
+};
+
/* TODO: put in a separate file ? */
extern int abis_nm_sendmsg(struct gsm_bts *bts, struct msgb *msg);
@@ -1461,18 +1466,26 @@
struct gsm_e1_subslot *e1_link = >oml_e1_link;
struct e1inp_line *line;
- bts->nokia.wait_reset = 0;
-
/* OML link */
line = e1inp_line_find(e1_link->e1_nr);
if (!line) {
- LOGP(DLINP, LOGL_ERROR, "BTS %u OML link referring to "
-"non-existing E1 line %u\n", bts->nr, e1_link->e1_nr);
+ LOGP(DLINP, LOGL_ERROR, "BTS %u OML link referring to
non-existing E1 line %u\n",
+bts->nr, e1_link->e1_nr);
return;
}
- start_sabm_in_line(line, 0, -1);/* stop all first */
- start_sabm_in_line(line, 1, SAPI_OML); /* start only OML */
+ switch (bts->nokia.wait_reset) {
+ case RESET_T_STOP_LAPD:
+ start_sabm_in_line(line, 0, -1);/* stop all first */
+ bts->nokia.wait_reset = RESET_T_RESTART_LAPD;
+ osmo_timer_schedule(>nokia.reset_timer,
bts->nokia.bts_reset_timer_cnf, 0);
+ break;
+ case RESET_T_RESTART_LAPD:
+ bts->nokia.wait_reset = 0;
+ start_sabm_in_line(line, 0, -1);/* stop all first */
+ start_sabm_in_line(line, 1, SAPI_OML); /* start only OML */
+ break;
+ }
}
/* TODO: put in a separate file ? */
@@ -1574,25 +1587,16 @@
(function handle_ts1_read()) and ignoring the
received data.
It seems to be necessary for the MetroSite too.
*/
- bts->nokia.wait_reset = 1;
- osmo_timer_setup(>nokia.reset_timer,
-reset_timer_cb, bts);
- osmo_timer_schedule(>nokia.reset_timer,
bts->nokia.bts_reset_timer_cnf, 0);
-
- struct gsm_e1_subslot *e1_link = >oml_e1_link;
- struct e1inp_line *line;
- /* OML link */
- line = e1inp_line_find(e1_link->e1_nr);
- if (!line) {
- LOGP(DLINP, LOGL_ERROR,
-"BTS %u OML link referring to "
-"non-existing E1 line %u\n", bts->nr,
-e1_link->e1_nr);
- return -ENOMEM;
- }
-
- start_sabm_in_line(line, 0, -1);/* stop all
first */
+ /* we cannot delete / stop the OML LAPD SAP right here,
as we are in
+* the middle of processing an LAPD I framd and are
subsequently returning
+* back to the LAPD I frame processing code that
assumes the SAP is
Change in osmo-bsc[master]: gsm_data.h: Comment the 'nokia' BTS fields
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/18008 )
Change subject: gsm_data.h: Comment the 'nokia' BTS fields
..
gsm_data.h: Comment the 'nokia' BTS fields
Change-Id: I5e3eaf3dee97e2edcd80b20c3acf85bd89b40cdc
---
M include/osmocom/bsc/gsm_data.h
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/18008/1
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 9a1db07..6996905 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1138,12 +1138,12 @@
} rbs2000;
struct {
uint8_t bts_type;
- unsigned int configured:1,
- skip_reset:1,
- no_loc_rel_cnf:1,
- bts_reset_timer_cnf,
- did_reset:1,
- wait_reset:1;
+ unsigned int configured:1, /* we sent the config
data request */
+ skip_reset:1, /* skip reset at
bootstrap */
+ no_loc_rel_cnf:1, /* don't wait for RSL
REL CONF */
+ bts_reset_timer_cnf,/* timer for BTS RESET
*/
+ did_reset:1,/* we received a RESET
ACK */
+ wait_reset:1; /* we are waiting for
reset to complete */
struct osmo_timer_list reset_timer;
} nokia;
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18008
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I5e3eaf3dee97e2edcd80b20c3acf85bd89b40cdc
Gerrit-Change-Number: 18008
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
