date:20230915

[M] Change in osmo-bsc[master]: osmo-bsc: Have PCU socket connection use osmo_wqueue

2023-09-15 Thread arehbein

Attention is currently required from: dexter, laforge, pespin.

arehbein has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/33891?usp=email )

Change subject: osmo-bsc: Have PCU socket connection use osmo_wqueue
..


Patch Set 4:

(1 comment)

File src/osmo-bsc/pcu_sock.c:

https://gerrit.osmocom.org/c/osmo-bsc/+/33891/comment/6ab89185_d3a8938b
PS2, Line 725:  "%u messages waiting). Closing 
connection\n",
> Ack
Done



--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33891?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: Ifd9741045a87338e17eec3492590a5de9c308cb5
Gerrit-Change-Number: 33891
Gerrit-PatchSet: 4
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Attention: dexter 
Gerrit-Comment-Date: Fri, 15 Sep 2023 20:12:01 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Comment-In-Reply-To: dexter 
Gerrit-MessageType: comment

[M] Change in osmo-bsc[master]: osmo-bsc: Have PCU socket connection use osmo_wqueue

2023-09-15 Thread arehbein

Attention is currently required from: arehbein, dexter, laforge, pespin.

Hello Jenkins Builder, dexter, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-bsc/+/33891?usp=email

to look at the new patch set (#4).

The following approvals got outdated and were removed:
Code-Review+1 by dexter, Code-Review+1 by pespin, Code-Review+2 by arehbein, 
Verified+1 by Jenkins Builder

The change is no longer submittable: Code-Review and Verified are unsatisfied 
now.


Change subject: osmo-bsc: Have PCU socket connection use osmo_wqueue
..

osmo-bsc: Have PCU socket connection use osmo_wqueue

Close PCU socket on write queue overflow.

Related: OS#5774
Change-Id: Ifd9741045a87338e17eec3492590a5de9c308cb5
---
M include/osmocom/bsc/pcu_if.h
M src/osmo-bsc/pcu_sock.c
2 files changed, 56 insertions(+), 69 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/33891/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33891?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: Ifd9741045a87338e17eec3492590a5de9c308cb5
Gerrit-Change-Number: 33891
Gerrit-PatchSet: 4
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: arehbein 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Attention: dexter 
Gerrit-MessageType: newpatchset

[M] Change in osmo-bsc[master]: osmo-bsc: Have PCU socket connection use osmo_wqueue

2023-09-15 Thread arehbein

Attention is currently required from: dexter, laforge.

arehbein has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/33891?usp=email )

Change subject: osmo-bsc: Have PCU socket connection use osmo_wqueue
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33891?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: Ifd9741045a87338e17eec3492590a5de9c308cb5
Gerrit-Change-Number: 33891
Gerrit-PatchSet: 3
Gerrit-Owner: arehbein 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein 
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: laforge 
Gerrit-Attention: dexter 
Gerrit-Comment-Date: Fri, 15 Sep 2023 20:07:16 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bts[master]: ASCI: Ignore LAPD frames from MS, while the uplink is not active

2023-09-15 Thread fixeria

Attention is currently required from: jolly.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email )

Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active
..


Patch Set 1:

(1 comment)

File src/common/l1sap.c:

https://gerrit.osmocom.org/c/osmo-bts/+/34423/comment/ae57d9e3_a38ed1b0
PS1, Line 1814: rsl_chan_rt_is_asci
I am wondering if the new check you added can be integrated here as follows:

```
if (rsl_chan_rt_is_asci(lchan->rsl_chan_rt) {
if (lchan->asci.talker_active == VGCS_TALKER_WAIT_FRAME)
vgcs_talker_frame(lchan);
if (lchan->asci.talker_active != VGCS_TALKER_ACTIVE)
return 0;
}
}
```



--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?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: I5075115123055b2997481f56ddf473430a1dc9e3
Gerrit-Change-Number: 34423
Gerrit-PatchSet: 1
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: fixeria 
Gerrit-Attention: jolly 
Gerrit-Comment-Date: Fri, 15 Sep 2023 19:58:57 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[S] Change in osmo-msc[master]: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling

2023-09-15 Thread fixeria

Attention is currently required from: jolly.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/33967?usp=email )

Change subject: ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel 
handling
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33967?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: I5e4891091c2ce56d4fd4a7f5f67156a94ade852d
Gerrit-Change-Number: 33967
Gerrit-PatchSet: 2
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: jolly 
Gerrit-Comment-Date: Fri, 15 Sep 2023 18:54:11 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bts[master]: nm: delay RSL connect until BBTRANSC object is OPSTARTed

2023-09-15 Thread fixeria

Attention is currently required from: pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email )

Change subject: nm: delay RSL connect until BBTRANSC object is OPSTARTed
..


Patch Set 1: Code-Review+1

(2 comments)

File src/common/nm_bb_transc_fsm.c:

https://gerrit.osmocom.org/c/osmo-bts/+/34442/comment/41ae1aa5_0d7f19fe
PS1, Line 143: Disabled because osmo-bsc doesn't send SetAttr on BB_TRANSC 
object
If I read 3GPP TS 52.021 correctly, there exists no `Set Attributes` procedure 
for the `Baseband Transceiver` object at all, so this code chunk should be 
removed. Unrelated to this patch, just mentioning.


https://gerrit.osmocom.org/c/osmo-bts/+/34442/comment/a23ccaf6_d1dea33d
PS1, Line 157: LOGL_NOTICE
`LOGL_ERROR` maybe? Ah, you're just moving the existing code.



--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34442?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: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0
Gerrit-Change-Number: 34442
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 18:28:06 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-bts[master]: Move trx->rsl_link to trx->bb_transc.rsl.link

2023-09-15 Thread fixeria

Attention is currently required from: pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email )

Change subject: Move trx->rsl_link to trx->bb_transc.rsl.link
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34441?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: I62937cbd81c27274b9f5f70d454d5319a6898c7b
Gerrit-Change-Number: 34441
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 18:21:26 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

2023-09-15 Thread fixeria

Attention is currently required from: neels.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email )

Change subject: sip: tweak failure reporting for SIP messages
..


Patch Set 3:

(1 comment)

File sip/SIP_Tests.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/e7e11706_27037f3d
PS1, Line 195: og("FAIL: expected SIP message ", sip_expect);
 :  setverdict(fail, "Received unexpected SIP message");
> I'm not sure that f_shutdown() should always dup the log in addition to 
> setverdict(), it only makes sense for logs that contain a message dump.

IMO, there should be no duplication at all. `log()` is for logging various 
events happening during the testcase execution, not for indicating the failure 
reason. There exists `setverdict()` for that purpose.

> Maybe f_shutdown() could get args expected_msg and got_msg, and log those 
> only when present.

I don't like this idea. Ideally, `f_shutdown()` should do what its name 
suggests - shutdown everything. The already existing additional feature for 
setting the verdict and the respective message by passing optional argument 
looks ideologically wrong to me. And you're suggesting to overload this 
function with even more stuff that can be done by calling `setverdict()`.

> That would make most sense if ttcn3 could somehow output the exact reason why 
> a msg does not match a template. (So far I just compare manually, or paste 
> into a diff invocation, cumbersome)

This can be achieved by adding `TTCN_MATCHING` to the logging mask in the 
testcase config file. TITAN would highlight the exact message part(s) which did 
not match the template. Quite useful.

> I confirmed that a message dump in the verdict doesn't get picked up properly 
> by logformat. I pasted below a comparison of 'log("FAIL: foo ", msg)' and 
> 'f_shutdown(..., log2str("foo ", msg))'.

Did you try what I suggested? If the problem is that TITAN does not format the 
verdict message (set by `setverdict()`) properly, then I believe TITAN needs to 
be fixed/improved?



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6
Gerrit-Change-Number: 34415
Gerrit-PatchSet: 3
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Attention: neels 
Gerrit-Comment-Date: Fri, 15 Sep 2023 18:10:26 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels 
Comment-In-Reply-To: laforge 
Comment-In-Reply-To: fixeria 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in osmo-msc[master]: make two functions static

2023-09-15 Thread neels

neels has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/34435?usp=email )

Change subject: make two functions static
..

make two functions static

Change-Id: I1de0f35f1606c99f34bbf4033e069aadbc64
---
M include/osmocom/msc/mncc.h
M src/libmsc/gsm_04_08_cc.c
M src/osmo-msc/msc_main.c
3 files changed, 12 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved




diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h
index 8a1e4ad..c8f3bfd 100644
--- a/include/osmocom/msc/mncc.h
+++ b/include/osmocom/msc/mncc.h
@@ -219,7 +219,6 @@

 const char *get_mncc_name(int value);
 void mncc_set_cause(struct gsm_mncc *data, int loc, int val);
-void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg);

 /* input from CC code into mncc_builtin */
 int int_mncc_recv(struct gsm_network *net, struct msgb *msg);
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 5908db9..6148bbd 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -129,7 +129,7 @@

 /* Call Control */

-void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
+static void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
 {
net->mncc_recv(net, msg);
 }
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 9808e86..913bd21 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -242,8 +242,8 @@
}
 }

-struct gsm_network *msc_network_alloc(void *ctx,
- mncc_recv_cb_t mncc_recv)
+static struct gsm_network *msc_network_alloc(void *ctx,
+mncc_recv_cb_t mncc_recv)
 {
struct gsm_network *net = gsm_network_init(ctx, mncc_recv);
if (!net)

--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34435?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: I1de0f35f1606c99f34bbf4033e069aadbc64
Gerrit-Change-Number: 34435
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-ttcn3-hacks[master]: sip: make mncc_with_sdp := true the default

2023-09-15 Thread neels

Attention is currently required from: neels.

Hello Jenkins Builder, laforge, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34418?usp=email

to look at the new patch set (#5).

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: sip: make mncc_with_sdp := true the default
..

sip: make mncc_with_sdp := true the default

A preceding patch has added mncc_with_sdp, defaulting to false.

So far just two new tests use mncc_with_sdp := true, but operation
without SDP is now merely the legacy compatibility mode, and I would
rather nudge new tests towards mncc_with_sdp := true.

So switch the default to mncc_with_sdp := true.

Change-Id: Ic9871917c57a9ab81b2fff0af7f569b09015910c
---
M sip/SIP_Tests.ttcn
1 file changed, 25 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/18/34418/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34418?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: Ic9871917c57a9ab81b2fff0af7f569b09015910c
Gerrit-Change-Number: 34418
Gerrit-PatchSet: 5
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: neels 
Gerrit-MessageType: newpatchset

[S] Change in osmo-ttcn3-hacks[master]: sip: pass CallPars into f_TC_*()

2023-09-15 Thread neels

neels has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34416?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: sip: pass CallPars into f_TC_*()
..

sip: pass CallPars into f_TC_*()

Move composition of CallPars out of all f_* functions into their TC_*
functions, so that future tests can reuse the f_* functions with
different CallPars.

An upcoming patch wants to call f_TC_mo_success_rel_sip() with different
CallPars.

Change-Id: Icdcaa7a8a0fadcd6f5715ad052e286b904ded570
---
M sip/SIP_Tests.ttcn
1 file changed, 22 insertions(+), 3 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve




diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn
index 935eed3..67e7818 100644
--- a/sip/SIP_Tests.ttcn
+++ b/sip/SIP_Tests.ttcn
@@ -410,7 +410,7 @@

 /* Successful MT Call, which is subsequently released by SIP side */
 private function f_TC_mt_success_rel_sip(charstring id) runs on ConnHdlr {
-   var CallPars cp := valueof(t_CallPars(false));
+   var CallPars cp := g_pars.g_cp;
f_CallPars_compute(cp);
cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM 
Call\r\nc=IN " &
f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & 
cp.sip_rtp_addr &
@@ -429,6 +429,7 @@
var ConnHdlr vc_conn;
f_init();
pars := valueof(t_Pars);
+   pars.g_cp := valueof(t_CallPars(false));
vc_conn := f_start_handler(refers(f_TC_mt_success_rel_sip), pars);
vc_conn.done;
 }
@@ -473,7 +474,7 @@

 /* Successful MO Call, which is subsequently released by SIP side */
 private function f_TC_mo_success_rel_sip(charstring id) runs on ConnHdlr {
-   var CallPars cp := valueof(t_CallPars(true));
+   var CallPars cp := g_pars.g_cp;
f_CallPars_compute(cp);
cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM 
Call\r\nc=IN " &
f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & 
cp.sip_rtp_addr &
@@ -492,13 +493,14 @@
var ConnHdlr vc_conn;
f_init();
pars := valueof(t_Pars);
+   pars.g_cp := valueof(t_CallPars(is_mo := true));
vc_conn := f_start_handler(refers(f_TC_mo_success_rel_sip), pars);
vc_conn.done;
 }

 /* SETUP followed by DISC results in lingering B-leg (OS#3518)*/
 private function f_TC_mo_setup_disc_late_rtp(charstring id) runs on ConnHdlr {
-   var CallPars cp := valueof(t_CallPars(true));
+   var CallPars cp := g_pars.g_cp;
f_CallPars_compute(cp);
cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM 
Call\r\nc=IN " &
f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & 
cp.sip_rtp_addr &
@@ -546,6 +548,7 @@
var ConnHdlr vc_conn;
f_init();
pars := valueof(t_Pars);
+   pars.g_cp := valueof(t_CallPars(is_mo := true));
vc_conn := f_start_handler(refers(f_TC_mo_setup_disc_late_rtp), pars);
vc_conn.done;
 }

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34416?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: Icdcaa7a8a0fadcd6f5715ad052e286b904ded570
Gerrit-Change-Number: 34416
Gerrit-PatchSet: 3
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

2023-09-15 Thread neels

neels has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email )

Change subject: sip: tweak failure reporting for SIP messages
..

sip: tweak failure reporting for SIP messages

Help developers by logging message matching failures in detail.

Change-Id: Id48016657ebb83953fe74f65332f318edf8f75e6
---
M sip/SIP_Tests.ttcn
1 file changed, 57 insertions(+), 33 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, but someone else must approve
  neels: Looks good to me, approved




diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn
index 58000d5..935eed3 100644
--- a/sip/SIP_Tests.ttcn
+++ b/sip/SIP_Tests.ttcn
@@ -188,11 +188,32 @@
g_cp := omit
 }

+altstep as_SIP_expect_resp(template PDU_SIP_Response sip_expect) runs on 
ConnHdlr
+{
+   [] SIP.receive(sip_expect);
+   [] SIP.receive {
+   log("FAIL: expected SIP message ", sip_expect);
+   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received 
unexpected SIP message");
+   }
+}
+
+function f_SIP_expect_req(template PDU_SIP_Request sip_expect) runs on 
ConnHdlr return PDU_SIP_Request
+{
+   var PDU_SIP_Request rx;
+   alt {
+   [] SIP.receive(sip_expect) -> value rx;
+   [] SIP.receive {
+   log("FAIL: expected SIP message ", sip_expect);
+   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, 
"Received unexpected SIP message");
+   }
+   }
+   return rx;
+}
+
 /* Establish a mobile terminated call described in 'cp' */
 function f_establish_mt(inout CallPars cp) runs on ConnHdlr {
var template SipAddr sip_addr_gsm := 
tr_SipAddr_from_val(cp.comp.sip_url_gsm);
var template SipAddr sip_addr_ext := 
tr_SipAddr_from_val(cp.comp.sip_url_ext);
-   var PDU_SIP_Response sip_resp;
var MNCC_PDU mncc;

/* Ask MNCC_Emulation to "expect" a call to the given called number */
@@ -202,8 +223,8 @@
SIP.send(ts_SIP_INVITE(cp.comp.sip_call_id, cp.comp.sip_url_ext, 
cp.comp.sip_url_gsm,
cp.comp.sip_seq_nr, cp.comp.sip_body));
/* OSC -> SIP */
-   SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, 
sip_addr_gsm, *,
-   "INVITE", 100, ?, "Trying", *));
+   as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, 
sip_addr_gsm, *,
+  "INVITE", 100, ?, "Trying", *));

alt {
/* MSC <- OSC: OSC generates MNCC_SETUP_REQ from INVITE */
@@ -231,33 +252,23 @@
/* MSC -> OSC: After MS is ringing and sent CC ALERTING */
MNCC.send(ts_MNCC_ALERT_ind(cp.mncc_call_id));
SIP.clear;
-   alt {
-   [] SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, 
sip_addr_gsm, *,
-  "INVITE", 180, ?, "Ringing", *));
-   [] SIP.receive {
-   setverdict(fail, "Received unexpected respose");
-   SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, 
cp.comp.sip_url_gsm,
-   cp.comp.sip_seq_nr, omit));
-   mtc.stop;
-   }
-   }
+
+   as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, 
sip_addr_gsm, *,
+  "INVITE", 180, ?, "Ringing", *));

/* MSC -> OSC: After MT user has picked up and sent CC CONNECT */
MNCC.send(ts_MNCC_SETUP_CNF(cp.mncc_call_id));

SIP.clear;
-   interleave {
/* MSC <- OSC: OSC asks MSC to connect its RTP stream to remote end */
-   [] MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id, 
f_addrstr2addr(cp.sip_rtp_addr), cp.sip_rtp_port)) {}
+   MNCC.receive(tr_MNCC_RTP_CONNECT(cp.mncc_call_id, 
f_addrstr2addr(cp.sip_rtp_addr), cp.sip_rtp_port));
+
/* OSC -> SIP: OSC confirms call establishment to SIP side */
-   [] SIP.receive(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, 
sip_addr_gsm, ?,
-   "INVITE", 200, ?, "OK", ?)) -> value 
sip_resp {
-   if (not 
match(sip_resp.messageBody, pattern "*" & cp.cn_rtp_addr & "*")) {
-   setverdict(fail, "wrong 
ip addr sent in SIP SDP, not containing ", cp.cn_rtp_addr);
-   mtc.stop;
-   }
-   }
-   }
+   as_SIP_expect_resp(tr_SIP_Response(cp.comp.sip_call_id, sip_addr_ext, 
sip_addr_gsm, contact_addr := ?,
+  method := "INVITE", status_code := 
200,
+  seq_nr := ?, reason := "OK",
+

[S] Change in osmo-ttcn3-hacks[master]: sip: tweak log msg

2023-09-15 Thread neels

neels has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34413?usp=email )

Change subject: sip: tweak log msg
..

sip: tweak log msg

Change-Id: Icf8a88306bf08d6e0d2c62f6c09ce89b36a40254
---
M sip/SIP_Tests.ttcn
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn
index 37c158e..1e3c43f 100644
--- a/sip/SIP_Tests.ttcn
+++ b/sip/SIP_Tests.ttcn
@@ -212,7 +212,7 @@
cp.mncc_call_id := mncc.u.signal.callref;
}
[] SIP.receive {
-   setverdict(fail, "Received unexpected respose");
+   setverdict(fail, "Received unexpected SIP response");
SIP.send(ts_SIP_ACK(cp.comp.sip_call_id, cp.comp.sip_url_ext, 
cp.comp.sip_url_gsm,
cp.comp.sip_seq_nr, omit));
mtc.stop;

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34413?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: Icf8a88306bf08d6e0d2c62f6c09ce89b36a40254
Gerrit-Change-Number: 34413
Gerrit-PatchSet: 2
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-MessageType: merged

[S] Change in osmo-ttcn3-hacks[master]: sip: drop unused var

2023-09-15 Thread neels

neels has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34414?usp=email )

Change subject: sip: drop unused var
..

sip: drop unused var

Change-Id: Id09760238c0e46de2c06e2cc5e7cfd1ffe84cb64
---
M sip/SIP_Tests.ttcn
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn
index 1e3c43f..58000d5 100644
--- a/sip/SIP_Tests.ttcn
+++ b/sip/SIP_Tests.ttcn
@@ -192,7 +192,6 @@
 function f_establish_mt(inout CallPars cp) runs on ConnHdlr {
var template SipAddr sip_addr_gsm := 
tr_SipAddr_from_val(cp.comp.sip_url_gsm);
var template SipAddr sip_addr_ext := 
tr_SipAddr_from_val(cp.comp.sip_url_ext);
-   var PDU_SIP_Request sip_req;
var PDU_SIP_Response sip_resp;
var MNCC_PDU mncc;


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34414?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: Id09760238c0e46de2c06e2cc5e7cfd1ffe84cb64
Gerrit-Change-Number: 34414
Gerrit-PatchSet: 2
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-MessageType: merged

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

2023-09-15 Thread neels

Attention is currently required from: fixeria, laforge, pespin.

neels has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email )

Change subject: sip: tweak failure reporting for SIP messages
..


Patch Set 2: Code-Review+2

(1 comment)

Patchset:

PS2:
combine votes



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6
Gerrit-Change-Number: 34415
Gerrit-PatchSet: 2
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Attention: laforge 
Gerrit-Attention: fixeria 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 14:50:46 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

2023-09-15 Thread neels

Attention is currently required from: fixeria, laforge, pespin.

neels has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email )

Change subject: sip: tweak failure reporting for SIP messages
..


Patch Set 2:

(1 comment)

File sip/SIP_Tests.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/ac33c3aa_deff0e02
PS1, Line 195: og("FAIL: expected SIP message ", sip_expect);
 :  setverdict(fail, "Received unexpected SIP message");
> FYI, you can still do it like this: […]
Ah interesting, thanks for log2str(), didn't know about it.

I'm not sure that f_shutdown() should always dup the log in addition to 
setverdict(), it only makes sense for logs that contain a message dump. Maybe 
f_shutdown() could get args expected_msg and got_msg, and log those only when 
present. That would make most sense if ttcn3 could somehow output the exact 
reason why a msg does not match a template. (So far I just compare manually, or 
paste into a diff invocation, cumbersome)

I like fixeria's example, f_shutdown() for shutdown only and set the verdict 
separately.

I confirmed that a message dump in the verdict doesn't get picked up properly 
by logformat. I pasted below a comparison of 'log("FAIL: foo ", msg)' and 
'f_shutdown(..., log2str("foo ", msg))'.

log from msg dump in setverdict possibly gets mixed up because of double 
quotes, and it prints the msg twice, so it's very noisy:

```
16:28:12.217318 5 Misc_Helpers.ttcn:32 setverdict(fail): none -> fail reason: 
""SIP_Tests.ttcn:300 : foo {
msg_type := MNCC_SETUP_REQ (257),
u := {
signal := {
callref := 5001,
bearer_cap := omit,
called := {
number_type := GSM48_TON_UNKNOWN (0),
plan := GSM48_NUMPLAN_E164 (1),
presence := GSM48_PRES_IND_ALLOWED (0),
screen := GSM48_SCR_IND_NOT_SCREENED (0),
number := \"98766\" }, calling := { number_type := 
GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 (1), presence := 
GSM48_PRES_IND_ALLOWED (0), screen := GSM48_SCR_IND_NOT_SCREENED (0), number := 
\"12345\" }, redirecting := omit, connected := omit, cause := omit, progress := 
omit, useruser := omit, facility := omit, cccap := omit, ssversion := omit, 
clir_sup := 0, clir_inv := 0, signal := omit, keypad := omit, more := 0, notify 
:= 0, emergency := omit, imsi := \"\", lchan_type := 0, lchan_mode := 0, gcr := 
omit, sdp := \"v=0\\r\
o=Osmocom 0 0 IN IP4 1.1.1.1\\r\
s=GSM Call\\r\
c=IN IP4 1.2.3.4\\r\
t=0 0\\r\
m=audio 1234 RTP/AVP 0\\r\
a=rtpmap:0 GSM/8000\\r\
\" } } }"", new component reason: ""SIP_Tests.ttcn:300 : foo { msg_type := 
MNCC_SETUP_REQ (257), u := { signal := { callref := 5001, bearer_cap := omit, 
called := { number_type := GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 
(1), presence := GSM48_PRES_IND_ALLOWED (0), screen := 
GSM48_SCR_IND_NOT_SCREENED (0), number := \"98766\" }, calling := { number_type 
:= GSM48_TON_UNKNOWN (0), plan := GSM48_NUMPLAN_E164 (1), presence := 
GSM48_PRES_IND_ALLOWED (0), screen := GSM48_SCR_IND_NOT_SCREENED (0), number := 
\"12345\" }, redirecting := omit, connected := omit, cause := omit, progress := 
omit, useruser := omit, facility := omit, cccap := omit, ssversion := omit, 
clir_sup := 0, clir_inv := 0, signal := omit, keypad := omit, more := 0, notify 
:= 0, emergency := omit, imsi := \"\", lchan_type := 0, lchan_mode := 0, gcr := 
omit, sdp := \"v=0\\r\
o=Osmocom 0 0 IN IP4 1.1.1.1\\r\
s=GSM Call\\r\
c=IN IP4 1.2.3.4\\r\
t=0 0\\r\
m=audio 1234 RTP/AVP 0\\r\
a=rtpmap:0 GSM/8000\\r\
\" } } }""
16:28:12.217445 5 Misc_Helpers.ttcn:35 Stopping testcase execution from 
"SIP_Tests.ttcn":300
```

output from log() looks nice and clean:

```
 16:28:12.217026 5 SIP_Tests.ttcn:299 FAIL: foo {
 msg_type := MNCC_SETUP_REQ (257),
 u := {
 signal := {
 callref := 5001,
 bearer_cap := omit,
 called := {
 number_type := GSM48_TON_UNKNOWN (0),
 plan := GSM48_NUMPLAN_E164 (1),
 presence := GSM48_PRES_IND_ALLOWED (0),
 screen := GSM48_SCR_IND_NOT_SCREENED (0),
 number := "98766"
 },
 calling := {
 number_type := GSM48_TON_UNKNOWN (0),
 plan := GSM48_NUMPLAN_E164 (1),
 presence := GSM48_PRES_IND_ALLOWED (0),
 screen := GSM48_SCR_IND_NOT_SCREENED (0),
 number := "12345"
 },
 redirecting := omit,
 connected := omit,
 cause := omit,
 progress := omit,
 useruser := omit,
 facility := omit,
 cccap := omit,
 ssversion := omit,
 clir_sup := 0,
 clir_inv := 0,
 signal := omit,
 keypad := omit,

[S] Change in osmo-bts[master]: nm: delay RSL connect until BBTRANSC object is OPSTARTed

2023-09-15 Thread pespin

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email )

Change subject: nm: delay RSL connect until BBTRANSC object is OPSTARTed
..


Patch Set 1: Verified+1

(1 comment)

Patchset:

PS1:
Tested successfully with sysmobts and osmo-bts-trx.



--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34442?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: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0
Gerrit-Change-Number: 34442
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 14:20:58 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bts[master]: oml: Store RSL connect related fields in bb_transc

2023-09-15 Thread fixeria

Attention is currently required from: pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34440?usp=email )

Change subject: oml: Store RSL connect related fields in bb_transc
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34440?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: Ia571ec19e9e8f8a6d7c2554642aab0afe1b4b917
Gerrit-Change-Number: 34440
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 14:18:36 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-msc[master]: CC: don't start guard timer on mid-call MNCC messages

2023-09-15 Thread neels

Attention is currently required from: falconia, fixeria, osmith.

neels has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/33472?usp=email )

Change subject: CC: don't start guard timer on mid-call MNCC messages
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33472?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: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa
Gerrit-Change-Number: 33472
Gerrit-PatchSet: 2
Gerrit-Owner: falconia 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: neels 
Gerrit-CC: osmith 
Gerrit-CC: pespin 
Gerrit-Attention: osmith 
Gerrit-Attention: falconia 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 14:12:11 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to GPRS Cell MO(s)

2023-09-15 Thread pespin

Attention is currently required from: fixeria, laforge.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email )

Change subject: abis_nm: send Get Attributes to GPRS Cell MO(s)
..


Patch Set 5: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?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: Ib6d87da49217f1c8d76445ce623a511a07daedbf
Gerrit-Change-Number: 34360
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 12:39:08 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to Rado Carrier MO(s)

2023-09-15 Thread pespin

Attention is currently required from: fixeria, laforge.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34359?usp=email )

Change subject: abis_nm: send Get Attributes to Rado Carrier MO(s)
..


Patch Set 5: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34359?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: If7b75689c12a253377f2747babd4d7ebd1db5f87
Gerrit-Change-Number: 34359
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 12:38:10 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to GPRS Cell MO(s)

2023-09-15 Thread fixeria

Attention is currently required from: laforge, pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email )

Change subject: abis_nm: send Get Attributes to GPRS Cell MO(s)
..


Patch Set 5:

(1 comment)

File src/osmo-bsc/nm_gprs_cell_fsm.c:

https://gerrit.osmocom.org/c/osmo-bsc/+/34360/comment/a5b6fb60_17b6ba81
PS4, Line 112:  abis_nm_get_attr(bts, NM_OC_GPRS_CELL, 0, bts->nr, 0xff,
> bts->bts_nr.
Done



--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?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: Ib6d87da49217f1c8d76445ce623a511a07daedbf
Gerrit-Change-Number: 34360
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 12:22:28 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to GPRS Cell MO(s)

2023-09-15 Thread fixeria

Attention is currently required from: fixeria, laforge.

Hello Jenkins Builder, laforge, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email

to look at the new patch set (#5).

The following approvals got outdated and were removed:
Code-Review+2 by laforge, Verified+1 by Jenkins Builder


Change subject: abis_nm: send Get Attributes to GPRS Cell MO(s)
..

abis_nm: send Get Attributes to GPRS Cell MO(s)

Change-Id: Ib6d87da49217f1c8d76445ce623a511a07daedbf
Related: OS#4505
---
M src/osmo-bsc/nm_gprs_cell_fsm.c
1 file changed, 41 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34360/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?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: Ib6d87da49217f1c8d76445ce623a511a07daedbf
Gerrit-Change-Number: 34360
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: fixeria 
Gerrit-MessageType: newpatchset

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to Rado Carrier MO(s)

2023-09-15 Thread fixeria

Attention is currently required from: fixeria, laforge, pespin.

Hello Jenkins Builder, laforge, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-bsc/+/34359?usp=email

to look at the new patch set (#5).

The following approvals got outdated and were removed:
Code-Review+1 by pespin, Code-Review+2 by laforge, Verified+1 by Jenkins Builder

The change is no longer submittable: Code-Review and Verified are unsatisfied 
now.


Change subject: abis_nm: send Get Attributes to Rado Carrier MO(s)
..

abis_nm: send Get Attributes to Rado Carrier MO(s)

Change-Id: If7b75689c12a253377f2747babd4d7ebd1db5f87
Related: OS#4505
---
M src/osmo-bsc/nm_rcarrier_fsm.c
1 file changed, 41 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/34359/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34359?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: If7b75689c12a253377f2747babd4d7ebd1db5f87
Gerrit-Change-Number: 34359
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: laforge 
Gerrit-Attention: fixeria 
Gerrit-Attention: pespin 
Gerrit-MessageType: newpatchset

[M] Change in osmo-bsc[master]: oml: ipacc: fix sending hard-coded GPRS Cell attributes

2023-09-15 Thread fixeria

Attention is currently required from: fixeria.

Hello Jenkins Builder, laforge, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-bsc/+/34357?usp=email

to look at the new patch set (#5).

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: oml: ipacc: fix sending hard-coded GPRS Cell attributes
..

oml: ipacc: fix sending hard-coded GPRS Cell attributes

Change-Id: I7d90ca3d6a660af8e953e890c7919194f5d297d2
Related: OS#4505
---
M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
M tests/nanobts_omlattr/nanobts_omlattr_test.c
M tests/nanobts_omlattr/nanobts_omlattr_test.ok
3 files changed, 40 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/34357/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34357?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: I7d90ca3d6a660af8e953e890c7919194f5d297d2
Gerrit-Change-Number: 34357
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-MessageType: newpatchset

[S] Change in osmo-bsc[master]: oml: ipacc: log supported features using LOGL_INFO

2023-09-15 Thread fixeria

Attention is currently required from: fixeria.

Hello Jenkins Builder, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-bsc/+/34429?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: oml: ipacc: log supported features using LOGL_INFO
..

oml: ipacc: log supported features using LOGL_INFO

Change-Id: Ie0b05bc9e3739b5a38b32a676641e64f2cf698ac
Related: OS#4505
---
M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/34429/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34429?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: Ie0b05bc9e3739b5a38b32a676641e64f2cf698ac
Gerrit-Change-Number: 34429
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-MessageType: newpatchset

[S] Change in osmo-bsc[master]: oml: ipacc: fix copy-pasted talloc chunk names

2023-09-15 Thread fixeria

Attention is currently required from: fixeria.

Hello Jenkins Builder, laforge, pespin,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/osmo-bsc/+/34358?usp=email

to look at the new patch set (#5).

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: oml: ipacc: fix copy-pasted talloc chunk names
..

oml: ipacc: fix copy-pasted talloc chunk names

Change-Id: Ib0858c0d84b9bd2d3a4d732cfedb045862d2efed
Related: OS#4505
---
M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
1 file changed, 20 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/34358/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34358?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: Ib0858c0d84b9bd2d3a4d732cfedb045862d2efed
Gerrit-Change-Number: 34358
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-MessageType: newpatchset

[S] Change in osmo-bts[master]: nm: delay RSL connect until BBTRANSC object is OPSTARTed

2023-09-15 Thread pespin

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email )


Change subject: nm: delay RSL connect until BBTRANSC object is OPSTARTed
..

nm: delay RSL connect until BBTRANSC object is OPSTARTed

Have same behavior as nanoBTS.

Related: OS#5253
Change-Id: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0
---
M src/common/nm_bb_transc_fsm.c
M src/common/oml.c
2 files changed, 28 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/42/34442/1

diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c
index 12493e4..c668eff 100644
--- a/src/common/nm_bb_transc_fsm.c
+++ b/src/common/nm_bb_transc_fsm.c
@@ -119,6 +119,7 @@
 {
struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv;
struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc);
+   struct gsm_bts *bts = trx->bts;
struct nm_fsm_ev_setattr_data *setattr_data;
bool phy_state_connected;
bool rsl_link_connected;
@@ -145,6 +146,19 @@
return;
}
 #endif
+   /* Connect RSL link: */
+   if (bts->variant == BTS_OSMO_OMLDUMMY) {
+   LOGPFSML(fi, LOGL_NOTICE, "Not connecting RSL in 
OML-DUMMY!\n");
+   } else {
+   rc = 
e1inp_ipa_bts_rsl_connect_n(bts->oml_link->ts->line,
+
bb_transc->rsl.rem_addrstr.ip,
+
bb_transc->rsl.rem_addrstr.port, trx->nr);
+   if (rc < 0) {
+   LOGPFSML(fi, LOGL_NOTICE, "Error connecting IPA 
RSL: %d\n", rc);
+   oml_mo_opstart_nack(_transc->mo, 
NM_NACK_CANT_PERFORM);
+   return;
+   }
+   }
bts_model_opstart(trx->bts, _transc->mo, bb_transc);
return;
case NM_EV_OPSTART_ACK:
@@ -170,7 +184,7 @@
}


-   if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL 
*/
+   if (bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */
struct phy_instance *pinst = trx_phy_instance(trx);
phy_state_connected = phy_link_state_get(pinst->phy_link) == 
PHY_LINK_CONNECTED;
rsl_link_connected = !!trx->bb_transc.rsl.link;
diff --git a/src/common/oml.c b/src/common/oml.c
index d347388..f842ead 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -1568,17 +1568,7 @@
 trx_name, bb_transc->rsl.rem_addrstr.ip, 
bb_transc->rsl.rem_addrstr.port,
 bb_transc->rsl.tei);
 
-   if (bts->variant == BTS_OSMO_OMLDUMMY) {
-   rc = 0;
-   LOGP(DOML, LOGL_NOTICE, "%s: Not connecting RSL in 
OML-DUMMY!\n", trx_name);
-   } else {
-   rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, 
bb_transc->rsl.rem_addrstr.ip,
-
bb_transc->rsl.rem_addrstr.port, trx->nr);
-   if (rc < 0) {
-   LOGP(DOML, LOGL_NOTICE, "%s: Error connecting IPA RSL: 
%d\n", trx_name, rc);
-   rc = NM_NACK_CANT_PERFORM;
-   }
-   }
+   rc = 0;

 tx_ack_nack:
/* The ACK/NACK is expected to contain all IEs */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34442?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: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0
Gerrit-Change-Number: 34442
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[M] Change in osmo-bts[master]: Move trx->rsl_link to trx->bb_transc.rsl.link

2023-09-15 Thread pespin

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email )


Change subject: Move trx->rsl_link to trx->bb_transc.rsl.link
..

Move trx->rsl_link to trx->bb_transc.rsl.link

The RSL link is configured/set up by the BBTRANSC NM object, hence move
it to the appropiate substruct.

Related: OS#5253
Change-Id: I62937cbd81c27274b9f5f70d454d5319a6898c7b
---
M include/osmo-bts/bts_trx.h
M src/common/abis.c
M src/common/nm_bb_transc_fsm.c
M src/common/nm_radio_carrier_fsm.c
M src/common/rsl.c
M src/common/vty.c
M src/osmo-bts-trx/trx_vty.c
M tests/handover/handover_test.c
8 files changed, 40 insertions(+), 28 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/34441/1

diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h
index 3ea017e..a098c3e 100644
--- a/include/osmo-bts/bts_trx.h
+++ b/include/osmo-bts/bts_trx.h
@@ -9,6 +9,7 @@
struct {
struct osmo_sockaddr_str rem_addrstr;
uint8_t tei;
+   struct e1inp_sign_link *link;
} rsl;
 };

@@ -22,8 +23,6 @@
uint8_t nr;
/* human readable name / description */
char *description;
-   /* how do we talk RSL with this TRX? */
-   struct e1inp_sign_link *rsl_link;

/* NM Radio Carrier and Baseband Transciever */
struct gsm_abis_mo mo;
diff --git a/src/common/abis.c b/src/common/abis.c
index 9677c1f..18e6c63 100644
--- a/src/common/abis.c
+++ b/src/common/abis.c
@@ -225,9 +225,9 @@

/* Then iterate over the RSL signalling links */
llist_for_each_entry(trx, >trx_list, list) {
-   if (trx->rsl_link) {
-   e1inp_sign_link_destroy(trx->rsl_link);
-   trx->rsl_link = NULL;
+   if (trx->bb_transc.rsl.link) {
+   e1inp_sign_link_destroy(trx->bb_transc.rsl.link);
+   trx->bb_transc.rsl.link = NULL;
if (trx == trx->bts->c0)
load_timer_stop(trx->bts);
} else {
@@ -364,7 +364,7 @@

/* osmo-bts uses msg->trx internally, but libosmo-abis uses
 * the signalling link at msg->dst */
-   msg->dst = msg->trx->rsl_link;
+   msg->dst = msg->trx->bb_transc.rsl.link;
return abis_sendmsg(msg);
 }

@@ -404,10 +404,10 @@
break;
}
e1inp_ts_config_sign(sign_ts, line);
-   trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL,
-  trx, 
trx->bb_transc.rsl.tei, 0);
+   trx->bb_transc.rsl.link = e1inp_sign_link_create(sign_ts, 
E1INP_SIGN_RSL,
+trx, 
trx->bb_transc.rsl.tei, 0);
trx_link_estab(trx);
-   return trx->rsl_link;
+   return trx->bb_transc.rsl.link;
}
return NULL;
 }
diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c
index 1dd2c85..12493e4 100644
--- a/src/common/nm_bb_transc_fsm.c
+++ b/src/common/nm_bb_transc_fsm.c
@@ -173,7 +173,7 @@
if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL 
*/
struct phy_instance *pinst = trx_phy_instance(trx);
phy_state_connected = phy_link_state_get(pinst->phy_link) == 
PHY_LINK_CONNECTED;
-   rsl_link_connected = !!trx->rsl_link;
+   rsl_link_connected = !!trx->bb_transc.rsl.link;
} else {
phy_state_connected = true;
rsl_link_connected = true;
diff --git a/src/common/nm_radio_carrier_fsm.c 
b/src/common/nm_radio_carrier_fsm.c
index 4431eb5..0e37c87 100644
--- a/src/common/nm_radio_carrier_fsm.c
+++ b/src/common/nm_radio_carrier_fsm.c
@@ -153,7 +153,7 @@
if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL 
*/
struct phy_instance *pinst = trx_phy_instance(trx);
phy_state_connected = phy_link_state_get(pinst->phy_link) == 
PHY_LINK_CONNECTED;
-   rsl_link_connected = !!trx->rsl_link;
+   rsl_link_connected = !!trx->bb_transc.rsl.link;
} else {
phy_state_connected = true;
rsl_link_connected = true;
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 5231765..f11ec0e 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -2911,7 +2911,7 @@

 static char *get_rsl_local_ip(struct gsm_bts_trx *trx)
 {
-   struct e1inp_ts *ts = trx->rsl_link->ts;
+   struct e1inp_ts *ts = trx->bb_transc.rsl.link->ts;
struct sockaddr_storage ss;
socklen_t sa_len = sizeof(ss);
static char hostbuf[256];
@@ -3054,7 +3054,7 @@
 * address */
if (connect_ip == 0) {
struct e1inp_sign_link *sign_link =

[S] Change in osmo-bts[master]: oml: Store RSL connect related fields in bb_transc

2023-09-15 Thread pespin

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34440?usp=email )


Change subject: oml: Store RSL connect related fields in bb_transc
..

oml: Store RSL connect related fields in bb_transc

This is a preparation commit towards delaying connection of RSL tcp
socket until the BBTRANSC object is OPSTARTed, as it is the case already
in nanoBTS.

Related: OS#5253
Change-Id: Ia571ec19e9e8f8a6d7c2554642aab0afe1b4b917
---
M include/osmo-bts/bts_trx.h
M src/common/abis.c
M src/common/oml.c
M src/common/vty.c
4 files changed, 32 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/34440/1

diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h
index 72522eb..3ea017e 100644
--- a/include/osmo-bts/bts_trx.h
+++ b/include/osmo-bts/bts_trx.h
@@ -1,9 +1,15 @@
 #pragma once

+#include 
 #include 

 struct gsm_bts_bb_trx {
struct gsm_abis_mo mo;
+   /* how do we talk RSL with this TRX? */
+   struct {
+   struct osmo_sockaddr_str rem_addrstr;
+   uint8_t tei;
+   } rsl;
 };

 /* One TRX in a BTS */
@@ -17,7 +23,6 @@
/* human readable name / description */
char *description;
/* how do we talk RSL with this TRX? */
-   uint8_t rsl_tei;
struct e1inp_sign_link *rsl_link;
 
/* NM Radio Carrier and Baseband Transciever */
diff --git a/src/common/abis.c b/src/common/abis.c
index 10eeaff..9677c1f 100644
--- a/src/common/abis.c
+++ b/src/common/abis.c
@@ -405,7 +405,7 @@
}
e1inp_ts_config_sign(sign_ts, line);
trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL,
-  trx, trx->rsl_tei, 0);
+  trx, 
trx->bb_transc.rsl.tei, 0);
trx_link_estab(trx);
return trx->rsl_link;
}
diff --git a/src/common/oml.c b/src/common/oml.c
index 4380258..d347388 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -1534,6 +1534,7 @@
struct e1inp_sign_link *oml_link = bts->oml_link;
const struct abis_om_fom_hdr *foh = msgb_l3(msg);
struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr);
+   struct gsm_bts_bb_trx *bb_transc;
const char *trx_name;
struct in_addr in;
uint16_t port = IPA_TCP_PORT_RSL;
@@ -1547,6 +1548,7 @@

if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT))
port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT));
+
if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID))
stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID);

@@ -1557,17 +1559,21 @@
goto tx_ack_nack;
}

-   trx_name = gsm_trx_name(trx);
+   bb_transc = >bb_transc;
+   osmo_sockaddr_str_from_in_addr(_transc->rsl.rem_addrstr, , port);
+   bb_transc->rsl.tei = stream_id;

+   trx_name = gsm_trx_name(trx);
LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u 
STREAM=0x%02x\n",
-trx_name, inet_ntoa(in), port, stream_id);
+trx_name, bb_transc->rsl.rem_addrstr.ip, 
bb_transc->rsl.rem_addrstr.port,
+bb_transc->rsl.tei);

if (bts->variant == BTS_OSMO_OMLDUMMY) {
rc = 0;
LOGP(DOML, LOGL_NOTICE, "%s: Not connecting RSL in 
OML-DUMMY!\n", trx_name);
} else {
-   trx->rsl_tei = stream_id;
-   rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, 
inet_ntoa(in), port, trx->nr);
+   rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, 
bb_transc->rsl.rem_addrstr.ip,
+
bb_transc->rsl.rem_addrstr.port, trx->nr);
if (rc < 0) {
LOGP(DOML, LOGL_NOTICE, "%s: Error connecting IPA RSL: 
%d\n", trx_name, rc);
rc = NM_NACK_CANT_PERFORM;
diff --git a/src/common/vty.c b/src/common/vty.c
index 31104c2..47e0ecd 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1662,7 +1662,7 @@
vty_out(vty, "  RSL State: %s%s", trx->rsl_link? "connected" : 
"disconnected", VTY_NEWLINE);
vty_out(vty, "  Baseband Transceiver NM State: ");
net_dump_nmstate(vty, >bb_transc.mo.nm_state);
-   vty_out(vty, "  IPA stream ID: 0x%02x%s", trx->rsl_tei, VTY_NEWLINE);
+   vty_out(vty, "  IPA stream ID: 0x%02x%s", trx->bb_transc.rsl.tei, 
VTY_NEWLINE);
 }

 static inline void print_all_trx(struct vty *vty, const struct gsm_bts *bts)

--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34440?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: Ia571ec19e9e8f8a6d7c2554642aab0afe1b4b917
Gerrit-Change-Number: 34440
Gerrit-PatchSet: 1

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to GPRS Cell MO(s)

2023-09-15 Thread pespin

Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email )

The change is no longer submittable: Code-Review is unsatisfied now.

Change subject: abis_nm: send Get Attributes to GPRS Cell MO(s)
..


Patch Set 4: Code-Review-2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?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: Ib6d87da49217f1c8d76445ce623a511a07daedbf
Gerrit-Change-Number: 34360
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 11:46:17 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bsc[master]: abis_nm: send Get Attributes to GPRS Cell MO(s)

2023-09-15 Thread pespin

Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34360?usp=email )

Change subject: abis_nm: send Get Attributes to GPRS Cell MO(s)
..


Patch Set 4: Code-Review-1

(1 comment)

File src/osmo-bsc/nm_gprs_cell_fsm.c:

https://gerrit.osmocom.org/c/osmo-bsc/+/34360/comment/23d78e42_58e046a0
PS4, Line 112:  abis_nm_get_attr(bts, NM_OC_GPRS_CELL, 0, bts->nr, 0xff,
bts->bts_nr.



--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34360?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: Ib6d87da49217f1c8d76445ce623a511a07daedbf
Gerrit-Change-Number: 34360
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 11:46:12 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

2023-09-15 Thread fixeria

Attention is currently required from: laforge, neels, pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email )

Change subject: sip: tweak failure reporting for SIP messages
..


Patch Set 2:

(1 comment)

File sip/SIP_Tests.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/8ec3bd36_cf136f8a
PS1, Line 195: og("FAIL: expected SIP message ", sip_expect);
 :  setverdict(fail, "Received unexpected SIP message");
> Yeah, "f_shutdown(__FILE__, __LINE__, fail, log2str(...))" is the usual 
> construct. […]
FYI, you can still do it like this:

```
setverdict(fail, "Received unexpected SIP message, expected: ", sip_expect);
Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
```

Personally I tend to use this combination, because `setverdict` is setting the 
verdict and `f_shutdown` is doing the shutdown. I don't like setting the 
verdict using `f_shutdown` because it requires using `log2str`.



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6
Gerrit-Change-Number: 34415
Gerrit-PatchSet: 2
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-CC: fixeria 
Gerrit-Attention: neels 
Gerrit-Attention: laforge 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 11:45:17 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels 
Comment-In-Reply-To: laforge 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[M] Change in osmo-pcu[master]: tbf: Log poll timeout reason

2023-09-15 Thread pespin

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-pcu/+/34426?usp=email )

Change subject: tbf: Log poll timeout reason
..

tbf: Log poll timeout reason

Change-Id: Ie0339b55e6d617a3e788972c3b226eef64124d2b
---
M src/tbf.cpp
M tests/tbf/TbfTest.err
2 files changed, 41 insertions(+), 31 deletions(-)

Approvals:
  osmith: Looks good to me, approved
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve




diff --git a/src/tbf.cpp b/src/tbf.cpp
index b708d73..840a1f7 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -484,8 +484,9 @@
gprs_rlcmac_ul_tbf *ul_tbf;
gprs_rlcmac_dl_tbf *dl_tbf;

-   LOGPTBF(this, LOGL_NOTICE, "poll timeout for FN=%d, TS=%d (curr FN 
%d)\n",
-   poll_fn, pdch->ts_no, bts_current_frame_number(bts));
+   LOGPTBF(this, LOGL_NOTICE, "poll timeout for FN=%d, TS=%d (curr FN %d), 
reason=%s\n",
+   poll_fn, pdch->ts_no, bts_current_frame_number(bts),
+   get_value_string(pdch_ulc_tbf_poll_reason_names, reason));

switch (reason) {
case PDCH_ULC_POLL_UL_ACK:
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index 02cefe2..42ce499 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -2703,7 +2703,7 @@
 PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654283): 
TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW}
 TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} N3101 1 => 2 (< MAX 
10)
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654292, 
reason=DL_ACK): TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED}
-TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} poll timeout for 
FN=2654292, TS=7 (curr FN 2654292)
+TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} poll timeout for 
FN=2654292, TS=7 (curr FN 2654292), reason=DL_ACK
 TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} Timeout for 
polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received 
yet|
 TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} N3105 0 => 1 (< 
MAX 8)
 DL_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED}: Received 
Event DL_ACKNACK_MISS
@@ -2772,7 +2772,7 @@
 TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FLOW} N3101 2 => 3 (< MAX 
10)
 PDCH(bts=0,trx=0,ts=7) Expiring FN=2654348 but previous FN=2654309 is still 
reserved!
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654309, 
reason=DL_ACK): TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED}
-TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} poll timeout for 
FN=2654309, TS=7 (curr FN 2654348)
+TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} poll timeout for 
FN=2654309, TS=7 (curr FN 2654348), reason=DL_ACK
 TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} Timeout for 
polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received 
yet|
 TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} N3105 1 => 2 (< 
MAX 8)
 DL_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED}: Received 
Event DL_ACKNACK_MISS
@@ -4100,7 +4100,7 @@
 PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654374): 
TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){RELEASING}
 TBF(UL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){RELEASING} N3101 22 => 23 
(< MAX 10)
 PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654379, 
reason=DL_ACK): TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED}
-TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} poll timeout for 
FN=2654379, TS=7 (curr FN 2654379)
+TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} poll timeout for 
FN=2654379, TS=7 (curr FN 2654379), reason=DL_ACK
 TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} Timeout for 
polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received 
yet|
 TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED} N3105 0 => 1 (< 
MAX 8)
 DL_TBF(DL:TFI-0-0-0:G:IMSI-0011223344:TLLI-0xf1223344){FINISHED}: Received 
Event DL_ACKNACK_MISS
@@ -5173,18 +5173,18 @@
 Detected FN jump! 4 -> 169 (expected 8, delta 165)
 PDCH(bts=0,trx=0,ts=4) Expiring FN=169 but previous FN=13 is still reserved!
 PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ACK): 
TBF(DL:TFI-0-0-0:E:TLLI-0xffeeddcc){FINISHED}
-TBF(DL:TFI-0-0-0:E:TLLI-0xffeeddcc){FINISHED} poll timeout for FN=13, TS=4 
(curr FN 169)
+TBF(DL:TFI-0-0-0:E:TLLI-0xffeeddcc){FINISHED} poll timeout for FN=13, TS=4 
(curr FN 169), reason=DL_ACK
 TBF(DL:TFI-0-0-0:E:TLLI-0xffeeddcc){FINISHED} Timeout for polling PACKET 
DOWNLINK ACK: |Assignment was on CCCH|Downlink ACK was received|
 TBF(DL:TFI-0-0-0:E:TLLI-0xffeeddcc){FINISHED} N3105 0 => 1 (< MAX 8)
 DL_TBF(DL:TFI-0-0-0:E){FINISHED}: Received Event DL_ACKNACK_MISS
 PDCH(bts=0,trx=0,ts=4) Expiring FN=169

[M] Change in osmo-pcu[master]: tbf: Log poll timeout reason

2023-09-15 Thread osmith

Attention is currently required from: pespin.

osmith has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-pcu/+/34426?usp=email )

Change subject: tbf: Log poll timeout reason
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34426?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: Ie0339b55e6d617a3e788972c3b226eef64124d2b
Gerrit-Change-Number: 34426
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 10:03:30 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: Use mp_pcuif_version := 11 everywhere

2023-09-15 Thread pespin

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34424?usp=email )

Change subject: PCUIF_Types: Use mp_pcuif_version := 11 everywhere
..

PCUIF_Types: Use mp_pcuif_version := 11 everywhere

Since osmo-bts 1.7.0 & osmo-pcu 1.3.0, which were just released
PCUIF v11 is supported, so use it by default.

Change-Id: I8e5f44fc1d613c12eaf984dff860ee6f05c2c171
---
M pcu/PCU_Tests.default
M pcu/PCU_Tests_SNS.cfg
M pcu/PCU_Tests_SNSv6.cfg
3 files changed, 15 insertions(+), 3 deletions(-)

Approvals:
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/pcu/PCU_Tests.default b/pcu/PCU_Tests.default
index 6f633d2..07d1ffc 100644
--- a/pcu/PCU_Tests.default
+++ b/pcu/PCU_Tests.default
@@ -29,7 +29,7 @@
}
 };
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU";
-PCUIF_Types.mp_pcuif_version := 10;
+PCUIF_Types.mp_pcuif_version := 11;

 [TESTPORT_PARAMETERS]
 *.PCU.socket_type := "SEQPACKET"
diff --git a/pcu/PCU_Tests_SNS.cfg b/pcu/PCU_Tests_SNS.cfg
index c36edac..c7c5771 100644
--- a/pcu/PCU_Tests_SNS.cfg
+++ b/pcu/PCU_Tests_SNS.cfg
@@ -54,7 +54,7 @@
}
}
 }
-PCUIF_Types.mp_pcuif_version := 10
+PCUIF_Types.mp_pcuif_version := 11

 [TESTPORT_PARAMETERS]

diff --git a/pcu/PCU_Tests_SNSv6.cfg b/pcu/PCU_Tests_SNSv6.cfg
index 3747f0a..02d04f3 100644
--- a/pcu/PCU_Tests_SNSv6.cfg
+++ b/pcu/PCU_Tests_SNSv6.cfg
@@ -26,7 +26,7 @@
}
}
 }
-PCUIF_Types.mp_pcuif_version := 10
+PCUIF_Types.mp_pcuif_version := 11

 [TESTPORT_PARAMETERS]


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34424?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: I8e5f44fc1d613c12eaf984dff860ee6f05c2c171
Gerrit-Change-Number: 34424
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: Use mp_pcuif_version := 11 everywhere

2023-09-15 Thread fixeria

Attention is currently required from: dexter, pespin.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34424?usp=email )

Change subject: PCUIF_Types: Use mp_pcuif_version := 11 everywhere
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34424?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: I8e5f44fc1d613c12eaf984dff860ee6f05c2c171
Gerrit-Change-Number: 34424
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter 
Gerrit-Reviewer: fixeria 
Gerrit-Attention: pespin 
Gerrit-Attention: dexter 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:50:00 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in simtrace2[osmith/0.8.2]: Bump version: 0.8.1 → 0.8.2

2023-09-15 Thread osmith

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email )

Change subject: Bump version: 0.8.1 → 0.8.2
..

Bump version: 0.8.1 → 0.8.2

Change-Id: I4f0510da6135fcd4d0b86d4fdfc114c27c82420c
---
M debian/changelog
1 file changed, 15 insertions(+), 0 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/debian/changelog b/debian/changelog
index 99cfb8b..0b341fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+simtrace2 (0.8.2) unstable; urgency=medium
+
+  * firmware/Makefile: don't use distribution's CFLAGS
+
+ -- Oliver Smith   Fri, 15 Sep 2023 11:17:37 +0200
+
 simtrace2 (0.8.1) unstable; urgency=medium

   * host/contrib/simtrace2.spec.in: fix soname

--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: osmith/0.8.2
Gerrit-Change-Id: I4f0510da6135fcd4d0b86d4fdfc114c27c82420c
Gerrit-Change-Number: 34438
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in simtrace2[osmith/0.8.2]: firmware/Makefile: don't use distribution's CFLAGS

2023-09-15 Thread osmith

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email )

Change subject: firmware/Makefile: don't use distribution's CFLAGS
..

firmware/Makefile: don't use distribution's CFLAGS

Set CFLAGS on top of the Makefile, to avoid using the distribution's
default CFLAGS. In debian testing and unstable, -fcf-protection was
recently added to the default CFLAGS, but it cannot be used with the
cross compiler:

  [COMPILING libosmocore/source/backtrace.c]
  cc1: error: '-fcf-protection=full' is not supported for this target
  make[2]: *** [Makefile:270: obj/simtrace/flash_backtrace.o] Error 1

Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70
(cherry picked from commit e6e77399d6c723c8a4f76c70b20c116004885a80)
---
M firmware/Makefile
1 file changed, 26 insertions(+), 0 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved




diff --git a/firmware/Makefile b/firmware/Makefile
index c30dc9a..eefe836 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -29,6 +29,13 @@
 #   Makefile for compiling the Getting Started with SAM3S Microcontrollers 
project

 GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarball-version)
+
+CFLAGS = \
+-Werror=format-security \
+-Wformat \
+-g \
+$(NULL)
+
 
#---
 #User-modifiable options
 
#---

--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: osmith/0.8.2
Gerrit-Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70
Gerrit-Change-Number: 34437
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Hoernchen 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in simtrace2[osmith/0.8.2]: Bump version: 0.8.1 → 0.8.2

2023-09-15 Thread fixeria

Attention is currently required from: osmith.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email )

Change subject: Bump version: 0.8.1 → 0.8.2
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: osmith/0.8.2
Gerrit-Change-Id: I4f0510da6135fcd4d0b86d4fdfc114c27c82420c
Gerrit-Change-Number: 34438
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:49:26 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in simtrace2[osmith/0.8.2]: firmware/Makefile: don't use distribution's CFLAGS

2023-09-15 Thread fixeria

Attention is currently required from: Hoernchen, osmith.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email )

Change subject: firmware/Makefile: don't use distribution's CFLAGS
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: osmith/0.8.2
Gerrit-Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70
Gerrit-Change-Number: 34437
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Hoernchen 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Attention: Hoernchen 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:49:17 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-pcu[master]: Bump version: 1.3.0.1-09dc → 1.3.1

2023-09-15 Thread pespin

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-pcu/+/34439?usp=email )

Change subject: Bump version: 1.3.0.1-09dc → 1.3.1
..

Bump version: 1.3.0.1-09dc → 1.3.1

Change-Id: I7fe48ac3176f9d48660260fb268ee22eedc78d1a
---
M debian/changelog
1 file changed, 15 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved




diff --git a/debian/changelog b/debian/changelog
index 01991de..df278a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmo-pcu (1.3.1) unstable; urgency=medium
+
+  * tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in ST_RELEASING
+
+ -- Pau Espin Pedrol   Fri, 15 Sep 2023 11:33:44 +0200
+
 osmo-pcu (1.3.0) unstable; urgency=medium

   [ Philipp Maier ]

--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34439?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: I7fe48ac3176f9d48660260fb268ee22eedc78d1a
Gerrit-Change-Number: 34439
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-pcu[master]: Bump version: 1.3.0.1-09dc → 1.3.1

2023-09-15 Thread pespin

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-pcu/+/34439?usp=email )

Change subject: Bump version: 1.3.0.1-09dc → 1.3.1
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34439?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: I7fe48ac3176f9d48660260fb268ee22eedc78d1a
Gerrit-Change-Number: 34439
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:48:16 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: repo-install-test: skip soapysdr-module-lms7

2023-09-15 Thread osmith

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email )

Change subject: repo-install-test: skip soapysdr-module-lms7
..

repo-install-test: skip soapysdr-module-lms7

Fix for:
  dpkg: error processing archive 
/tmp/apt-dpkg-install-4OjX3P/0924-soapysdr0.8-module-lms7_22.09.1+dfsg-1+b2_amd64.deb
 (--unpack):
   trying to overwrite 
'/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.8/libLMS7Support.so', which is 
also in package soapysdr0.7-module-lms7:amd64 22.09.1.17.4828.202309142026

Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94
---
M scripts/repo-install-test/blacklist_debian12.txt
1 file changed, 14 insertions(+), 0 deletions(-)

Approvals:
  fixeria: Looks good to me, but someone else must approve
  Jenkins Builder: Verified
  pespin: Looks good to me, approved




diff --git a/scripts/repo-install-test/blacklist_debian12.txt 
b/scripts/repo-install-test/blacklist_debian12.txt
index 4c9dbde..b470d44 100644
--- a/scripts/repo-install-test/blacklist_debian12.txt
+++ b/scripts/repo-install-test/blacklist_debian12.txt
@@ -34,6 +34,7 @@
 limesuite-dbgsym
 soapysdr0.7-module-lms7
 soapysdr0.7-module-lms7-dbgsym
+soapysdr-module-lms7

 # Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install
 librtlsdr0-dbgsym

--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94
Gerrit-Change-Number: 34436
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-pcu[master]: Bump version: 1.3.0.1-09dc → 1.3.1

2023-09-15 Thread pespin

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-pcu/+/34439?usp=email )


Change subject: Bump version: 1.3.0.1-09dc → 1.3.1
..

Bump version: 1.3.0.1-09dc → 1.3.1

Change-Id: I7fe48ac3176f9d48660260fb268ee22eedc78d1a
---
M debian/changelog
1 file changed, 15 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/39/34439/1

diff --git a/debian/changelog b/debian/changelog
index 01991de..df278a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmo-pcu (1.3.1) unstable; urgency=medium
+
+  * tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in ST_RELEASING
+
+ -- Pau Espin Pedrol   Fri, 15 Sep 2023 11:33:44 +0200
+
 osmo-pcu (1.3.0) unstable; urgency=medium

   [ Philipp Maier ]

--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34439?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: I7fe48ac3176f9d48660260fb268ee22eedc78d1a
Gerrit-Change-Number: 34439
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange

[S] Change in simtrace2[osmith/0.8.2]: firmware/Makefile: don't use distribution's CFLAGS

2023-09-15 Thread pespin

Attention is currently required from: Hoernchen, fixeria, osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email )

Change subject: firmware/Makefile: don't use distribution's CFLAGS
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: osmith/0.8.2
Gerrit-Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70
Gerrit-Change-Number: 34437
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Hoernchen 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Attention: Hoernchen 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:31:47 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in simtrace2[osmith/0.8.2]: Bump version: 0.8.1 → 0.8.2

2023-09-15 Thread pespin

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email )

Change subject: Bump version: 0.8.1 → 0.8.2
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: osmith/0.8.2
Gerrit-Change-Id: I4f0510da6135fcd4d0b86d4fdfc114c27c82420c
Gerrit-Change-Number: 34438
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:31:51 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: repo-install-test: skip soapysdr-module-lms7

2023-09-15 Thread pespin

Attention is currently required from: osmith.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email )

Change subject: repo-install-test: skip soapysdr-module-lms7
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94
Gerrit-Change-Number: 34436
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:30:49 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in simtrace2[osmith/0.8.2]: Bump version: 0.8.1 → 0.8.2

2023-09-15 Thread osmith

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email )


Change subject: Bump version: 0.8.1 → 0.8.2
..

Bump version: 0.8.1 → 0.8.2

Change-Id: I4f0510da6135fcd4d0b86d4fdfc114c27c82420c
---
M debian/changelog
1 file changed, 15 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/38/34438/1

diff --git a/debian/changelog b/debian/changelog
index 99cfb8b..0b341fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+simtrace2 (0.8.2) unstable; urgency=medium
+
+  * firmware/Makefile: don't use distribution's CFLAGS
+
+ -- Oliver Smith   Fri, 15 Sep 2023 11:17:37 +0200
+
 simtrace2 (0.8.1) unstable; urgency=medium

   * host/contrib/simtrace2.spec.in: fix soname

--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: osmith/0.8.2
Gerrit-Change-Id: I4f0510da6135fcd4d0b86d4fdfc114c27c82420c
Gerrit-Change-Number: 34438
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in simtrace2[osmith/0.8.2]: firmware/Makefile: don't use distribution's CFLAGS

2023-09-15 Thread osmith

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email )


Change subject: firmware/Makefile: don't use distribution's CFLAGS
..

firmware/Makefile: don't use distribution's CFLAGS

Set CFLAGS on top of the Makefile, to avoid using the distribution's
default CFLAGS. In debian testing and unstable, -fcf-protection was
recently added to the default CFLAGS, but it cannot be used with the
cross compiler:

  [COMPILING libosmocore/source/backtrace.c]
  cc1: error: '-fcf-protection=full' is not supported for this target
  make[2]: *** [Makefile:270: obj/simtrace/flash_backtrace.o] Error 1

Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70
(cherry picked from commit e6e77399d6c723c8a4f76c70b20c116004885a80)
---
M firmware/Makefile
1 file changed, 26 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/37/34437/1

diff --git a/firmware/Makefile b/firmware/Makefile
index c30dc9a..eefe836 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -29,6 +29,13 @@
 #   Makefile for compiling the Getting Started with SAM3S Microcontrollers 
project

 GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarball-version)
+
+CFLAGS = \
+-Werror=format-security \
+-Wformat \
+-g \
+$(NULL)
+
 
#---
 #User-modifiable options
 
#---

--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: osmith/0.8.2
Gerrit-Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70
Gerrit-Change-Number: 34437
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[M] Change in osmo-ci[master]: OBS: fix generating wrong limesuite version

2023-09-15 Thread osmith

osmith has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email )

Change subject: OBS: fix generating wrong limesuite version
..

OBS: fix generating wrong limesuite version

Instead of using git-version-gen in all git repositories, only use it
where it is part of the repository. Use git directly to build the
version string otherwise. To fix generating the wrong version string for
limesuite, use "git describe --tags" instead of "git describe" as in
git-version-gen. This is needed because limesuite releases > 20.01 only
have lightweight (non-annotated) tags.

Fix for:
  limesuite: WARNING: version from changelog (22.09.1-1) is higher than
  version based on git tag (20.01.0.182-4828.202309140026), using
  version from changelog (git tag not pushed yet?)

Change-Id: I00d97d5cd12b2938a002d3e5c8ada6503f976e36
---
M scripts/obs/lib/srcpkg.py
1 file changed, 50 insertions(+), 27 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 13404a7..cffb961 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -24,38 +24,40 @@
 lib.git.checkout(project, f"origin/{feed}")


-def get_git_version_gen_path(project):
-# Use git-version-gen in the project's repository if available
-repo_path = lib.git.get_repo_path(project)
-ret = f"{repo_path}/git-version-gen"
-if os.path.exists(ret):
-return ret
-
-# Use git-version-gen script from libosmocore.git as fallback
-print(f"{project}: has no git-version-gen, using the one from libosmocore")
-repo_path = lib.git.get_repo_path("libosmocore")
-ret = f"{repo_path}/git-version-gen"
-if not os.path.exists(ret):
-lib.git.clone("libosmocore")
-if os.path.exists(ret):
-return ret
-
-print(f"ERROR: {project}.git doesn't have a git-version-gen script and"
-  " couldn't find libosmocore.git's copy of the script here either: "
-  + ret)
-sys.exit(1)
-
-
 def get_git_version(project):
 """ :returns: the string from git-version-gen, e.g. '1.7.0.10-76bdb' """
 repo_path = lib.git.get_repo_path(project)
-script_path = get_git_version_gen_path(project)

-ret = lib.run_cmd([script_path, "."], cwd=repo_path)
-if not ret.output:
-lib.exit_error_cmd(ret, "empty output from git-version-gen")
+# Run git-version-gen if it is in the repository
+script_path = f"{repo_path}/git-version-gen"
+if os.path.exists(script_path):
+ret = lib.run_cmd([script_path, "."], cwd=repo_path).output
+if not ret:
+lib.exit_error_cmd(ret, "empty output from git-version-gen")
+return ret

-return ret.output
+# Generate a version string similar to git-version-gen, but run use git
+# describe --tags, so it works with non-annotated tags as well (needed for
+# e.g. limesuite's tags).
+pattern = lib.git.get_latest_tag_pattern(project)
+pattern = pattern.replace("^", "", 1)
+pattern = pattern.replace("$", "", -1)
+ret = lib.run_cmd(["git", "describe",
+   "--abbrev=4",
+   "--tags",
+   f"--match={pattern}",
+   "HEAD"], cwd=repo_path).output.rstrip()
+
+# Like git-version-gen:
+# * Change the first '-' to '.'
+# * Remove the 'g' in git describe's output string
+# * Remove the leading 'v'
+ret = ret.replace("-", ".", 1)
+ret = ret.replace("-g", "-", 1)
+if ret.startswith("v"):
+ret = ret[1:]
+
+return ret


 def get_version_for_feed(project):

--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I00d97d5cd12b2938a002d3e5c8ada6503f976e36
Gerrit-Change-Number: 34422
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: osmith 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-ci[master]: repo-install-test: skip soapysdr-module-lms7

2023-09-15 Thread fixeria

Attention is currently required from: osmith.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email )

Change subject: repo-install-test: skip soapysdr-module-lms7
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94
Gerrit-Change-Number: 34436
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:09:16 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ci[master]: OBS: fix generating wrong limesuite version

2023-09-15 Thread fixeria

Attention is currently required from: osmith.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email )

Change subject: OBS: fix generating wrong limesuite version
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I00d97d5cd12b2938a002d3e5c8ada6503f976e36
Gerrit-Change-Number: 34422
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Fri, 15 Sep 2023 09:08:57 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-ci[master]: repo-install-test: skip soapysdr-module-lms7

2023-09-15 Thread osmith

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email )


Change subject: repo-install-test: skip soapysdr-module-lms7
..

repo-install-test: skip soapysdr-module-lms7

Fix for:
  dpkg: error processing archive 
/tmp/apt-dpkg-install-4OjX3P/0924-soapysdr0.8-module-lms7_22.09.1+dfsg-1+b2_amd64.deb
 (--unpack):
   trying to overwrite 
'/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.8/libLMS7Support.so', which is 
also in package soapysdr0.7-module-lms7:amd64 22.09.1.17.4828.202309142026

Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94
---
M scripts/repo-install-test/blacklist_debian12.txt
1 file changed, 14 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/36/34436/1

diff --git a/scripts/repo-install-test/blacklist_debian12.txt 
b/scripts/repo-install-test/blacklist_debian12.txt
index 4c9dbde..b470d44 100644
--- a/scripts/repo-install-test/blacklist_debian12.txt
+++ b/scripts/repo-install-test/blacklist_debian12.txt
@@ -34,6 +34,7 @@
 limesuite-dbgsym
 soapysdr0.7-module-lms7
 soapysdr0.7-module-lms7-dbgsym
+soapysdr-module-lms7

 # Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install
 librtlsdr0-dbgsym

--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94
Gerrit-Change-Number: 34436
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[M] Change in osmo-bsc[master]: gsm_data: refactor/simplify and expose gsm_objclass2mo()

2023-09-15 Thread fixeria

fixeria has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34420?usp=email )

Change subject: gsm_data: refactor/simplify and expose gsm_objclass2mo()
..

gsm_data: refactor/simplify and expose gsm_objclass2mo()

Change-Id: Ic03fdfabf84a1b5cd8046101c1575296914c6332
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/gsm_data.c
2 files changed, 29 insertions(+), 47 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 7f79162..fa9213b 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -890,6 +890,8 @@
 void gsm_mo_init(struct gsm_abis_mo *mo, struct gsm_bts *bts,
 uint8_t obj_class, uint8_t p1, uint8_t p2, uint8_t p3);

+struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
+   const struct abis_om_obj_inst *obj_inst);
 struct gsm_nm_state *
 gsm_objclass2nmstate(struct gsm_bts *bts, uint8_t obj_class,
 const struct abis_om_obj_inst *obj_inst);
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 9a32e07..580fa84 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -327,85 +327,56 @@
 }

 /* obtain the MO structure for a given object instance */
-static inline struct gsm_abis_mo *
-gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
-   const struct abis_om_obj_inst *obj_inst)
+struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
+   const struct abis_om_obj_inst *obj_inst)
 {
struct gsm_bts_trx *trx;
-   struct gsm_abis_mo *mo = NULL;

switch (obj_class) {
case NM_OC_BTS:
-   mo = >mo;
-   break;
+   return >mo;
case NM_OC_RADIO_CARRIER:
-   if (obj_inst->trx_nr >= bts->num_trx) {
-   return NULL;
-   }
trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-   mo = >mo;
-   break;
+   return trx != NULL ? >mo : NULL;
case NM_OC_BASEB_TRANSC:
-   if (obj_inst->trx_nr >= bts->num_trx) {
-   return NULL;
-   }
trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-   mo = >bb_transc.mo;
-   break;
+   return trx != NULL ? >bb_transc.mo : NULL;
case NM_OC_CHANNEL:
-   if (obj_inst->trx_nr >= bts->num_trx) {
-   return NULL;
-   }
-   trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
if (obj_inst->ts_nr >= TRX_NR_TS)
return NULL;
-   mo = >ts[obj_inst->ts_nr].mo;
-   break;
+   trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
+   return trx != NULL ? >ts[obj_inst->ts_nr].mo : NULL;
case NM_OC_SITE_MANAGER:
-   mo = >site_mgr->mo;
-   break;
+   return >site_mgr->mo;
case NM_OC_BS11:
switch (obj_inst->bts_nr) {
case BS11_OBJ_CCLK:
-   mo = >bs11.cclk.mo;
-   break;
+   return >bs11.cclk.mo;
case BS11_OBJ_BBSIG:
-   if (obj_inst->ts_nr > bts->num_trx)
-   return NULL;
trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-   mo = >bs11.bbsig.mo;
-   break;
+   return trx != NULL ? >bs11.bbsig.mo : NULL;
case BS11_OBJ_PA:
-   if (obj_inst->ts_nr > bts->num_trx)
-   return NULL;
trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-   mo = >bs11.pa.mo;
-   break;
-   default:
-   return NULL;
+   return trx != NULL ? >bs11.pa.mo : NULL;
}
break;
case NM_OC_BS11_RACK:
-   mo = >bs11.rack.mo;
-   break;
+   return >bs11.rack.mo;
case NM_OC_BS11_ENVABTSE:
if (obj_inst->trx_nr >= ARRAY_SIZE(bts->bs11.envabtse))
return NULL;
-   mo = >bs11.envabtse[obj_inst->trx_nr].mo;
-   break;
+   return >bs11.envabtse[obj_inst->trx_nr].mo;
case NM_OC_GPRS_NSE:
-   mo = >site_mgr->gprs.nse.mo;
-   break;
+   return >site_mgr->gprs.nse.mo;
case NM_OC_GPRS_CELL:
-   mo = >gprs.cell.mo;
-   break;
+   return >gprs.cell.mo;
case NM_OC_GPRS_NSVC:
if

[M] Change in osmo-bsc[master]: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()

2023-09-15 Thread fixeria

fixeria has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34421?usp=email )

Change subject: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()
..

bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()

Change-Id: Ic6c0dfe950459d07a8f506b5007a65fea1950c18
---
M src/osmo-bsc/bts_ipaccess_nanobts.c
1 file changed, 37 insertions(+), 141 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  Jenkins Builder: Verified




diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c 
b/src/osmo-bsc/bts_ipaccess_nanobts.c
index 8669d64..941fe55 100644
--- a/src/osmo-bsc/bts_ipaccess_nanobts.c
+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c
@@ -195,156 +195,50 @@
 /* Callback function to be called every time we receive a 12.21 SW activated 
report */
 static int sw_activ_rep(struct msgb *mb)
 {
-   struct abis_om_fom_hdr *foh = msgb_l3(mb);
+   const struct abis_om_fom_hdr *foh = msgb_l3(mb);
struct e1inp_sign_link *sign_link = mb->dst;
struct gsm_bts *bts = sign_link->trx->bts;
-   struct gsm_bts_trx *trx;
-   struct gsm_gprs_nsvc *nsvc;
-   struct gsm_bts_trx_ts *ts;
+   struct gsm_abis_mo *mo;

if (!is_ipa_abisip_bts(bts))
return 0;

-   switch (foh->obj_class) {
-   case NM_OC_SITE_MANAGER:
-   osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SW_ACT_REP, 
NULL);
-   break;
-   case NM_OC_BTS:
-   osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_SW_ACT_REP, NULL);
-   break;
-   case NM_OC_BASEB_TRANSC:
-   if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-   return -EINVAL;
-   osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT_REP, 
NULL);
-   break;
-   case NM_OC_RADIO_CARRIER:
-   if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-   return -EINVAL;
-   osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT_REP, NULL);
-   break;
-   case NM_OC_CHANNEL:
-   if (!(ts = abis_nm_get_ts(mb)))
-   return -EINVAL;
-   osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SW_ACT_REP, NULL);
-   break;
-   case NM_OC_GPRS_NSE:
-   osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, 
NM_EV_SW_ACT_REP, NULL);
-   break;
-   case NM_OC_GPRS_CELL:
-   osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_SW_ACT_REP, 
NULL);
-   break;
-   case NM_OC_GPRS_NSVC:
-   if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, 
foh->obj_inst.trx_nr)))
-   return -EINVAL;
-   osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_SW_ACT_REP, NULL);
-   break;
+   mo = gsm_objclass2mo(bts, foh->obj_class, >obj_inst);
+   if (mo == NULL) {
+   LOGPFOH(DNM, LOGL_ERROR, foh, "Rx SW activated report for 
non-existent MO\n");
+   return -ENOENT;
}
-   return 0;
-}

-static void nm_rx_opstart_ack_chan(struct msgb *oml_msg)
-{
-   struct gsm_bts_trx_ts *ts;
-   ts = abis_nm_get_ts(oml_msg);
-   if (!ts)
-   /* error already logged in abis_nm_get_ts() */
-   return;
-   if (!ts->fi) {
-   LOG_TS(ts, LOGL_ERROR, "Channel OPSTART ACK for uninitialized 
TS\n");
-   return;
-   }
-   osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL);
+   osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL);
+   return 0;
 }

 static void nm_rx_opstart_ack(struct msgb *oml_msg)
 {
-   struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
+   const struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
struct e1inp_sign_link *sign_link = oml_msg->dst;
struct gsm_bts *bts = sign_link->trx->bts;
-   struct gsm_bts_trx *trx;
-   struct gsm_gprs_nsvc *nsvc;
+   struct gsm_abis_mo *mo;

-   switch (foh->obj_class) {
-   case NM_OC_SITE_MANAGER:
-   osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OPSTART_ACK, 
NULL);
-   break;
-   case NM_OC_BTS:
-   osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL);
-   break;
-   case NM_OC_RADIO_CARRIER:
-   if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-   return;
-   osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);
-   break;
-   case NM_OC_BASEB_TRANSC:
-   if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-   return;
-   osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_OPSTART_ACK, 
NULL);
-   break;
-   case NM_OC_CHANNEL:
-   nm_rx_opstart_ack_chan(oml_msg);
-   break;
-   case

[S] Change in osmo-bsc[master]: oml: ipacc: parse Object Version from SW Activated Report

2023-09-15 Thread fixeria

fixeria has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34356?usp=email )

Change subject: oml: ipacc: parse Object Version from SW Activated Report
..

oml: ipacc: parse Object Version from SW Activated Report

Change-Id: I39105096a6b29bd7e4fb15287653074527c3e024
Related: OS#4505
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bts_ipaccess_nanobts.c
2 files changed, 31 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved




diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index fa9213b..2876d24 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -537,6 +537,12 @@
bool rsl_connect_sent;
bool rsl_connect_ack_received;
bool force_rf_lock;
+   /* vendor specific fields below */
+   union {
+   struct {
+   uint8_t obj_version;
+   } ipaccess;
+   };
 };

 /* Ericsson OM2000 Managed Object */
diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c 
b/src/osmo-bsc/bts_ipaccess_nanobts.c
index 941fe55..24966a7 100644
--- a/src/osmo-bsc/bts_ipaccess_nanobts.c
+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c
@@ -199,6 +199,7 @@
struct e1inp_sign_link *sign_link = mb->dst;
struct gsm_bts *bts = sign_link->trx->bts;
struct gsm_abis_mo *mo;
+   struct tlv_parsed tp;

if (!is_ipa_abisip_bts(bts))
return 0;
@@ -209,6 +210,20 @@
return -ENOENT;
}

+   if (abis_nm_tlv_parse(, bts, >data[0], msgb_l3len(mb) - 
sizeof(*foh)) < 0) {
+   LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", 
__func__);
+   return -EINVAL;
+   }
+
+   mo->ipaccess.obj_version = 0; /* implicit default */
+   if (TLVP_PRES_LEN(, NM_ATT_IPACC_OBJ_VERSION, 1)) {
+   /* nanoBTS may report several Object Versions;  the first one 
will
+* be used by default unless requested explicitly before 
OPSTARTing. */
+   mo->ipaccess.obj_version = *TLVP_VAL(, 
NM_ATT_IPACC_OBJ_VERSION);
+   LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Version is %u 
(default)\n",
+   mo->ipaccess.obj_version);
+   }
+
osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL);
return 0;
 }

--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34356?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: I39105096a6b29bd7e4fb15287653074527c3e024
Gerrit-Change-Number: 34356
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in libosmocore[master]: gsm_12_21.h: fix values for NM_IPAC_F_GPRS_CODING_MCS[1-9]

2023-09-15 Thread laforge

Attention is currently required from: fixeria.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmocore/+/34427?usp=email )

Change subject: gsm_12_21.h: fix values for NM_IPAC_F_GPRS_CODING_MCS[1-9]
..


Patch Set 1: Code-Review+1

(1 comment)

Patchset:

PS1:
well, it is probably simply a question of endianness of the underlying CPU, 
right?  It's a 16 bit value, and you can either do htons/ntohs on it and use 
#defines in one order, or not do any htons/ntohs + assume running on 
little-endian and have the #define the other way?



--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34427?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: I85316af9b57e8113077305798cb2d82a24e48e00
Gerrit-Change-Number: 34427
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:29:05 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bsc[master]: oml: ipacc: parse Object Version from SW Activated Report

2023-09-15 Thread laforge

Attention is currently required from: fixeria.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34356?usp=email )

Change subject: oml: ipacc: parse Object Version from SW Activated Report
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34356?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: I39105096a6b29bd7e4fb15287653074527c3e024
Gerrit-Change-Number: 34356
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:26:53 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-bsc[master]: gsm_data: refactor/simplify and expose gsm_objclass2mo()

2023-09-15 Thread laforge

Attention is currently required from: fixeria.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34420?usp=email )

Change subject: gsm_data: refactor/simplify and expose gsm_objclass2mo()
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34420?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: Ic03fdfabf84a1b5cd8046101c1575296914c6332
Gerrit-Change-Number: 34420
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:26:39 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-bsc[master]: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()

2023-09-15 Thread laforge

Attention is currently required from: fixeria.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34421?usp=email )

Change subject: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34421?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: Ic6c0dfe950459d07a8f506b5007a65fea1950c18
Gerrit-Change-Number: 34421
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:25:46 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: sip: test SDP forwarding via MNCC

2023-09-15 Thread laforge

Attention is currently required from: neels, pespin.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?usp=email )

Change subject: sip: test SDP forwarding via MNCC
..


Patch Set 4: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34417?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: Ib2ae8449e673f5027f01d428d3718c006f76d93e
Gerrit-Change-Number: 34417
Gerrit-PatchSet: 4
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: neels 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:25:09 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

2023-09-15 Thread laforge

Attention is currently required from: neels, pespin.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email )

Change subject: sip: tweak failure reporting for SIP messages
..


Patch Set 2: Code-Review+1

(1 comment)

File sip/SIP_Tests.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/cbd7d03c_8cd122e7
PS1, Line 195: og("FAIL: expected SIP message ", sip_expect);
 :  setverdict(fail, "Received unexpected SIP message");
> see log2str() in code.
Yeah, "f_shutdown(__FILE__, __LINE__, fail, log2str(...))" is the usual 
construct.  If logging ahead of setverdict is useful for some reason, then we 
might also shift that into the f_shutdown() helper function to avoid duplicate 
statements like here.  Not a blocker herer, but might warrant some general 
cleanup



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6
Gerrit-Change-Number: 34415
Gerrit-PatchSet: 2
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Attention: neels 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:24:24 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: neels 
Comment-In-Reply-To: laforge 
Comment-In-Reply-To: pespin 
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

2023-09-15 Thread pespin

Attention is currently required from: laforge, neels.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email )

Change subject: sip: tweak failure reporting for SIP messages
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6
Gerrit-Change-Number: 34415
Gerrit-PatchSet: 2
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Attention: neels 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:10:38 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-ttcn3-hacks[master]: sip: tweak failure reporting for SIP messages

2023-09-15 Thread pespin

Attention is currently required from: laforge, neels.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?usp=email )

Change subject: sip: tweak failure reporting for SIP messages
..


Patch Set 2:

(1 comment)

File sip/SIP_Tests.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415/comment/57cb8df1_7df1ee90
PS1, Line 195: og("FAIL: expected SIP message ", sip_expect);
 :  setverdict(fail, "Received unexpected SIP message");
> IIRC the reason why i got into the behavior to log separately is that message 
> dumps in verdicts aren […]
see log2str() in code.



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34415?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: Id48016657ebb83953fe74f65332f318edf8f75e6
Gerrit-Change-Number: 34415
Gerrit-PatchSet: 2
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-CC: pespin 
Gerrit-Attention: neels 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:10:13 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels 
Comment-In-Reply-To: laforge 
Gerrit-MessageType: comment

[S] Change in osmo-msc[master]: make two functions static

2023-09-15 Thread pespin

Attention is currently required from: neels.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-msc/+/34435?usp=email )

Change subject: make two functions static
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34435?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: I1de0f35f1606c99f34bbf4033e069aadbc64
Gerrit-Change-Number: 34435
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: neels 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:08:47 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bts[master]: oml: oml_tx_attr_resp(): handle common nm_state attributes

2023-09-15 Thread pespin

Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34433?usp=email )

Change subject: oml: oml_tx_attr_resp(): handle common nm_state attributes
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34433?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: I94702c503fea5b42d84673ccd7065c9323b733b8
Gerrit-Change-Number: 34433
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:07:22 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bts[master]: osmo-bts-{oc2g,lc15}: signal CBCH support to BSC

2023-09-15 Thread pespin

Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34430?usp=email )

Change subject: osmo-bts-{oc2g,lc15}: signal CBCH support to BSC
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34430?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: I6b4d82223dc0bdcd94cd1269bfb02047cbebe480
Gerrit-Change-Number: 34430
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:07:05 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bts[master]: oml: oml_tx_attr_resp(): pass *mo to handle_attrs_{bts,trx}()

2023-09-15 Thread pespin

Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34431?usp=email )

Change subject: oml: oml_tx_attr_resp(): pass *mo to handle_attrs_{bts,trx}()
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34431?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: I78555d7226afd0c25efc100d95642634323a7b95
Gerrit-Change-Number: 34431
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:06:47 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-bts[master]: oml: refactor generation of Get Attribute Response

2023-09-15 Thread pespin

Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bts/+/34432?usp=email )

Change subject: oml: refactor generation of Get Attribute Response
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34432?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: I531e88e789d09f8828a53813e3b2863faf0cc572
Gerrit-Change-Number: 34432
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:05:32 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-bsc[master]: oml: ipacc: log supported features using LOGL_INFO

2023-09-15 Thread pespin

Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34429?usp=email )

Change subject: oml: ipacc: log supported features using LOGL_INFO
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34429?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: Ie0b05bc9e3739b5a38b32a676641e64f2cf698ac
Gerrit-Change-Number: 34429
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:03:10 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-bsc[master]: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()

2023-09-15 Thread pespin

Attention is currently required from: fixeria.

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-bsc/+/34421?usp=email )

Change subject: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()
..


Patch Set 3: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34421?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: Ic6c0dfe950459d07a8f506b5007a65fea1950c18
Gerrit-Change-Number: 34421
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Fri, 15 Sep 2023 08:00:33 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-pcu[master]: tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in ST_RELEASING

2023-09-15 Thread pespin

pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-pcu/+/34425?usp=email )

Change subject: tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in 
ST_RELEASING
..

tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in ST_RELEASING

That code path was incorrectly removed a few commits back, re-add it.

Fixes: 40a297f3b0c8e1670d46a4974750dd3335bc7885
Change-Id: I27e61dc4b3396360327dcd377d171daa30684d23
---
M src/tbf_dl_fsm.c
1 file changed, 20 insertions(+), 0 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve




diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c
index 8d95d14..917c4b1 100644
--- a/src/tbf_dl_fsm.c
+++ b/src/tbf_dl_fsm.c
@@ -305,6 +305,14 @@
 * already ACKED since we left ST_FINISHED. This happens due to
 * fn-advance scheduling several DL blocks in advance. */
break;
+   case TBF_EV_MAX_N3105:
+   /* Triggered potentially by a poll timeout of PKT UL/DL TBF ASS.
+* Reached N3105, the MS is not responding, so stop attempting
+* using the TBF for DL assignment and change to ST_RELEASING in
+* order to simply wait until resources can be reused (see
+* st_releasing_on_enter()). */
+   tbf_dl_fsm_state_chg(fi, TBF_ST_RELEASING);
+   break;
default:
OSMO_ASSERT(0);
}

--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34425?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: I27e61dc4b3396360327dcd377d171daa30684d23
Gerrit-Change-Number: 34425
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-MessageType: merged

[S] Change in osmo-pcu[master]: tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in ST_RELEASING

2023-09-15 Thread pespin

pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-pcu/+/34425?usp=email )

Change subject: tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in 
ST_RELEASING
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34425?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: I27e61dc4b3396360327dcd377d171daa30684d23
Gerrit-Change-Number: 34425
Gerrit-PatchSet: 2
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 07:58:41 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[L] Change in osmo-sip-connector[master]: forward SDP between SIP and MNCC

2023-09-15 Thread laforge

laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-sip-connector/+/16222?usp=email )

Change subject: forward SDP between SIP and MNCC
..

forward SDP between SIP and MNCC

We have added support for sending SDP via MNCC a long time ago, but so
far the SDP section remained empty. Now, implement actually forwarding
SDP codec information between SIP and MNCC.

The aim is to let the MSC know about all codec choices the remote SIP
call leg has to offer, so that finding a codec match between local and
remote call leg becomes possible.

Store any SDP info contained in incoming SIP and MNCC messages, and send
the stored SDP to the other call leg in all outgoing SIP and MNCC
messages.

In sdp_create_file(), we used to compose fixed SDP -- instead, take the
other call leg's SDP as-is, only make sure to modify the mode (e.g.
"a=sendrecv") to reflect the current call hold state.

The RTP address and codec info in the MNCC structures is now essentially
a redundant / possibly less accurate copy of the SDP info, but leave all
of that as-is, for backwards compat.

There is codec checking that may reject unexpected codecs. The
overall/future aim is to leave all codec checking up to the MSC, but so
far just leave current behaviour unchanged, until we notice problems.

Related: SYS#5066
Related: osmo-ttcn3-hacks Ib2ae8449e673f5027f01d428d3718c006f76d93e
Change-Id: I3df5d06f38ee2d122706a9ebffde7db4f2bd6bae
---
M src/call.c
M src/call.h
M src/mncc.c
M src/sdp.c
M src/sdp.h
M src/sip.c
6 files changed, 231 insertions(+), 41 deletions(-)

Approvals:
  Jenkins Builder: Verified
  keith: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved




diff --git a/src/call.c b/src/call.c
index 9f593ea..3f7beb2 100644
--- a/src/call.c
+++ b/src/call.c
@@ -172,3 +172,20 @@
return "Unknown call type";
}
 }
+
+void call_leg_rx_sdp(struct call_leg *leg, const char *rx_sdp)
+{
+   /* If no SDP was received, keep whatever SDP was previously seen. */
+   if (!rx_sdp || !*rx_sdp || !strncmp(leg->rx_sdp, rx_sdp, 
sizeof(leg->rx_sdp))) {
+   LOGP(DAPP, LOGL_DEBUG, "call(%u) leg(0x%p) no new SDP in %s\n", 
leg->call->id, leg,
+osmo_quote_str(rx_sdp, -1));
+   LOGP(DAPP, LOGL_DEBUG, "call(%u) leg(0x%p) keep stored 
SDP=%s\n", leg->call->id, leg,
+osmo_quote_str(leg->rx_sdp, -1));
+   return;
+   }
+   LOGP(DAPP, LOGL_DEBUG, "call(%u) leg(0x%p) received new SDP=%s\n", 
leg->call->id, leg, osmo_quote_str(rx_sdp, -1));
+   LOGP(DAPP, LOGL_DEBUG, "call(%u) leg(0x%p) replaced old SDP=%s\n", 
leg->call->id, leg,
+osmo_quote_str(leg->rx_sdp, -1));
+   OSMO_STRLCPY_ARRAY(leg->rx_sdp, rx_sdp);
+   leg->rx_sdp_changed = true;
+}
diff --git a/src/call.h b/src/call.h
index a835f71..cd8d630 100644
--- a/src/call.h
+++ b/src/call.h
@@ -62,7 +62,11 @@
/* SDP as received for this call leg. If this is an MNCC call leg, 
contains the SDP most recently received in an
 * MNCC message; if this is a SIP call leg, contains the SDP most 
recently received in a SIP message. If no SDP
 * was received yet, this string is empty. Otherwise a nul terminated 
string. */
-   char sdp[1024];
+   char rx_sdp[1024];
+   /* If the contents of rx_sdp[] changes, set rx_sdp_changed = true. When 
the other call leg transmits the next
+* message, it can decide whether to include SDP because there is new 
information, or whether to omit SDP
+* because it was already sent identically earlier. */
+   bool rx_sdp_changed;

/**
 * Remote started to ring/alert
@@ -167,6 +171,8 @@

 struct call_leg *call_leg_other(struct call_leg *leg);

+void call_leg_rx_sdp(struct call_leg *cl, const char *rx_sdp);
+
 void call_leg_release(struct call_leg *leg);


diff --git a/src/mncc.c b/src/mncc.c
index 02ba2cc..ed36085 100644
--- a/src/mncc.c
+++ b/src/mncc.c
@@ -170,12 +170,14 @@
return rc;
 }

-static int mncc_rtp_send(struct mncc_connection *conn, uint32_t msg_type, 
uint32_t callref)
+static int mncc_rtp_send(struct mncc_connection *conn, uint32_t msg_type, 
uint32_t callref, const char *sdp)
 {
struct gsm_mncc_rtp mncc = { 0, };

mncc.msg_type = msg_type;
mncc.callref = callref;
+   if (sdp)
+   OSMO_STRLCPY_ARRAY(mncc.sdp, sdp);

return mncc_rtp_write(conn, );
 }
@@ -195,6 +197,10 @@
mncc.callref = leg->callref;
mncc.addr = other->addr;
mncc.payload_type = other->payload_type;
+
+   /* Forward whichever SDP was last received on the other call leg */
+   OSMO_STRLCPY_ARRAY(mncc.sdp, other->rx_sdp);
+
/*
 * FIXME: mncc.payload_msg_type should already be compatible.. but
 * payload_type should be different..
@@ -408,6 +414,8 @@
return;
}

+

[L] Change in osmo-sip-connector[master]: forward SDP between SIP and MNCC

2023-09-15 Thread laforge

Attention is currently required from: neels, pespin.

laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sip-connector/+/16222?usp=email )

Change subject: forward SDP between SIP and MNCC
..


Patch Set 10: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16222?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I3df5d06f38ee2d122706a9ebffde7db4f2bd6bae
Gerrit-Change-Number: 16222
Gerrit-PatchSet: 10
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: keith 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Reviewer: pespin 
Gerrit-Attention: neels 
Gerrit-Attention: pespin 
Gerrit-Comment-Date: Fri, 15 Sep 2023 07:25:32 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

76 matches

Mail list logo