date:20231123

[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes

2023-11-23 Thread fixeria

Attention is currently required from: daniel, laforge, lynxis lazus, osmith.

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

Change subject: libgtp: Check for all successful create_pdp_conf causes
..


Patch Set 3: Code-Review+1

(1 comment)

File src/sgsn/sgsn_libgtp.c:

https://gerrit.osmocom.org/c/osmo-sgsn/+/35094/comment/bf8cb339_100396de
PS2, Line 420:  if (gtp_cause_successful(cause)) {
> true is false ☯
Done



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

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
Gerrit-Change-Number: 35094
Gerrit-PatchSet: 3
Gerrit-Owner: daniel 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Attention: osmith 
Gerrit-Attention: laforge 
Gerrit-Attention: daniel 
Gerrit-Attention: lynxis lazus 
Gerrit-Comment-Date: Fri, 24 Nov 2023 07:44:15 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: daniel 
Gerrit-MessageType: comment

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder

2023-11-23 Thread fixeria

Attention is currently required from: laforge.

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

Change subject: Add a GSM RLP decoder and encoder
..


Patch Set 2:

(1 comment)

Patchset:

PS2:
Would be also nice to have some unit test coverage.



--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?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: I2d9bd8eb4f0cd0f72c436996767b199429596917
Gerrit-Change-Number: 35123
Gerrit-PatchSet: 2
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Fri, 24 Nov 2023 07:42:41 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder

2023-11-23 Thread fixeria

Attention is currently required from: laforge.

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

Change subject: Add a GSM RLP decoder and encoder
..


Patch Set 2:

(6 comments)

File include/osmocom/gsm/rlp.h:

https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/e6e943e7_0d077a3a
PS2, Line 24: GSM A5 ciphering algorithm
copy-paste


https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/db8bb2e2_82c0f279
PS2, Line 28: 24.002
It should actually be TS 24.022.


https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/4d173cf8_6ad9a36f
PS2, Line 75: osmo_rlp_decode
also expose `osmo_rlp_encode`?


File src/gsm/libosmogsm.map:

https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/9ecd737a_db24db2c
PS2, Line 863: osmo_rlp_decode
also expose `osmo_rlp_encode`?


File src/gsm/rlp.c:

https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/e86caeff_197bfc48
PS2, Line 77: EINVAL
`ENOTSUP`


https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/3c8d5198_9efab098
PS2, Line 121: EINVAL
`ENOTSUP`



--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?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: I2d9bd8eb4f0cd0f72c436996767b199429596917
Gerrit-Change-Number: 35123
Gerrit-PatchSet: 2
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Fri, 24 Nov 2023 07:42:10 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[S] Change in osmo-msc[master]: call_leg: silence some false errors

2023-11-23 Thread fixeria

Attention is currently required from: neels.

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

Change subject: call_leg: silence some false errors
..


Patch Set 1: Code-Review+2


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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I9b1fd63ed1ee7ed2877a4b2059386354598f4ea4
Gerrit-Change-Number: 35100
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: neels 
Gerrit-Comment-Date: Fri, 24 Nov 2023 07:32:04 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle

2023-11-23 Thread fixeria

Attention is currently required from: dexter.

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

Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on 
idle
..


Patch Set 1: Code-Review+1

(1 comment)

File src/bts.h:

https://gerrit.osmocom.org/c/osmo-pcu/+/35096/comment/b6be7124_a8a58beb
PS1, Line 282: idele
idle



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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17
Gerrit-Change-Number: 35096
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-CC: laforge 
Gerrit-Attention: dexter 
Gerrit-Comment-Date: Fri, 24 Nov 2023 07:29:43 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder

2023-11-23 Thread laforge

Attention is currently required from: fixeria.

Hello Jenkins Builder, fixeria,

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

https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email

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

The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder


Change subject: Add a GSM RLP decoder and encoder
..

Add a GSM RLP decoder and encoder

This code implements a decoder and encoder for the RLP (Radio Link
Protocol) as used in the bearer channel of GSM CSD (Circuit Switched
Data).

Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917
---
M include/osmocom/gsm/Makefile.am
A include/osmocom/gsm/rlp.h
M src/gsm/Makefile.am
M src/gsm/libosmogsm.map
A src/gsm/rlp.c
5 files changed, 329 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/35123/2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?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: I2d9bd8eb4f0cd0f72c436996767b199429596917
Gerrit-Change-Number: 35123
Gerrit-PatchSet: 2
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: fixeria 
Gerrit-MessageType: newpatchset

[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode

2023-11-23 Thread laforge

Attention is currently required from: fixeria.

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

Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode
..


Patch Set 1:

(1 comment)

Patchset:

PS1:
this needs to be vty-configurable and should likely contain a [default] setting 
of suppressing any NULL Frames to avoid filling the pcap with uesless info



--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219
Gerrit-Change-Number: 35124
Gerrit-PatchSet: 1
Gerrit-Owner: laforge 
Gerrit-Reviewer: fixeria 
Gerrit-CC: Jenkins Builder
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Thu, 23 Nov 2023 22:19:49 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode

2023-11-23 Thread laforge

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


Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode
..

Add GSMTAP encapsulation of RLP frames in CSD NT mode

In CSD (Circuit Switched Data) NT (Non-Transparent) mode, there
are RLP (Radio Link Protocol) frames inside the modified V.110.

wireshark alrady has a dissector for this, and we've introduced
a GSMTAP type for RLP some time ago.  So with this patch, we now
generate such GSMTAP RLP frames.

Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219
---
M src/common/l1sap.c
1 file changed, 55 insertions(+), 3 deletions(-)



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

diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index c599726..4b2ca02 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1841,19 +1841,54 @@
return 1;
 }

-static void send_ul_rtp_packet_data(struct gsm_lchan *lchan, uint32_t fn,
+static void gsmtap_csd_ul(struct gsm_lchan *lchan, const struct ph_tch_param 
*tch_ind, const uint8_t *data, unsigned int data_len)
+{
+   struct gsm_bts_trx *trx = lchan->ts->trx;
+   struct gsmtap_inst *inst = trx->bts->gsmtap.inst;
+   if (!inst)
+   return;
+
+   if (lchan->csd_mode == LCHAN_CSD_M_NT) {
+   pbit_t buf[data_len/8+1];
+   int len = osmo_ubit2pbit_ext(buf, 0, data, 0, data_len, 1);
+   gsmtap_send_ex(inst, GSMTAP_TYPE_GSM_RLP, trx->arfcn | 
GSMTAP_ARFCN_F_UPLINK, lchan->ts->nr,
+   lchan->type == GSM_LCHAN_TCH_H ? 
GSMTAP_CHANNEL_TCH_H : GSMTAP_CHANNEL_TCH_F,
+   lchan->nr, tch_ind->fn, tch_ind->rssi, 0, buf, 
len);
+
+   }
+}
+
+static void gsmtap_csd_dl(struct gsm_lchan *lchan, const uint8_t *data, 
unsigned int data_len)
+{
+   struct gsm_bts_trx *trx = lchan->ts->trx;
+   struct gsmtap_inst *inst = trx->bts->gsmtap.inst;
+   if (!inst)
+   return;
+
+   if (lchan->csd_mode == LCHAN_CSD_M_NT) {
+   pbit_t buf[data_len/8+1];
+   int len = osmo_ubit2pbit_ext(buf, 0, data, 0, data_len, 1);
+   gsmtap_send_ex(inst, GSMTAP_TYPE_GSM_RLP, trx->arfcn, 
lchan->ts->nr,
+   lchan->type == GSM_LCHAN_TCH_H ? 
GSMTAP_CHANNEL_TCH_H : GSMTAP_CHANNEL_TCH_F,
+   lchan->nr, 0, 0, 0, buf, len);
+   }
+}
+
+static void send_ul_rtp_packet_data(struct gsm_lchan *lchan, const struct 
ph_tch_param *tch_ind,
const uint8_t *data, uint16_t data_len)
 {
uint8_t rtp_pl[RFC4040_RTP_PLEN];
int rc;

+   gsmtap_csd_ul(lchan, tch_ind, data, data_len);
+
rc = csd_v110_rtp_encode(lchan, _pl[0], data, data_len);
if (rc < 0)
return;

osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket,
_pl[0], sizeof(rtp_pl),
-   fn_ms_adj(fn, lchan),
+   fn_ms_adj(tch_ind->fn, lchan),
lchan->rtp_tx_marker);
/* Only clear the marker bit once we have sent a RTP packet with it */
lchan->rtp_tx_marker = false;
@@ -1987,7 +2022,7 @@
send_ul_rtp_packet_speech(lchan, fn, msg->data, 
msg->len);
break;
case RSL_CMOD_SPD_DATA:
-   send_ul_rtp_packet_data(lchan, fn, msg->data, msg->len);
+   send_ul_rtp_packet_data(lchan, tch_ind, msg->data, 
msg->len);
break;
case RSL_CMOD_SPD_SIGN:
return 0; /* drop stale TCH.ind */
@@ -2296,6 +2331,7 @@
int rc = csd_v110_rtp_decode(lchan, msg->tail,
 rtp_pl, rtp_pl_len);
if (rc > 0) {
+   gsmtap_csd_dl(lchan, msg->tail, rc);
msgb_put(msg, rc);
} else {
msgb_free(msg);

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

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder

2023-11-23 Thread Jenkins Builder

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

Change subject: Add a GSM RLP decoder and encoder
..


Patch Set 1:

(1 comment)

File src/gsm/rlp.c:

Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12602):
https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/02357150_8ba1b962
PS1, Line 169:  fcs = osmo_rlp_fcs_compute(out, out_len -3);
need consistent spacing around '-' (ctx:WxV) (or typedef missing in 
osmo-ci/lint/checkpatch/typedefs_osmo.txt?)



--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?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: I2d9bd8eb4f0cd0f72c436996767b199429596917
Gerrit-Change-Number: 35123
Gerrit-PatchSet: 1
Gerrit-Owner: laforge 
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Thu, 23 Nov 2023 22:13:59 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder

2023-11-23 Thread laforge

laforge has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email )


Change subject: Add a GSM RLP decoder and encoder
..

Add a GSM RLP decoder and encoder

This code implements a decoder and encoder for the RLP (Radio Link
Protocol) as used in the bearer channel of GSM CSD (Circuit Switched
Data).

Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917
---
M include/osmocom/gsm/Makefile.am
A include/osmocom/gsm/rlp.h
M src/gsm/Makefile.am
M src/gsm/libosmogsm.map
A src/gsm/rlp.c
5 files changed, 329 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/35123/1

diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am
index f840a27..5678a51 100644
--- a/include/osmocom/gsm/Makefile.am
+++ b/include/osmocom/gsm/Makefile.am
@@ -48,6 +48,7 @@
l1sap.h \
oap.h \
oap_client.h \
+   rlp.h \
rsl.h \
rxlev_stat.h \
sysinfo.h \
diff --git a/include/osmocom/gsm/rlp.h b/include/osmocom/gsm/rlp.h
new file mode 100644
index 000..c0f2f81
--- /dev/null
+++ b/include/osmocom/gsm/rlp.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2022-2023 Harald Welte 
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+
+#pragma once
+#include 
+#include 
+#include 
+
+/*! \defgroup rlp GSM A5 ciphering algorithm
+ *  @{
+ * \file rlp.h */
+
+/*! RLP frame type as per 3GPP TS 24.002 Section 5.2.1 */
+enum osmo_rlp_ftype {
+   OSMO_RLP_FT_U,
+   OSMO_RLP_FT_S,
+   OSMO_RLP_FT_IS,
+};
+extern const struct value_string osmo_rlp_ftype_vals[];
+
+/*! RLP U-Frame Type as per 3GPP TS 24.002 Section 5.2.1 */
+enum osmo_rlp_u_ftype {
+   OSMO_RLP_U_FT_SABM  = 0x07,
+   OSMO_RLP_U_FT_UA= 0x0c,
+   OSMO_RLP_U_FT_DISC  = 0x08,
+   OSMO_RLP_U_FT_DM= 0x03,
+   OSMO_RLP_U_FT_NULL  = 0x0f,
+   OSMO_RLP_U_FT_UI= 0x00,
+   OSMO_RLP_U_FT_XID   = 0x17,
+   OSMO_RLP_U_FT_TEST  = 0x1c,
+   OSMO_RLP_U_FT_REMAP = 0x11,
+};
+extern const struct value_string osmo_rlp_ftype_u_vals[];
+
+/*! RLP S-Frame type as per 3GPP TS 24.002 Section 5.2.1 */
+enum osmo_rlp_s_ftype {
+   OSMO_RLP_S_FT_RR= 0,
+   OSMO_RLP_S_FT_REJ   = 2,
+   OSMO_RLP_S_FT_RNR   = 1,
+   OSMO_RLP_S_FT_SREJ  = 3,
+};
+extern const struct value_string osmo_rlp_ftype_s_vals[];
+
+/*! Data structure representing one decoded RLP frame */
+struct osmo_rlp_frame_decoded {
+   uint8_t version;
+   enum osmo_rlp_ftype ftype;
+   enum osmo_rlp_u_ftype u_ftype;
+   enum osmo_rlp_s_ftype s_ftype;
+   bool c_r;
+   bool p_f;
+   uint8_t s_bits;
+   uint16_t n_s;
+   uint16_t n_r;
+   uint32_t fcs;
+   uint8_t info[536/8];
+   uint16_t info_len;
+};
+
+int osmo_rlp_decode(struct osmo_rlp_frame_decoded *out, uint8_t version, const 
uint8_t *data, size_t data_len);
+uint32_t osmo_rlp_fcs_compute(const uint8_t *in, size_t in_len);
+
+/*! @} */
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index a01189c..67ecf9d 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -36,7 +36,7 @@
gsup.c gsup_sms.c gprs_gea.c gsm0503_conv.c oap.c 
gsm0808_utils.c \
gsm23003.c gsm23236.c mncc.c bts_features.c 
oap_client.c \
gsm29118.c gsm48_rest_octets.c cbsp.c gsm48049.c \
-   gad.c bsslap.c bssmap_le.c kdf.c iuup.c gsm44021.c 
gsm44068.c
+   gad.c bsslap.c bssmap_le.c kdf.c iuup.c gsm44021.c 
gsm44068.c rlp.c

 libgsmint_la_LDFLAGS = -no-undefined
 libgsmint_la_LIBADD = $(top_builddir)/src/core/libosmocore.la 
$(top_builddir)/src/isdn/libosmoisdn.la
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index 056d320..19f0254 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -860,5 +860,11 @@
 osmo_csd_3k6_encode_frame;
 osmo_csd_ubit_dump;

+osmo_rlp_decode;
+osmo_rlp_fcs_compute;
+osmo_rlp_ftype_s_vals;
+osmo_rlp_ftype_u_vals;
+osmo_rlp_ftype_vals;
+
 local: *;
 };
diff --git a/src/gsm/rlp.c b/src/gsm/rlp.c
new file mode 100644
index 000..397c89c
--- /dev/null
+++ b/src/gsm/rlp.c
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2022-2023 Harald Welte 
+ *
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or

[L] Change in libosmocore[master]: core: Add software UART implementation

2023-11-23 Thread fixeria

Attention is currently required from: laforge.

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

Change subject: core: Add software UART implementation
..


Patch Set 4:

(3 comments)

File include/osmocom/core/soft_uart.h:

https://gerrit.osmocom.org/c/libosmocore/+/30763/comment/8cd3f6c6_22facbf6
PS3, Line 38:   OSMO_SUART_F_BREAK  = (1 << 2),
So far there was no need to do anything else with those flags other than 
setting/unsetting and checking them. In the original Harald's code it was 
actually as you suggested (0, 1, 2), but the code was using them incorrectly, 
as if they were the actual flags (i.e. without doing 1 << N). So I fixed the 
problem this way.

> Anyway, just saying, if FOO_FIVE == 0x10, it's not so trivial to calculate 
> that back to a 5.)

In the worst case one can use the libc's `ffs()` function.
But well, even you cannot remember the actual use case for doing this math :P


https://gerrit.osmocom.org/c/libosmocore/+/30763/comment/14be204f_4345560c
PS3, Line 52: stop bots
> a stop bot, is that a traffic light? =)
Haha! Nice one :D  Fixed in this patch:
https://gerrit.osmocom.org/c/libosmocore/+/35122


File src/core/soft_uart.c:

https://gerrit.osmocom.org/c/libosmocore/+/30763/comment/c0506d87_99e2c06b
PS3, Line 4:  * (C) 2022 by Harald Welte 
> 2022-2023? […]
This patch is mostly Harald's original code from 2022 
(https://cgit.osmocom.org/libosmocore/commit/?h=laforge/libosmoisdn=c776de6a83b78b39c183467acc768f8663721605)
 with a small number of cosmetic edits from my side, plus the `OSMO_SUART_F_` 
fix that I squashed into this patch. The code is further improved and completed 
in subsequent patches (one of them adding Sysmocom to this header).



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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2ca95963fd5852ddb89bdd35b86b31489127fe84
Gerrit-Change-Number: 30763
Gerrit-PatchSet: 4
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly 
Gerrit-Reviewer: laforge 
Gerrit-CC: fixeria 
Gerrit-CC: neels 
Gerrit-Attention: laforge 
Gerrit-Comment-Date: Thu, 23 Nov 2023 20:05:20 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels 
Gerrit-MessageType: comment

[S] Change in libosmocore[master]: soft_uart: fix spelling in doxygen docs

2023-11-23 Thread fixeria

fixeria has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libosmocore/+/35122?usp=email )


Change subject: soft_uart: fix spelling in doxygen docs
..

soft_uart: fix spelling in doxygen docs

Change-Id: Ib719d1fe4ee6c058860e861c91ec2417d9dff0af
---
M include/osmocom/core/soft_uart.h
1 file changed, 12 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/35122/1

diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h
index 2b108c4..097d2ee 100644
--- a/include/osmocom/core/soft_uart.h
+++ b/include/osmocom/core/soft_uart.h
@@ -51,7 +51,7 @@
 struct osmo_soft_uart_cfg {
/*! number of data bits (typically 5, 6, 7 or 8) */
uint8_t num_data_bits;
-   /*! number of stop bots (typically 1 or 2) */
+   /*! number of stop bits (typically 1 or 2) */
uint8_t num_stop_bits;
/*! parity mode (none, even, odd) */
enum osmo_soft_uart_parity_mode parity_mode;
@@ -59,7 +59,7 @@
 *  before calling the receive call-back */
unsigned int rx_buf_size;
/*! receive timeout; UART will flush receive buffer via the receive 
call-back
-* after indicated number of milli-seconds even if it is not full yet */
+* after indicated number of milliseconds even if it is not full yet */
unsigned int rx_timeout_ms;

/*! opaque application-private data; passed to call-backs */
@@ -71,7 +71,7 @@
void (*rx_cb)(void *priv, struct msgb *rx_data, unsigned int flags);

/*! transmit call-back. The implementation is expected to provide at 
most
-* tx_data->data_len characters (the actual amount is detetmined by the
+* tx_data->data_len characters (the actual amount is determined by the
 * number of requested bits and the effective UART configuration). */
void (*tx_cb)(void *priv, struct msgb *tx_data);


--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35122?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: Ib719d1fe4ee6c058860e861c91ec2417d9dff0af
Gerrit-Change-Number: 35122
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria 
Gerrit-MessageType: newchange

[S] Change in pysim[master]: pySim-shell: refuse to execute a startup script on initialization errors

2023-11-23 Thread fixeria

Attention is currently required from: dexter, laforge.

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

Change subject: pySim-shell: refuse to execute a startup script on 
initialization errors
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b
Gerrit-Change-Number: 35102
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Attention: laforge 
Gerrit-Attention: dexter 
Gerrit-Comment-Date: Thu, 23 Nov 2023 19:41:20 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in pysim[master]: app: do not catch exceptions in init_card

2023-11-23 Thread fixeria

Attention is currently required from: dexter, laforge.

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

Change subject: app: do not catch exceptions in init_card
..


Patch Set 1:

(1 comment)

File pySim/app.py:

https://gerrit.osmocom.org/c/pysim/+/35101/comment/83ab8558_2c1e42ce
PS1, Line 69: raise ValueError
Not sure about this particular change. IIUC, currently it is possible to 
interact with the card, even if no matching profile could be found. With your 
patch it's no longer possible because you raise an exception instead of 
returning `(None, card)`.



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

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d
Gerrit-Change-Number: 35101
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Attention: laforge 
Gerrit-Attention: dexter 
Gerrit-Comment-Date: Thu, 23 Nov 2023 19:40:03 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes

2023-11-23 Thread daniel

Attention is currently required from: laforge, lynxis lazus, osmith.

daniel has removed a vote from this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email )


Change subject: libgtp: Check for all successful create_pdp_conf causes
..


Removed Code-Review-2 by daniel 
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
Gerrit-Change-Number: 35094
Gerrit-PatchSet: 3
Gerrit-Owner: daniel 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Attention: osmith 
Gerrit-Attention: laforge 
Gerrit-Attention: lynxis lazus 
Gerrit-MessageType: deleteVote

[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes

2023-11-23 Thread daniel

Attention is currently required from: laforge, lynxis lazus, osmith.

Hello Jenkins Builder, laforge, lynxis lazus, osmith,

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

https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email

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

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


Change subject: libgtp: Check for all successful create_pdp_conf causes
..

libgtp: Check for all successful create_pdp_conf causes

Related: OS#6268
Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
---
M TODO-RELEASE
M src/sgsn/sgsn_libgtp.c
2 files changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/94/35094/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
Gerrit-Change-Number: 35094
Gerrit-PatchSet: 3
Gerrit-Owner: daniel 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Attention: osmith 
Gerrit-Attention: laforge 
Gerrit-Attention: lynxis lazus 
Gerrit-MessageType: newpatchset

[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes

2023-11-23 Thread daniel

Attention is currently required from: laforge, lynxis lazus.

daniel has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email )

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

Change subject: libgtp: Check for all successful create_pdp_conf causes
..


Patch Set 2: Code-Review-2

(1 comment)

File src/sgsn/sgsn_libgtp.c:

https://gerrit.osmocom.org/c/osmo-sgsn/+/35094/comment/7fd2de4e_82e04695
PS2, Line 420:  if (gtp_cause_successful(cause)) {
true is false ☯



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

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
Gerrit-Change-Number: 35094
Gerrit-PatchSet: 2
Gerrit-Owner: daniel 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: lynxis lazus 
Gerrit-Reviewer: osmith 
Gerrit-Attention: laforge 
Gerrit-Attention: lynxis lazus 
Gerrit-Comment-Date: Thu, 23 Nov 2023 16:58:17 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[L] Change in docker-playground[master]: open5gs configs: update to current format

2023-11-23 Thread fixeria

Attention is currently required from: osmith.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email )

Change subject: open5gs configs: update to current format
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6
Gerrit-Change-Number: 35105
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 16:47:52 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in docker-playground[master]: open5gs configs: duplicate cfgs for latest/master

2023-11-23 Thread fixeria

Attention is currently required from: osmith.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email )

Change subject: open5gs configs: duplicate cfgs for latest/master
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2
Gerrit-Change-Number: 35104
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 16:36:47 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[XL] Change in docker-playground[master]: open5gs configs: remove comments

2023-11-23 Thread fixeria

Attention is currently required from: osmith.

fixeria has posted comments on this change. ( 
https://gerrit.osmocom.org/c/docker-playground/+/35103?usp=email )

Change subject: open5gs configs: remove comments
..


Patch Set 1: Code-Review+1


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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I67c2a198b9682e15e23a466380e62a976e6236cd
Gerrit-Change-Number: 35103
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: fixeria 
Gerrit-Attention: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 16:35:11 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-hnodeb[master]: Use 'iuh/local-ip' as local IP for RTP sockets

2023-11-23 Thread laforge

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

Change subject: Use 'iuh/local-ip' as local IP for RTP sockets
..

Use 'iuh/local-ip' as local IP for RTP sockets

Don't use the wildcard IPv4 address for RTP sockets, but instead use
the address explicitly configured by the user for the Iuh interface.

Closes: SYS#6657
Change-Id: I90e2cbb1765d4d2db5a19f64f0ff09cdc18b7911
Depends: libosmocore.git Change-Id I6b5c0bf8ca97e6358d992fb2ff45ffd53ba15197
---
M TODO-RELEASE
M include/osmocom/hnodeb/rtp.h
M src/osmo-hnodeb/llsk_audio.c
M src/osmo-hnodeb/rtp.c
4 files changed, 30 insertions(+), 12 deletions(-)

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




diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..2c9f8ba 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
 # If any interfaces have been added since the last public release: c:r:a + 1.
 # If any interfaces have been removed or changed since the last public 
release: c:r:0.
 #library   whatdescription / commit summary line
+libosmocoredepend >= 1.9.0 we need 
osmo_sockaddr_from_str_and_uint()
diff --git a/include/osmocom/hnodeb/rtp.h b/include/osmocom/hnodeb/rtp.h
index 5eaec7b..dbb33c5 100644
--- a/include/osmocom/hnodeb/rtp.h
+++ b/include/osmocom/hnodeb/rtp.h
@@ -40,5 +40,6 @@
 struct rtp_conn *rtp_conn_alloc(struct hnb_ue *ue);
 void rtp_conn_free(struct rtp_conn *conn);

-int rtp_conn_setup(struct rtp_conn *conn, const struct osmo_sockaddr 
*rem_addr, const struct hnb_audio_conn_establish_req_param *ce_req);
+int rtp_conn_setup(struct rtp_conn *conn, const char *local_ipstr, const 
struct osmo_sockaddr *rem_addr,
+  const struct hnb_audio_conn_establish_req_param *ce_req);
 int rtp_conn_tx_data(struct rtp_conn *conn, uint8_t frame_nr, uint8_t fqc, 
uint8_t rfci, const uint8_t *data, unsigned int data_len);
diff --git a/src/osmo-hnodeb/llsk_audio.c b/src/osmo-hnodeb/llsk_audio.c
index a545ee7..3140f83 100644
--- a/src/osmo-hnodeb/llsk_audio.c
+++ b/src/osmo-hnodeb/llsk_audio.c
@@ -210,7 +210,7 @@

/* Create the socket: */
conn = rtp_conn_alloc(ue);
-   if ((rc = rtp_conn_setup(conn, _osa, ce_req)) < 0) {
+   if ((rc = rtp_conn_setup(conn, hnb->iuh.local_addr, _osa, ce_req)) 
< 0) {
LOGUE(ue, DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: 
Failed to set up audio socket rem_addr=%s\n",
  rem_addrstr);
return _send_conn_establish_cnf_failed(hnb, v0->context_id, 4);
diff --git a/src/osmo-hnodeb/rtp.c b/src/osmo-hnodeb/rtp.c
index 422e043..6213eee 100644
--- a/src/osmo-hnodeb/rtp.c
+++ b/src/osmo-hnodeb/rtp.c
@@ -263,14 +263,13 @@
  "Failed passing rx rtp up to IuUP layer: %d\n", rc);
 }

-int rtp_conn_setup(struct rtp_conn *conn, const struct osmo_sockaddr *rem_addr,
+int rtp_conn_setup(struct rtp_conn *conn, const char *local_ipstr, const 
struct osmo_sockaddr *rem_addr,
   const struct hnb_audio_conn_establish_req_param *ce_req)
 {
int rc;
char cname[256+4];
char name[32];
struct osmo_rtp_socket *rs;
-   const char *local_wildcard_ipstr = "0.0.0.0";
char remote_ipstr[INET6_ADDRSTRLEN];
uint16_t remote_port;
struct osmo_iuup_rnl_prim *irp;
@@ -305,15 +304,16 @@
rs->priv = conn;
rs->rx_cb = _rx_cb;

-   rc = rtp_bind(hnb, rs, local_wildcard_ipstr);
+   rc = rtp_bind(hnb, rs, local_ipstr);
if (rc < 0) {
LOGUE(ue, DRTP, LOGL_ERROR, "Failed to bind RTP/RTCP 
sockets\n");
goto free_ret;
}
conn->id = rc; /* We use local port as rtp conn ID */
+   osmo_sockaddr_from_str_and_uint(>loc_addr, local_ipstr, rc);

/* Ensure RTCP SDES contains some useful information */
-   snprintf(cname, sizeof(cname), "hnb@%s", local_wildcard_ipstr);
+   snprintf(cname, sizeof(cname), "hnb@%s", local_ipstr);
snprintf(name, sizeof(name), "ue@%u-%u", conn->ue->conn_id, conn->id);
osmo_rtp_set_source_desc(rs, cname, name, NULL, NULL, NULL,
 "OsmoHNodeB-" PACKAGE_VERSION, NULL);
@@ -324,12 +324,14 @@
goto free_ret;
}

-   /* osmo_rtp_socket_connect() is broken, OS#5356 */
-   //rc = rtp_get_bound_addr(rs, >loc_addr);
-   rc = rtp_get_bound_addr(rs, rem_addr, >loc_addr);
-   if (rc < 0) {
-   LOGUE(ue, DRTP, LOGL_ERROR, "Cannot obtain locally bound 
IP/port: %d\n", rc);
-   goto free_ret;
+   if (osmo_sockaddr_is_any(>loc_addr)) {
+   /* osmo_rtp_socket_connect() is broken, OS#5356 */
+   //rc = rtp_get_bound_addr(rs, >loc_addr);
+   rc = rtp_get_bound_addr(rs, rem_addr, >loc_addr);
+   if (rc < 0)

[S] Change in osmo-hnodeb[master]: Use 'iuh/local-ip' as local IP for RTP sockets

2023-11-23 Thread laforge

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

Change subject: Use 'iuh/local-ip' as local IP for RTP sockets
..


Patch Set 2: Code-Review+2


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

Gerrit-Project: osmo-hnodeb
Gerrit-Branch: master
Gerrit-Change-Id: I90e2cbb1765d4d2db5a19f64f0ff09cdc18b7911
Gerrit-Change-Number: 35075
Gerrit-PatchSet: 2
Gerrit-Owner: laforge 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 16:26:32 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[XL] Change in docker-playground[master]: open5gs configs: remove comments

2023-11-23 Thread daniel

Attention is currently required from: fixeria, osmith.

daniel has posted comments on this change. ( 
https://gerrit.osmocom.org/c/docker-playground/+/35103?usp=email )

Change subject: open5gs configs: remove comments
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
Actually +2, only comment changes



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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I67c2a198b9682e15e23a466380e62a976e6236cd
Gerrit-Change-Number: 35103
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: fixeria 
Gerrit-Attention: osmith 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Thu, 23 Nov 2023 16:18:19 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[XL] Change in docker-playground[master]: open5gs configs: remove comments

2023-11-23 Thread daniel

Attention is currently required from: fixeria, osmith.

daniel has posted comments on this change. ( 
https://gerrit.osmocom.org/c/docker-playground/+/35103?usp=email )

Change subject: open5gs configs: remove comments
..


Patch Set 1: Code-Review+1

(1 comment)

Patchset:

PS1:
Very reasonable



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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I67c2a198b9682e15e23a466380e62a976e6236cd
Gerrit-Change-Number: 35103
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel 
Gerrit-Reviewer: fixeria 
Gerrit-Attention: osmith 
Gerrit-Attention: fixeria 
Gerrit-Comment-Date: Thu, 23 Nov 2023 16:17:48 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: pgw: depend on osmo-uecups

2023-11-23 Thread osmith

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

Change subject: ttcn3: pgw: depend on osmo-uecups
..

ttcn3: pgw: depend on osmo-uecups

Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d
---
M all.deps
M ttcn3/ttcn3.sh
2 files changed, 16 insertions(+), 1 deletion(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/all.deps b/all.deps
index 7857f16..5a1191a 100644
--- a/all.deps
+++ b/all.deps
@@ -35,6 +35,7 @@
 osmo-hnbgw osmo-iuh osmo-mgw libosmo-pfcp
 osmo-e1d   libosmocore
 osmo-remsimsimtrace2_host libosmo-netif
+osmo-uecupslibosmocore

 open5gs

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 85cbb6b..d665e84 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -187,9 +187,13 @@
 # Programs that need to be built
 get_programs() {
case "$PROJECT" in
+   # Open5gs
+   *-ogs) echo "open5gs" ;;
+   pgw) echo "open5gs osmo-uecups-daemon" ;;
+
+   # Osmocom
bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;;
bts) echo "osmo-bsc osmo-bts-trx" ;;
-   *-ogs|pgw) echo "open5gs" ;;
msc) echo "osmo-stp osmo-msc" ;;
pcu-sns) echo "osmo-pcu" ;;
pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;;
@@ -206,6 +210,7 @@
osmo-bts-*) echo "osmo-bts" ;;
osmo-pcap-*) echo "osmo-pcap" ;;
osmo-stp) echo "libosmo-sccp" ;;
+   osmo-uecups-*) echo "osmo-uecups" ;;
*) echo "$1" ;;
esac
 }

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d
Gerrit-Change-Number: 35121
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: ttcn3: remove unused functions

2023-11-23 Thread osmith

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

Change subject: ttcn3: remove unused functions
..

ttcn3: remove unused functions

Change-Id: I1939f1262757899c1a75c6d51cffd2ab13815c0f
---
M ttcn3/ttcn3.sh
1 file changed, 9 insertions(+), 20 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 5c3fae6..38a5c37 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -115,16 +115,6 @@
fi
 }

-# Returns the name of the testsuite binary
-get_testsuite_name() {
-   case "$PROJECT" in
-   bts-*) echo "BTS_Tests" ;;
-   mgw) echo "MGCP_Test" ;;
-   pcu-sns) echo "PCU_Tests" ;;
-   *) echo "${PROJECT_UPPER}_Tests" ;;
-   esac
-}
-
 get_testsuite_dir() {
local hacks="${DIR_OSMODEV}/src/osmo-ttcn3-hacks"
 
@@ -137,16 +127,6 @@
esac
 }

-get_testsuite_config() {
-   case "$PROJECT" in
-   bts-gprs) echo "BTS_Tests_GPRS.cfg" ;;
-   bts-oml) echo "BTS_Tests_OML.cfg" ;;
-   pcu-sns) echo "PCU_Tests_SNS.cfg" ;;
-   ggsn-ogs) echo "GGSN_Tests.cfg" ;;
-   *) echo "$(get_testsuite_name).cfg" ;;
-   esac
-}
-
 get_testsuite_dir_docker() {
local dp="${DIR_OSMODEV}/src/docker-playground"


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I1939f1262757899c1a75c6d51cffd2ab13815c0f
Gerrit-Change-Number: 35116
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: ttcn3: fix missing test name in usage desc

2023-11-23 Thread osmith

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

Change subject: ttcn3: fix missing test name in usage desc
..

ttcn3: fix missing test name in usage desc

Change-Id: I5be5ee227dac0969e12d284ec518019c75698754
---
M ttcn3/ttcn3.sh
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 3a501b0..85cbb6b 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -79,7 +79,7 @@
;;
h|*)
local name="$(basename $0)"
-   echo "usage: $name [-h] [-t] [-d|-k [-f]] PROJECT"
+   echo "usage: $name [-h] [-t TESTNAME] [-d|-k [-f]] 
PROJECT"
echo "   or: $name clean"
echo
echo "arguments:"

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I5be5ee227dac0969e12d284ec518019c75698754
Gerrit-Change-Number: 35120
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: ttcn3: add aliases hss -> hss-ogs etc.

2023-11-23 Thread osmith

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

Change subject: ttcn3: add aliases hss -> hss-ogs etc.
..

ttcn3: add aliases hss -> hss-ogs etc.

Some open5gs testsuites end in -ogs (hss, mme, ggsn), others do not
(pgw). Let the user omit -ogs and choose the right one automatically.

Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7
---
M ttcn3/ttcn3.sh
1 file changed, 31 insertions(+), 4 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 701e323..3a501b0 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -34,6 +34,12 @@
exit 0
 }

+set_project() {
+   PROJECT="$1"
+   PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')"
+   PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')"
+}
+
 parse_args() {
while getopts 'ht:dkf' OPTION; do
case "$OPTION" in
@@ -95,7 +101,9 @@
echo "  $name -k ggsn"
echo "  $name -k -f ggsn"
echo "  $name ggsn-ogs"
-   echo "  $name hss-ogs"
+   echo "  $name hss"
+   echo "  $name mme"
+   echo "  $name pgw"
exit 1
;;
esac
@@ -106,9 +114,16 @@
parse_args -h
fi

-   PROJECT="$1"
-   PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')"
-   PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')"
+   set_project "$1"
+   if ! [ -d "$(get_testsuite_dir_docker)" ]; then
+   set_project "$1-ogs"
+   if ! [ -d "$(get_testsuite_dir_docker)" ]; then
+   echo "ERROR: can't find testsuite_dir, adjust" \
+   "get_testsuite_dir_docker"
+   fi
+   fi
+
+   echo "PROJECT: $PROJECT"
 }

 check_usage() {

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7
Gerrit-Change-Number: 35119
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: ttcn3: support hss-ogs, mme-ogs, pgw

2023-11-23 Thread osmith

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

Change subject: ttcn3: support hss-ogs, mme-ogs, pgw
..

ttcn3: support hss-ogs, mme-ogs, pgw

Change-Id: I08d76e6c92e2e3eacacb02a5a6f6d589e5889499
---
M ttcn3/ttcn3.sh
1 file changed, 18 insertions(+), 4 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index a07295a..701e323 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -95,6 +95,7 @@
echo "  $name -k ggsn"
echo "  $name -k -f ggsn"
echo "  $name ggsn-ogs"
+   echo "  $name hss-ogs"
exit 1
;;
esac
@@ -107,6 +108,7 @@
 
PROJECT="$1"
PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')"
+   PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')"
 }

 check_usage() {
@@ -123,7 +125,7 @@
bts-*) echo "$hacks/bts" ;;
ggsn|ggsn-ogs) echo "$hacks/ggsn_tests" ;;
pcu-sns) echo "$hacks/pcu" ;;
-   *) echo "$hacks/$PROJECT" ;;
+   *) echo "$hacks/$PROJECT_NO_OGS" ;;
esac
 }

@@ -134,8 +136,8 @@
bsc-*)
echo "$dp/ttcn3-bsc-test-$(echo "$PROJECT" | cut -d - 
-f 2-)"
;;
-   ggsn-ogs)
-   echo "$dp/ttcn3-ggsn-test-ogs"
+   *-ogs)
+   echo "$dp/ttcn3-$PROJECT_NO_OGS-test-ogs"
;;
*)
echo "$dp/ttcn3-$PROJECT-test"
@@ -151,6 +153,9 @@
ggsn-ogs)
echo "$USER/ttcn3-ggsn-test"
;;
+   *-ogs)
+   echo "$USER/ttcn3-$PROJECT_NO_OGS-test-ogs"
+   ;;
*)
echo "$USER/ttcn3-$PROJECT-test"
;;
@@ -169,7 +174,7 @@
case "$PROJECT" in
bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;;
bts) echo "osmo-bsc osmo-bts-trx" ;;
-   ggsn-ogs) echo "open5gs" ;;
+   *-ogs|pgw) echo "open5gs" ;;
msc) echo "osmo-stp osmo-msc" ;;
pcu-sns) echo "osmo-pcu" ;;
pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;;

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I08d76e6c92e2e3eacacb02a5a6f6d589e5889499
Gerrit-Change-Number: 35118
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[M] Change in osmo-dev[master]: ttcn3: add ggsn-ogs

2023-11-23 Thread osmith

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

Change subject: ttcn3: add ggsn-ogs
..

ttcn3: add ggsn-ogs

Change-Id: Id84047e56a6c07fbf0984eb6aedcecd4d7f3ae97
---
M .gitignore
M gen_makefile.py
M ttcn3/scripts/docker_configure_make.sh
M ttcn3/ttcn3.sh
4 files changed, 82 insertions(+), 25 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/.gitignore b/.gitignore
index 2e88651..406a33b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 ttcn3/make/
 ttcn3/.run.sh
 ttcn3/usr_local
+ttcn3/var_local
 current_log
 lastlog
 autolog
diff --git a/gen_makefile.py b/gen_makefile.py
index d306364..3f6a994 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -364,7 +364,7 @@
   deps_installed = ' '.join(['.make.%s.install' % d for d in deps])
   deps_reinstall = ' '.join(['%s-reinstall' %d for d in deps])
   cflags = 'CFLAGS=-g ' if args.build_debug else ''
-  docker_cmd = f'{args.docker_cmd} ' if args.docker_cmd else ''
+  docker_cmd = f'OSMODEV_PROJECT={proj} {args.docker_cmd} ' if args.docker_cmd 
else ''
   check = 'check' if make_check else ''
   no_ldconfig = '#' if no_ldconfig else ''
   sudo_ldconfig = '' if ldconfig_without_sudo else 'sudo '
diff --git a/ttcn3/scripts/docker_configure_make.sh 
b/ttcn3/scripts/docker_configure_make.sh
index 7a79ff1..e6857fd 100755
--- a/ttcn3/scripts/docker_configure_make.sh
+++ b/ttcn3/scripts/docker_configure_make.sh
@@ -4,16 +4,60 @@
 # location inside the docker container. A usr_local dir is mounted to
 # /usr/local, so 'make install' can put all files there and following builds
 # have the files available.
+# env vars: OSMODEV_PROJECT
 DIR_OSMODEV="$(readlink -f "$(dirname $0)/../..")"
 DIR_MAKE="$DIR_OSMODEV/ttcn3/make"
 DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local"
+DIR_VAR_LOCAL="$DIR_OSMODEV/ttcn3/var_local"
 DIR_CCACHE="$DIR_OSMODEV/ttcn3/ccache/osmocom-programs"
 RUN_SCRIPT="$DIR_OSMODEV/ttcn3/.run.sh"
-DOCKER_IMG="$1"
 UID="$(id -u)"
-shift

-mkdir -p "$DIR_MAKE" "$DIR_CCACHE"
+# Osmocom libraries and programs relevant for the current testsuite will be
+# built in this container. It must have all build dependencies available and
+# be based on the same distribution that master-* containers are based on, so
+# there are no incompatibilities with shared libraries.
+DOCKER_IMG_BUILD="debian-bookworm-build"
+DOCKER_IMG_BUILD_OGS="open5gs-master"
+
+docker_image_exists() {
+   test -n "$(docker images -q "$1")"
+}
+
+build_docker_img() {
+   local img="$1"
+   local dp="${DIR_OSMODEV}/src/docker-playground"
+
+   if ! docker_image_exists "$USER/$img"; then
+   echo "Building docker image: $USER/$img"
+   make -C "$dp/$img"
+   fi
+}
+
+build_docker_imgs() {
+   build_docker_img "$DOCKER_IMG_BUILD"
+
+   if [ "$OSMODEV_PROJECT" = "open5gs" ]; then
+   build_docker_img "$DOCKER_IMG_BUILD_OGS"
+   fi
+}
+
+set_docker_img_var() {
+   case "$OSMODEV_PROJECT" in
+   open5gs)
+   DOCKER_IMG="$USER/$DOCKER_IMG_BUILD_OGS"
+   ;;
+   *)
+   DOCKER_IMG="$USER/$DOCKER_IMG_BUILD"
+   ;;
+   esac
+}
+
+mkdir -p \
+   "$DIR_MAKE" \
+   "$DIR_CCACHE" \
+   "$DIR_USR_LOCAL" \
+   "$DIR_VAR_LOCAL"

 # Script running as user inside docker
 echo "#!/bin/sh -ex" > "$RUN_SCRIPT"
@@ -24,12 +68,16 @@
 echo >> "$RUN_SCRIPT"
 chmod +x "$RUN_SCRIPT"

+build_docker_imgs
+set_docker_img_var
+
 docker run \
--rm \
-t \
-e "LD_LIBRARY_PATH=/usr/local/lib" \
-v "$DIR_OSMODEV:$DIR_OSMODEV" \
-v "$DIR_USR_LOCAL:/usr/local" \
+   -v "$DIR_VAR_LOCAL:/var/local" \
-v "$RUN_SCRIPT:/tmp/run.sh:ro" \
-v "$DIR_CCACHE:/home/build/.ccache" \
"$DOCKER_IMG" \
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 3426e7b..5c3fae6 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -5,16 +5,11 @@
 DIR_MAKE="${DIR_MAKE:-${DIR_OSMODEV}/ttcn3/make}"
 DIR_OUTPUT="${DIR_OUTPUT:-${DIR_OSMODEV}/ttcn3/out}"
 DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local"
+DIR_VAR_LOCAL="$DIR_OSMODEV/ttcn3/var_local"
 JOBS="$(nproc)"
 KERNEL_DIR=""
 KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source"
 ARG_TEST_NAME=""
-
-# Osmocom libraries and programs relevant for the current testsuite will be
-# built in this container. It must have all build dependencies available and
-# be based on the same distribution that master-* containers are based on, so
-# there are no incompatibilities with shared libraries.
-DOCKER_IMG_BUILD="debian-bookworm-build"
 DOCKER_IMG_TITAN="debian-bookworm-titan"

 clean() {
@@ -29,7 +24,8 @@
rm -rf \
"$DIR_MAKE" \
"$DIR_OUTPUT" \
-   "$DIR_USR_LOCAL"
+   "$DIR_USR_LOCAL" \
+   "$DIR_VAR_LOCAL"

if [ -d "$DIR_OSMODEV/src/osmo-ttcn3-hacks" ]; then

[S] Change in osmo-dev[master]: ttcn3: run_docker: remove :ro

2023-11-23 Thread osmith

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

Change subject: ttcn3: run_docker: remove :ro
..

ttcn3: run_docker: remove :ro

Don't mount usr_local, var_local as read-only, so the environment is
more similar to our jenkins.

Fix for:
  + /data/upfd-setup.sh
  + command -v open5gs-upfd
  + upfd_bin=/usr/local/bin/open5gs-upfd
  + setcap cap_net_raw+ep /usr/local/bin/open5gs-upfd
  Failed to set capabilities on file '/usr/local/bin/open5gs-upfd': Read-only 
file system

Change-Id: I52d2989d91119f0f1673f49723f1055fe7428d15
---
M ttcn3/ttcn3.sh
1 file changed, 21 insertions(+), 2 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 38a5c37..a07295a 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -450,8 +450,8 @@
cd "$(get_testsuite_dir_docker)"
DOCKER_ARGS="\
-e LD_LIBRARY_PATH=/usr/local/lib \
-   -v "$DIR_USR_LOCAL":/usr/local:ro \
-   -v "$DIR_VAR_LOCAL":/var/local:ro \
+   -v "$DIR_USR_LOCAL":/usr/local \
+   -v "$DIR_VAR_LOCAL":/var/local \
-v $hacks:/osmo-ttcn3-hacks:ro \
"
if [ -n "$ARG_TEST_NAME" ]; then

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I52d2989d91119f0f1673f49723f1055fe7428d15
Gerrit-Change-Number: 35117
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[M] Change in osmo-dev[master]: gen_makefile: split gen_make into more functions

2023-11-23 Thread osmith

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

Change subject: gen_makefile: split gen_make into more functions
..

gen_makefile: split gen_make into more functions

Add separate functions for each rule (autoconf, configure, build,
install, reinstall, clean, distclean). This is in preparation for
supporting open5gs (meson).

Change-Id: Id7acfec7f5dd0d3d1a080b3c9d15005e51863e66
---
M gen_makefile.py
1 file changed, 122 insertions(+), 63 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/gen_makefile.py b/gen_makefile.py
index 7fc2bd2..82ebef0 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -214,14 +214,88 @@
touch $@
   '''

+def gen_makefile_autoconf(proj, src_proj, distclean_cond):
+  return f'''
+.make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac
+   if {distclean_cond}; then $(MAKE) {proj}-distclean; fi
+   @echo -e "\\n\\n\\n= $@\\n"
+   -rm -f {src_proj}/.version
+   cd {src_proj}; autoreconf -fi
+   sync
+   touch $@
+  '''
+
+def gen_makefile_configure(proj, deps_installed, distclean_cond, build_proj,
+   cflags, docker_cmd, build_to_src, configure_opts):
+  return f'''
+.make.{proj}.configure: .make.{proj}.autoconf {deps_installed} 
$({proj}_configure_files)
+   if {distclean_cond}; then $(MAKE) {proj}-distclean 
.make.{proj}.autoconf; fi
+   @echo -e "\\n\\n\\n= $@\\n"
+   -chmod -R ug+w {build_proj}
+   -rm -rf {build_proj}
+   mkdir -p {build_proj}
+   cd {build_proj}; {cflags}{docker_cmd}{build_to_src}/configure 
{configure_opts}
+   sync
+   touch $@
+  '''
+
+def gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd, jobs,
+   check):
+  return f'''
+.make.{proj}.build: .make.{proj}.configure $({proj}_files)
+   if {distclean_cond}; then $(MAKE) {proj}-distclean 
.make.{proj}.configure; fi
+   @echo -e "\\n\\n\\n= $@\\n"
+   {docker_cmd}$(MAKE) -C {build_proj} -j {jobs} {check}
+   sync
+   touch $@
+  '''
+
+def gen_makefile_install(proj, docker_cmd, sudo_make_install, build_proj,
+ no_ldconfig, sudo_ldconfig):
+  return f'''
+.make.{proj}.install: .make.{proj}.build
+   @echo -e "\\n\\n\\n= $@\\n"
+   {docker_cmd}{sudo_make_install}$(MAKE) -C {build_proj} install
+   {no_ldconfig}{sudo_ldconfig}ldconfig
+   sync
+   touch $@
+  '''
+
+def gen_makefile_reinstall(proj, deps_reinstall, sudo_make_install,
+   build_proj):
+  return f'''
+.PHONY: {proj}-reinstall
+{proj}-reinstall: {deps_reinstall}
+   {sudo_make_install}$(MAKE) -C {build_proj} install
+  '''
+
+def gen_makefile_clean(proj, build_proj):
+  return f'''
+.PHONY: {proj}-clean
+{proj}-clean:
+   @echo -e "\\n\\n\\n= $@\\n"
+   -chmod -R ug+w {build_proj}
+   -rm -rf {build_proj}
+   -rm -rf .make.{proj}.*
+  '''
+
+def gen_makefile_distclean(proj, src_proj):
+  return f'''
+.PHONY: {proj}-distclean
+{proj}-distclean: {proj}-clean
+   @echo -e "\\n\\n\\n= $@\\n"
+   $(MAKE) -C {src_proj} distclean
+  '''
+
 def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, 
url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, 
make_check):
   src_proj = os.path.join(src_dir, proj)
   if proj == 'openbsc':
 src_proj = os.path.join(src_proj, 'openbsc')
-  build_proj = os.path.join(build_dir, proj)

-  make_to_build_proj = os.path.relpath(build_proj, make_dir)
+  build_proj = os.path.join(build_dir, proj)
   build_to_src = os.path.relpath(src_proj, build_proj)
+  build_proj = os.path.relpath(build_proj, make_dir)
+
   src = os.path.relpath(src_dir, make_dir)
   src_proj = os.path.relpath(src_proj, make_dir)
   push_url = push_url or url
@@ -231,6 +305,16 @@
   else:
 configure_opts_str = ''

+  distclean_cond = f'[ -e {src_proj}/config.status ]' if args.auto_distclean 
else 'false'
+  deps_installed = ' '.join(['.make.%s.install' % d for d in deps])
+  deps_reinstall = ' '.join(['%s-reinstall' %d for d in deps])
+  cflags = 'CFLAGS=-g ' if args.build_debug else ''
+  docker_cmd = f'{args.docker_cmd} ' if args.docker_cmd else ''
+  check = 'check' if make_check else ''
+  no_ldconfig = '#' if no_ldconfig else ''
+  sudo_ldconfig = '' if ldconfig_without_sudo else 'sudo '
+  sudo_make_install = 'sudo ' if sudo_make_install else ''
+
   return r'''
 ### {proj} ###

@@ -251,77 +335,39 @@

 {clone_rule}

-.make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac
-   if {distclean_cond}; then $(MAKE) {proj}-distclean; fi
-   @echo -e "\n\n\n= $@\n"
-   -rm -f {src_proj}/.version
-   cd {src_proj}; autoreconf -fi
-   sync
-   touch $@
-
-.make.{proj}.configure: .make.{proj}.autoconf {deps_installed} 
$({proj}_configure_files)
-   if

[M] Change in osmo-dev[master]: Support building open5gs

2023-11-23 Thread osmith

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

Change subject: Support building open5gs
..

Support building open5gs

Change-Id: Id145443ff53f13740167e9dde6417b7e915b8399
---
A all.buildsystems
M all.deps
M all.urls
M gen_makefile.py
4 files changed, 82 insertions(+), 11 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/all.buildsystems b/all.buildsystems
new file mode 100644
index 000..fc1784b
--- /dev/null
+++ b/all.buildsystems
@@ -0,0 +1,3 @@
+# Projects with buildsystems other than autotools
+# project  buildsystem
+open5gsmeson
diff --git a/all.deps b/all.deps
index 4769d02..7857f16 100644
--- a/all.deps
+++ b/all.deps
@@ -36,6 +36,8 @@
 osmo-e1d   libosmocore
 osmo-remsimsimtrace2_host libosmo-netif

+open5gs
+
 # can only clone these
 docker-playground
 osmo-ttcn3-hacks
diff --git a/all.urls b/all.urls
index 27aaf6e..dfc8ae7 100644
--- a/all.urls
+++ b/all.urls
@@ -2,3 +2,4 @@
 # project  url
 libnftnl   https://git.netfilter.org/libnftnl/
 nftables   https://git.netfilter.org/nftables/
+open5gshttps://github.com/open5gs/open5gs
diff --git a/gen_makefile.py b/gen_makefile.py
index 82ebef0..d306364 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -54,6 +54,7 @@
 topdir = os.path.dirname(os.path.realpath(__file__))
 all_deps_file = os.path.join(topdir, "all.deps")
 all_urls_file = os.path.join(topdir, "all.urls")
+all_buildsystems_file = os.path.join(topdir, "all.buildsystems")
 parser = argparse.ArgumentParser(epilog=__doc__, 
formatter_class=argparse.RawTextHelpFormatter)

 parser.add_argument('configure_opts_files',
@@ -152,8 +153,8 @@
 l.append((tokens[0], tokens[1:]))
   return l

-def read_projects_urls(path):
-  'Read urls config and return dict {project_name: url, …}.'
+def read_projects_dict(path):
+  'Read urls/buildsystems config and return dict {project_name: url, …}.'
   ret = {}
   for line in open(path):
 line = line.strip()
@@ -215,7 +216,9 @@
   '''

 def gen_makefile_autoconf(proj, src_proj, distclean_cond):
-  return f'''
+  buildsystem = projects_buildsystems.get(proj, "autotools")
+  if buildsystem == "autotools":
+return f'''
 .make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac
if {distclean_cond}; then $(MAKE) {proj}-distclean; fi
@echo -e "\\n\\n\\n= $@\\n"
@@ -223,11 +226,18 @@
cd {src_proj}; autoreconf -fi
sync
touch $@
-  '''
+'''
+  elif buildsystem == "meson":
+return ""
+  else:
+assert False, f"unknown buildsystem: {buildsystem}"
+

 def gen_makefile_configure(proj, deps_installed, distclean_cond, build_proj,
cflags, docker_cmd, build_to_src, configure_opts):
-  return f'''
+  buildsystem = projects_buildsystems.get(proj, "autotools")
+  if buildsystem == "autotools":
+return f'''
 .make.{proj}.configure: .make.{proj}.autoconf {deps_installed} 
$({proj}_configure_files)
if {distclean_cond}; then $(MAKE) {proj}-distclean 
.make.{proj}.autoconf; fi
@echo -e "\\n\\n\\n= $@\\n"
@@ -237,29 +247,74 @@
cd {build_proj}; {cflags}{docker_cmd}{build_to_src}/configure 
{configure_opts}
sync
touch $@
-  '''
+'''
+  elif buildsystem == "meson":
+return f'''
+.make.{proj}.configure: .make.{proj}.clone {deps_installed} 
$({proj}_configure_files)
+   @echo -e "\\n\\n\\n= $@\\n"
+   -chmod -R ug+w {build_proj}
+   -rm -rf {build_proj}
+   mkdir -p {build_proj}
+   cd {build_proj}; {cflags}{docker_cmd}meson {build_to_src} .
+   sync
+   touch $@
+'''
+  else:
+assert False, f"unknown buildsystem: {buildsystem}"

 def gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd, jobs,
check):
-  return f'''
+  buildsystem = projects_buildsystems.get(proj, "autotools")
+
+  if buildsystem == "autotools":
+return f'''
 .make.{proj}.build: .make.{proj}.configure $({proj}_files)
if {distclean_cond}; then $(MAKE) {proj}-distclean 
.make.{proj}.configure; fi
@echo -e "\\n\\n\\n= $@\\n"
{docker_cmd}$(MAKE) -C {build_proj} -j {jobs} {check}
sync
touch $@
-  '''
+'''
+  elif buildsystem == "meson":
+target = "test" if check else "compile"
+test_line = ""
+# TODO: currently tests don't pass in this env
+# if check:
+#   test_line = f"{docker_cmd}meson test -C {build_proj} -v"
+return f'''
+.make.{proj}.build: .make.{proj}.configure $({proj}_files)
+   @echo -e "\\n\\n\\n= $@\\n"
+   {docker_cmd}meson compile -C {build_proj} -j {jobs}
+   {test_line}
+   sync
+   touch $@
+'''
+  else:
+assert False, f"unknown buildsystem: {buildsystem}"

 def gen_makefile_install(proj, docker_cmd, sudo_make_install, build_proj,

[S] Change in osmo-dev[master]: gen_makefile: don't shell out to nproc

2023-11-23 Thread osmith

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

Change subject: gen_makefile: don't shell out to nproc
..

gen_makefile: don't shell out to nproc

Use python's multiprocessing.cpu_count() instead of "$(nproc)". The
latter didn't work properly in Makefiles, the right syntax would have
been "$(shell nproc)". Make didn't complain about it and assumed that we
want to use all CPUs with an empty argument "-j ", but meson doesn't
accept this syntax.

Change-Id: I58ca082339f3aff813f587f4c2be9c0951b9b2dd
---
M gen_makefile.py
1 file changed, 19 insertions(+), 1 deletion(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/gen_makefile.py b/gen_makefile.py
index 9a8a5cf..7fc2bd2 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -49,6 +49,7 @@
 import sys
 import os
 import argparse
+import multiprocessing

 topdir = os.path.dirname(os.path.realpath(__file__))
 all_deps_file = os.path.join(topdir, "all.deps")
@@ -85,7 +86,9 @@
 parser.add_argument('-o', '--output', dest='output', default='Makefile',
   help='''Makefile filename (default: 'Makefile').''')

-parser.add_argument('-j', '--jobs', dest='jobs', default='$(nproc)', 
nargs='?', const='$(nproc)',
+parser.add_argument('-j', '--jobs', dest='jobs', type=int,
+  default=multiprocessing.cpu_count(), nargs='?',
+  const=multiprocessing.cpu_count(),
   help='''-j option to pass to 'make'.''')

 parser.add_argument('-I', '--sudo-make-install', dest='sudo_make_install',

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I58ca082339f3aff813f587f4c2be9c0951b9b2dd
Gerrit-Change-Number: 35112
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: gen_makefile: update URL code for netfilter urls

2023-11-23 Thread osmith

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

Change subject: gen_makefile: update URL code for netfilter urls
..

gen_makefile: update URL code for netfilter urls

* libgtnpnl is now developed at gerrit.osmocom.org
* use https:// instead of git:// for libnftnl, nftables
* read the urls from a new all.urls file
* don't set a push URL pointing to gerrit for projects that have
  different URLs

Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e
---
A all.urls
M gen_makefile.py
2 files changed, 43 insertions(+), 3 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/all.urls b/all.urls
new file mode 100644
index 000..27aaf6e
--- /dev/null
+++ b/all.urls
@@ -0,0 +1,4 @@
+# Git clone URLs for projects not developed at gerrit.osmocom.org
+# project  url
+libnftnl   https://git.netfilter.org/libnftnl/
+nftables   https://git.netfilter.org/nftables/
diff --git a/gen_makefile.py b/gen_makefile.py
index a00234f..9a8a5cf 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -52,6 +52,7 @@

 topdir = os.path.dirname(os.path.realpath(__file__))
 all_deps_file = os.path.join(topdir, "all.deps")
+all_urls_file = os.path.join(topdir, "all.urls")
 parser = argparse.ArgumentParser(epilog=__doc__, 
formatter_class=argparse.RawTextHelpFormatter)

 parser.add_argument('configure_opts_files',
@@ -148,6 +149,18 @@
 l.append((tokens[0], tokens[1:]))
   return l

+def read_projects_urls(path):
+  'Read urls config and return dict {project_name: url, …}.'
+  ret = {}
+  for line in open(path):
+line = line.strip()
+if not line or line.startswith('#'):
+  continue
+project, url = line.split()
+assert project not in ret, f"project '{project} found twice in {path}"
+ret[project] = url
+  return ret
+
 def read_configure_opts(path):
   'Read config opts file and return tuples of (project_name, config-opts).'
   if not path:
@@ -179,14 +192,21 @@
touch $@
   '''

-  if proj in ("libgtpnl", "libnftnl", "nftables"):
-url = "git://git.netfilter.org"
+  if proj in projects_urls:
+url = projects_urls[proj]
+cmd_set_push_url = "true"
+  else:
+url = f"{url}/{proj}"
+push_url = f"{push_url}/{proj}"
+cmd_set_push_url = f'git -C "{src}/{proj}" remote set-url --push origin 
"{push_url}"'
+
+  cmd_clone = f'git -C {src} clone --recurse-submodules "{url}" "{proj}"'

   return f'''
 .make.{proj}.clone:
@echo -e "\\n\\n\\n= $@\\n"
test -d {src} || mkdir -p {src}
-   test -d {src_proj} || ( git -C {src} clone --recurse-submodules 
"{url}/{proj}" "{proj}" && git -C "{src}/{proj}" remote set-url --push origin 
"{push_url}/{proj}" )
+   test -d {src_proj} || ( {cmd_clone} && {cmd_set_push_url} )
sync
touch $@
   '''
@@ -303,6 +323,7 @@

 
 projects_deps = read_projects_deps(all_deps_file)
+projects_urls = read_projects_urls(all_urls_file)
 configure_opts = listdict()
 configure_opts_files = sorted(args.configure_opts_files or [])
 for configure_opts_file in configure_opts_files:

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e
Gerrit-Change-Number: 35111
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: ttcn3.sh: enable color output from gcc

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: enable color output from gcc
..

ttcn3.sh: enable color output from gcc

Change-Id: Idde8084ca981333be2fc2b369ea8f25881470654
---
M ttcn3/scripts/docker_configure_make.sh
1 file changed, 10 insertions(+), 0 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/scripts/docker_configure_make.sh 
b/ttcn3/scripts/docker_configure_make.sh
index 56fee71..7a79ff1 100755
--- a/ttcn3/scripts/docker_configure_make.sh
+++ b/ttcn3/scripts/docker_configure_make.sh
@@ -26,6 +26,7 @@

 docker run \
--rm \
+   -t \
-e "LD_LIBRARY_PATH=/usr/local/lib" \
-v "$DIR_OSMODEV:$DIR_OSMODEV" \
-v "$DIR_USR_LOCAL:/usr/local" \

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Idde8084ca981333be2fc2b369ea8f25881470654
Gerrit-Change-Number: 35110
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[M] Change in osmo-dev[master]: ttcn3.sh: add options for kernel tests

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: add options for kernel tests
..

ttcn3.sh: add options for kernel tests

Change-Id: I2a569b6712d8930807750751c14ed4e18b325e02
---
M ttcn3/ttcn3.sh
1 file changed, 102 insertions(+), 2 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 007fcc7..c315eda 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -6,6 +6,8 @@
 DIR_OUTPUT="${DIR_OUTPUT:-${DIR_OSMODEV}/ttcn3/out}"
 DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local"
 JOBS="$(nproc)"
+KERNEL_DIR=""
+KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source"

 # Osmocom libraries and programs relevant for the current testsuite will be
 # built in this container. It must have all build dependencies available and
@@ -36,19 +38,61 @@
 }

 parse_args() {
-   while getopts 'h' OPTION; do
+   while getopts 'hdkf' OPTION; do
case "$OPTION" in
+   d)
+   if [ -n "$KERNEL_TEST" ]; then
+   echo "ERROR: use either -d or -k"
+   exit 1
+   fi
+   export KERNEL_TEST=1
+   ;;
+   k)
+   if [ -n "$KERNEL_TEST" ]; then
+   echo "ERROR: use either -d or -k"
+   exit 1
+   fi
+   if [ -z "$KERNEL_DIR" ]; then
+   KERNEL_DIR="$(realpath "$DIR_OSMODEV/../linux")"
+   fi
+   if ! [ -e "$KERNEL_DIR/Kbuild" ]; then
+   echo "ERROR: KERNEL_DIR is invalid: $KERNEL_DIR"
+   exit 1
+   fi
+
+   export KERNEL_TEST=1
+   export KERNEL_BUILD=1
+   export KERNEL_SKIP_REBUILD=1
+   ;;
+   f)
+   if [ -z "$KERNEL_BUILD" ]; then
+   echo "ERROR: don't use -f without -k"
+   exit 1
+   fi
+   rm -f "$KERNEL_SKIP_MARKER"
+   ;;
h|*)
local name="$(basename $0)"
-   echo "usage: $name [-h] PROJECT"
+   echo "usage: $name [-h] [-d|-k [-f]] PROJECT"
echo "   or: $name clean"
+   echo
echo "arguments:"
echo "  -h   show help"
+   echo
+   echo "arguments for kernel tests:"
+   echo "  -d   run kernel tests with debian kernel"
+   echo "  -k   run kernel tests with kernel built 
from source"
+   echo "  -f   (use with -k) don't skip build if 
kernel already exists"
+   echo
echo "  PROJECT  the testsuite project to run"
+   echo
echo "examples:"
echo "  $name bsc"
echo "  $name bsc-sccplite"
echo "  $name hlr"
+   echo "  $name -d ggsn"
+   echo "  $name -k ggsn"
+   echo "  $name -k -f ggsn"
exit 1
;;
esac
@@ -361,6 +405,52 @@
"
 }

+# Similar to update_kernel_config in docker-playground
+# scripts/kernel-test/kernel-build.sh
+update_kernel_config() {
+   local previous="$DIR_MAKE/.kernel.previous.config"
+   local fragment="$(get_testsuite_dir_docker)/fragment.config"
+
+   set -x
+   make defconfig
+   scripts/kconfig/merge_config.sh -m .config "$fragment"
+   make olddefconfig
+   set +x
+
+   if [ -e "$previous" ] && ! diff -q "$previous" .config; then
+   # Remove everything built with previous config
+   echo "Kernel config changed, running 'make clean'"
+   make clean
+   fi
+
+   cp .config "$previous"
+}
+
+build_kernel() {
+   local image="arch/x86/boot/bzImage"
+
+   if [ -z "$KERNEL_DIR" ]; then
+   return
+   fi
+
+   cd "$KERNEL_DIR"
+   if ! [ -e "$image" ]; then
+   rm -f "$KERNEL_SKIP_MARKER"
+   fi
+   if ! [ -e "$KERNEL_SKIP_MARKER" ]; then
+   update_kernel_config
+   make -j"$JOBS"
+   fi
+
+   # Copy the kernel to the path expected by
+   # docker-playground scripts/kernel-test/kernel-build.sh
+   local dest="$DIR_OSMODEV/src/docker-playground/_cache/linux/$image"
+   mkdir -p "$(dirname "$dest")"
+   cp

[S] Change in osmo-dev[master]: werror.opts: add libgtpnl

2023-11-23 Thread osmith

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

Change subject: werror.opts: add libgtpnl
..

werror.opts: add libgtpnl

Depends: libgtpnl Ife3716c667d2e9b3fcd94d3cdc044d594e7dab5a
Change-Id: Ia5f6f6d2641318c00608471256257b4e06627c7c
---
M werror.opts
1 file changed, 11 insertions(+), 0 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/werror.opts b/werror.opts
index 312b97b..3b27b74 100644
--- a/werror.opts
+++ b/werror.opts
@@ -6,6 +6,7 @@
 libosmo-sccp --enable-werror
 libosmo-pfcp --enable-werror
 libsmpp34 --enable-werror
+libgtpnl --enable-werror
 osmo-bsc --enable-werror
 osmo-ggsn --enable-werror
 osmo-hlr --enable-werror

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Ia5f6f6d2641318c00608471256257b4e06627c7c
Gerrit-Change-Number: 35109
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: ttcn3.sh: clean osmo-ttcn3-hacks too

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: clean osmo-ttcn3-hacks too
..

ttcn3.sh: clean osmo-ttcn3-hacks too

Change-Id: Id0fdf5e3f0917e56e3c6abff54a2f886367252f5
---
M ttcn3/ttcn3.sh
1 file changed, 14 insertions(+), 0 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 54b4328..007fcc7 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -27,6 +27,11 @@
"$DIR_MAKE" \
"$DIR_OUTPUT" \
"$DIR_USR_LOCAL"
+
+   if [ -d "$DIR_OSMODEV/src/osmo-ttcn3-hacks" ]; then
+   make -C "$DIR_OSMODEV/src/osmo-ttcn3-hacks" clean
+   fi
+
exit 0
 }


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id0fdf5e3f0917e56e3c6abff54a2f886367252f5
Gerrit-Change-Number: 35106
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: ttcn3.sh: add arg to only run one test

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: add arg to only run one test
..

ttcn3.sh: add arg to only run one test

Depends: docker-playground I1f45a05e089b429918096fcd64f7c02033d5a9dd
Change-Id: I07a76f6c58d379608ecadfc3ba845651929f668c
---
M ttcn3/ttcn3.sh
1 file changed, 23 insertions(+), 4 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified




diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index c315eda..3426e7b 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -8,6 +8,7 @@
 JOBS="$(nproc)"
 KERNEL_DIR=""
 KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source"
+ARG_TEST_NAME=""

 # Osmocom libraries and programs relevant for the current testsuite will be
 # built in this container. It must have all build dependencies available and
@@ -38,8 +39,11 @@
 }

 parse_args() {
-   while getopts 'hdkf' OPTION; do
+   while getopts 'ht:dkf' OPTION; do
case "$OPTION" in
+   t)
+   ARG_TEST_NAME="$OPTARG"
+   ;;
d)
if [ -n "$KERNEL_TEST" ]; then
echo "ERROR: use either -d or -k"
@@ -73,11 +77,12 @@
;;
h|*)
local name="$(basename $0)"
-   echo "usage: $name [-h] [-d|-k [-f]] PROJECT"
+   echo "usage: $name [-h] [-t] [-d|-k [-f]] PROJECT"
echo "   or: $name clean"
echo
echo "arguments:"
echo "  -h   show help"
+   echo "  -t   only run the test with this name"
echo
echo "arguments for kernel tests:"
echo "  -d   run kernel tests with debian kernel"
@@ -89,7 +94,7 @@
echo "examples:"
echo "  $name bsc"
echo "  $name bsc-sccplite"
-   echo "  $name hlr"
+   echo "  $name -t TC_gsup_check_imei hlr"
echo "  $name -d ggsn"
echo "  $name -k ggsn"
echo "  $name -k -f ggsn"
@@ -464,11 +469,15 @@
fi

cd "$(get_testsuite_dir_docker)"
-   export DOCKER_ARGS="\
+   DOCKER_ARGS="\
-e LD_LIBRARY_PATH=/usr/local/lib \
-v "$DIR_USR_LOCAL":/usr/local:ro \
-v $hacks:/osmo-ttcn3-hacks:ro \
"
+   if [ -n "$ARG_TEST_NAME" ]; then
+   DOCKER_ARGS="$DOCKER_ARGS -e TEST_NAME=$ARG_TEST_NAME"
+   fi
+   export DOCKER_ARGS
export NO_LIST_OSMO_PACKAGES=1
./jenkins.sh


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I07a76f6c58d379608ecadfc3ba845651929f668c
Gerrit-Change-Number: 35108
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-MessageType: merged

[S] Change in osmo-dev[master]: ttcn3: fix missing test name in usage desc

2023-11-23 Thread osmith

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

Change subject: ttcn3: fix missing test name in usage desc
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I5be5ee227dac0969e12d284ec518019c75698754
Gerrit-Change-Number: 35120
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:42 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: pgw: depend on osmo-uecups

2023-11-23 Thread osmith

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

Change subject: ttcn3: pgw: depend on osmo-uecups
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d
Gerrit-Change-Number: 35121
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:45 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: add aliases hss -> hss-ogs etc.

2023-11-23 Thread osmith

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

Change subject: ttcn3: add aliases hss -> hss-ogs etc.
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7
Gerrit-Change-Number: 35119
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:41 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: support hss-ogs, mme-ogs, pgw

2023-11-23 Thread osmith

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

Change subject: ttcn3: support hss-ogs, mme-ogs, pgw
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I08d76e6c92e2e3eacacb02a5a6f6d589e5889499
Gerrit-Change-Number: 35118
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:38 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: remove unused functions

2023-11-23 Thread osmith

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

Change subject: ttcn3: remove unused functions
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I1939f1262757899c1a75c6d51cffd2ab13815c0f
Gerrit-Change-Number: 35116
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:35 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: run_docker: remove :ro

2023-11-23 Thread osmith

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

Change subject: ttcn3: run_docker: remove :ro
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I52d2989d91119f0f1673f49723f1055fe7428d15
Gerrit-Change-Number: 35117
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:37 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: ttcn3: add ggsn-ogs

2023-11-23 Thread osmith

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

Change subject: ttcn3: add ggsn-ogs
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id84047e56a6c07fbf0984eb6aedcecd4d7f3ae97
Gerrit-Change-Number: 35115
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:33 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: Support building open5gs

2023-11-23 Thread osmith

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

Change subject: Support building open5gs
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id145443ff53f13740167e9dde6417b7e915b8399
Gerrit-Change-Number: 35114
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:32 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: gen_makefile: update URL code for netfilter urls

2023-11-23 Thread osmith

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

Change subject: gen_makefile: update URL code for netfilter urls
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e
Gerrit-Change-Number: 35111
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:26 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: gen_makefile: split gen_make into more functions

2023-11-23 Thread osmith

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

Change subject: gen_makefile: split gen_make into more functions
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id7acfec7f5dd0d3d1a080b3c9d15005e51863e66
Gerrit-Change-Number: 35113
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:30 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: gen_makefile: don't shell out to nproc

2023-11-23 Thread osmith

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

Change subject: gen_makefile: don't shell out to nproc
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I58ca082339f3aff813f587f4c2be9c0951b9b2dd
Gerrit-Change-Number: 35112
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:28 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: ttcn3.sh: add options for kernel tests

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: add options for kernel tests
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I2a569b6712d8930807750751c14ed4e18b325e02
Gerrit-Change-Number: 35107
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:18 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3.sh: enable color output from gcc

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: enable color output from gcc
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Idde8084ca981333be2fc2b369ea8f25881470654
Gerrit-Change-Number: 35110
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:24 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: werror.opts: add libgtpnl

2023-11-23 Thread osmith

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

Change subject: werror.opts: add libgtpnl
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Ia5f6f6d2641318c00608471256257b4e06627c7c
Gerrit-Change-Number: 35109
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:22 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3.sh: add arg to only run one test

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: add arg to only run one test
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I07a76f6c58d379608ecadfc3ba845651929f668c
Gerrit-Change-Number: 35108
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:20 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3.sh: clean osmo-ttcn3-hacks too

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: clean osmo-ttcn3-hacks too
..


Patch Set 1: Verified+1


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id0fdf5e3f0917e56e3c6abff54a2f886367252f5
Gerrit-Change-Number: 35106
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:16 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: pgw: depend on osmo-uecups

2023-11-23 Thread osmith

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

Change subject: ttcn3: pgw: depend on osmo-uecups
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d
Gerrit-Change-Number: 35121
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:07 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: fix missing test name in usage desc

2023-11-23 Thread osmith

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

Change subject: ttcn3: fix missing test name in usage desc
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I5be5ee227dac0969e12d284ec518019c75698754
Gerrit-Change-Number: 35120
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:56:03 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: add aliases hss -> hss-ogs etc.

2023-11-23 Thread osmith

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

Change subject: ttcn3: add aliases hss -> hss-ogs etc.
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7
Gerrit-Change-Number: 35119
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:59 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: support hss-ogs, mme-ogs, pgw

2023-11-23 Thread osmith

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

Change subject: ttcn3: support hss-ogs, mme-ogs, pgw
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I08d76e6c92e2e3eacacb02a5a6f6d589e5889499
Gerrit-Change-Number: 35118
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:55 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: run_docker: remove :ro

2023-11-23 Thread osmith

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

Change subject: ttcn3: run_docker: remove :ro
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I52d2989d91119f0f1673f49723f1055fe7428d15
Gerrit-Change-Number: 35117
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:49 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: remove unused functions

2023-11-23 Thread osmith

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

Change subject: ttcn3: remove unused functions
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I1939f1262757899c1a75c6d51cffd2ab13815c0f
Gerrit-Change-Number: 35116
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:43 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: ttcn3: add ggsn-ogs

2023-11-23 Thread osmith

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

Change subject: ttcn3: add ggsn-ogs
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id84047e56a6c07fbf0984eb6aedcecd4d7f3ae97
Gerrit-Change-Number: 35115
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:39 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: Support building open5gs

2023-11-23 Thread osmith

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

Change subject: Support building open5gs
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id145443ff53f13740167e9dde6417b7e915b8399
Gerrit-Change-Number: 35114
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:34 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: gen_makefile: split gen_make into more functions

2023-11-23 Thread osmith

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

Change subject: gen_makefile: split gen_make into more functions
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id7acfec7f5dd0d3d1a080b3c9d15005e51863e66
Gerrit-Change-Number: 35113
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:30 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: gen_makefile: don't shell out to nproc

2023-11-23 Thread osmith

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

Change subject: gen_makefile: don't shell out to nproc
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I58ca082339f3aff813f587f4c2be9c0951b9b2dd
Gerrit-Change-Number: 35112
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:26 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: gen_makefile: update URL code for netfilter urls

2023-11-23 Thread osmith

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

Change subject: gen_makefile: update URL code for netfilter urls
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e
Gerrit-Change-Number: 35111
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:22 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3.sh: enable color output from gcc

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: enable color output from gcc
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Idde8084ca981333be2fc2b369ea8f25881470654
Gerrit-Change-Number: 35110
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:16 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: werror.opts: add libgtpnl

2023-11-23 Thread osmith

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

Change subject: werror.opts: add libgtpnl
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Ia5f6f6d2641318c00608471256257b4e06627c7c
Gerrit-Change-Number: 35109
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:12 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3.sh: add arg to only run one test

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: add arg to only run one test
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I07a76f6c58d379608ecadfc3ba845651929f668c
Gerrit-Change-Number: 35108
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:07 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: ttcn3.sh: add options for kernel tests

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: add options for kernel tests
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I2a569b6712d8930807750751c14ed4e18b325e02
Gerrit-Change-Number: 35107
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:55:03 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[S] Change in osmo-dev[master]: ttcn3: pgw: depend on osmo-uecups

2023-11-23 Thread osmith

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


Change subject: ttcn3: pgw: depend on osmo-uecups
..

ttcn3: pgw: depend on osmo-uecups

Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d
---
M all.deps
M ttcn3/ttcn3.sh
2 files changed, 16 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/21/35121/1

diff --git a/all.deps b/all.deps
index 7857f16..5a1191a 100644
--- a/all.deps
+++ b/all.deps
@@ -35,6 +35,7 @@
 osmo-hnbgw osmo-iuh osmo-mgw libosmo-pfcp
 osmo-e1d   libosmocore
 osmo-remsimsimtrace2_host libosmo-netif
+osmo-uecupslibosmocore

 open5gs
 
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 85cbb6b..d665e84 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -187,9 +187,13 @@
 # Programs that need to be built
 get_programs() {
case "$PROJECT" in
+   # Open5gs
+   *-ogs) echo "open5gs" ;;
+   pgw) echo "open5gs osmo-uecups-daemon" ;;
+
+   # Osmocom
bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;;
bts) echo "osmo-bsc osmo-bts-trx" ;;
-   *-ogs|pgw) echo "open5gs" ;;
msc) echo "osmo-stp osmo-msc" ;;
pcu-sns) echo "osmo-pcu" ;;
pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;;
@@ -206,6 +210,7 @@
osmo-bts-*) echo "osmo-bts" ;;
osmo-pcap-*) echo "osmo-pcap" ;;
osmo-stp) echo "libosmo-sccp" ;;
+   osmo-uecups-*) echo "osmo-uecups" ;;
*) echo "$1" ;;
esac
 }

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I95b77ea1a9f4c31c8886dc3f613e545135da320d
Gerrit-Change-Number: 35121
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: ttcn3: add aliases hss -> hss-ogs etc.

2023-11-23 Thread osmith

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


Change subject: ttcn3: add aliases hss -> hss-ogs etc.
..

ttcn3: add aliases hss -> hss-ogs etc.

Some open5gs testsuites end in -ogs (hss, mme, ggsn), others do not
(pgw). Let the user omit -ogs and choose the right one automatically.

Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7
---
M ttcn3/ttcn3.sh
1 file changed, 31 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/19/35119/1

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 701e323..3a501b0 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -34,6 +34,12 @@
exit 0
 }

+set_project() {
+   PROJECT="$1"
+   PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')"
+   PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')"
+}
+
 parse_args() {
while getopts 'ht:dkf' OPTION; do
case "$OPTION" in
@@ -95,7 +101,9 @@
echo "  $name -k ggsn"
echo "  $name -k -f ggsn"
echo "  $name ggsn-ogs"
-   echo "  $name hss-ogs"
+   echo "  $name hss"
+   echo "  $name mme"
+   echo "  $name pgw"
exit 1
;;
esac
@@ -106,9 +114,16 @@
parse_args -h
fi

-   PROJECT="$1"
-   PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')"
-   PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')"
+   set_project "$1"
+   if ! [ -d "$(get_testsuite_dir_docker)" ]; then
+   set_project "$1-ogs"
+   if ! [ -d "$(get_testsuite_dir_docker)" ]; then
+   echo "ERROR: can't find testsuite_dir, adjust" \
+   "get_testsuite_dir_docker"
+   fi
+   fi
+
+   echo "PROJECT: $PROJECT"
 }

 check_usage() {

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I64fb519c15cfff8a8b560d51ff8b6b5d1aada8f7
Gerrit-Change-Number: 35119
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: ttcn3.sh: clean osmo-ttcn3-hacks too

2023-11-23 Thread osmith

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

Change subject: ttcn3.sh: clean osmo-ttcn3-hacks too
..


Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
as discussed with neels, pushing these without code review



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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id0fdf5e3f0917e56e3c6abff54a2f886367252f5
Gerrit-Change-Number: 35106
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-Reviewer: osmith 
Gerrit-Comment-Date: Thu, 23 Nov 2023 15:54:59 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[M] Change in osmo-dev[master]: ttcn3: add ggsn-ogs

2023-11-23 Thread osmith

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


Change subject: ttcn3: add ggsn-ogs
..

ttcn3: add ggsn-ogs

Change-Id: Id84047e56a6c07fbf0984eb6aedcecd4d7f3ae97
---
M .gitignore
M gen_makefile.py
M ttcn3/scripts/docker_configure_make.sh
M ttcn3/ttcn3.sh
4 files changed, 82 insertions(+), 25 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/15/35115/1

diff --git a/.gitignore b/.gitignore
index 2e88651..406a33b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 ttcn3/make/
 ttcn3/.run.sh
 ttcn3/usr_local
+ttcn3/var_local
 current_log
 lastlog
 autolog
diff --git a/gen_makefile.py b/gen_makefile.py
index d306364..3f6a994 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -364,7 +364,7 @@
   deps_installed = ' '.join(['.make.%s.install' % d for d in deps])
   deps_reinstall = ' '.join(['%s-reinstall' %d for d in deps])
   cflags = 'CFLAGS=-g ' if args.build_debug else ''
-  docker_cmd = f'{args.docker_cmd} ' if args.docker_cmd else ''
+  docker_cmd = f'OSMODEV_PROJECT={proj} {args.docker_cmd} ' if args.docker_cmd 
else ''
   check = 'check' if make_check else ''
   no_ldconfig = '#' if no_ldconfig else ''
   sudo_ldconfig = '' if ldconfig_without_sudo else 'sudo '
diff --git a/ttcn3/scripts/docker_configure_make.sh 
b/ttcn3/scripts/docker_configure_make.sh
index 7a79ff1..e6857fd 100755
--- a/ttcn3/scripts/docker_configure_make.sh
+++ b/ttcn3/scripts/docker_configure_make.sh
@@ -4,16 +4,60 @@
 # location inside the docker container. A usr_local dir is mounted to
 # /usr/local, so 'make install' can put all files there and following builds
 # have the files available.
+# env vars: OSMODEV_PROJECT
 DIR_OSMODEV="$(readlink -f "$(dirname $0)/../..")"
 DIR_MAKE="$DIR_OSMODEV/ttcn3/make"
 DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local"
+DIR_VAR_LOCAL="$DIR_OSMODEV/ttcn3/var_local"
 DIR_CCACHE="$DIR_OSMODEV/ttcn3/ccache/osmocom-programs"
 RUN_SCRIPT="$DIR_OSMODEV/ttcn3/.run.sh"
-DOCKER_IMG="$1"
 UID="$(id -u)"
-shift

-mkdir -p "$DIR_MAKE" "$DIR_CCACHE"
+# Osmocom libraries and programs relevant for the current testsuite will be
+# built in this container. It must have all build dependencies available and
+# be based on the same distribution that master-* containers are based on, so
+# there are no incompatibilities with shared libraries.
+DOCKER_IMG_BUILD="debian-bookworm-build"
+DOCKER_IMG_BUILD_OGS="open5gs-master"
+
+docker_image_exists() {
+   test -n "$(docker images -q "$1")"
+}
+
+build_docker_img() {
+   local img="$1"
+   local dp="${DIR_OSMODEV}/src/docker-playground"
+
+   if ! docker_image_exists "$USER/$img"; then
+   echo "Building docker image: $USER/$img"
+   make -C "$dp/$img"
+   fi
+}
+
+build_docker_imgs() {
+   build_docker_img "$DOCKER_IMG_BUILD"
+
+   if [ "$OSMODEV_PROJECT" = "open5gs" ]; then
+   build_docker_img "$DOCKER_IMG_BUILD_OGS"
+   fi
+}
+
+set_docker_img_var() {
+   case "$OSMODEV_PROJECT" in
+   open5gs)
+   DOCKER_IMG="$USER/$DOCKER_IMG_BUILD_OGS"
+   ;;
+   *)
+   DOCKER_IMG="$USER/$DOCKER_IMG_BUILD"
+   ;;
+   esac
+}
+
+mkdir -p \
+   "$DIR_MAKE" \
+   "$DIR_CCACHE" \
+   "$DIR_USR_LOCAL" \
+   "$DIR_VAR_LOCAL"

 # Script running as user inside docker
 echo "#!/bin/sh -ex" > "$RUN_SCRIPT"
@@ -24,12 +68,16 @@
 echo >> "$RUN_SCRIPT"
 chmod +x "$RUN_SCRIPT"

+build_docker_imgs
+set_docker_img_var
+
 docker run \
--rm \
-t \
-e "LD_LIBRARY_PATH=/usr/local/lib" \
-v "$DIR_OSMODEV:$DIR_OSMODEV" \
-v "$DIR_USR_LOCAL:/usr/local" \
+   -v "$DIR_VAR_LOCAL:/var/local" \
-v "$RUN_SCRIPT:/tmp/run.sh:ro" \
-v "$DIR_CCACHE:/home/build/.ccache" \
"$DOCKER_IMG" \
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 3426e7b..5c3fae6 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -5,16 +5,11 @@
 DIR_MAKE="${DIR_MAKE:-${DIR_OSMODEV}/ttcn3/make}"
 DIR_OUTPUT="${DIR_OUTPUT:-${DIR_OSMODEV}/ttcn3/out}"
 DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local"
+DIR_VAR_LOCAL="$DIR_OSMODEV/ttcn3/var_local"
 JOBS="$(nproc)"
 KERNEL_DIR=""
 KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source"
 ARG_TEST_NAME=""
-
-# Osmocom libraries and programs relevant for the current testsuite will be
-# built in this container. It must have all build dependencies available and
-# be based on the same distribution that master-* containers are based on, so
-# there are no incompatibilities with shared libraries.
-DOCKER_IMG_BUILD="debian-bookworm-build"
 DOCKER_IMG_TITAN="debian-bookworm-titan"

 clean() {
@@ -29,7 +24,8 @@
rm -rf \
"$DIR_MAKE" \
"$DIR_OUTPUT" \
-   "$DIR_USR_LOCAL"
+   "$DIR_USR_LOCAL" \
+   "$DIR_VAR_LOCAL"

if [ -d

[S] Change in osmo-dev[master]: ttcn3: support hss-ogs, mme-ogs, pgw

2023-11-23 Thread osmith

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


Change subject: ttcn3: support hss-ogs, mme-ogs, pgw
..

ttcn3: support hss-ogs, mme-ogs, pgw

Change-Id: I08d76e6c92e2e3eacacb02a5a6f6d589e5889499
---
M ttcn3/ttcn3.sh
1 file changed, 18 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/18/35118/1

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index a07295a..701e323 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -95,6 +95,7 @@
echo "  $name -k ggsn"
echo "  $name -k -f ggsn"
echo "  $name ggsn-ogs"
+   echo "  $name hss-ogs"
exit 1
;;
esac
@@ -107,6 +108,7 @@

PROJECT="$1"
PROJECT_UPPER="$(echo "$PROJECT" | tr '[:lower:]' '[:upper:]')"
+   PROJECT_NO_OGS="$(echo "$PROJECT" | sed 's/-ogs$//')"
 }

 check_usage() {
@@ -123,7 +125,7 @@
bts-*) echo "$hacks/bts" ;;
ggsn|ggsn-ogs) echo "$hacks/ggsn_tests" ;;
pcu-sns) echo "$hacks/pcu" ;;
-   *) echo "$hacks/$PROJECT" ;;
+   *) echo "$hacks/$PROJECT_NO_OGS" ;;
esac
 }

@@ -134,8 +136,8 @@
bsc-*)
echo "$dp/ttcn3-bsc-test-$(echo "$PROJECT" | cut -d - 
-f 2-)"
;;
-   ggsn-ogs)
-   echo "$dp/ttcn3-ggsn-test-ogs"
+   *-ogs)
+   echo "$dp/ttcn3-$PROJECT_NO_OGS-test-ogs"
;;
*)
echo "$dp/ttcn3-$PROJECT-test"
@@ -151,6 +153,9 @@
ggsn-ogs)
echo "$USER/ttcn3-ggsn-test"
;;
+   *-ogs)
+   echo "$USER/ttcn3-$PROJECT_NO_OGS-test-ogs"
+   ;;
*)
echo "$USER/ttcn3-$PROJECT-test"
;;
@@ -169,7 +174,7 @@
case "$PROJECT" in
bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;;
bts) echo "osmo-bsc osmo-bts-trx" ;;
-   ggsn-ogs) echo "open5gs" ;;
+   *-ogs|pgw) echo "open5gs" ;;
msc) echo "osmo-stp osmo-msc" ;;
pcu-sns) echo "osmo-pcu" ;;
pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;;

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I08d76e6c92e2e3eacacb02a5a6f6d589e5889499
Gerrit-Change-Number: 35118
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: ttcn3: run_docker: remove :ro

2023-11-23 Thread osmith

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


Change subject: ttcn3: run_docker: remove :ro
..

ttcn3: run_docker: remove :ro

Don't mount usr_local, var_local as read-only, so the environment is
more similar to our jenkins.

Fix for:
  + /data/upfd-setup.sh
  + command -v open5gs-upfd
  + upfd_bin=/usr/local/bin/open5gs-upfd
  + setcap cap_net_raw+ep /usr/local/bin/open5gs-upfd
  Failed to set capabilities on file '/usr/local/bin/open5gs-upfd': Read-only 
file system

Change-Id: I52d2989d91119f0f1673f49723f1055fe7428d15
---
M ttcn3/ttcn3.sh
1 file changed, 21 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/17/35117/1

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 38a5c37..a07295a 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -450,8 +450,8 @@
cd "$(get_testsuite_dir_docker)"
DOCKER_ARGS="\
-e LD_LIBRARY_PATH=/usr/local/lib \
-   -v "$DIR_USR_LOCAL":/usr/local:ro \
-   -v "$DIR_VAR_LOCAL":/var/local:ro \
+   -v "$DIR_USR_LOCAL":/usr/local \
+   -v "$DIR_VAR_LOCAL":/var/local \
-v $hacks:/osmo-ttcn3-hacks:ro \
"
if [ -n "$ARG_TEST_NAME" ]; then

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I52d2989d91119f0f1673f49723f1055fe7428d15
Gerrit-Change-Number: 35117
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: ttcn3: fix missing test name in usage desc

2023-11-23 Thread osmith

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


Change subject: ttcn3: fix missing test name in usage desc
..

ttcn3: fix missing test name in usage desc

Change-Id: I5be5ee227dac0969e12d284ec518019c75698754
---
M ttcn3/ttcn3.sh
1 file changed, 10 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/20/35120/1

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 3a501b0..85cbb6b 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -79,7 +79,7 @@
;;
h|*)
local name="$(basename $0)"
-   echo "usage: $name [-h] [-t] [-d|-k [-f]] PROJECT"
+   echo "usage: $name [-h] [-t TESTNAME] [-d|-k [-f]] 
PROJECT"
echo "   or: $name clean"
echo
echo "arguments:"

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I5be5ee227dac0969e12d284ec518019c75698754
Gerrit-Change-Number: 35120
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[M] Change in osmo-dev[master]: Support building open5gs

2023-11-23 Thread osmith

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


Change subject: Support building open5gs
..

Support building open5gs

Change-Id: Id145443ff53f13740167e9dde6417b7e915b8399
---
A all.buildsystems
M all.deps
M all.urls
M gen_makefile.py
4 files changed, 82 insertions(+), 11 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/14/35114/1

diff --git a/all.buildsystems b/all.buildsystems
new file mode 100644
index 000..fc1784b
--- /dev/null
+++ b/all.buildsystems
@@ -0,0 +1,3 @@
+# Projects with buildsystems other than autotools
+# project  buildsystem
+open5gsmeson
diff --git a/all.deps b/all.deps
index 4769d02..7857f16 100644
--- a/all.deps
+++ b/all.deps
@@ -36,6 +36,8 @@
 osmo-e1d   libosmocore
 osmo-remsimsimtrace2_host libosmo-netif

+open5gs
+
 # can only clone these
 docker-playground
 osmo-ttcn3-hacks
diff --git a/all.urls b/all.urls
index 27aaf6e..dfc8ae7 100644
--- a/all.urls
+++ b/all.urls
@@ -2,3 +2,4 @@
 # project  url
 libnftnl   https://git.netfilter.org/libnftnl/
 nftables   https://git.netfilter.org/nftables/
+open5gshttps://github.com/open5gs/open5gs
diff --git a/gen_makefile.py b/gen_makefile.py
index 82ebef0..d306364 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -54,6 +54,7 @@
 topdir = os.path.dirname(os.path.realpath(__file__))
 all_deps_file = os.path.join(topdir, "all.deps")
 all_urls_file = os.path.join(topdir, "all.urls")
+all_buildsystems_file = os.path.join(topdir, "all.buildsystems")
 parser = argparse.ArgumentParser(epilog=__doc__, 
formatter_class=argparse.RawTextHelpFormatter)

 parser.add_argument('configure_opts_files',
@@ -152,8 +153,8 @@
 l.append((tokens[0], tokens[1:]))
   return l

-def read_projects_urls(path):
-  'Read urls config and return dict {project_name: url, …}.'
+def read_projects_dict(path):
+  'Read urls/buildsystems config and return dict {project_name: url, …}.'
   ret = {}
   for line in open(path):
 line = line.strip()
@@ -215,7 +216,9 @@
   '''

 def gen_makefile_autoconf(proj, src_proj, distclean_cond):
-  return f'''
+  buildsystem = projects_buildsystems.get(proj, "autotools")
+  if buildsystem == "autotools":
+return f'''
 .make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac
if {distclean_cond}; then $(MAKE) {proj}-distclean; fi
@echo -e "\\n\\n\\n= $@\\n"
@@ -223,11 +226,18 @@
cd {src_proj}; autoreconf -fi
sync
touch $@
-  '''
+'''
+  elif buildsystem == "meson":
+return ""
+  else:
+assert False, f"unknown buildsystem: {buildsystem}"
+

 def gen_makefile_configure(proj, deps_installed, distclean_cond, build_proj,
cflags, docker_cmd, build_to_src, configure_opts):
-  return f'''
+  buildsystem = projects_buildsystems.get(proj, "autotools")
+  if buildsystem == "autotools":
+return f'''
 .make.{proj}.configure: .make.{proj}.autoconf {deps_installed} 
$({proj}_configure_files)
if {distclean_cond}; then $(MAKE) {proj}-distclean 
.make.{proj}.autoconf; fi
@echo -e "\\n\\n\\n= $@\\n"
@@ -237,29 +247,74 @@
cd {build_proj}; {cflags}{docker_cmd}{build_to_src}/configure 
{configure_opts}
sync
touch $@
-  '''
+'''
+  elif buildsystem == "meson":
+return f'''
+.make.{proj}.configure: .make.{proj}.clone {deps_installed} 
$({proj}_configure_files)
+   @echo -e "\\n\\n\\n= $@\\n"
+   -chmod -R ug+w {build_proj}
+   -rm -rf {build_proj}
+   mkdir -p {build_proj}
+   cd {build_proj}; {cflags}{docker_cmd}meson {build_to_src} .
+   sync
+   touch $@
+'''
+  else:
+assert False, f"unknown buildsystem: {buildsystem}"

 def gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd, jobs,
check):
-  return f'''
+  buildsystem = projects_buildsystems.get(proj, "autotools")
+
+  if buildsystem == "autotools":
+return f'''
 .make.{proj}.build: .make.{proj}.configure $({proj}_files)
if {distclean_cond}; then $(MAKE) {proj}-distclean 
.make.{proj}.configure; fi
@echo -e "\\n\\n\\n= $@\\n"
{docker_cmd}$(MAKE) -C {build_proj} -j {jobs} {check}
sync
touch $@
-  '''
+'''
+  elif buildsystem == "meson":
+target = "test" if check else "compile"
+test_line = ""
+# TODO: currently tests don't pass in this env
+# if check:
+#   test_line = f"{docker_cmd}meson test -C {build_proj} -v"
+return f'''
+.make.{proj}.build: .make.{proj}.configure $({proj}_files)
+   @echo -e "\\n\\n\\n= $@\\n"
+   {docker_cmd}meson compile -C {build_proj} -j {jobs}
+   {test_line}
+   sync
+   touch $@
+'''
+  else:
+assert False, f"unknown buildsystem: {buildsystem}"

 def gen_makefile_install(proj, docker_cmd, sudo_make_install, build_proj,

[M] Change in osmo-dev[master]: gen_makefile: split gen_make into more functions

2023-11-23 Thread osmith

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


Change subject: gen_makefile: split gen_make into more functions
..

gen_makefile: split gen_make into more functions

Add separate functions for each rule (autoconf, configure, build,
install, reinstall, clean, distclean). This is in preparation for
supporting open5gs (meson).

Change-Id: Id7acfec7f5dd0d3d1a080b3c9d15005e51863e66
---
M gen_makefile.py
1 file changed, 122 insertions(+), 63 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/13/35113/1

diff --git a/gen_makefile.py b/gen_makefile.py
index 7fc2bd2..82ebef0 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -214,14 +214,88 @@
touch $@
   '''

+def gen_makefile_autoconf(proj, src_proj, distclean_cond):
+  return f'''
+.make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac
+   if {distclean_cond}; then $(MAKE) {proj}-distclean; fi
+   @echo -e "\\n\\n\\n= $@\\n"
+   -rm -f {src_proj}/.version
+   cd {src_proj}; autoreconf -fi
+   sync
+   touch $@
+  '''
+
+def gen_makefile_configure(proj, deps_installed, distclean_cond, build_proj,
+   cflags, docker_cmd, build_to_src, configure_opts):
+  return f'''
+.make.{proj}.configure: .make.{proj}.autoconf {deps_installed} 
$({proj}_configure_files)
+   if {distclean_cond}; then $(MAKE) {proj}-distclean 
.make.{proj}.autoconf; fi
+   @echo -e "\\n\\n\\n= $@\\n"
+   -chmod -R ug+w {build_proj}
+   -rm -rf {build_proj}
+   mkdir -p {build_proj}
+   cd {build_proj}; {cflags}{docker_cmd}{build_to_src}/configure 
{configure_opts}
+   sync
+   touch $@
+  '''
+
+def gen_makefile_build(proj, distclean_cond, build_proj, docker_cmd, jobs,
+   check):
+  return f'''
+.make.{proj}.build: .make.{proj}.configure $({proj}_files)
+   if {distclean_cond}; then $(MAKE) {proj}-distclean 
.make.{proj}.configure; fi
+   @echo -e "\\n\\n\\n= $@\\n"
+   {docker_cmd}$(MAKE) -C {build_proj} -j {jobs} {check}
+   sync
+   touch $@
+  '''
+
+def gen_makefile_install(proj, docker_cmd, sudo_make_install, build_proj,
+ no_ldconfig, sudo_ldconfig):
+  return f'''
+.make.{proj}.install: .make.{proj}.build
+   @echo -e "\\n\\n\\n= $@\\n"
+   {docker_cmd}{sudo_make_install}$(MAKE) -C {build_proj} install
+   {no_ldconfig}{sudo_ldconfig}ldconfig
+   sync
+   touch $@
+  '''
+
+def gen_makefile_reinstall(proj, deps_reinstall, sudo_make_install,
+   build_proj):
+  return f'''
+.PHONY: {proj}-reinstall
+{proj}-reinstall: {deps_reinstall}
+   {sudo_make_install}$(MAKE) -C {build_proj} install
+  '''
+
+def gen_makefile_clean(proj, build_proj):
+  return f'''
+.PHONY: {proj}-clean
+{proj}-clean:
+   @echo -e "\\n\\n\\n= $@\\n"
+   -chmod -R ug+w {build_proj}
+   -rm -rf {build_proj}
+   -rm -rf .make.{proj}.*
+  '''
+
+def gen_makefile_distclean(proj, src_proj):
+  return f'''
+.PHONY: {proj}-distclean
+{proj}-distclean: {proj}-clean
+   @echo -e "\\n\\n\\n= $@\\n"
+   $(MAKE) -C {src_proj} distclean
+  '''
+
 def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, 
url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, 
make_check):
   src_proj = os.path.join(src_dir, proj)
   if proj == 'openbsc':
 src_proj = os.path.join(src_proj, 'openbsc')
-  build_proj = os.path.join(build_dir, proj)

-  make_to_build_proj = os.path.relpath(build_proj, make_dir)
+  build_proj = os.path.join(build_dir, proj)
   build_to_src = os.path.relpath(src_proj, build_proj)
+  build_proj = os.path.relpath(build_proj, make_dir)
+
   src = os.path.relpath(src_dir, make_dir)
   src_proj = os.path.relpath(src_proj, make_dir)
   push_url = push_url or url
@@ -231,6 +305,16 @@
   else:
 configure_opts_str = ''

+  distclean_cond = f'[ -e {src_proj}/config.status ]' if args.auto_distclean 
else 'false'
+  deps_installed = ' '.join(['.make.%s.install' % d for d in deps])
+  deps_reinstall = ' '.join(['%s-reinstall' %d for d in deps])
+  cflags = 'CFLAGS=-g ' if args.build_debug else ''
+  docker_cmd = f'{args.docker_cmd} ' if args.docker_cmd else ''
+  check = 'check' if make_check else ''
+  no_ldconfig = '#' if no_ldconfig else ''
+  sudo_ldconfig = '' if ldconfig_without_sudo else 'sudo '
+  sudo_make_install = 'sudo ' if sudo_make_install else ''
+
   return r'''
 ### {proj} ###

@@ -251,77 +335,39 @@

 {clone_rule}

-.make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac
-   if {distclean_cond}; then $(MAKE) {proj}-distclean; fi
-   @echo -e "\n\n\n= $@\n"
-   -rm -f {src_proj}/.version
-   cd {src_proj}; autoreconf -fi
-   sync
-   touch $@
-
-.make.{proj}.configure: .make.{proj}.autoconf {deps_installed}

[S] Change in osmo-dev[master]: gen_makefile: don't shell out to nproc

2023-11-23 Thread osmith

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


Change subject: gen_makefile: don't shell out to nproc
..

gen_makefile: don't shell out to nproc

Use python's multiprocessing.cpu_count() instead of "$(nproc)". The
latter didn't work properly in Makefiles, the right syntax would have
been "$(shell nproc)". Make didn't complain about it and assumed that we
want to use all CPUs with an empty argument "-j ", but meson doesn't
accept this syntax.

Change-Id: I58ca082339f3aff813f587f4c2be9c0951b9b2dd
---
M gen_makefile.py
1 file changed, 19 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/12/35112/1

diff --git a/gen_makefile.py b/gen_makefile.py
index 9a8a5cf..7fc2bd2 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -49,6 +49,7 @@
 import sys
 import os
 import argparse
+import multiprocessing

 topdir = os.path.dirname(os.path.realpath(__file__))
 all_deps_file = os.path.join(topdir, "all.deps")
@@ -85,7 +86,9 @@
 parser.add_argument('-o', '--output', dest='output', default='Makefile',
   help='''Makefile filename (default: 'Makefile').''')

-parser.add_argument('-j', '--jobs', dest='jobs', default='$(nproc)', 
nargs='?', const='$(nproc)',
+parser.add_argument('-j', '--jobs', dest='jobs', type=int,
+  default=multiprocessing.cpu_count(), nargs='?',
+  const=multiprocessing.cpu_count(),
   help='''-j option to pass to 'make'.''')

 parser.add_argument('-I', '--sudo-make-install', dest='sudo_make_install',

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I58ca082339f3aff813f587f4c2be9c0951b9b2dd
Gerrit-Change-Number: 35112
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: ttcn3: remove unused functions

2023-11-23 Thread osmith

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


Change subject: ttcn3: remove unused functions
..

ttcn3: remove unused functions

Change-Id: I1939f1262757899c1a75c6d51cffd2ab13815c0f
---
M ttcn3/ttcn3.sh
1 file changed, 9 insertions(+), 20 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/16/35116/1

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 5c3fae6..38a5c37 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -115,16 +115,6 @@
fi
 }

-# Returns the name of the testsuite binary
-get_testsuite_name() {
-   case "$PROJECT" in
-   bts-*) echo "BTS_Tests" ;;
-   mgw) echo "MGCP_Test" ;;
-   pcu-sns) echo "PCU_Tests" ;;
-   *) echo "${PROJECT_UPPER}_Tests" ;;
-   esac
-}
-
 get_testsuite_dir() {
local hacks="${DIR_OSMODEV}/src/osmo-ttcn3-hacks"

@@ -137,16 +127,6 @@
esac
 }

-get_testsuite_config() {
-   case "$PROJECT" in
-   bts-gprs) echo "BTS_Tests_GPRS.cfg" ;;
-   bts-oml) echo "BTS_Tests_OML.cfg" ;;
-   pcu-sns) echo "PCU_Tests_SNS.cfg" ;;
-   ggsn-ogs) echo "GGSN_Tests.cfg" ;;
-   *) echo "$(get_testsuite_name).cfg" ;;
-   esac
-}
-
 get_testsuite_dir_docker() {
local dp="${DIR_OSMODEV}/src/docker-playground"


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I1939f1262757899c1a75c6d51cffd2ab13815c0f
Gerrit-Change-Number: 35116
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: werror.opts: add libgtpnl

2023-11-23 Thread osmith

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


Change subject: werror.opts: add libgtpnl
..

werror.opts: add libgtpnl

Depends: libgtpnl Ife3716c667d2e9b3fcd94d3cdc044d594e7dab5a
Change-Id: Ia5f6f6d2641318c00608471256257b4e06627c7c
---
M werror.opts
1 file changed, 11 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/09/35109/1

diff --git a/werror.opts b/werror.opts
index 312b97b..3b27b74 100644
--- a/werror.opts
+++ b/werror.opts
@@ -6,6 +6,7 @@
 libosmo-sccp --enable-werror
 libosmo-pfcp --enable-werror
 libsmpp34 --enable-werror
+libgtpnl --enable-werror
 osmo-bsc --enable-werror
 osmo-ggsn --enable-werror
 osmo-hlr --enable-werror

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Ia5f6f6d2641318c00608471256257b4e06627c7c
Gerrit-Change-Number: 35109
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: gen_makefile: update URL code for netfilter urls

2023-11-23 Thread osmith

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


Change subject: gen_makefile: update URL code for netfilter urls
..

gen_makefile: update URL code for netfilter urls

* libgtnpnl is now developed at gerrit.osmocom.org
* use https:// instead of git:// for libnftnl, nftables
* read the urls from a new all.urls file
* don't set a push URL pointing to gerrit for projects that have
  different URLs

Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e
---
A all.urls
M gen_makefile.py
2 files changed, 43 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/11/35111/1

diff --git a/all.urls b/all.urls
new file mode 100644
index 000..27aaf6e
--- /dev/null
+++ b/all.urls
@@ -0,0 +1,4 @@
+# Git clone URLs for projects not developed at gerrit.osmocom.org
+# project  url
+libnftnl   https://git.netfilter.org/libnftnl/
+nftables   https://git.netfilter.org/nftables/
diff --git a/gen_makefile.py b/gen_makefile.py
index a00234f..9a8a5cf 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -52,6 +52,7 @@

 topdir = os.path.dirname(os.path.realpath(__file__))
 all_deps_file = os.path.join(topdir, "all.deps")
+all_urls_file = os.path.join(topdir, "all.urls")
 parser = argparse.ArgumentParser(epilog=__doc__, 
formatter_class=argparse.RawTextHelpFormatter)

 parser.add_argument('configure_opts_files',
@@ -148,6 +149,18 @@
 l.append((tokens[0], tokens[1:]))
   return l

+def read_projects_urls(path):
+  'Read urls config and return dict {project_name: url, …}.'
+  ret = {}
+  for line in open(path):
+line = line.strip()
+if not line or line.startswith('#'):
+  continue
+project, url = line.split()
+assert project not in ret, f"project '{project} found twice in {path}"
+ret[project] = url
+  return ret
+
 def read_configure_opts(path):
   'Read config opts file and return tuples of (project_name, config-opts).'
   if not path:
@@ -179,14 +192,21 @@
touch $@
   '''

-  if proj in ("libgtpnl", "libnftnl", "nftables"):
-url = "git://git.netfilter.org"
+  if proj in projects_urls:
+url = projects_urls[proj]
+cmd_set_push_url = "true"
+  else:
+url = f"{url}/{proj}"
+push_url = f"{push_url}/{proj}"
+cmd_set_push_url = f'git -C "{src}/{proj}" remote set-url --push origin 
"{push_url}"'
+
+  cmd_clone = f'git -C {src} clone --recurse-submodules "{url}" "{proj}"'

   return f'''
 .make.{proj}.clone:
@echo -e "\\n\\n\\n= $@\\n"
test -d {src} || mkdir -p {src}
-   test -d {src_proj} || ( git -C {src} clone --recurse-submodules 
"{url}/{proj}" "{proj}" && git -C "{src}/{proj}" remote set-url --push origin 
"{push_url}/{proj}" )
+   test -d {src_proj} || ( {cmd_clone} && {cmd_set_push_url} )
sync
touch $@
   '''
@@ -303,6 +323,7 @@


 projects_deps = read_projects_deps(all_deps_file)
+projects_urls = read_projects_urls(all_urls_file)
 configure_opts = listdict()
 configure_opts_files = sorted(args.configure_opts_files or [])
 for configure_opts_file in configure_opts_files:

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I5522c9fcc594d296c581ba59c0beb4882e2d976e
Gerrit-Change-Number: 35111
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: ttcn3.sh: enable color output from gcc

2023-11-23 Thread osmith

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


Change subject: ttcn3.sh: enable color output from gcc
..

ttcn3.sh: enable color output from gcc

Change-Id: Idde8084ca981333be2fc2b369ea8f25881470654
---
M ttcn3/scripts/docker_configure_make.sh
1 file changed, 10 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/10/35110/1

diff --git a/ttcn3/scripts/docker_configure_make.sh 
b/ttcn3/scripts/docker_configure_make.sh
index 56fee71..7a79ff1 100755
--- a/ttcn3/scripts/docker_configure_make.sh
+++ b/ttcn3/scripts/docker_configure_make.sh
@@ -26,6 +26,7 @@

 docker run \
--rm \
+   -t \
-e "LD_LIBRARY_PATH=/usr/local/lib" \
-v "$DIR_OSMODEV:$DIR_OSMODEV" \
-v "$DIR_USR_LOCAL:/usr/local" \

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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Idde8084ca981333be2fc2b369ea8f25881470654
Gerrit-Change-Number: 35110
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[M] Change in osmo-dev[master]: ttcn3.sh: add options for kernel tests

2023-11-23 Thread osmith

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


Change subject: ttcn3.sh: add options for kernel tests
..

ttcn3.sh: add options for kernel tests

Change-Id: I2a569b6712d8930807750751c14ed4e18b325e02
---
M ttcn3/ttcn3.sh
1 file changed, 102 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/07/35107/1

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 007fcc7..c315eda 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -6,6 +6,8 @@
 DIR_OUTPUT="${DIR_OUTPUT:-${DIR_OSMODEV}/ttcn3/out}"
 DIR_USR_LOCAL="$DIR_OSMODEV/ttcn3/usr_local"
 JOBS="$(nproc)"
+KERNEL_DIR=""
+KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source"

 # Osmocom libraries and programs relevant for the current testsuite will be
 # built in this container. It must have all build dependencies available and
@@ -36,19 +38,61 @@
 }

 parse_args() {
-   while getopts 'h' OPTION; do
+   while getopts 'hdkf' OPTION; do
case "$OPTION" in
+   d)
+   if [ -n "$KERNEL_TEST" ]; then
+   echo "ERROR: use either -d or -k"
+   exit 1
+   fi
+   export KERNEL_TEST=1
+   ;;
+   k)
+   if [ -n "$KERNEL_TEST" ]; then
+   echo "ERROR: use either -d or -k"
+   exit 1
+   fi
+   if [ -z "$KERNEL_DIR" ]; then
+   KERNEL_DIR="$(realpath "$DIR_OSMODEV/../linux")"
+   fi
+   if ! [ -e "$KERNEL_DIR/Kbuild" ]; then
+   echo "ERROR: KERNEL_DIR is invalid: $KERNEL_DIR"
+   exit 1
+   fi
+
+   export KERNEL_TEST=1
+   export KERNEL_BUILD=1
+   export KERNEL_SKIP_REBUILD=1
+   ;;
+   f)
+   if [ -z "$KERNEL_BUILD" ]; then
+   echo "ERROR: don't use -f without -k"
+   exit 1
+   fi
+   rm -f "$KERNEL_SKIP_MARKER"
+   ;;
h|*)
local name="$(basename $0)"
-   echo "usage: $name [-h] PROJECT"
+   echo "usage: $name [-h] [-d|-k [-f]] PROJECT"
echo "   or: $name clean"
+   echo
echo "arguments:"
echo "  -h   show help"
+   echo
+   echo "arguments for kernel tests:"
+   echo "  -d   run kernel tests with debian kernel"
+   echo "  -k   run kernel tests with kernel built 
from source"
+   echo "  -f   (use with -k) don't skip build if 
kernel already exists"
+   echo
echo "  PROJECT  the testsuite project to run"
+   echo
echo "examples:"
echo "  $name bsc"
echo "  $name bsc-sccplite"
echo "  $name hlr"
+   echo "  $name -d ggsn"
+   echo "  $name -k ggsn"
+   echo "  $name -k -f ggsn"
exit 1
;;
esac
@@ -361,6 +405,52 @@
"
 }

+# Similar to update_kernel_config in docker-playground
+# scripts/kernel-test/kernel-build.sh
+update_kernel_config() {
+   local previous="$DIR_MAKE/.kernel.previous.config"
+   local fragment="$(get_testsuite_dir_docker)/fragment.config"
+
+   set -x
+   make defconfig
+   scripts/kconfig/merge_config.sh -m .config "$fragment"
+   make olddefconfig
+   set +x
+
+   if [ -e "$previous" ] && ! diff -q "$previous" .config; then
+   # Remove everything built with previous config
+   echo "Kernel config changed, running 'make clean'"
+   make clean
+   fi
+
+   cp .config "$previous"
+}
+
+build_kernel() {
+   local image="arch/x86/boot/bzImage"
+
+   if [ -z "$KERNEL_DIR" ]; then
+   return
+   fi
+
+   cd "$KERNEL_DIR"
+   if ! [ -e "$image" ]; then
+   rm -f "$KERNEL_SKIP_MARKER"
+   fi
+   if ! [ -e "$KERNEL_SKIP_MARKER" ]; then
+   update_kernel_config
+   make -j"$JOBS"
+   fi
+
+   # Copy the kernel to the path expected by
+   # docker-playground scripts/kernel-test/kernel-build.sh
+   local dest="$DIR_OSMODEV/src/docker-playground/_cache/linux/$image"
+   mkdir -p "$(dirname

[S] Change in osmo-dev[master]: ttcn3.sh: clean osmo-ttcn3-hacks too

2023-11-23 Thread osmith

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


Change subject: ttcn3.sh: clean osmo-ttcn3-hacks too
..

ttcn3.sh: clean osmo-ttcn3-hacks too

Change-Id: Id0fdf5e3f0917e56e3c6abff54a2f886367252f5
---
M ttcn3/ttcn3.sh
1 file changed, 14 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/06/35106/1

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 54b4328..007fcc7 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -27,6 +27,11 @@
"$DIR_MAKE" \
"$DIR_OUTPUT" \
"$DIR_USR_LOCAL"
+
+   if [ -d "$DIR_OSMODEV/src/osmo-ttcn3-hacks" ]; then
+   make -C "$DIR_OSMODEV/src/osmo-ttcn3-hacks" clean
+   fi
+
exit 0
 }


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id0fdf5e3f0917e56e3c6abff54a2f886367252f5
Gerrit-Change-Number: 35106
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in osmo-dev[master]: ttcn3.sh: add arg to only run one test

2023-11-23 Thread osmith

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


Change subject: ttcn3.sh: add arg to only run one test
..

ttcn3.sh: add arg to only run one test

Depends: docker-playground I1f45a05e089b429918096fcd64f7c02033d5a9dd
Change-Id: I07a76f6c58d379608ecadfc3ba845651929f668c
---
M ttcn3/ttcn3.sh
1 file changed, 23 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/08/35108/1

diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index c315eda..3426e7b 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -8,6 +8,7 @@
 JOBS="$(nproc)"
 KERNEL_DIR=""
 KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source"
+ARG_TEST_NAME=""

 # Osmocom libraries and programs relevant for the current testsuite will be
 # built in this container. It must have all build dependencies available and
@@ -38,8 +39,11 @@
 }

 parse_args() {
-   while getopts 'hdkf' OPTION; do
+   while getopts 'ht:dkf' OPTION; do
case "$OPTION" in
+   t)
+   ARG_TEST_NAME="$OPTARG"
+   ;;
d)
if [ -n "$KERNEL_TEST" ]; then
echo "ERROR: use either -d or -k"
@@ -73,11 +77,12 @@
;;
h|*)
local name="$(basename $0)"
-   echo "usage: $name [-h] [-d|-k [-f]] PROJECT"
+   echo "usage: $name [-h] [-t] [-d|-k [-f]] PROJECT"
echo "   or: $name clean"
echo
echo "arguments:"
echo "  -h   show help"
+   echo "  -t   only run the test with this name"
echo
echo "arguments for kernel tests:"
echo "  -d   run kernel tests with debian kernel"
@@ -89,7 +94,7 @@
echo "examples:"
echo "  $name bsc"
echo "  $name bsc-sccplite"
-   echo "  $name hlr"
+   echo "  $name -t TC_gsup_check_imei hlr"
echo "  $name -d ggsn"
echo "  $name -k ggsn"
echo "  $name -k -f ggsn"
@@ -464,11 +469,15 @@
fi

cd "$(get_testsuite_dir_docker)"
-   export DOCKER_ARGS="\
+   DOCKER_ARGS="\
-e LD_LIBRARY_PATH=/usr/local/lib \
-v "$DIR_USR_LOCAL":/usr/local:ro \
-v $hacks:/osmo-ttcn3-hacks:ro \
"
+   if [ -n "$ARG_TEST_NAME" ]; then
+   DOCKER_ARGS="$DOCKER_ARGS -e TEST_NAME=$ARG_TEST_NAME"
+   fi
+   export DOCKER_ARGS
export NO_LIST_OSMO_PACKAGES=1
./jenkins.sh


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

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I07a76f6c58d379608ecadfc3ba845651929f668c
Gerrit-Change-Number: 35108
Gerrit-PatchSet: 1
Gerrit-Owner: osmith 
Gerrit-MessageType: newchange

[S] Change in docker-playground[master]: open5gs configs: duplicate cfgs for latest/master

2023-11-23 Thread osmith

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email )


Change subject: open5gs configs: duplicate cfgs for latest/master
..

open5gs configs: duplicate cfgs for latest/master

The config format just changed significantly in main/master. Duplicate
the configs, so we can run latest with the old versions.

Related: OS#6267
Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2
---
M ttcn3-ggsn-test/jenkins-ogs.sh
R ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml
C ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
R ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml
C ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
M ttcn3-hss-test-ogs/jenkins.sh
R ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml
C ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
M ttcn3-mme-test-ogs/jenkins.sh
R ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml
C ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
M ttcn3-pgw-test/jenkins.sh
R ttcn3-pgw-test/open5gs-nrf-latest.yaml
C ttcn3-pgw-test/open5gs-nrf-master.yaml
R ttcn3-pgw-test/open5gs-smf-latest.yaml
C ttcn3-pgw-test/open5gs-smf-master.yaml
R ttcn3-pgw-test/open5gs-upf-latest.yaml
C ttcn3-pgw-test/open5gs-upf-master.yaml
18 files changed, 27 insertions(+), 14 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground 
refs/changes/04/35104/1

diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh
index 5875b75..07952bc 100755
--- a/ttcn3-ggsn-test/jenkins-ogs.sh
+++ b/ttcn3-ggsn-test/jenkins-ogs.sh
@@ -16,7 +16,7 @@
 write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg"

 mkdir $VOL_BASE_DIR/ggsn
-cp ogs/open5gs-*.yaml $VOL_BASE_DIR/ggsn/
+cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/ggsn/
 cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/
 cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/
 cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/
@@ -35,9 +35,9 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
-   /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml 
>/data/open5gs-smfd.out 2>&1"
-   #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 
'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml 
>/data/open5gs-smfd.out 2>&1"
-   #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes 
--show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c 
/data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1"
+   /bin/sh -c "open5gs-smfd -c 
/data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1"
+   #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 
'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml 
>/data/open5gs-smfd.out 2>&1"
+   #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes 
--show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c 
/data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1"

 docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
@@ -49,7 +49,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 222) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
-   /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml 
>/data/open5gs-upfd.out 2>&1"
+   /bin/sh -c "/data/upfd.sh -c 
/data/open5gs-upf-$IMAGE_SUFFIX.yaml >/data/open5gs-upfd.out 2>&1"

 # start docker container with testsuite in foreground
 docker run --rm \
diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml 
b/ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/open5gs-smf.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml
diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml 
b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
similarity index 100%
copy from ttcn3-ggsn-test/ogs/open5gs-smf.yaml
copy to ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml 
b/ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/open5gs-upf.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml
diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml 
b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
similarity index 100%
copy from ttcn3-ggsn-test/ogs/open5gs-upf.yaml
copy to ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh
index 0eacaf9..eb60835 100755
--- a/ttcn3-hss-test-ogs/jenkins.sh
+++ b/ttcn3-hss-test-ogs/jenkins.sh
@@ -18,7 +18,7 @@
 write_mp_osmo_repo "$VOL_BASE_DIR/hss-tester/HSS_Tests.cfg"

 mkdir $VOL_BASE_DIR/hss
-cp ogs/open5gs-*.yaml $VOL_BASE_DIR/hss/
+cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/hss/
 cp ogs/freediameter.conf $VOL_BASE_DIR/hss/

 network_create
@@ -64,7 +64,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 201) \

[L] Change in docker-playground[master]: open5gs configs: update to current format

2023-11-23 Thread osmith

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email )


Change subject: open5gs configs: update to current format
..

open5gs configs: update to current format

Adjust open5gs configs to the new formats from:
https://github.com/open5gs/open5gs/pull/2739

This fixes all open5gs programs from crashing on startup with various
errors such as:
  11/21 07:39:25.971: [core] FATAL: epoll_init: Assertion `context->epfd >= 0' 
failed. (../lib/core/ogs-epoll.c:77)

Related: OS#6267
Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6
---
M ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
M ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
M ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
M ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
M ttcn3-pgw-test/open5gs-nrf-master.yaml
M ttcn3-pgw-test/open5gs-smf-master.yaml
M ttcn3-pgw-test/open5gs-upf-master.yaml
7 files changed, 158 insertions(+), 116 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground 
refs/changes/05/35105/1

diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml 
b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
index afb5cf2..4b5891e 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml
@@ -3,6 +3,10 @@
 logger:
 level: info

+global:
+  max:
+ue: 1024
+
 sbi:
 server:
   no_tls: true
@@ -17,30 +21,43 @@

 smf:
 sbi:
-  - addr: 172.18.3.201
+  server:
+  - address: 172.18.3.201
 port: 
+  client:
+nrf:
+  - uri: http://172.18.3.201:
+scp:
+  - uri: http://127.0.1.10:
 pfcp:
-  - addr: 172.18.3.201
+  server:
+- address: 172.18.3.201
+  client:
+upf:
+  - address: 172.18.3.222
 gtpc:
-  - addr: 172.18.3.201
-option:
-  so_bindtodevice: eth0
+  server:
+- address: 172.18.3.201
+  option:
+so_bindtodevice: eth0
 gtpu:
-  - addr: 172.18.3.201
-port: 2152
-option:
-  so_bindtodevice: eth0
+  server:
+- address: 172.18.3.201
+  port: 2152
+  option:
+so_bindtodevice: eth0
 metrics:
-addr: 172.18.3.201
-port: 9090
-subnet:
-  - addr: 176.16.16.1/20
+  server:
+- address: 172.18.3.201
+  port: 9090
+session:
+  - subnet: 176.16.16.1/20
 dnn: internet
-  - addr: 2001:780:44:2000:0:0:0:1/56
+  - subnet: 2001:780:44:2000:0:0:0:1/56
 dnn: inet6
-  - addr: 176.16.32.1/20
+  - subnet: 176.16.32.1/20
 dnn: inet46
-  - addr: 2001:780:44:2100:0:0:0:1/56
+  - subnet: 2001:780:44:2100:0:0:0:1/56
 dnn: inet46
 dns:
   - 172.18.3.222
@@ -52,21 +69,6 @@
   enabled: auto
 freeDiameter: /data/freediameter.conf

-scp:
-sbi:
-  - addr: 127.0.1.10
-port: 
-
-nrf:
-sbi:
-  - addr:
-  - 172.18.3.201
-port: 
-
-upf:
-pfcp:
-  - addr: 172.18.3.222
-
 parameter:

 max:
diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml 
b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
index 73e1bac..81afc6e 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml
@@ -3,31 +3,37 @@
 logger:
 level: info

+global:
+  max:
+ue: 1024
+
 upf:
 pfcp:
-  - addr: 172.18.3.222
+  server:
+- address: 172.18.3.222
 gtpu:
-  - addr: 172.18.3.222
-port: 2152
-option:
-  so_bindtodevice: eth0
-subnet:
-  - addr: 176.16.16.1/20
+  server:
+- address: 172.18.3.222
+  port: 2152
+  option:
+so_bindtodevice: eth0
+session:
+  - subnet: 176.16.16.1/20
 dnn: internet
 dev: ogstun4
-  - addr: 2001:780:44:2000:0:0:0:1/56
+  - subnet: 2001:780:44:2000:0:0:0:1/56
 dnn: inet6
 dev: ogstun6
-  - addr: 176.16.32.1/20
+  - subnet: 176.16.32.1/20
 dnn: inet46
 dev: ogstun46
-  - addr: 2001:780:44:2100:0:0:0:1/56
+  - subnet: 2001:780:44:2100:0:0:0:1/56
 dnn: inet46
 dev: ogstun46

 smf:
 pfcp:
-  - addr: 172.18.3.201
+  - address: 172.18.3.201

 parameter:

diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml 
b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
index 8d1f42e..df92b6f 100644
--- a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
+++ b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml
@@ -5,6 +5,10 @@
 logger:
 level: trace

+global:
+  max:
+ue: 1024
+
 hss:
 freeDiameter: /data/freediameter.conf

diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml 
b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
index 35b718d..520a0b5 100644
--- a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml
+++

[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload

2023-11-23 Thread jolly

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

Hello Jenkins Builder, fixeria, laforge,

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

https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email

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


Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without 
L3 payload
..

LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload

A special flag is used to keep track on the establishment of the data
link. If it is being established (not re-established) without L3
payload, it is rejected by a release request inside BTS.

Related: OS#5971
Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c
---
M include/osmo-bts/lchan.h
M src/common/lchan.c
M src/common/rsl.c
3 files changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/35082/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c
Gerrit-Change-Number: 35082
Gerrit-PatchSet: 4
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Attention: jolly 
Gerrit-Attention: laforge 
Gerrit-Attention: fixeria 
Gerrit-MessageType: newpatchset

[S] Change in pysim[master]: app: do not catch exceptions in init_card

2023-11-23 Thread dexter

dexter has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/pysim/+/35101?usp=email )


Change subject: app: do not catch exceptions in init_card
..

app: do not catch exceptions in init_card

The function init_card catches all exceptions and then returns None
objects for card or rs in case of an error. This does not fit in the
style we pursue in pySim. This is in particular true for library
functions. We want those functions to raise exceptions when something is
wrong, so that we can catch the exception at top level. Let's fix this
for init_card now.

Related: OS#6271
Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d
---
M pySim/app.py
1 file changed, 19 insertions(+), 10 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/35101/1

diff --git a/pySim/app.py b/pySim/app.py
index 1711a1c..5a9f772 100644
--- a/pySim/app.py
+++ b/pySim/app.py
@@ -55,14 +55,7 @@
 # Wait up to three seconds for a card in reader and try to detect
 # the card type.
 print("Waiting for card...")
-try:
-sl.wait_for_card(3)
-except NoCardError:
-print("No card detected!")
-return None, None
-except:
-print("Card not readable!")
-return None, None
+sl.wait_for_card(3)

 generic_card = False
 card = card_detect(scc)
@@ -73,8 +66,7 @@

 profile = CardProfile.pick(scc)
 if profile is None:
-print("Unsupported card type!")
-return None, card
+raise ValueError("Unsupported card type!")

 # ETSI TS 102 221, Table 9.3 specifies a default for the PIN key
 # references, however card manufactures may still decide to pick an

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

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d
Gerrit-Change-Number: 35101
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-MessageType: newchange

[S] Change in pysim[master]: pySim-shell: refuse to execute a startup script on initialization errors

2023-11-23 Thread dexter

dexter has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/pysim/+/35102?usp=email )


Change subject: pySim-shell: refuse to execute a startup script on 
initialization errors
..

pySim-shell: refuse to execute a startup script on initialization errors

When there is an error on initialization (e.g. card not present), we
should not continue to execute a startup script that was passed with the
pySim-shell commandline. Instead we should print a message that the
startup script was ignored due to errors.

Related: OS#6271
Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b
---
M pySim-shell.py
1 file changed, 18 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/35102/1

diff --git a/pySim-shell.py b/pySim-shell.py
index 795276a..4e08eb7 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -979,7 +979,9 @@
 " it should also be noted that some readers may behave strangely 
when no card")
 print(" is inserted.)")
 print("")
-app = PysimApp(None, None, sl, ch, opts.script)
+if opts.script:
+print("will not execute startup script due to card initialization 
errors!")
+app = PysimApp(None, None, sl, ch)

 # If the user supplies an ADM PIN at via commandline args authenticate
 # immediately so that the user does not have to use the shell commands

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

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b
Gerrit-Change-Number: 35102
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-MessageType: newchange

[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame

2023-11-23 Thread jolly

Attention is currently required from: jolly.

Hello Jenkins Builder, fixeria, laforge,

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

https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email

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

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: LAPDm: Add a flag to enable suppression of subsequent REJ frame
..

LAPDm: Add a flag to enable suppression of subsequent REJ frame

This behaviour was default in earlier versions of LAPDm/LAPD. Because it
is only required for osmocom-bb, a flag is added to enable it there.

Related: OS#5969
Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565
---
M include/osmocom/gsm/lapdm.h
M include/osmocom/isdn/lapd_core.h
M src/gsm/lapdm.c
M src/isdn/lapd_core.c
4 files changed, 19 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/35015/6
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?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: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565
Gerrit-Change-Number: 35015
Gerrit-PatchSet: 6
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Attention: jolly 
Gerrit-MessageType: newpatchset

[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200

2023-11-23 Thread jolly

Attention is currently required from: laforge, neels.

Hello Jenkins Builder, laforge, neels,

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

https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email

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

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


Change subject: LAPD: Add support for RTS based polling and T200
..

LAPD: Add support for RTS based polling and T200

The T200 timer is started when the current frame is polled at
PH-READY-TO-SEND event.

A flag is used to enable this feature. The user of LAPD core must track
frame numbers to check the timeout condition. Then it must call the
external timeout function.

Related: OS#4074
Change-Id: Ib961b5a44911b99b0487641533301749c0286995
---
M TODO-RELEASE
M include/osmocom/isdn/lapd_core.h
M src/isdn/lapd_core.c
M src/isdn/libosmoisdn.map
4 files changed, 135 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/34985/9
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995
Gerrit-Change-Number: 34985
Gerrit-PatchSet: 9
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Attention: neels 
Gerrit-Attention: laforge 
Gerrit-MessageType: newpatchset

[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200

2023-11-23 Thread jolly

Attention is currently required from: neels.

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

Change subject: LAPD: Add support for RTS based polling and T200
..


Patch Set 8:

(4 comments)

File include/osmocom/isdn/lapd_core.h:

https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/215d440d_f2511945
PS8, Line 88: #define LAPD_F_RTS0x0001
> (an enum would be nicer IMHO)
There is another flag in a later patch. 
https://gerrit.osmocom.org/c/libosmocore/+/35015


File src/isdn/lapd_core.c:

https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/437e7a58_4f75489a
PS8, Line 220: Function to
> (just drop the words "Function to", rationale: it is obvious that it is a 
> function)
Done


https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/4aeccd7b_30b7fa62
PS8, Line 400: \ref
> '\ref' is not valid doxygen here, see https://osmocom. […]
Done


https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/033fbb3f_b994b69e
PS8, Line 1785: Function call when a LAPD frame is ready to sent.
> this is hard to understand, could you make this an "imperative form" 
> description of what the functio […]
Done



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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995
Gerrit-Change-Number: 34985
Gerrit-PatchSet: 8
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Attention: neels 
Gerrit-Comment-Date: Thu, 23 Nov 2023 10:46:53 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels 
Gerrit-MessageType: comment

[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling

2023-11-23 Thread jolly

Attention is currently required from: laforge, neels.

Hello Jenkins Builder, laforge, neels,

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

https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email

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

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


Change subject: LAPDm: Add support for RTS based polling
..

LAPDm: Add support for RTS based polling

The lower layer must set the 'POLLING_ONLY' flag and provide frame
number when polling a frame. If T200 is pending, it is started with a
timeout frame number in advance to given frame number.

The lower layer must call lapdm_t200_fn() after a frame has been
received or if a frame has not been received. Also it must be called
after a TCH frame has been received. LAPDm uses this to check the T200
timeout condition.

A new function is used to set the frame number based timeout values.

Related: OS#4074
Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c
---
M TODO-RELEASE
M include/osmocom/gsm/lapdm.h
M src/gsm/lapdm.c
M src/gsm/libosmogsm.map
4 files changed, 175 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/34986/13
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c
Gerrit-Change-Number: 34986
Gerrit-PatchSet: 13
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Attention: neels 
Gerrit-Attention: laforge 
Gerrit-MessageType: newpatchset

[M] Change in libosmocore[master]: LAPDm: Add an extra queue for UI frames

2023-11-23 Thread jolly

Attention is currently required from: jolly, laforge.

Hello Jenkins Builder, laforge,

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

https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email

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

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


Change subject: LAPDm: Add an extra queue for UI frames
..

LAPDm: Add an extra queue for UI frames

The extra queue is used to transmit the UI frame only when there is no
frame in the regular TX queue. This allows to give LAPD frames prioity
over UI frame.

Related: OS#4074
Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da
---
M TODO-RELEASE
M include/osmocom/gsm/lapdm.h
M src/gsm/lapdm.c
3 files changed, 52 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/34987/13
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34987?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: I00c8ee73be8b7c564a4dee3fca3e893484f567da
Gerrit-Change-Number: 34987
Gerrit-PatchSet: 13
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Attention: jolly 
Gerrit-Attention: laforge 
Gerrit-MessageType: newpatchset

[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame

2023-11-23 Thread jolly

Attention is currently required from: jolly.

Hello Jenkins Builder, fixeria, laforge,

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

https://gerrit.osmocom.org/c/libosmocore/+/35015?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: LAPDm: Add a flag to enable suppression of subsequent REJ frame
..

LAPDm: Add a flag to enable suppression of subsequent REJ frame

This behaviour was default in earlier versions of LAPDm/LAPD. Because it
is only required for osmocom-bb, a flag is added to enable it there.

Related: OS#5969
Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565
---
M include/osmocom/gsm/lapdm.h
M include/osmocom/isdn/lapd_core.h
M src/gsm/lapdm.c
M src/isdn/lapd_core.c
4 files changed, 19 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/35015/5
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?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: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565
Gerrit-Change-Number: 35015
Gerrit-PatchSet: 5
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria 
Gerrit-Reviewer: laforge 
Gerrit-Attention: jolly 
Gerrit-MessageType: newpatchset

[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling

2023-11-23 Thread jolly

Attention is currently required from: neels.

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

Change subject: LAPDm: Add support for RTS based polling
..


Patch Set 12:

(1 comment)

File src/gsm/lapdm.c:

https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/c45204e2_b76aae5a
PS12, Line 393: /*! Get transmit frame number from L1. (Triggered when sending 
a frame.) */
> are you sure this doc matches the function??
Oh, something leftovers from developing process. Fixed now.



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

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c
Gerrit-Change-Number: 34986
Gerrit-PatchSet: 12
Gerrit-Owner: jolly 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: neels 
Gerrit-Attention: neels 
Gerrit-Comment-Date: Thu, 23 Nov 2023 10:20:39 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels 
Gerrit-MessageType: comment

1 2 >

1 - 100 of 102 matches

Mail list logo