[L] Change in libosmocore[master]: core: Add software UART implementation
Attention is currently required from: laforge.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/30763?usp=email )
Change subject: core: Add software UART implementation
..
Patch Set 4:
(4 comments)
Patchset:
PS4:
sorry, some late comments that were stranded in draft lands
File include/osmocom/core/soft_uart.h:
https://gerrit.osmocom.org/c/libosmocore/+/30763/comment/160f09b8_e49e1896
PS3, Line 38: OSMO_SUART_F_BREAK = (1 << 2),
(it is sometimes useful to define the bit positions instead of the bitmask. Like
enum foo {
FOO_ZERO = 0,
FOO_ONE = 1,
FOO_TWO = 2,
};
and use it like
if (flags & (1 << FOO_TWO)) ...
(with a macro maybe)
because that allows math on the bit position that i had to use once and can't
remember now =)
was it to iterate bits, or calculate used nr of bits...?
Anyway, just saying, if FOO_FIVE == 0x10, it's not so trivial to calculate that
back to a 5.)
https://gerrit.osmocom.org/c/libosmocore/+/30763/comment/e99d0176_e6532a56
PS3, Line 52: stop bots
a stop bot, is that a traffic light? =)
File src/core/soft_uart.c:
https://gerrit.osmocom.org/c/libosmocore/+/30763/comment/34735c3e_3114260e
PS3, Line 4: * (C) 2022 by Harald Welte
2022-2023?
(I'm slightly unclear, is this patch a collaboration of laforge and fixeria?)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30763?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2ca95963fd5852ddb89bdd35b86b31489127fe84
Gerrit-Change-Number: 30763
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-CC: fixeria
Gerrit-CC: neels
Gerrit-Attention: laforge
Gerrit-Comment-Date: Wed, 22 Nov 2023 23:16:12 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: call_leg: silence some false errors
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/35100?usp=email ) Change subject: call_leg: silence some false errors .. call_leg: silence some false errors "[ESTABLISHED] transition to state ESTABLISHED not permitted" i.e. don't complain when we already are in the established state. Change-Id: I9b1fd63ed1ee7ed2877a4b2059386354598f4ea4 --- M src/libmsc/call_leg.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/00/35100/1 diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c index b797322..5720417 100644 --- a/src/libmsc/call_leg.c +++ b/src/libmsc/call_leg.c @@ -158,7 +158,8 @@ } if (!established) break; - call_leg_state_chg(cl, CALL_LEG_ST_ESTABLISHED); + if (cl->fi->state != CALL_LEG_ST_ESTABLISHED) + call_leg_state_chg(cl, CALL_LEG_ST_ESTABLISHED); break; case CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE: -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b1fd63ed1ee7ed2877a4b2059386354598f4ea4 Gerrit-Change-Number: 35100 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
[S] Change in osmo-msc[master]: add sdp_audio_codec_to_speech_codec_list()
Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/35050?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: add sdp_audio_codec_to_speech_codec_list() .. add sdp_audio_codec_to_speech_codec_list() Used by I8760feaa8598047369ef8c3ab2673013bac8ac8a to add just a single codec to a speech codec list, instead of a list. Change-Id: I6ac23c54bc26939e048ff2df06eb987421cfb1c5 --- M include/osmocom/msc/codec_mapping.h M src/libmsc/codec_mapping.c 2 files changed, 33 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/50/35050/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35050?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6ac23c54bc26939e048ff2df06eb987421cfb1c5 Gerrit-Change-Number: 35050 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset
[S] Change in osmo-msc[master]: add sdp_audio_codec_to_speech_codec_list()
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35050?usp=email ) Change subject: add sdp_audio_codec_to_speech_codec_list() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35050?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6ac23c54bc26939e048ff2df06eb987421cfb1c5 Gerrit-Change-Number: 35050 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 22 Nov 2023 23:03:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: fix codec mapping for GSM-HR
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/35049?usp=email )
Change subject: fix codec mapping for GSM-HR
..
fix codec mapping for GSM-HR
The cfg bits are for AMR-HR, not GSM-HR. The function
gsm0808_enc_speech_codec_list2() will return -EINVAL when it encounters
GSM-HR with non-zero cfg bits.
It appears this mapping was never used before, and my testing of call
re-assignment to match MT's codecs (it allows more than just the
assigned codec, because it can re-assign) has uncovered this bug
via MSC_Tests.TC_ho_inter_msc_out. I don't fully understand all the
details why we didn't see this before; anyway, the fix is obvious.
Change-Id: I19cff847a0f618ad000d12c1df54c55ef2f79699
---
M src/libmsc/codec_mapping.c
1 file changed, 19 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/libmsc/codec_mapping.c b/src/libmsc/codec_mapping.c
index 918428a..114abaa 100644
--- a/src/libmsc/codec_mapping.c
+++ b/src/libmsc/codec_mapping.c
@@ -105,7 +105,6 @@
.gsm0808_speech_codec = {
.fi = true,
.type = GSM0808_SCT_HR1,
- .cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR,
},
.perm_speech = GSM0808_PERM_HR1,
.frhr = CODEC_FRHR_HR,
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35049?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I19cff847a0f618ad000d12c1df54c55ef2f79699
Gerrit-Change-Number: 35049
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-MessageType: merged
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: jolly. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling .. Patch Set 12: Code-Review+1 (1 comment) File src/gsm/lapdm.c: https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/af821be4_34061e9f PS12, Line 393: /*! Get transmit frame number from L1. (Triggered when sending a frame.) */ are you sure this doc matches the function?? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 12 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 22 Nov 2023 22:23:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
Attention is currently required from: jolly. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email ) Change subject: LAPD: Add support for RTS based polling and T200 .. Patch Set 8: Code-Review+1 (4 comments) File include/osmocom/isdn/lapd_core.h: https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/096a5c7e_e9c0ff67 PS8, Line 88: #define LAPD_F_RTS0x0001 (an enum would be nicer IMHO) File src/isdn/lapd_core.c: https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/a08beb95_979c4df4 PS8, Line 220: Function to (just drop the words "Function to", rationale: it is obvious that it is a function) https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/37864d12_f292a897 PS8, Line 400: \ref '\ref' is not valid doxygen here, see https://osmocom.org/projects/cellular-infrastructure/wiki/Guidelines_for_API_documentation#Parameters https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/8dbf6784_2d0d40c0 PS8, Line 1785: Function call when a LAPD frame is ready to sent. this is hard to understand, could you make this an "imperative form" description of what the function does, like Send the next LAPD frame. (if that is correct). That is the shortest and clearest form of doc. thanks -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 8 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 22 Nov 2023 22:17:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: use X6 timer for REL ACK, not T3111
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/35088?usp=email )
Change subject: use X6 timer for REL ACK, not T3111
..
use X6 timer for REL ACK, not T3111
The lchan FSM timers were originally implemented to model earlier code
as closely as possible. Now it has come up that T3111 is used in the
wrong place:
3GPP TS 44.018 says:
T3111:
This timer is used to delay the channel deactivation after
disconnection of the main signalling link.
Its purpose is to let some time for possible repetition of the disconnection.
Its value is equal to the value of T3110.
Before this patch, we use it also to time the RF REL ACK message. That
is pretty bad, because T3111 is only 2 seconds by default, making RF
CHAN REL vulnerable for timeout. When a user increased T3111 to
alleviate the problem, the result is that each lchan also delays its
normal channel release procedure by the configured amount of time. Very
inelegant.
Instead, use the X6 timer for REL ACK, because X6 already times the CHAN
ACTIV ACK, which is semantically identical.
Compatibility / user impact: No negative impact expected.
We can assume that every user out there has X6 configured to work for
CHAN ACTIV ACK. From that logic, switching channel release ACK to the
same timer is guaranteed to be what the user intends. We could instruct
users in the release notes that they may now choose T3111 freely (as
short as 2 seconds) without jeopardising channel release anymore.
Related: SYS#6655
Change-Id: Ibd118fa23e5deb4381bc31b11a7b495f57901d6c
---
M src/osmo-bsc/lchan_fsm.c
1 file changed, 40 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 1b012bd..d6dfe3a 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -330,7 +330,7 @@
[LCHAN_ST_WAIT_RLL_RTP_ESTABLISH] = { .T = 3101 },
[LCHAN_ST_WAIT_RLL_RTP_RELEASED]= { .T = 3109 },
[LCHAN_ST_WAIT_BEFORE_RF_RELEASE] = { .T = 3111 },
- [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T = 3111 },
+ [LCHAN_ST_WAIT_RF_RELEASE_ACK] = { .T = -6 },
[LCHAN_ST_WAIT_AFTER_ERROR] = { .T = -3111 },
[LCHAN_ST_WAIT_RR_CHAN_MODE_MODIFY_ACK] = { .T = -13 },
[LCHAN_ST_WAIT_RSL_CHAN_MODE_MODIFY_ACK]= { .T = -14 },
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35088?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ibd118fa23e5deb4381bc31b11a7b495f57901d6c
Gerrit-Change-Number: 35088
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[M] Change in osmo-bsc[master]: recover BORKEN lchans for missing ACK scenarios
Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30252?usp=email ) Change subject: recover BORKEN lchans for missing ACK scenarios .. Patch Set 13: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30252?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic4728b3efe843ea63e2a0b54b1ea8a925347484a Gerrit-Change-Number: 30252 Gerrit-PatchSet: 13 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 Nov 2023 21:54:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: recover BORKEN lchans for missing ACK scenarios
Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30252?usp=email ) Change subject: recover BORKEN lchans for missing ACK scenarios .. Patch Set 13: (1 comment) Patchset: PS13: > a few BSC_Tests. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30252?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic4728b3efe843ea63e2a0b54b1ea8a925347484a Gerrit-Change-Number: 30252 Gerrit-PatchSet: 13 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 Nov 2023 21:54:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: bsc: tests recovery from BORKEN after release failed
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35098?usp=email ) Change subject: bsc: tests recovery from BORKEN after release failed .. Patch Set 1: (1 comment) This change is ready for review. Patchset: PS1: > some tests still fail, seems to be those that use the BORKEN state as part of > the test setup on testing again, actually all seems fine. My TC_paging_500req always fails on N=209 fail reason: "Retrans of "00" happened before Rx initial trans for all reqs. rx_paging_num=209" but same with current master. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35098?usp=email 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: I9b4ddfc4a337808d9d5ec538c25fd390b1b2530f Gerrit-Change-Number: 35098 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Nov 2023 21:53:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: fixup for osmo-hnbgw-with-pfcp.cfg
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35099?usp=email ) Change subject: hnbgw: fixup for osmo-hnbgw-with-pfcp.cfg .. hnbgw: fixup for osmo-hnbgw-with-pfcp.cfg Drop a config line that should not be committed; it was added during local testing of logging patches that are still unmerged. Change-Id: Ie29c0e0d80c9318c104fe884868a30c17b6997bb --- M hnbgw/osmo-hnbgw-with-pfcp.cfg 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/osmo-hnbgw-with-pfcp.cfg b/hnbgw/osmo-hnbgw-with-pfcp.cfg index 6407e41..ffe5e09 100644 --- a/hnbgw/osmo-hnbgw-with-pfcp.cfg +++ b/hnbgw/osmo-hnbgw-with-pfcp.cfg @@ -20,7 +20,6 @@ logging level lpfcp info logging level lsua notice logging level lsccp notice - logging print timestamp date ! line vty no login -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35099?usp=email 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: Ie29c0e0d80c9318c104fe884868a30c17b6997bb Gerrit-Change-Number: 35099 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: fixup for osmo-hnbgw-with-pfcp.cfg
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35099?usp=email ) Change subject: hnbgw: fixup for osmo-hnbgw-with-pfcp.cfg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35099?usp=email 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: Ie29c0e0d80c9318c104fe884868a30c17b6997bb Gerrit-Change-Number: 35099 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Nov 2023 21:48:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: fixup for osmo-hnbgw-with-pfcp.cfg
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35099?usp=email ) Change subject: hnbgw: fixup for osmo-hnbgw-with-pfcp.cfg .. hnbgw: fixup for osmo-hnbgw-with-pfcp.cfg Drop a config line that should not be committed; it was added during local testing of logging patches that are still unmerged. Change-Id: Ie29c0e0d80c9318c104fe884868a30c17b6997bb --- M hnbgw/osmo-hnbgw-with-pfcp.cfg 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/35099/1 diff --git a/hnbgw/osmo-hnbgw-with-pfcp.cfg b/hnbgw/osmo-hnbgw-with-pfcp.cfg index 6407e41..ffe5e09 100644 --- a/hnbgw/osmo-hnbgw-with-pfcp.cfg +++ b/hnbgw/osmo-hnbgw-with-pfcp.cfg @@ -20,7 +20,6 @@ logging level lpfcp info logging level lsua notice logging level lsccp notice - logging print timestamp date ! line vty no login -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35099?usp=email 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: Ie29c0e0d80c9318c104fe884868a30c17b6997bb Gerrit-Change-Number: 35099 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: bsc: tests recovery from BORKEN after release failed
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35098?usp=email )
Change subject: bsc: tests recovery from BORKEN after release failed
..
bsc: tests recovery from BORKEN after release failed
Related: osmo-bsc Ic4728b3efe843ea63e2a0b54b1ea8a925347484a
Related: SYS#6655
Change-Id: I9b4ddfc4a337808d9d5ec538c25fd390b1b2530f
---
M bsc/BSC_Tests.ttcn
1 file changed, 139 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/98/35098/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 57b44e0..1fc42ba 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -8529,7 +8529,8 @@
}
friend function f_perform_clear(RSL_DCHAN_PT rsl_pt := RSL, RSLEM_PROC_PT
rsl_proc_pt := RSL_PROC,
-template PDU_ML3_NW_MS exp_rr_rel_tmpl :=
tr_RRM_RR_RELEASE)
+ template PDU_ML3_NW_MS exp_rr_rel_tmpl :=
tr_RRM_RR_RELEASE,
+ boolean send_rel_ack := true)
runs on MSC_ConnHdlr {
var default ack_dlcx := activate(as_mgcp_ack_all_dlcx());
var default ack_rel_req := activate(as_rsl_ack_all_rel_req());
@@ -8549,8 +8550,10 @@
}
[] rsl_pt.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack");
- rsl_pt.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
- f_rslem_unregister(0, g_chan_nr, PT := rsl_proc_pt);
+ if (send_rel_ack) {
+ rsl_pt.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
+ f_rslem_unregister(0, g_chan_nr, PT :=
rsl_proc_pt);
+ }
}
}
deactivate(ack_dlcx);
@@ -12439,6 +12442,125 @@
f_shutdown_helper(ho := true);
}
+private function f_vty_expect_borken(TELNETasp_PT pt, boolean expect_borken)
+{
+ var charstring lchan_summary;
+ lchan_summary := f_vty_transceive_ret(pt, "show lchan summary");
+ var boolean found_borken := (f_strstr(lchan_summary, "State BORKEN") >=
0);
+ if (found_borken != expect_borken) {
+ if (expect_borken) {
+ setverdict(fail, "Expected 'BORKEN' state in ",
lchan_summary);
+ } else {
+ setverdict(fail, "Expected no 'BORKEN' state in ",
lchan_summary);
+ }
+ mtc.stop;
+ }
+}
+
+private function f_tc_unbreak_lchan_after_missing_rel_ack(integer
test_variant) runs on MSC_ConnHdlr {
+
+ /* Establish a channel, so we can mess with the release of it. */
+ var template PDU_BSSAP exp_compl := f_gen_exp_compl();
+ var PDU_BSSAP ass_cmd := f_gen_ass_req();
+
+ ass_cmd.pdu.bssmap.assignmentRequest.channelType :=
valueof(ts_BSSMAP_IE_ChannelType);
+ ass_cmd.pdu.bssmap.assignmentRequest.codecList :=
valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));
+
+ f_establish_fully(ass_cmd, exp_compl);
+
+ /* shorten X28, the time after which a BORKEN lchan recovers, from 30s
to something short */
+ f_vty_enter_cfg_network(BSCVTY);
+ f_vty_transceive(BSCVTY, "timer X28 3");
+ f_vty_transceive(BSCVTY, "end");
+
+ /* Allow us to include handling of Channel Activation in this
component, to test recovery from BORKEN */
+ f_rslem_set_auto_chan_act_ack(RSL_PROC, false);
+
+ /* give a moment before releasing */
+ f_sleep(2.0);
+
+ /* Perform a channel release, but omit the RF CHAN REL ACK. The aim is
to get the lchan to go BORKEN. */
+ f_perform_clear(send_rel_ack := false);
+
+ f_vty_expect_borken(BSCVTY, false);
+
+ /* After a timeout of X6, the lchan ends up in LCHAN_ST_BORKEN */
+ f_sleep(6.0);
+
+ f_vty_expect_borken(BSCVTY, true);
+
+ /* Now within two seconds, we expect OsmoBSC to attempt recovering from
the broken state.
+*
+* test_variant == 1:
+* It will first attempt a Channel Activation. If the BTS accepts that,
it means the state is back in sync.
+* Then OsmoBSC releases the lchan again and makes it available for use.
+*
+* test_variant == 2:
+* It will first attempt a Channel Activation and the BTS NACKs that.
+* It will then attempt a release, which we ACK, and the channel will
be available again.
+*/
+
+ /* Receive the Channel Activation */
+ var ASP_RSL_Unitdata rx_rsl_ud;
+ RSL.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV), sid :=
?)) -> value rx_rsl_ud;
+
+ var RslChannelNr chan_nr;
+ var RSL_IE_Body ie;
+ if (f_rsl_find_ie(rx_rsl_ud.rsl, RSL_IE_CHAN_NR, ie) == true) {
+ chan_nr := ie.chan_nr;
+ } else {
+ setverdict(fail, "Unable to find RSL_IE_CHAN_NR in ",
rx_rsl_ud)
[M] Change in libosmocore[master]: osmo_io: Factor out and use common send function from backend
Attention is currently required from: daniel. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email ) Change subject: osmo_io: Factor out and use common send function from backend .. Patch Set 1: (1 comment) File src/core/osmo_io_uring.c: https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/8cbca25d_4e44408c PS1, Line 188: iofd_msghdr_free(msghdr); > I don't understand? Are you saying that the -EAGAIN case was previously > missed (only checking for < […] Yes, previous you didn't checked for -EAGAIN, now you're checking it and doing things based on it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6da2653d32aedd0e7872be0cf90a841b56462e59 Gerrit-Change-Number: 35078 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 Nov 2023 19:06:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags ...
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email ) Change subject: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags of GCC .. firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags of GCC It seems that those flags have always been gcc flags, and not ld flags. After decades of tolerating this, binutils 2.36.x no longer tolerates those flags but prints an error: arm-none-eabi-ld: Error: unable to disambiguate: -nostartfiles (did you mean --nostartfiles ?) See also https://github.com/apache/nuttx/issues/3826 and the related https://github.com/apache/nuttx/pull/3836 how this was solved in another project - I adopted that solution here 1:1 Change-Id: Id199e4d03d5aae07a347c98f47791f42c12008c6 --- M src/target/firmware/Makefile.inc 1 file changed, 24 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index 2be240d..86e8f3c 100644 --- a/src/target/firmware/Makefile.inc +++ b/src/target/firmware/Makefile.inc @@ -4,7 +4,7 @@ CROSS_COMPILE?=arm-none-eabi- CC=gcc -LD=ld +LD=gcc AR=ar SIZE=size OBJCOPY=objcopy @@ -22,7 +22,7 @@ #ASFLAGS=--g$(DEBUGF) $(INCLUDES) -D__ASSEMBLY__ ASFLAGS=$(INCLUDES) -D__ASSEMBLY__ -LDFLAGS = -nostartfiles -nostdlib -nodefaultlibs --gc-sections --cref +LDFLAGS = -nostartfiles -nostdlib -nodefaultlibs -Wl,--gc-sections -Wl,--cref QUIET OUTPUT @@ -99,8 +99,8 @@ # define compilation rule, also generates map file board/$(2)/$(1).$(3).elf board/$(2)/$(1).$(3).map: $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) $$(ENV_$(3)_LDS) $$(Q_LD)$(CROSS_COMPILE)$(LD) $(LDFLAGS) -T $$(ENV_$(3)_LDS) -Bstatic \ - -Map board/$(2)/$(1).$(3).map -o board/$(2)/$(1).$(3).elf \ - --start-group $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) --end-group + -Wl,-Map board/$(2)/$(1).$(3).map -o board/$(2)/$(1).$(3).elf \ + -Wl,--start-group $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) -Wl,--end-group # define size rule board/$(2)/$(1).$(3).size: board/$(2)/$(1).$(3).elf -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id199e4d03d5aae07a347c98f47791f42c12008c6 Gerrit-Change-Number: 35089 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 22 Nov 2023 17:45:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: sgsn_vty: Correctly indent encryption cipher-plugin-path
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email ) Change subject: sgsn_vty: Correctly indent encryption cipher-plugin-path .. sgsn_vty: Correctly indent encryption cipher-plugin-path Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 --- M src/sgsn/sgsn_vty.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index e69307f..4c04368 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -292,7 +292,7 @@ vty_out(vty, "%s", VTY_NEWLINE); } if (g_cfg->crypt_cipher_plugin_path) - vty_out(vty, "encryption cipher-plugin-path %s%s", g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE); + vty_out(vty, " encryption cipher-plugin-path %s%s", g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE); if (g_cfg->sgsn_ipa_name) vty_out(vty, " gsup ipa-name %s%s", g_cfg->sgsn_ipa_name, VTY_NEWLINE); if (g_cfg->gsup_server_addr.sin_addr.s_addr) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 Gerrit-Change-Number: 35092 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmo-sgsn[master]: vty-tests: Test encryption options
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email ) Change subject: vty-tests: Test encryption options .. vty-tests: Test encryption options Change-Id: I471c04602dedfb2a80d4408c09125e51c465a8b8 --- M tests/osmo-sgsn_test-nodes.vty 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/tests/osmo-sgsn_test-nodes.vty b/tests/osmo-sgsn_test-nodes.vty index 4c65415..32ff8e7 100644 --- a/tests/osmo-sgsn_test-nodes.vty +++ b/tests/osmo-sgsn_test-nodes.vty @@ -120,3 +120,14 @@ gtp remote-ip 5.6.7.8 ... OsmoSGSN(config-sgsn)# no mme test1 +OsmoSGSN(config-sgsn)# encryption gea 0 3 +OsmoSGSN(config-sgsn)# encryption uea 1 2 +OsmoSGSN(config-sgsn)# encryption cipher-plugin-path /foo/bar +OsmoSGSN(config-sgsn)# show running-config +... +sgsn +... + encryption gea 0 3 + encryption uea 1 2 + encryption cipher-plugin-path /foo/bar +... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I471c04602dedfb2a80d4408c09125e51c465a8b8 Gerrit-Change-Number: 35093 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
[S] Change in osmo-sgsn[master]: sgsn_vty: Fix output in config_write_sgsn
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email )
Change subject: sgsn_vty: Fix output in config_write_sgsn
..
sgsn_vty: Fix output in config_write_sgsn
The encryption uea option was missing
Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76
---
M src/sgsn/sgsn_vty.c
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
daniel: Looks good to me, approved
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c
index b31fb59..e69307f 100644
--- a/src/sgsn/sgsn_vty.c
+++ b/src/sgsn/sgsn_vty.c
@@ -282,6 +282,15 @@
vty_out(vty, "%s", VTY_NEWLINE);
}
+ if (g_cfg->uea_encryption_mask != 0) {
+ vty_out(vty, " encryption uea");
+
+ for (i = 0; i < _OSMO_UTRAN_UEA_NUM; i++)
+ if (g_cfg->uea_encryption_mask >> i & 1)
+ vty_out(vty, " %u", i);
+
+ vty_out(vty, "%s", VTY_NEWLINE);
+ }
if (g_cfg->crypt_cipher_plugin_path)
vty_out(vty, "encryption cipher-plugin-path %s%s",
g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE);
if (g_cfg->sgsn_ipa_name)
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76
Gerrit-Change-Number: 35091
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-sgsn[master]: sgsn_vty: Correctly indent encryption cipher-plugin-path
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email ) Change subject: sgsn_vty: Correctly indent encryption cipher-plugin-path .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 Gerrit-Change-Number: 35092 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 22 Nov 2023 17:32:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: sgsn_vty: Fix output in config_write_sgsn
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email ) Change subject: sgsn_vty: Fix output in config_write_sgsn .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76 Gerrit-Change-Number: 35091 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 22 Nov 2023 17:31:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email to look at the new patch set (#2). Change subject: vty: disallow combination of early-IA and frequency hopping .. vty: disallow combination of early-IA and frequency hopping Related: osmo-bts Id9a930e5c67122812b229dc27ea2bfe246b67611 Related: SYS#6655 Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 --- M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c A tests/early_ia.vty 3 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/35097/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: osmo_io: Factor out and use common send function from backend
Attention is currently required from: lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email ) Change subject: osmo_io: Factor out and use common send function from backend .. Patch Set 1: (1 comment) File src/core/osmo_io_uring.c: https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/5ee32e96_ea710d82 PS1, Line 188: iofd_msghdr_free(msghdr); > here you are now checking also for EAGAIN by iofd_msghdr_free I don't understand? Are you saying that the -EAGAIN case was previously missed (only checking for < 0 and erroring out) and refactoring has fixed this for us? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6da2653d32aedd0e7872be0cf90a841b56462e59 Gerrit-Change-Number: 35078 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 17:28:53 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email )
Change subject: vty: disallow combination of early-IA and frequency hopping
..
vty: disallow combination of early-IA and frequency hopping
Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0
---
M src/osmo-bsc/bts_trx_vty.c
M src/osmo-bsc/bts_vty.c
A tests/early_ia.vty
3 files changed, 62 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/35097/1
diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c
index 385336b..b349951 100644
--- a/src/osmo-bsc/bts_trx_vty.c
+++ b/src/osmo-bsc/bts_trx_vty.c
@@ -351,6 +351,13 @@
ts->hopping.enabled = enabled;
+ if (enabled && bts->imm_ass_time != IMM_ASS_TIME_POST_CHAN_ACK) {
+ vty_out(vty,
+ "%% ERROR: 'hopping enabled 1' works only with
'immediate-assignment post-chan-ack'%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
return CMD_SUCCESS;
}
diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index 3af7296..afe71b1 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -3229,6 +3229,28 @@
bts->imm_ass_time = IMM_ASS_TIME_PRE_CHAN_ACK;
else
bts->imm_ass_time = IMM_ASS_TIME_POST_CHAN_ACK;
+
+ if (bts->imm_ass_time != IMM_ASS_TIME_POST_CHAN_ACK) {
+ struct gsm_bts_trx *trx;
+ int hopping_enabled = 0;
+
+ /* Early-IA does not work with frequency hopping, because the
IMM ASS does not convey an ARFCN when
+* frequency is in use. Make sure the user knows that. */
+ llist_for_each_entry(trx, &bts->trx_list, list) {
+ int ts_nr;
+ for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) {
+ struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr];
+ if (ts->hopping.enabled)
+ hopping_enabled++;
+ }
+ }
+ if (hopping_enabled) {
+ vty_out(vty,
+ "%% ERROR: 'hopping enabled 1' works only with
'immediate-assignment post-chan-ack'%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
return CMD_SUCCESS;
}
diff --git a/tests/early_ia.vty b/tests/early_ia.vty
new file mode 100644
index 000..d97aeed
--- /dev/null
+++ b/tests/early_ia.vty
@@ -0,0 +1,24 @@
+OsmoBSC> enable
+OsmoBSC# configure terminal
+OsmoBSC(config)# network
+OsmoBSC(config-net)# bts 0
+
+OsmoBSC(config-net-bts)# ### Check that first setting early-IA and then
enabling frequency hopping throws an error
+OsmoBSC(config-net-bts)# immediate-assignment pre-chan-ack
+OsmoBSC(config-net-bts)# trx 0
+OsmoBSC(config-net-bts-trx)# timeslot 2
+OsmoBSC(config-net-bts-trx-ts)# hopping enabled 1
+% ERROR: 'hopping enabled 1' works only with 'immediate-assignment
post-chan-ack'
+OsmoBSC(config-net-bts-trx-ts)# hopping enabled 0
+OsmoBSC(config-net-bts-trx-ts)# exit
+OsmoBSC(config-net-bts-trx)# exit
+OsmoBSC(config-net-bts)# immediate-assignment post-chan-ack
+
+OsmoBSC(config-net-bts)# ### Check that first enabling frequency hopping and
then setting early-IA throws an error
+OsmoBSC(config-net-bts)# trx 0
+OsmoBSC(config-net-bts-trx)# timeslot 2
+OsmoBSC(config-net-bts-trx-ts)# hopping enabled 1
+OsmoBSC(config-net-bts-trx-ts)# exit
+OsmoBSC(config-net-bts-trx)# exit
+OsmoBSC(config-net-bts)# immediate-assignment pre-chan-ack
+% ERROR: 'hopping enabled 1' works only with 'immediate-assignment
post-chan-ack'
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I8d375e5155be7b53034d5c0be5566d2f33af5db0
Gerrit-Change-Number: 35097
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
[M] Change in osmo-bts[master]: early-IA: use the correct TRX
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email to look at the new patch set (#3). Change subject: early-IA: use the correct TRX .. early-IA: use the correct TRX In early-Immediate-Assignment, the BSC sends the IMM ASS message directly after it sent the Channel Activation message, and osmo-bts should cache it until the Channel Activation is complete. So far the code had a bug: it assumed that the lchan was on the same TRX where the IMM ASS is transmitted -- but actually, 'trx' refers to the BCCH channel's TRX, i.e. always c0. Instead, look up the correct TRX by the ARFCN in the IMM ASS message. Now, when frequency hopping is enabled, there will be no ARFCN in the IMM ASS message, hence this fix does not work with frequency hopping. Related osmo-bsc patch disallows this combination. (To also support frequency hopping, osmo-bsc would need to modify the RSL protocol: send the IMM ASS message as a custom IE directly as part of the Channel Activation. Then it is always possible to correllate the IMM ASS with a specific trx and lchan, no matter what information it contains. However, early-IA is a "bad" feature in itself as it "promotes" having high latency on Abis. It seems unnecessary to do extra work to also support this odd use case for frequency hopping.) Related: osmo-bsc I8d375e5155be7b53034d5c0be5566d2f33af5db0 Related: SYS#6655 Change-Id: Id9a930e5c67122812b229dc27ea2bfe246b67611 --- M src/common/rsl.c 1 file changed, 67 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/35095/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id9a930e5c67122812b229dc27ea2bfe246b67611 Gerrit-Change-Number: 35095 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: Disable uring when building for embedded
Attention is currently required from: laforge. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34879?usp=email ) Change subject: Disable uring when building for embedded .. Patch Set 1: (1 comment) Patchset: PS1: > why is it bad to run the pkg-config check unconditionally? It will fail and > not include the related […] In https://projects.osmocom.org/issues/6233 Hörnchen reported that it errors out even with this patch. At the time I think this was also the case with libpcsclite. If you don't have the -dev package it will fail configure even with --enable-embedded, all our dev machines just happen to have the "requirements" installed. Reproduce by changing the requirements to something invalid in configure.ac, like PKG_CHECK_MODULES(PCSC, libpcsclight) in line 200. I tried to put these checks after if test x"$embedded", but this didn't change the behavior. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34879?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Gerrit-Change-Number: 34879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 Nov 2023 17:10:53 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: port from osmo_stream_*_get_ofd() to osmo_stream_srv_get_fd()
Attention is currently required from: arehbein, laforge. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35073?usp=email ) Change subject: port from osmo_stream_*_get_ofd() to osmo_stream_srv_get_fd() .. Patch Set 2: Code-Review+1 (2 comments) File src/osmo_ss7_asp.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/35073/comment/3ec83c43_196abe23 PS1, Line 846: asp->sock_name = osmo_sock_get_name(asp, fd); > `osmo_sock_get_name_buf()` (which will be called) does check for `fd < 0`, > not sure if we also want […] Done https://gerrit.osmocom.org/c/libosmo-sccp/+/35073/comment/663f118a_5127442b PS1, Line 915: return ipa_rx_msg(asp, msg, fd & 0xf); > no, not problematic at all. […] I was also a bit puzzled when reading this and just assumed something like that was happening. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35073?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I12c66badfb4bdfdfe71f1716de960d353d3548b1 Gerrit-Change-Number: 35073 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: daniel Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 Nov 2023 16:59:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: arehbein Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: early-IA: use the correct TRX
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email to look at the new patch set (#2). Change subject: early-IA: use the correct TRX .. early-IA: use the correct TRX In early-Immediate-Assignment, the BSC sends the IMM ASS message directly after it sent the Channel Activation message, and osmo-bts should cache it until the Channel Activation is complete. So far the code had a bug: it assumed that the lchan was on the same TRX where the IMM ASS is transmitted -- but actually, 'trx' refers to the BCCH channel's TRX, i.e. always c0. Instead, look up the correct TRX by the ARFCN in the IMM ASS message. Now, when frequency hopping is enabled, there will be no ARFCN in the IMM ASS message, hence this fix does not work with frequency hopping. (To also support frequency hopping, osmo-bsc would need to modify the RSL protocol: send the IMM ASS message as a custom IE directly as part of the Channel Activation. Then it is always possible to correllate the IMM ASS with a specific trx and lchan, no matter what information it contains. However, early-IA is a "bad" feature in itself as it "promotes" having high latency on Abis. It seems unnecessary to do extra work to also support this odd use case for frequency hopping.) Related: SYS#6655 Change-Id: Id9a930e5c67122812b229dc27ea2bfe246b67611 --- M src/common/rsl.c 1 file changed, 65 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/35095/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id9a930e5c67122812b229dc27ea2bfe246b67611 Gerrit-Change-Number: 35095 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in libosmo-netif[master]: stream_{cli,srv}: Add support for SCTP in OSMO_IO mode
Attention is currently required from: arehbein, laforge, pespin.
daniel has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/35069?usp=email )
Change subject: stream_{cli,srv}: Add support for SCTP in OSMO_IO mode
..
Patch Set 5: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35069?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I6cf5bad5f618e71c80017960c38009b089dbd6a1
Gerrit-Change-Number: 35069
Gerrit-PatchSet: 5
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Attention: arehbein
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 22 Nov 2023 16:49:59 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email ) Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle .. Patch Set 1: (1 comment) File src/bts.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12577): https://gerrit.osmocom.org/c/osmo-pcu/+/35096/comment/a5197d21_76a7346e PS1, Line 284: * continous stream of PDCH blocks that already has the gaps filled with dummy blocks. */ 'continous' may be misspelled - perhaps 'continuous'? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17 Gerrit-Change-Number: 35096 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Nov 2023 16:29:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: make PCUIF_info_ind field bts_model optional
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35090?usp=email )
Change subject: PCUIF_Types: make PCUIF_info_ind field bts_model optional
..
PCUIF_Types: make PCUIF_info_ind field bts_model optional
The field bts_model has been introduced with PCUIF v12, which is now
used in master. In latest we still use PCUIF v11, where the bts_model
field is not present. This means that when we test against osmo-bts
latest there will be an error parsing PCUIF_info_ind. A solution to this
problem is to declare the bts_model field as an optional field until
PCUIF v12 is also used in latest.
Related: OS#6191
Change-Id: I45947f3bddaccafee82824ebb1b8494eabc67e7a
---
M library/PCUIF_Types.ttcn
1 file changed, 24 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index 12c704f..33b454f 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -212,7 +212,11 @@
record length(2) of uint16_tremote_port,
PCUIF_RemoteAddrremote_addr,
- PCUIF_bts_model bts_model
+ /* The bts_model field was introduced with PCUIF v12 as a new mandatory
field. This also means that when we
+* use the testsuite to test against latest builds (still uses PCUIF
v11) this field is not included in
+* the PCUIF_info_ind message. Since the testsuite does not check on
this field we decided to declare the
+* field as an optional field until PCUIF v12 is also used in the
latest builds.*/
+ PCUIF_bts_model bts_model optional
} with { variant "" };
type enumerated PCUIF_AddrType {
@@ -992,7 +996,8 @@
local_port := ?,
remote_port := ?,
remote_addr := ?,
- bts_model := ?
+ /* See note in record PCUIF_info_ind */
+ bts_model := *
}
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35090?usp=email
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: I45947f3bddaccafee82824ebb1b8494eabc67e7a
Gerrit-Change-Number: 35090
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email )
Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on
idle
..
gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
When a PDCH is idle, then the gaps are filled with dummy blocks. OsmoPCU
supports generating the dummy blocks locally, so that a continous stream of
PDCH blocks is sent to L1. However, some BTS models (the OsmoTRX based models
in particular) are able to generate the idle blocks locally. In this case the
PCU should leave the genration of the dummy blocks to the BTS in order to
save processing time and load on the PCUIF interface.
In gprs_rlcmac_sched we already have a flag to skip idle frames in case we do
not use the so called "direct phy access". A similar mechanism also exists in
pcu_l1_if.cpp in function pcu_rx_rts_req_ptcch().
Unfortunately this check is not implemented correctly. The flag gets set when
the ENABLE_DIRECT_PHY define constant is set. However, this does not say
anything about whether the BTS model supports the generation of idle blocks or
not. The define constant is intended to be used to disable direct phy related
code in on platforms where no direct phy code is used or cannot be used. We
must instead check the BTS model (bts->bts_model) in order to decide whether
this particular BTS type requires the generation of dummy blocks or not.
Related: OS#6191
Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17
---
M src/bts.h
M src/gprs_rlcmac_sched.cpp
M src/pcu_l1_if.cpp
3 files changed, 63 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/35096/1
diff --git a/src/bts.h b/src/bts.h
index 1d88cb5..6958881 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -278,6 +278,11 @@
/* BTS hardware model, see pcuif_proto.h */
uint8_t bts_model;
+
+ /* When the PDCH is idele, the timeslot is expected to transmit dummy
blocks. Some BTS models will generate
+* those dummy blocks automatically when no data is transmitted. In
contrast, other BTS models may require a
+* continous stream of PDCH blocks that already has the gaps filled
with dummy blocks. */
+ bool gen_idle_blocks;
};
struct paging_req_cs {
diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp
index 314fd58..12b9e50 100644
--- a/src/gprs_rlcmac_sched.cpp
+++ b/src/gprs_rlcmac_sched.cpp
@@ -487,11 +487,10 @@
const unsigned num_tbfs = pdch->num_tbfs(GPRS_RLCMAC_DL_TBF)
+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
bool skip_idle = (num_tbfs == 0);
-#ifdef ENABLE_DIRECT_PHY
- /* In DIRECT_PHY mode we want to always submit something to L1
in
-* TRX0, since BTS is not preparing dummy bursts on idle TS for
us */
- skip_idle = skip_idle && trx != 0;
-#endif
+
+ if (bts->gen_idle_blocks)
+ skip_idle = skip_idle && trx != 0;
+
if (!skip_idle && (msg = sched_dummy())) {
/* increase counter */
gsmtap_cat = PCU_GSMTAP_C_DL_DUMMY;
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index e391829..07082d3 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -551,11 +551,10 @@
const unsigned num_tbfs = pdch->num_tbfs(GPRS_RLCMAC_DL_TBF)
+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
bool skip_idle = (num_tbfs == 0);
-#ifdef ENABLE_DIRECT_PHY
- /* In DIRECT_PHY mode we want to always submit something to L1
in
-* TRX0, since BTS is not preparing dummy bursts on idle TS for
us: */
+
+ if (bts->gen_idle_blocks)
skip_idle = skip_idle && trx != 0;
-#endif
+
if (skip_idle) {
pcu_l1if_tx_ptcch(bts, trx, ts, bts->trx[trx].arfcn, fn,
block_nr,
NULL, 0);
@@ -735,6 +734,27 @@
{ 0, NULL }
};
+static bool decide_gen_idle_blocks(struct gprs_rlcmac_bts *bts)
+{
+ switch (bts->bts_model) {
+ case PCU_IF_BTS_MODEL_UNSPEC:
+ case PCU_IF_BTS_MODEL_LC15:
+ case PCU_IF_BTS_MODEL_OC2G:
+ case PCU_IF_BTS_MODEL_OCTPHY:
+ case PCU_IF_BTS_MODEL_SYSMO:
+ case PCU_IF_BTS_MODEL_RBS:
+ /* The BTS models above do not generate dummy blocks by
themselves, so OsmoPCU must fill the idle gaps in the
+* stream of generated PDCH blocks with dummy blocks. */
+ return true;
+ case PCU_IF_BTS_MODEL_TRX:
+ /* The BTS models above generate dummy blocks by themselves, so
OsmoBTS will only generate PDCH bloks that
+* actually contain data. On idle, no blocks are generated. */
+ return false;
+ default:
+ return false;
+ }
+}
+
static int
[M] Change in osmo-bts[master]: early-IA: use the correct TRX
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email ) Change subject: early-IA: use the correct TRX .. Patch Set 1: (1 comment) Patchset: PS1: completely untested -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id9a930e5c67122812b229dc27ea2bfe246b67611 Gerrit-Change-Number: 35095 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 22 Nov 2023 16:28:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: early-IA: use the correct TRX
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email )
Change subject: early-IA: use the correct TRX
..
early-IA: use the correct TRX
Change-Id: Id9a930e5c67122812b229dc27ea2bfe246b67611
---
M src/common/rsl.c
1 file changed, 43 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/35095/1
diff --git a/src/common/rsl.c b/src/common/rsl.c
index deeb255..9405c6e 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -371,6 +371,16 @@
return true;
}
+static struct gsm_bts_trx *trx_lookup_by_arfcn(struct llist_head *trx_list,
uint16_t arfcn)
+{
+ struct gsm_bts_trx *trx;
+ llist_for_each_entry(trx, trx_list, list) {
+ if (trx->arfcn == arfcn)
+ return trx;
+ }
+ return NULL;
+}
+
static struct gsm_lchan *lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr,
const char *log_name)
{
@@ -1383,18 +1393,33 @@
* the channel is active. Hence we still wait for the activation, but
don't need the Abis roundtrip of Activ ACK
* -> Immediate Assignment via the BSC.
* If anything is wrong with the sizes or the lchan lookup, behave
normally, i.e. do not do the RR IA caching,
-* but just send the RR message to the MS as-is. */
+* but just send the RR message to the MS as-is.
+* 'trx' here is the TRX of the BCCH channel. To find the correct TRX
for the IMM ASS target, we need to look up
+* the ARFCN that is contained in the IMM ASS message. When frequency
hopping is enabled, there will not be an
+* ARFCN, so we cannot support early-IA with frequency hopping enabled.
*/
if (msg->len >= sizeof(struct gsm48_imm_ass)) {
struct gsm48_imm_ass *rr_ia = (void*)msg->data;
- struct gsm_lchan *ia_target_lchan = lchan_lookup(trx,
rr_ia->chan_desc.chan_nr, "Early IA check: ");
- if (ia_target_lchan && ia_target_lchan->state !=
LCHAN_S_ACTIVE) {
- /* Target lchan is not yet active. Cache the IA.
-* If a previous IA is still lingering, free it. */
- msgb_free(ia_target_lchan->early_rr_ia);
- ia_target_lchan->early_rr_ia = msg;
+ if (rr_ia->chan_desc.h0.h == 0) {
+ /* hopping is disabled. */
+ struct gsm_bts_trx *ia_target_trx;
+ uint16_t arfcn;
+ arfcn = (rr_ia->chan_desc.h0.arfcn_high << 8) +
rr_ia->chan_desc.h0.arfcn_low;
- /* return 1 means: don't msgb_free() the msg */
- return 1;
+ ia_target_trx =
trx_lookup_by_arfcn(&trx->bts->trx_list, arfcn);
+ if (ia_target_trx) {
+ /* found the ARFCN's trx */
+ struct gsm_lchan *ia_target_lchan;
+ ia_target_lchan = lchan_lookup(ia_target_trx,
rr_ia->chan_desc.chan_nr, "Early IA check: ");
+ if (ia_target_lchan && ia_target_lchan->state
!= LCHAN_S_ACTIVE) {
+ /* Target lchan is not yet active.
Cache the IA.
+* If a previous IA is still lingering,
free it. */
+ msgb_free(ia_target_lchan->early_rr_ia);
+ ia_target_lchan->early_rr_ia = msg;
+
+ /* return 1 means: don't msgb_free()
the msg */
+ return 1;
+ }
+ }
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id9a930e5c67122812b229dc27ea2bfe246b67611
Gerrit-Change-Number: 35095
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy
dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy .. Abandoned We have found a better solution to this -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: abandon
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
Attention is currently required from: laforge, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes .. Patch Set 2: (1 comment) Patchset: PS1: > Should probably mention in TODO-RELEASE that a new osmo-ggsn version is > required for https://gerrit. […] Done, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 15:58:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
Attention is currently required from: daniel, laforge, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes .. Patch Set 2: (1 comment) Patchset: PS1: > Should probably mention in TODO-RELEASE that a new osmo-ggsn version is > required for https://gerrit. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 15:56:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
Attention is currently required from: daniel, laforge, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 15:56:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
Attention is currently required from: daniel, laforge, lynxis lazus, osmith. Hello Jenkins Builder, laforge, lynxis lazus, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: libgtp: Check for all successful create_pdp_conf causes .. libgtp: Check for all successful create_pdp_conf causes Related: OS#6268 Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 --- M TODO-RELEASE M src/sgsn/sgsn_libgtp.c 2 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/94/35094/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags ...
Attention is currently required from: laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email ) Change subject: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags of GCC .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id199e4d03d5aae07a347c98f47791f42c12008c6 Gerrit-Change-Number: 35089 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 Nov 2023 15:54:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: make PCUIF_info_ind field bts_model optional
Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35090?usp=email ) Change subject: PCUIF_Types: make PCUIF_info_ind field bts_model optional .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35090?usp=email 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: I45947f3bddaccafee82824ebb1b8494eabc67e7a Gerrit-Change-Number: 35090 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 22 Nov 2023 15:54:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: vty-tests: Test encryption options
Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email ) Change subject: vty-tests: Test encryption options .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I471c04602dedfb2a80d4408c09125e51c465a8b8 Gerrit-Change-Number: 35093 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 Nov 2023 15:53:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: sgsn_vty: Correctly indent encryption cipher-plugin-path
Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email ) Change subject: sgsn_vty: Correctly indent encryption cipher-plugin-path .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 Gerrit-Change-Number: 35092 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 Nov 2023 15:52:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: sgsn_vty: Fix output in config_write_sgsn
Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email ) Change subject: sgsn_vty: Fix output in config_write_sgsn .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76 Gerrit-Change-Number: 35091 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 Nov 2023 15:52:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
Attention is currently required from: daniel, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Should probably mention in TODO-RELEASE that a new osmo-ggsn version is required for https://gerrit.osmocom.org/c/osmo-ggsn/+/35084. Otherwise LGTM -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 15:51:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags ...
Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email ) Change subject: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags of GCC .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id199e4d03d5aae07a347c98f47791f42c12008c6 Gerrit-Change-Number: 35089 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: Hoernchen Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 Nov 2023 15:45:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
Attention is currently required from: daniel, lynxis lazus, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 15:22:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: vty-tests: Test encryption options
Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email ) Change subject: vty-tests: Test encryption options .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I471c04602dedfb2a80d4408c09125e51c465a8b8 Gerrit-Change-Number: 35093 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 Nov 2023 15:22:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: sgsn_vty: Correctly indent encryption cipher-plugin-path
Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email ) Change subject: sgsn_vty: Correctly indent encryption cipher-plugin-path .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 Gerrit-Change-Number: 35092 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 Nov 2023 15:21:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: sgsn_vty: Fix output in config_write_sgsn
Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email ) Change subject: sgsn_vty: Fix output in config_write_sgsn .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76 Gerrit-Change-Number: 35091 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 22 Nov 2023 15:21:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: make PCUIF_info_ind field bts_model optional
Attention is currently required from: dexter, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35090?usp=email ) Change subject: PCUIF_Types: make PCUIF_info_ind field bts_model optional .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35090?usp=email 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: I45947f3bddaccafee82824ebb1b8494eabc67e7a Gerrit-Change-Number: 35090 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 22 Nov 2023 15:17:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email )
Change subject: libgtp: Check for all successful create_pdp_conf causes
..
libgtp: Check for all successful create_pdp_conf causes
Related: OS#6268
Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
---
M src/sgsn/sgsn_libgtp.c
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/94/35094/1
diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c
index 0b6da62..6e09562 100644
--- a/src/sgsn/sgsn_libgtp.c
+++ b/src/sgsn/sgsn_libgtp.c
@@ -417,7 +417,7 @@
}
/* Check for cause value if it was really successful */
- if (cause != GTPCAUSE_ACC_REQ) {
+ if (gtp_cause_successful(cause)) {
reject_cause = cause_map(gtp2sm_cause_map, cause,
GSM_CAUSE_ACT_REJ_GGSN);
goto reject;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
Gerrit-Change-Number: 35094
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
[S] Change in osmo-sgsn[master]: sgsn_vty: Correctly indent encryption cipher-plugin-path
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email ) Change subject: sgsn_vty: Correctly indent encryption cipher-plugin-path .. sgsn_vty: Correctly indent encryption cipher-plugin-path Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 --- M src/sgsn/sgsn_vty.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/92/35092/1 diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index e69307f..4c04368 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -292,7 +292,7 @@ vty_out(vty, "%s", VTY_NEWLINE); } if (g_cfg->crypt_cipher_plugin_path) - vty_out(vty, "encryption cipher-plugin-path %s%s", g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE); + vty_out(vty, " encryption cipher-plugin-path %s%s", g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE); if (g_cfg->sgsn_ipa_name) vty_out(vty, " gsup ipa-name %s%s", g_cfg->sgsn_ipa_name, VTY_NEWLINE); if (g_cfg->gsup_server_addr.sin_addr.s_addr) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35092?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16b3450c3919bebbceb8d27f73d7c6dde102d0f7 Gerrit-Change-Number: 35092 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
[S] Change in osmo-sgsn[master]: vty-tests: Test encryption options
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email ) Change subject: vty-tests: Test encryption options .. vty-tests: Test encryption options Change-Id: I471c04602dedfb2a80d4408c09125e51c465a8b8 --- M tests/osmo-sgsn_test-nodes.vty 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/93/35093/1 diff --git a/tests/osmo-sgsn_test-nodes.vty b/tests/osmo-sgsn_test-nodes.vty index 4c65415..32ff8e7 100644 --- a/tests/osmo-sgsn_test-nodes.vty +++ b/tests/osmo-sgsn_test-nodes.vty @@ -120,3 +120,14 @@ gtp remote-ip 5.6.7.8 ... OsmoSGSN(config-sgsn)# no mme test1 +OsmoSGSN(config-sgsn)# encryption gea 0 3 +OsmoSGSN(config-sgsn)# encryption uea 1 2 +OsmoSGSN(config-sgsn)# encryption cipher-plugin-path /foo/bar +OsmoSGSN(config-sgsn)# show running-config +... +sgsn +... + encryption gea 0 3 + encryption uea 1 2 + encryption cipher-plugin-path /foo/bar +... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35093?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I471c04602dedfb2a80d4408c09125e51c465a8b8 Gerrit-Change-Number: 35093 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
[S] Change in osmo-sgsn[master]: sgsn_vty: Fix output in config_write_sgsn
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email )
Change subject: sgsn_vty: Fix output in config_write_sgsn
..
sgsn_vty: Fix output in config_write_sgsn
The encryption uea option was missing
Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76
---
M src/sgsn/sgsn_vty.c
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/91/35091/1
diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c
index b31fb59..e69307f 100644
--- a/src/sgsn/sgsn_vty.c
+++ b/src/sgsn/sgsn_vty.c
@@ -282,6 +282,15 @@
vty_out(vty, "%s", VTY_NEWLINE);
}
+ if (g_cfg->uea_encryption_mask != 0) {
+ vty_out(vty, " encryption uea");
+
+ for (i = 0; i < _OSMO_UTRAN_UEA_NUM; i++)
+ if (g_cfg->uea_encryption_mask >> i & 1)
+ vty_out(vty, " %u", i);
+
+ vty_out(vty, "%s", VTY_NEWLINE);
+ }
if (g_cfg->crypt_cipher_plugin_path)
vty_out(vty, "encryption cipher-plugin-path %s%s",
g_cfg->crypt_cipher_plugin_path, VTY_NEWLINE);
if (g_cfg->sgsn_ipa_name)
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35091?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I2c81ced87c53d69a94b3894441323201f81f1a76
Gerrit-Change-Number: 35091
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: make PCUIF_info_ind field bts_model optional
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35090?usp=email )
Change subject: PCUIF_Types: make PCUIF_info_ind field bts_model optional
..
PCUIF_Types: make PCUIF_info_ind field bts_model optional
The field bts_model has been introduced with PCUIF v12, which is now
used in master. In latest we still use PCUIF v11, where the bts_model
field is not present. This means that when we test against osmo-bts
latest there will be an error parsing PCUIF_info_ind. A solution to this
problem is to declare the bts_model field as an optional field until
PCUIF v12 is also used in latest.
Related: OS#6191
Change-Id: I45947f3bddaccafee82824ebb1b8494eabc67e7a
---
M library/PCUIF_Types.ttcn
1 file changed, 24 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/90/35090/1
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index 12c704f..33b454f 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -212,7 +212,11 @@
record length(2) of uint16_tremote_port,
PCUIF_RemoteAddrremote_addr,
- PCUIF_bts_model bts_model
+ /* The bts_model field was introduced with PCUIF v12 as a new mandatory
field. This also means that when we
+* use the testsuite to test against latest builds (still uses PCUIF
v11) this field is not included in
+* the PCUIF_info_ind message. Since the testsuite does not check on
this field we decided to declare the
+* field as an optional field until PCUIF v12 is also used in the
latest builds.*/
+ PCUIF_bts_model bts_model optional
} with { variant "" };
type enumerated PCUIF_AddrType {
@@ -992,7 +996,8 @@
local_port := ?,
remote_port := ?,
remote_addr := ?,
- bts_model := ?
+ /* See note in record PCUIF_info_ind */
+ bts_model := *
}
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35090?usp=email
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: I45947f3bddaccafee82824ebb1b8494eabc67e7a
Gerrit-Change-Number: 35090
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCC0, SAPI 0 without L3 payload
Attention is currently required from: fixeria, laforge.
jolly has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email )
Change subject: LAPDm: Reject (release) establishment on DCC0, SAPI 0 without
L3 payload
..
Patch Set 2:
(1 comment)
File src/common/rsl.c:
https://gerrit.osmocom.org/c/osmo-bts/+/35082/comment/e0478ddf_76a91bf6
PS1, Line 3839: if (msgb_l2len(msg) == sizeof(*rllh) &&
(rllh->link_id & 0xc7) == 0x00) {
> Using our union abis_rsl_link_id and then comparing sapin and cbits
> individually is probably the mor […]
I agree.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c
Gerrit-Change-Number: 35082
Gerrit-PatchSet: 2
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Attention: laforge
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Wed, 22 Nov 2023 14:08:09 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCC0, SAPI 0 without L3 payload
Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: LAPDm: Reject (release) establishment on DCC0, SAPI 0 without L3 payload .. LAPDm: Reject (release) establishment on DCC0, SAPI 0 without L3 payload A special flag is used to keep track on the establishment of the data link. If it is being established (not re-established) without L3 payload, it is rejected by a release request inside BTS. Related: OS#5971 Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/35082/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers
Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email ) Change subject: Use polling based LAPDm with frame numbers .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 Nov 2023 13:21:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers
Attention is currently required from: fixeria, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email ) Change subject: Use polling based LAPDm with frame numbers .. Patch Set 5: (2 comments) Patchset: PS2: > Not addressed. Done File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/35007/comment/fcdc0a38_fe15f7ae PS3, Line 686: #if 0 > Still missing to log a message, but not critical I guess. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 5 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 Nov 2023 13:20:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers
Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified-1 by Jenkins Builder Change subject: Use polling based LAPDm with frame numbers .. Use polling based LAPDm with frame numbers Osmo-bts uses the new polling based LAPDm implementation. The OML message NM_ATT_T200 is ignored, because T200 timeouts are set to the minimal response time. Longer timeouts would cause lower throughput in case of lost frames. Shorter timeouts would cause LAPDm to fail. Related: OS#4074 Depends: libosmocore.git I6ebe83f829d7751ea9de1d90eb478c7a628db64c Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd --- M include/osmo-bts/bts.h M include/osmo-bts/oml.h M src/common/bts.c M src/common/l1sap.c M src/common/lchan.c M src/common/oml.c 6 files changed, 107 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/35007/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCC0, SAPI 0 without L3 payload
Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified-1 by Jenkins Builder Change subject: LAPDm: Reject (release) establishment on DCC0, SAPI 0 without L3 payload .. LAPDm: Reject (release) establishment on DCC0, SAPI 0 without L3 payload A special flag is used to keep track on the establishment of the data link. If it is being established (not re-established) without L3 payload, it is rejected by a release request inside BTS. Related: OS#5971 Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/35082/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags ...
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email ) Change subject: firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags of GCC .. firmware: -nostartfiles -nodefaultlibs are not flags of LD but flags of GCC It seems that those flags have always been gcc flags, and not ld flags. After decades of tolerating this, binutils 2.36.x no longer tolerates those flags but prints an error: arm-none-eabi-ld: Error: unable to disambiguate: -nostartfiles (did you mean --nostartfiles ?) See also https://github.com/apache/nuttx/issues/3826 and the related https://github.com/apache/nuttx/pull/3836 how this was solved in another project - I adopted that solution here 1:1 Change-Id: Id199e4d03d5aae07a347c98f47791f42c12008c6 --- M src/target/firmware/Makefile.inc 1 file changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/89/35089/1 diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index 2be240d..86e8f3c 100644 --- a/src/target/firmware/Makefile.inc +++ b/src/target/firmware/Makefile.inc @@ -4,7 +4,7 @@ CROSS_COMPILE?=arm-none-eabi- CC=gcc -LD=ld +LD=gcc AR=ar SIZE=size OBJCOPY=objcopy @@ -22,7 +22,7 @@ #ASFLAGS=--g$(DEBUGF) $(INCLUDES) -D__ASSEMBLY__ ASFLAGS=$(INCLUDES) -D__ASSEMBLY__ -LDFLAGS = -nostartfiles -nostdlib -nodefaultlibs --gc-sections --cref +LDFLAGS = -nostartfiles -nostdlib -nodefaultlibs -Wl,--gc-sections -Wl,--cref QUIET OUTPUT @@ -99,8 +99,8 @@ # define compilation rule, also generates map file board/$(2)/$(1).$(3).elf board/$(2)/$(1).$(3).map: $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) $$(ENV_$(3)_LDS) $$(Q_LD)$(CROSS_COMPILE)$(LD) $(LDFLAGS) -T $$(ENV_$(3)_LDS) -Bstatic \ - -Map board/$(2)/$(1).$(3).map -o board/$(2)/$(1).$(3).elf \ - --start-group $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) --end-group + -Wl,-Map board/$(2)/$(1).$(3).map -o board/$(2)/$(1).$(3).elf \ + -Wl,--start-group $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) -Wl,--end-group # define size rule board/$(2)/$(1).$(3).size: board/$(2)/$(1).$(3).elf -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35089?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id199e4d03d5aae07a347c98f47791f42c12008c6 Gerrit-Change-Number: 35089 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm.TC_sabm_retransmit_bts: Fix time to wait
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35054?usp=email )
Change subject: BTS_Tests_LAPDm.TC_sabm_retransmit_bts: Fix time to wait
..
BTS_Tests_LAPDm.TC_sabm_retransmit_bts: Fix time to wait
Wait 20 seconds, because T200 on SDCCH, SAPI 3 lasts about 2 seconds.
Relates: OS#5970
Change-Id: I593008420f58cc1d5e4778874f9071914d24f82e
---
M bts/BTS_Tests_LAPDm.ttcn
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn
index 2e984d1..7dda8b8 100644
--- a/bts/BTS_Tests_LAPDm.ttcn
+++ b/bts/BTS_Tests_LAPDm.ttcn
@@ -287,7 +287,7 @@
LAPDM.clear;
RSL.send(ts_RSL_EST_REQ(g_chan_nr, ts_RslLinkID_DCCH(sapi)));
- timer T := 8.0;
+ timer T := 20.0;
var integer sabm_received := 0;
T.start;
alt {
@@ -311,6 +311,7 @@
}
testcase TC_sabm_retransmit_bts() runs on test_CT {
var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1),
ts_RSL_ChanMode_SIGN));
+ pars.t_guard := 30.0;
f_testmatrix_each_chan(pars, refers(f_TC_sabm_retransmit_bts));
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35054?usp=email
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: I593008420f58cc1d5e4778874f9071914d24f82e
Gerrit-Change-Number: 35054
Gerrit-PatchSet: 2
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email ) Change subject: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test .. BTS_Tests_LAPDm.TC_nr_seq_error: Fix test Related: OS#5968 Change-Id: I4cdff6ab607e158d4956a1bd87f74e9e75579cff --- M bts/BTS_Tests_LAPDm.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index b4c2c33..2e984d1 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -801,6 +801,11 @@ /* SAPI = 0, C = 1, P = 0, M = 0, L = N201, N(S) = 0, N(R) = 1. * */ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_I(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1, ns:=0, l3:=l3_mo))); + /* LAPD indicates the data and then indicates error with sequence error cause. */ + RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3_mo)); + RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, '07'O)); + /* Release RSL link. */ + RSL.send(ts_RSL_REL_REQ(g_chan_nr, link_id)); /* The BTS may: a) send a DISC frame within N200×T200; */ /* DISC SAPI = 0, C = 0, P = 1, M = 0, L = 0. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email 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: I4cdff6ab607e158d4956a1bd87f74e9e75579cff Gerrit-Change-Number: 35047 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email ) Change subject: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email 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: I4cdff6ab607e158d4956a1bd87f74e9e75579cff Gerrit-Change-Number: 35047 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 22 Nov 2023 12:24:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling .. Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 12 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 22 Nov 2023 12:22:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: Introduce generic osmo_stream_{cli,srv}_get_fd() API
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/35072?usp=email )
Change subject: Introduce generic osmo_stream_{cli,srv}_get_fd() API
..
Introduce generic osmo_stream_{cli,srv}_get_fd() API
The old osmo_stream_{cli,srv}_get_ofd() API only works for streams
in OSMO_FD mode. However, it is legitimate for an application
wanting to get low-level access to the file descriptor, for example
to issue some {get,set}sockopt() calls on it.
Change-Id: Ib0737f21150f6ac8d524b92c7ddb098f2afdeaab
Related: OS#5753
---
M include/osmocom/netif/stream.h
M src/stream_cli.c
M src/stream_srv.c
3 files changed, 45 insertions(+), 6 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index a24244c..218b635 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -64,6 +64,7 @@
void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn);
struct osmo_stream_srv_link *osmo_stream_srv_get_master(struct osmo_stream_srv
*conn);
struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv);
+int osmo_stream_srv_get_fd(const struct osmo_stream_srv *srv);
void osmo_stream_srv_destroy(struct osmo_stream_srv *conn);
void osmo_stream_srv_set_flush_and_destroy(struct osmo_stream_srv *conn);
@@ -96,6 +97,7 @@
void *osmo_stream_cli_get_data(struct osmo_stream_cli *cli);
char *osmo_stream_cli_get_sockname(const struct osmo_stream_cli *cli);
struct osmo_fd *osmo_stream_cli_get_ofd(struct osmo_stream_cli *cli);
+int osmo_stream_cli_get_fd(const struct osmo_stream_cli *cli);
void osmo_stream_cli_set_connect_cb(struct osmo_stream_cli *cli, int
(*connect_cb)(struct osmo_stream_cli *cli));
void osmo_stream_cli_set_disconnect_cb(struct osmo_stream_cli *cli, int
(*disconnect_cb)(struct osmo_stream_cli *cli));
void osmo_stream_cli_set_read_cb(struct osmo_stream_cli *cli, int
(*read_cb)(struct osmo_stream_cli *cli));
diff --git a/src/stream_cli.c b/src/stream_cli.c
index ef571cc..1e7ebeb 100644
--- a/src/stream_cli.c
+++ b/src/stream_cli.c
@@ -210,7 +210,11 @@
}
}
-static inline int osmo_stream_cli_fd(const struct osmo_stream_cli *cli)
+/*! \brief Get file descriptor of the stream client socket
+ * \param[in] cli Stream Client of which we want to obtain the file descriptor
+ * \returns File descriptor or negative in case of error */
+int
+osmo_stream_cli_get_fd(const struct osmo_stream_cli *cli)
{
switch (cli->mode) {
case OSMO_STREAM_MODE_OSMO_FD:
@@ -314,7 +318,7 @@
#ifdef SO_NOSIGPIPE
int ret;
int val = 1;
- ret = setsockopt(osmo_stream_cli_fd(cli), SOL_SOCKET, SO_NOSIGPIPE,
(void *)&val, sizeof(val));
+ ret = setsockopt(osmo_stream_cli_get_fd(cli), SOL_SOCKET, SO_NOSIGPIPE,
(void *)&val, sizeof(val));
if (ret < 0)
LOGSCLI(cli, LOGL_ERROR, "Failed setting SO_NOSIGPIPE: %s\n",
strerror(errno));
return ret;
@@ -328,7 +332,7 @@
int error, ret = res;
socklen_t len = sizeof(error);
- int fd = osmo_stream_cli_fd(cli);
+ int fd = osmo_stream_cli_get_fd(cli);
OSMO_ASSERT(fd >= 0);
if (ret < 0) {
@@ -347,7 +351,7 @@
osmo_fd_write_disable(&cli->ofd);
/* Update sockname based on socket info: */
- osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname),
osmo_stream_cli_fd(cli));
+ osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname),
osmo_stream_cli_get_fd(cli));
LOGSCLI(cli, LOGL_INFO, "connection established\n");
cli->state = STREAM_CLI_STATE_CONNECTED;
@@ -683,7 +687,7 @@
{
static char buf[OSMO_SOCK_NAME_MAXLEN];
- osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN,
osmo_stream_cli_fd(cli));
+ osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN,
osmo_stream_cli_get_fd(cli));
return buf;
}
@@ -837,7 +841,7 @@
int ret, fd = -1;
/* we are reconfiguring this socket, close existing first. */
- if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_fd(cli)
>= 0)
+ if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) &&
osmo_stream_cli_get_fd(cli) >= 0)
osmo_stream_cli_close(cli);
cli->flags &= ~OSMO_STREAM_CLI_F_RECONF;
diff --git a/src/stream_srv.c b/src/stream_srv.c
index 36e21cc..42b04ad 100644
--- a/src/stream_srv.c
+++ b/src/stream_srv.c
@@ -838,6 +838,24 @@
return &conn->ofd;
}
+/*! \brief Get File Descriptor of the stream server
+ * \param[in] conn Stream Server
+ * \returns file descriptor or negative on error */
+int
+osmo_stream_srv_get_fd(const struct osmo_stream_srv *conn)
+{
+ switch (conn->mode) {
+ case OSMO_STREAM_MODE_OSMO_FD:
+ return conn->ofd.fd;
+ case OSMO_STREAM_MODE_OSMO_IO:
+
[M] Change in libosmo-netif[master]: Introduce generic osmo_stream_{cli,srv}_get_fd() API
Attention is currently required from: daniel.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/35072?usp=email )
Change subject: Introduce generic osmo_stream_{cli,srv}_get_fd() API
..
Patch Set 3: Code-Review+2
(1 comment)
Patchset:
PS3:
re-adding daniels +1 from patch version 1 (only cosmetic changes since)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35072?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: Ib0737f21150f6ac8d524b92c7ddb098f2afdeaab
Gerrit-Change-Number: 35072
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Attention: daniel
Gerrit-Comment-Date: Wed, 22 Nov 2023 12:21:07 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in libosmocore[master]: osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35062?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: osmo_io: rename unsupported SCTP mode to
OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND
..
osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND
The two functions of the SCTP socket interface we use in osmo-* are
sctp_send() and sctp_recvmsg(). We do not use sctp_sendmsg() at all,
so let's make sure the mode is named correctly.
Change-Id: Ie2d1c7ce6f211dbe025a0e843ad733443102ea15
Related: OS#5751
---
M include/osmocom/core/osmo_io.h
M src/core/osmo_io.c
M src/core/osmo_io_poll.c
3 files changed, 19 insertions(+), 5 deletions(-)
Approvals:
daniel: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h
index b3d248f..46e1a53 100644
--- a/include/osmocom/core/osmo_io.h
+++ b/include/osmocom/core/osmo_io.h
@@ -21,8 +21,8 @@
OSMO_IO_FD_MODE_READ_WRITE,
/*! use recvfrom() / sendto() calls */
OSMO_IO_FD_MODE_RECVFROM_SENDTO,
- /*! emulate sctp_recvmsg() and sctp_sendmsg() */
- OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG,
+ /*! emulate sctp_recvmsg() and sctp_send() */
+ OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND,
};
enum osmo_io_backend {
diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index 649bf73..1a8c01d 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -337,7 +337,7 @@
case OSMO_IO_FD_MODE_RECVFROM_SENDTO:
iofd->io_ops.recvfrom_cb(iofd, rc, msg, &hdr->osa);
break;
- case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG:
+ case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND:
/* TODO Implement */
OSMO_ASSERT(false);
break;
@@ -688,7 +688,7 @@
else
osmo_iofd_ops.read_disable(iofd);
break;
- case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG:
+ case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND:
default:
OSMO_ASSERT(0);
}
diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c
index a9aaea4..2c1e422 100644
--- a/src/core/osmo_io_poll.c
+++ b/src/core/osmo_io_poll.c
@@ -98,7 +98,7 @@
case OSMO_IO_FD_MODE_RECVFROM_SENDTO:
iofd->io_ops.sendto_cb(iofd, rc, msg,
&msghdr->osa);
break;
- case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG:
+ case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND:
OSMO_ASSERT(false);
break;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35062?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ie2d1c7ce6f211dbe025a0e843ad733443102ea15
Gerrit-Change-Number: 35062
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-CC: fixeria
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: io_uring: add some more source code comments/docs
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35061?usp=email )
Change subject: io_uring: add some more source code comments/docs
..
io_uring: add some more source code comments/docs
Change-Id: I8ba77a18b51f67a9edbd1fa488b9791f8bf6e40a
---
M src/core/osmo_io.c
M src/core/osmo_io_internal.h
M src/core/osmo_io_uring.c
3 files changed, 30 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index f23986f..649bf73 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -323,6 +323,10 @@
iofd->pending = pending;
}
+/*! completion handler: Called by osmo_io backend after a given I/O operation
has completed
+ * \param[in] iofd I/O file-descriptor on which I/O has completed
+ * \param[in] msg message buffer containing data related to completed I/O
+ * \param[in] hdr serialized msghdr containing state of completed I/O */
void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc,
struct iofd_msghdr *hdr)
{
talloc_steal(iofd->msgb_alloc.ctx, msg);
diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h
index 5b7ab90..73a81e1 100644
--- a/src/core/osmo_io_internal.h
+++ b/src/core/osmo_io_internal.h
@@ -111,16 +111,24 @@
};
-/* serialized version of 'struct msghdr' employed by sendmsg/recvmsg */
+/*! serialized version of 'struct msghdr' employed by sendmsg/recvmsg */
struct iofd_msghdr {
+ /*! entry into osmo_io_fd.tx_queue.msg_queue */
struct llist_head list;
enum iofd_msg_action action;
+ /*! the 'struct msghdr' we are wrapping/ecapsulating here */
struct msghdr hdr;
+ /*! socket address of the remote peer */
struct osmo_sockaddr osa;
+ /*! io-vector we need to pass as argument to sendmsg/recvmsg; is set up
+* to point into msg below */
struct iovec iov[1];
+ /*! flags we pass as argument to sendmsg / recvmsg */
int flags;
+ /*! message-buffer containing data for this I/O operation */
struct msgb *msg;
+ /*! I/O file descriptor on which we perform this I/O operation */
struct osmo_io_fd *iofd;
};
diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c
index a6395fe..abeea79 100644
--- a/src/core/osmo_io_uring.c
+++ b/src/core/osmo_io_uring.c
@@ -59,6 +59,8 @@
static __thread struct osmo_io_uring g_ring;
static void iofd_uring_cqe(struct io_uring *ring);
+
+/*! read call-back for eventfd notifying us if entries are in the completion
queue */
static int iofd_uring_poll_cb(struct osmo_fd *ofd, unsigned int what)
{
struct io_uring *ring = ofd->data;
@@ -157,6 +159,7 @@
iofd->u.uring.read_msghdr = msghdr;
}
+/*! completion call-back for READ/RECVFROM */
static void iofd_uring_handle_recv(struct iofd_msghdr *msghdr, int rc)
{
struct osmo_io_fd *iofd = msghdr->iofd;
@@ -179,6 +182,7 @@
static int iofd_uring_submit_tx(struct osmo_io_fd *iofd);
+/*! completion call-back for WRITE/SENDTO */
static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc)
{
struct osmo_io_fd *iofd = msghdr->iofd;
@@ -220,10 +224,12 @@
out:
iofd->u.uring.write_msghdr = NULL;
+ /* submit the next to-be-transmitted message for this file descriptor */
if (iofd->u.uring.write_enabled && !IOFD_FLAG_ISSET(iofd,
IOFD_FLAG_CLOSED))
iofd_uring_submit_tx(iofd);
}
+/*! handle completion of a single I/O message */
static void iofd_uring_handle_completion(struct iofd_msghdr *msghdr, int res)
{
struct osmo_io_fd *iofd = msghdr->iofd;
@@ -250,6 +256,7 @@
talloc_free(iofd);
}
+/*! process all pending completion queue entries in given io_uring */
static void iofd_uring_cqe(struct io_uring *ring)
{
int rc;
@@ -274,6 +281,7 @@
}
}
+/*! will submit the next to-be-transmitted message for given iofd */
static int iofd_uring_submit_tx(struct osmo_io_fd *iofd)
{
struct io_uring_sqe *sqe;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35061?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I8ba77a18b51f67a9edbd1fa488b9791f8bf6e40a
Gerrit-Change-Number: 35061
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email )
Change subject: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup()
..
osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup()
The current code does not check the value range of the 'mode' parameter
and would later run into OSMO_ASSERT(), rather than rejecting such a
mode from the very beginning.
Change-Id: I10dd612487638f456d0ad59c2cca203f1e098da3
Related: OS#5751
---
M src/core/osmo_io.c
1 file changed, 26 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index 1a8c01d..8507f46 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -445,7 +445,18 @@
struct osmo_io_fd *osmo_iofd_setup(const void *ctx, int fd, const char *name,
enum osmo_io_fd_mode mode,
const struct osmo_io_ops *ioops, void *data)
{
- struct osmo_io_fd *iofd = talloc_zero(ctx, struct osmo_io_fd);
+ struct osmo_io_fd *iofd;
+
+ /* reject unsupported/unknown modes */
+ switch (mode) {
+ case OSMO_IO_FD_MODE_READ_WRITE:
+ case OSMO_IO_FD_MODE_RECVFROM_SENDTO:
+ break;
+ default:
+ return NULL;
+ }
+
+ iofd = talloc_zero(ctx, struct osmo_io_fd);
if (!iofd)
return NULL;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I10dd612487638f456d0ad59c2cca203f1e098da3
Gerrit-Change-Number: 35063
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in osmo-bsc[master]: use X6 timer for REL ACK, not T3111
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35088?usp=email ) Change subject: use X6 timer for REL ACK, not T3111 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35088?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibd118fa23e5deb4381bc31b11a7b495f57901d6c Gerrit-Change-Number: 35088 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Wed, 22 Nov 2023 12:18:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: add new osmo_sockaddr_from_str_and_uint() function
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35085?usp=email )
Change subject: add new osmo_sockaddr_from_str_and_uint() function
..
add new osmo_sockaddr_from_str_and_uint() function
The function is basically a shortcut for getaddrinfo with storing the
output data into our 'struct osmo_sockaddr'.
Change-Id: I6b5c0bf8ca97e6358d992fb2ff45ffd53ba15197
Related: SYS#6657
---
M include/osmocom/core/socket.h
M src/core/libosmocore.map
M src/core/socket.c
M tests/socket/socket_test.c
M tests/socket/socket_test.ok
5 files changed, 52 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h
index db55863..03f1d39 100644
--- a/include/osmocom/core/socket.h
+++ b/include/osmocom/core/socket.h
@@ -74,6 +74,7 @@
int osmo_sockaddr_to_octets(uint8_t *dst, size_t dst_maxlen, const struct
osmo_sockaddr *os);
int osmo_sockaddr_from_octets(struct osmo_sockaddr *os, const void *src,
size_t src_len);
+int osmo_sockaddr_from_str_and_uint(struct osmo_sockaddr *osa_out, const char
*ipstr, uint16_t port);
int osmo_sockaddr_netmask_to_prefixlen(const struct osmo_sockaddr *addr);
diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map
index ae8a068..3d6aa42 100644
--- a/src/core/libosmocore.map
+++ b/src/core/libosmocore.map
@@ -374,6 +374,7 @@
osmo_signal_unregister_handler;
osmo_sockaddr_cmp;
osmo_sockaddr_from_octets;
+osmo_sockaddr_from_str_and_uint;
osmo_sockaddr_in_to_str_and_uint;
osmo_sockaddr_is_any;
osmo_sockaddr_is_local;
diff --git a/src/core/socket.c b/src/core/socket.c
index fa5fb88..1dc8e46 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1662,6 +1662,27 @@
}
}
+/*! Convert an IP address string (and port number) into a 'struct
osmo_sockaddr'.
+ * \param[out] osa_out caller-allocated osmo_sockaddr storage
+ * \param[in] ipstr IP[v4,v6] address in string format
+ * \param[in] port port number (host byte order)
+ * \returns 0 on success; negative on error. */
+int osmo_sockaddr_from_str_and_uint(struct osmo_sockaddr *osa_out, const char
*ipstr, uint16_t port)
+{
+ struct addrinfo *ai = addrinfo_helper(AF_UNSPEC, 0, 0, ipstr, port,
true);
+
+ if (!ai)
+ return -EIO;
+
+ if (ai->ai_addrlen > sizeof(*osa_out))
+ return -ENOSPC;
+
+ memcpy(&osa_out->u.sa, ai->ai_addr, ai->ai_addrlen);
+ freeaddrinfo(ai);
+
+ return 0;
+}
+
/*! Initialize a unix domain socket (including bind/connect)
* \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM
* \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP
diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c
index ddb6926..34130b2 100644
--- a/tests/socket/socket_test.c
+++ b/tests/socket/socket_test.c
@@ -315,6 +315,7 @@
const char *result;
struct osmo_sockaddr localhost4 = {};
struct osmo_sockaddr localhost6 = {};
+ struct osmo_sockaddr osa = {};
localhost4.u.sin = (struct sockaddr_in){
.sin_family = AF_INET,
@@ -383,6 +384,18 @@
result = osmo_sockaddr_to_str(&localhost6);
printf("Checking osmo_sockaddr_to_str_buf long IPv6 port static
buffer\n");
OSMO_ASSERT(!strncmp("[2003:1234:5678:90ab:cdef:1234:4321:4321]:23420",
result, sizeof(buf)));
+
+ printf("Checking osmo_sockaddr_from_str_and_uint for 0.0.0.0\n");
+ OSMO_ASSERT(osmo_sockaddr_from_str_and_uint(&osa, "0.0.0.0", 1234) ==
0);
+ OSMO_ASSERT(osmo_sockaddr_is_any(&osa));
+
+ printf("Checking osmo_sockaddr_from_str_and_uint for ::\n");
+ OSMO_ASSERT(osmo_sockaddr_from_str_and_uint(&osa, "::", 1234) == 0);
+ OSMO_ASSERT(osmo_sockaddr_is_any(&osa));
+
+ printf("Checking osmo_sockaddr_from_str_and_uint for 1.2.3.4\n");
+ OSMO_ASSERT(osmo_sockaddr_from_str_and_uint(&osa, "1.2.3.4", 1234) ==
0);
+ OSMO_ASSERT(!osmo_sockaddr_is_any(&osa));
}
static void test_osa_netmask_prefixlen(void)
diff --git a/tests/socket/socket_test.ok b/tests/socket/socket_test.ok
index 236c011..2b1c100 100644
--- a/tests/socket/socket_test.ok
+++ b/tests/socket/socket_test.ok
@@ -31,3 +31,6 @@
Checking osmo_sockaddr_to_str_buf long IPv6
Checking osmo_sockaddr_to_str_buf long IPv6 port
Checking osmo_sockaddr_to_str_buf long IPv6 port static buffer
+Checking osmo_sockaddr_from_str_and_uint for 0.0.0.0
+Checking osmo_sockaddr_from_str_and_uint for ::
+Checking osmo_sockaddr_from_str_and_uint for 1.2.3.4
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35085?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6b5c0bf8ca97e6358d992fb2ff45ffd53ba15197
Gerrit-Change-N
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCC0, SAPI 0 without L3 payload
Attention is currently required from: jolly.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email )
Change subject: LAPDm: Reject (release) establishment on DCC0, SAPI 0 without
L3 payload
..
Patch Set 1: Code-Review+1
(1 comment)
File src/common/rsl.c:
https://gerrit.osmocom.org/c/osmo-bts/+/35082/comment/59b49993_7d9faff6
PS1, Line 3839: if (msgb_l2len(msg) == sizeof(*rllh) &&
(rllh->link_id & 0xc7) == 0x00) {
Using our union abis_rsl_link_id and then comparing sapin and cbits
individually is probably the more higher-level / cleaner approach than doing
low-level bit-masking which no developer understands off their head without
reading the relevant spec section.
It's not critical, I just think we should always try to aim making code as
readable as possible. Open Source is not written to just execute, but to be
read by other developers.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c
Gerrit-Change-Number: 35082
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Attention: jolly
Gerrit-Comment-Date: Wed, 22 Nov 2023 12:18:09 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in osmo-hnodeb[master]: Use 'iuh/local-ip' as local IP for RTP sockets
Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/35075?usp=email ) Change subject: Use 'iuh/local-ip' as local IP for RTP sockets .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/35075?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I90e2cbb1765d4d2db5a19f64f0ff09cdc18b7911 Gerrit-Change-Number: 35075 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 22 Nov 2023 12:12:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: RSL_Emulation: allow RSL_DchanHdlr sandbox escape for both roles
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35086?usp=email )
Change subject: RSL_Emulation: allow RSL_DchanHdlr sandbox escape for both roles
..
RSL_Emulation: allow RSL_DchanHdlr sandbox escape for both roles
This feature was initially added in 1470fc668 for the RSL_Emulation_CT
operating in the BTS role. In a subsequent patch I also need to escape
the sandbox, but in my case the RSL_Emulation_CT is playing the BSC role.
Change-Id: I42557f85d3e5e7ef7147a87293f5dd1716884534
Related: 1470fc668 "allow ASP_RSL_UD on MSC_ConnHdlr RSL"
Related: SYS#6655
---
M library/RSL_Emulation.ttcn
1 file changed, 25 insertions(+), 3 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn
index effe83b..891e565 100644
--- a/library/RSL_Emulation.ttcn
+++ b/library/RSL_Emulation.ttcn
@@ -651,15 +651,22 @@
cid := f_cid_by_comp_ref(vc_conn);
IPA_PT.send(ts_ASP_RSL_UD(rx_rsl_msg,
ConnectionTable[cid].stream_id));
}
- [bts_role] CLIENT_PT.receive(tr_ASP_RSL_UD(?, sid := ?)) ->
value rx_rsl {
- IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.rsl, rx_rsl.streamId));
- }
[not bts_role] CLIENT_PT.receive(tr_RSL_MsgType(?)) -> value
rx_rsl_msg sender vc_conn {
cid := f_cid_by_comp_ref(vc_conn);
conn_id :=
f_trx_conn_map_resolve(ConnectionTable[cid].stream_id);
IPA_PT.send(ts_ASP_RSL_UD(rx_rsl_msg,
ConnectionTable[cid].stream_id, conn_id));
}
+ /* allow the RSL_DchanHdlr components to "escape the sandbox"
by sending RSL messages
+* to other transceivers than they're bound to (determined by
rx_rsl.streamId) */
+ [bts_role] CLIENT_PT.receive(tr_ASP_RSL_UD(?, sid := ?)) ->
value rx_rsl {
+ IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.rsl, rx_rsl.streamId));
+ }
+ [not bts_role] CLIENT_PT.receive(tr_ASP_RSL_UD(?, sid := ?)) ->
value rx_rsl {
+ conn_id := f_trx_conn_map_resolve(rx_rsl.streamId);
+ IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.rsl, rx_rsl.streamId,
conn_id));
+ }
+
/* RSL message from MTC */
[bts_role] CCHAN_PT.receive(tr_ASP_RSL_UD(?, sid := ?)) ->
value rx_rsl {
IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.rsl, rx_rsl.streamId));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35086?usp=email
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: I42557f85d3e5e7ef7147a87293f5dd1716884534
Gerrit-Change-Number: 35086
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: extend TC_early_immediate_assignment: run on trx_nr=1
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35087?usp=email )
Change subject: BTS_Tests: extend TC_early_immediate_assignment: run on trx_nr=1
..
BTS_Tests: extend TC_early_immediate_assignment: run on trx_nr=1
This patch demonstrates the problem with handling of the Early IA:
* the first part remains unchanged: assign a channel on C0 (arfcn=871);
* the second (new) part tests channel assignment on C1 (arfcn=873).
As of now, osmo-bts does not meet our expectations for the second part.
Change-Id: I7517574a8095ddfa05c34c4c3d4accf2bd07894b
Related: SYS#6655
---
M bts/BTS_Tests.ttcn
1 file changed, 31 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index d667344..82a83cf 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -8815,10 +8815,11 @@
if (g_pars.fhp.enabled) {
ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr,
g_pars.fhp.maio_hsn, g_pars.tsc));
} else {
- ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr,
mp_trx_pars[0].arfcn, g_pars.tsc));
+ var GsmArfcn arfcn := mp_trx_pars[g_pars.trx_nr].arfcn;
+ ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, arfcn,
g_pars.tsc));
}
var GsmRrMessage rr_msg := valueof(ts_IMM_ASS(ra, fn, 0, ch_desc,
g_pars.fhp.ma_map));
- RSL.send(ts_RSL_IMM_ASSIGN(enc_GsmRrMessage(rr_msg)));
+ RSL.send(ts_ASP_RSL_UD(ts_RSL_IMM_ASSIGN(enc_GsmRrMessage(rr_msg;
/* force sending to TRX0 */
/* Do not expect the Immediate Assignment to show up on MS side yet.
Even give it one second before the BSC
* requests Chan Activ, to make sure the RR IMM ASS is held back. */
@@ -8859,10 +8860,20 @@
testcase TC_early_immediate_assignment() runs on test_CT {
var ConnHdlr vc_conn;
- var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1),
ts_RSL_ChanMode_SIGN));
+ var ConnHdlrPars pars;
+
f_init();
+
+ /* verify early Immediate Assignment on C0 (the BCCH carrier): TCH/F on
TS1 */
+ pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN, trx_nr
:= 0));
vc_conn := f_start_handler(refers(f_TC_early_immediate_assignment),
pars);
vc_conn.done;
+
+ /* verify early Immediate Assignment on C1: TCH/F on TS0 */
+ pars := valueof(t_Pars(t_RslChanNr_Bm(0), ts_RSL_ChanMode_SIGN, trx_nr
:= 1));
+ vc_conn := f_start_handler(refers(f_TC_early_immediate_assignment),
pars);
+ vc_conn.done;
+
Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35087?usp=email
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: I7517574a8095ddfa05c34c4c3d4accf2bd07894b
Gerrit-Change-Number: 35087
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: extend TC_early_immediate_assignment: run on trx_nr=1
Attention is currently required from: fixeria, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35087?usp=email ) Change subject: BTS_Tests: extend TC_early_immediate_assignment: run on trx_nr=1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35087?usp=email 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: I7517574a8095ddfa05c34c4c3d4accf2bd07894b Gerrit-Change-Number: 35087 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 Nov 2023 12:11:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: RSL_Emulation: allow RSL_DchanHdlr sandbox escape for both roles
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35086?usp=email ) Change subject: RSL_Emulation: allow RSL_DchanHdlr sandbox escape for both roles .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35086?usp=email 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: I42557f85d3e5e7ef7147a87293f5dd1716884534 Gerrit-Change-Number: 35086 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 Nov 2023 12:11:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnodeb[master]: Use 'iuh/local-ip' as local IP for RTP sockets
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/35075?usp=email ) Change subject: Use 'iuh/local-ip' as local IP for RTP sockets .. Patch Set 2: (1 comment) File src/osmo-hnodeb/rtp.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/35075/comment/e35133bc_44e59877 PS2, Line 335: } > maybe add an else path here that logs an error and goes to free_ret? why/where / what should that clause do? The existing code in rtp_get_bound_addr "does the right thing" for local INADDR_ANY/IN6ADDR_ANY. In all other cases, conn->loc_addr already contains a specific local address and hence there's nothing to do. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/35075?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I90e2cbb1765d4d2db5a19f64f0ff09cdc18b7911 Gerrit-Change-Number: 35075 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 22 Nov 2023 12:10:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email )
Change subject: gtp: Add net GTP cause values and a function to check for
success
..
gtp: Add net GTP cause values and a function to check for success
According to the spec the upf/pgw can accept a modified pdp context from
the request e.g. if an ipv4/6 context was requested, but only ipv4 is
availiable. Introduce a function that checks all cause values that are
considered successful.
See also: 3GPP TS 29.060 Ch 7.3.2
Related: OS#6268
Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68
---
M gtp/gtp.h
1 file changed, 27 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/gtp/gtp.h b/gtp/gtp.h
index ede6f73..c066fa6 100644
--- a/gtp/gtp.h
+++ b/gtp/gtp.h
@@ -103,7 +103,9 @@
#define GTPCAUSE_049 49 /* Cause values reserved for
GPRS charging protocol use (See GTP' in GSM 12.15) 49-63 */
#define GTPCAUSE_064 64 /* For future use 64-127 */
#define GTPCAUSE_ACC_REQ 128 /* Request accepted */
-#define GTPCAUSE_129 129 /* For future use 129-176 */
+#define GTPCAUSE_NEW_PDP_NET_PREF 129 /* New PDP type due to network
preference */
+#define GTPCAUSE_NEW_PDP_ADDR_BEAR130 /* New PDP type due to single
address bearer only */
+#define GTPCAUSE_131 131 /* For future use 131-176 */
#define GTPCAUSE_177 177 /* Cause values reserved for
GPRS charging protocol use (See GTP' In GSM 12.15) 177-191 */
#define GTPCAUSE_NON_EXIST192 /* Non-existent */
#define GTPCAUSE_INVALID_MESSAGE 193 /* Invalid message format */
@@ -137,6 +139,13 @@
#define GTPCAUSE_221 221 /* For Future Use 221-240 */
#define GTPCAUSE_241 241 /* Cause Values Reserved For
Gprs Charging Protocol Use (See Gtp' In Gsm 12.15) 241-255 */
+static inline bool gtp_cause_successful(uint8_t cause)
+{
+ return cause == GTPCAUSE_ACC_REQ ||
+ cause == GTPCAUSE_NEW_PDP_NET_PREF ||
+ cause == GTPCAUSE_NEW_PDP_ADDR_BEAR;
+}
+
struct ul66_t;
struct ul16_t;
struct pdp_t;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68
Gerrit-Change-Number: 35084
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
Attention is currently required from: laforge, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 11:40:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
Attention is currently required from: laforge, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success .. Patch Set 2: (1 comment) Patchset: PS2: +2 from before after lint fixes -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 11:40:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
Attention is currently required from: daniel, laforge, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 22 Nov 2023 11:38:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
Attention is currently required from: daniel, laforge, lynxis lazus, osmith. Hello Jenkins Builder, laforge, lynxis lazus, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by lynxis lazus, Code-Review+1 by osmith, Verified-1 by Jenkins Builder Change subject: gtp: Add net GTP cause values and a function to check for success .. gtp: Add net GTP cause values and a function to check for success According to the spec the upf/pgw can accept a modified pdp context from the request e.g. if an ipv4/6 context was requested, but only ipv4 is availiable. Introduce a function that checks all cause values that are considered successful. See also: 3GPP TS 29.060 Ch 7.3.2 Related: OS#6268 Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 --- M gtp/gtp.h 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/84/35084/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
Attention is currently required from: daniel, laforge.
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email )
Change subject: gtp: Add net GTP cause values and a function to check for
success
..
Patch Set 1: Code-Review+1
(1 comment)
File gtp/gtp.h:
https://gerrit.osmocom.org/c/osmo-ggsn/+/35084/comment/60a72f2c_965173d8
PS1, Line 142: static inline bool gtp_cause_successful(uint8_t cause) {
> I want to use it in osmo-sgsn (see OS#6268)
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68
Gerrit-Change-Number: 35084
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: osmith
Gerrit-Attention: laforge
Gerrit-Attention: daniel
Gerrit-Comment-Date: Wed, 22 Nov 2023 08:11:20 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith
Comment-In-Reply-To: daniel
Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
Attention is currently required from: laforge, osmith.
daniel has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email )
Change subject: gtp: Add net GTP cause values and a function to check for
success
..
Patch Set 1:
(1 comment)
File gtp/gtp.h:
https://gerrit.osmocom.org/c/osmo-ggsn/+/35084/comment/60144fe8_6c27e94e
PS1, Line 142: static inline bool gtp_cause_successful(uint8_t cause) {
> where does the function get used?
I want to use it in osmo-sgsn (see OS#6268)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68
Gerrit-Change-Number: 35084
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: osmith
Gerrit-Attention: osmith
Gerrit-Attention: laforge
Gerrit-Comment-Date: Wed, 22 Nov 2023 08:10:08 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith
Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: extend TC_early_immediate_assignment: run on trx_nr=1
Attention is currently required from: fixeria, laforge, neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35087?usp=email ) Change subject: BTS_Tests: extend TC_early_immediate_assignment: run on trx_nr=1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35087?usp=email 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: I7517574a8095ddfa05c34c4c3d4accf2bd07894b Gerrit-Change-Number: 35087 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 22 Nov 2023 08:00:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
