- gerrit-log - lists.osmocom.org

[XS] Change in libosmo-abis[master]: trau2rtp FR & EFR: fix uninitialized memory bug
by fixeria 15 Sep '24

15 Sep '24

Attention is currently required from: falconia, laforge. fixeria has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38138?usp=email ) Change subject: trau2rtp FR & EFR: fix uninitialized memory bug ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > while I tend to agree, we now may end up memset'ing twice. Alternatively, we may clarify the API docs and state that it's responsibility of the caller to [zero-]initialize the output buffer. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6e6693e096b920a973c8cc627e94884099d004b5 Gerrit-Change-Number: 38138 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 15 Sep 2024 18:57:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in libosmo-abis[master]: trau2rtp FR & EFR: fix uninitialized memory bug
by fixeria 15 Sep '24

15 Sep '24

Attention is currently required from: falconia. fixeria has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38138?usp=email ) Change subject: trau2rtp FR & EFR: fix uninitialized memory bug ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6e6693e096b920a973c8cc627e94884099d004b5 Gerrit-Change-Number: 38138 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Sun, 15 Sep 2024 18:54:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmocom-bb[master]: firmware: k2xx: fix comments about flash organization
by fixeria 15 Sep '24

15 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38148?usp=email ) Change subject: firmware: k2xx: fix comments about flash organization ...................................................................... firmware: k2xx: fix comments about flash organization Change-Id: I1b6a50cf7e10b5d71c6aa8d492721a7345ad892a --- M src/target/firmware/board/se_k2xx/init.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/48/38148/1 diff --git a/src/target/firmware/board/se_k2xx/init.c b/src/target/firmware/board/se_k2xx/init.c index 7121867..631a87f 100644 --- a/src/target/firmware/board/se_k2xx/init.c +++ b/src/target/firmware/board/se_k2xx/init.c @@ -132,9 +132,9 @@ /* Initialize ABB driver (uses SPI) */ twl3025_init(); - /* K200i uses 13 sectors of 256 KiB each */ + /* SPANSION flash has 13 sectors of 256 KiB each */ if (tiffs_init(0x01800000, 0x40000, 13) < 0) { - /* K220i uses 52 sectors of 64 KiB each */ + /* SAMSUNG flash has 52 sectors of 64 KiB each */ tiffs_init(0x01800000, 0x10000, 52); } } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38148?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1b6a50cf7e10b5d71c6aa8d492721a7345ad892a Gerrit-Change-Number: 38148 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: firmware: rename 'se_k2x0' -> 'se_k2xx' (include K205)
by fixeria 15 Sep '24

15 Sep '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/38147?usp=email ) Change subject: firmware: rename 'se_k2x0' -> 'se_k2xx' (include K205) ...................................................................... firmware: rename 'se_k2x0' -> 'se_k2xx' (include K205) Sony Ericsson K205 joins the party! The entire K2xx-series of Sony Ericsson ODM phone models is based on TI Calypso. The K200, K205, and K220 are identical, except that the K205 has a different case/housing, and the K220 includes an FM receiver. Change-Id: I05a4815c38f9cea7c2c7f2a33b836ebd0c016d0d --- M src/target/firmware/Makefile R src/target/firmware/board/se_k2xx/init.c R src/target/firmware/board/se_k2xx/keymap.h R src/target/firmware/board/se_k2xx/rffe_k2xx.c R src/target/firmware/fb/fb_k2xx.c 5 files changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/38147/1 diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 2a376bc..9be0bfb 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -24,7 +24,7 @@ # # List of all supported boards (meant to be overridden on command line) -BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 se_k2x0 gta0x gtm900b fcdev3b \ +BOARDS?=compal_e88 compal_e86 compal_e99 se_j100 se_k2xx gta0x gtm900b fcdev3b \ pirelli_dpl10 tr800 # Framebuffer support, board specific drivers @@ -36,7 +36,7 @@ FB_e86_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_td014.o FB_j100_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_ssd1963.o FB_dpl10_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_s6b33b1x.o -FB_k2x0_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_k2x0.o +FB_k2xx_OBJS=$(FB_OBJS) fb/fb_rgb332.o fb/fb_k2xx.o FB_dummy_OBJS=$(FB_OBJS) fb/fb_dummy.o # TI Calypso @@ -110,11 +110,11 @@ BOARD_se_j100_ENVIRONMENTS=$(compal_COMMON_ENVIRONMENTS) # Sony Ericsson K200i/K220i -BOARD_se_k2x0_OBJS=$(calypso_COMMON_OBJS) board/se_k2x0/init.o \ - board/se_k2x0/rffe_k2x0.o \ +BOARD_se_k2xx_OBJS=$(calypso_COMMON_OBJS) board/se_k2xx/init.o \ + board/se_k2xx/rffe_k2xx.o \ board/gta0x/rf_tables.o board/gta0x/afcparams.o \ - board/common/readcal_tiffs.o battery/dummy.o $(FB_k2x0_OBJS) -BOARD_se_k2x0_ENVIRONMENTS=highram + board/common/readcal_tiffs.o battery/dummy.o $(FB_k2xx_OBJS) +BOARD_se_k2xx_ENVIRONMENTS=highram # # Applications diff --git a/src/target/firmware/board/se_k2x0/init.c b/src/target/firmware/board/se_k2xx/init.c similarity index 100% rename from src/target/firmware/board/se_k2x0/init.c rename to src/target/firmware/board/se_k2xx/init.c diff --git a/src/target/firmware/board/se_k2x0/keymap.h b/src/target/firmware/board/se_k2xx/keymap.h similarity index 100% rename from src/target/firmware/board/se_k2x0/keymap.h rename to src/target/firmware/board/se_k2xx/keymap.h diff --git a/src/target/firmware/board/se_k2x0/rffe_k2x0.c b/src/target/firmware/board/se_k2xx/rffe_k2xx.c similarity index 100% rename from src/target/firmware/board/se_k2x0/rffe_k2x0.c rename to src/target/firmware/board/se_k2xx/rffe_k2xx.c diff --git a/src/target/firmware/fb/fb_k2x0.c b/src/target/firmware/fb/fb_k2xx.c similarity index 87% rename from src/target/firmware/fb/fb_k2x0.c rename to src/target/firmware/fb/fb_k2xx.c index 7e433cd..fe1ad33 100644 --- a/src/target/firmware/fb/fb_k2x0.c +++ b/src/target/firmware/fb/fb_k2xx.c @@ -25,8 +25,8 @@ #include <delay.h> #include <memory.h> -#define K2X0_WIDTH 128 -#define K2X0_HEIGHT 128 +#define K2XX_WIDTH 128 +#define K2XX_HEIGHT 128 #define ARMIO_LATCH_OUT 0xfffe4802 #define CS3_ADDR 0x02000000 @@ -38,11 +38,11 @@ #define CL761_CLK (1 << 4) #define CL761_RESET (1 << 9) -#define K2X0_ENABLE_BACKLIGHT (1 << 3) +#define K2XX_ENABLE_BACKLIGHT (1 << 3) -static uint8_t fb_k2x0_mem[K2X0_WIDTH * K2X0_HEIGHT]; +static uint8_t fb_k2xx_mem[K2XX_WIDTH * K2XX_HEIGHT]; -static const uint8_t k2x0_initdata[] = { +static const uint8_t k2xx_initdata[] = { 0x2c, /* CMD: Standby Mode off */ 0x02, /* CMD: Oscillation Mode Set */ 0x01, /* DATA: oscillator on */ @@ -95,7 +95,7 @@ writew(data, CL761_DATA_ADDR); } -static void fb_k2x0_init(void) +static void fb_k2xx_init(void) { unsigned int i; uint16_t reg; @@ -116,14 +116,14 @@ delay_ms(1); reg &= ~CL761_CLK; - reg |= (1 << 1) | K2X0_ENABLE_BACKLIGHT; + reg |= (1 << 1) | K2XX_ENABLE_BACKLIGHT; writew(reg, ARMIO_LATCH_OUT); - for (i = 0; i < sizeof(k2x0_initdata); i++) - writew(k2x0_initdata[i], DISPLAY_CMD_ADDR); + for (i = 0; i < sizeof(k2xx_initdata); i++) + writew(k2xx_initdata[i], DISPLAY_CMD_ADDR); } -static void fb_k2x0_flush(void) +static void fb_k2xx_flush(void) { unsigned int i; int x, y; @@ -170,21 +170,21 @@ fb_rgb332->damage_y1 = fb_rgb332->damage_y2 = 0; } -static struct framebuffer fb_k2x0_framebuffer = { - .name = "k2x0", - .init = fb_k2x0_init, +static struct framebuffer fb_k2xx_framebuffer = { + .name = "k2xx", + .init = fb_k2xx_init, .clear = fb_rgb332_clear, .boxto = fb_rgb332_boxto, .lineto = fb_rgb332_lineto, .putstr = fb_rgb332_putstr, - .flush = fb_k2x0_flush, - .width = K2X0_WIDTH, - .height = K2X0_HEIGHT + .flush = fb_k2xx_flush, + .width = K2XX_WIDTH, + .height = K2XX_HEIGHT }; -static struct fb_rgb332 fb_k2x0_rgb332 = { - .mem = fb_k2x0_mem +static struct fb_rgb332 fb_k2xx_rgb332 = { + .mem = fb_k2xx_mem }; -struct framebuffer *framebuffer = &fb_k2x0_framebuffer; -struct fb_rgb332 *fb_rgb332 = &fb_k2x0_rgb332; +struct framebuffer *framebuffer = &fb_k2xx_framebuffer; +struct fb_rgb332 *fb_rgb332 = &fb_k2xx_rgb332; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/38147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I05a4815c38f9cea7c2c7f2a33b836ebd0c016d0d Gerrit-Change-Number: 38147 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: derive functions from f_TC_e_rab_setup()
by fixeria 15 Sep '24

15 Sep '24

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062?usp=email ) Change subject: s1gw: derive functions from f_TC_e_rab_setup() ...................................................................... Patch Set 3: (1 comment) This change is ready for review. File s1gw/S1GW_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062/comment/16ad3e04_97ce… : PS2, Line 328: for (var integer i := 0; i < lengthof(erabs); i := i + 1) { > You could actually split this for loop in a function which returns E_RABToBeSetupListBearerSUReq. […] We can do that when we can re-use `E_RABToBeSetupListBearerSUReq` in other PDUs (e.g. in upcoming testcases for the `INITIAL CONTEXT SETUP REQUEST`). Unfortunately, the S1AP specs. defined in a way that each message type has its own specific IEs, even though the IE structure is almost identical. And for now there would be only one user per such IE-crafting function. Let's keep it as-is for now and get back to this idea later. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1bff371da6337ecd7710219d1c86f0fff82ad17f Gerrit-Change-Number: 38062 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 15 Sep 2024 15:58:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: library/s1ap: fix formatting in ts_S1AP_RABSetupItemCtxtSURes
by fixeria 15 Sep '24

15 Sep '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38143?usp=email ) Change subject: library/s1ap: fix formatting in ts_S1AP_RABSetupItemCtxtSURes ...................................................................... library/s1ap: fix formatting in ts_S1AP_RABSetupItemCtxtSURes Change-Id: Ie6a367841a927ee0b542ccff2d6eb4ab9e51ca12 --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index dbea258..60dd063 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -600,10 +600,10 @@ ts_S1AP_RABSetupItemCtxtSURes(template (value) E_RAB_ID rab_id := 5, template (value) TransportLayerAddress tla := '00001010000101110001100000000100'B, template (value) GTP_TEID gtp_teid := '00000002'O) := { - e_RAB_ID := rab_id, - transportLayerAddress := tla, - gTP_TEID := gtp_teid, - iE_Extensions := omit + e_RAB_ID := rab_id, + transportLayerAddress := tla, + gTP_TEID := gtp_teid, + iE_Extensions := omit } template (value) E_RABSetupListCtxtSURes ts_S1AP_RABSetupListCtxtSURes(template (value) E_RABSetupItemCtxtSURes it := ts_S1AP_RABSetupItemCtxtSURes()) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie6a367841a927ee0b542ccff2d6eb4ab9e51ca12 Gerrit-Change-Number: 38143 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/PFCP_Templates: fix missing fields in {ts,tr}_PFCP_Session_Es...
by fixeria 15 Sep '24

15 Sep '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38101?usp=email ) Change subject: library/PFCP_Templates: fix missing fields in {ts,tr}_PFCP_Session_Est_Resp ...................................................................... library/PFCP_Templates: fix missing fields in {ts,tr}_PFCP_Session_Est_Resp Change-Id: Ib0887f1150f87746f9048f2944cd18c65224a4c7 --- M hnbgw/HNBGW_Tests.ttcn M library/PFCP_Templates.ttcn 2 files changed, 34 insertions(+), 25 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 5204f38..86a4f3f 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1969,30 +1969,25 @@ /* Expect PFCP Session Establishment Request. */ m := f_pfcp_expect(tr_PFCP_Session_Est_Req()); - var F_SEID hnbgw_f_seid := m.message_body.pfcp_session_establishment_request.CP_F_SEID; var PFCP_Session_Establishment_Request serq := m.message_body.pfcp_session_establishment_request; + var F_SEID hnbgw_f_seid := serq.CP_F_SEID; /* Acting as UPF, invent a new PFCP SEID to send to HNBGW. Respond to the Session Establishment. * The PFCP response must have the same sequence_number as the request. */ - var F_SEID up_f_seid := valueof(ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), '1111111111111111'O)); - var template PDU_PFCP r := ts_PFCP_Session_Est_Resp(m.sequence_number, upf_node_id, hnbgw_f_seid.seid); - r.message_body.pfcp_session_establishment_response := { - offending_ie := omit, - UP_F_SEID := up_f_seid, - created_PDR_list := { - ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id, - local_F_TEID := ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid, - f_inet_addr(gtp_pars.core.local.addr))), - ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id, - local_F_TEID := ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid, - f_inet_addr(gtp_pars.access.local.addr))) - }, - load_control_information := omit, - overload_control_information := omit, - node_list := omit, - failed_rule_id := omit, - created_traffic_endpoint_list := omit - }; + var template F_SEID up_f_seid := ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), '1111111111111111'O); + var template F_TEID f_teid1 := ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid, + f_inet_addr(gtp_pars.core.local.addr)); + var template F_TEID f_teid2 := ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid, + f_inet_addr(gtp_pars.access.local.addr)); + var template Created_PDR pdr1 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id, + local_F_TEID := f_teid1); + var template Created_PDR pdr2 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id, + local_F_TEID := f_teid2); + var template PDU_PFCP r := ts_PFCP_Session_Est_Resp(seq_nr := m.sequence_number, + node_id := upf_node_id, + seid := hnbgw_f_seid.seid, + f_seid := up_f_seid, + created_pdr := {pdr1, pdr2}); PFCP.send(r); /* Expect on Iuh: RAB Assignment Request with IP/port from PFCP Session Est Resp */ diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn index 42fad90..3a49df3 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -792,29 +792,43 @@ template (value) PDU_PFCP ts_PFCP_Session_Est_Resp(template (value) LIN3_BO_LAST seq_nr, template (value) Node_ID node_id, - template (value) OCT8 seid) + template (value) OCT8 seid, + template (value) F_SEID f_seid, + template (omit) PFCP_Session_Establishment_Response.created_PDR_list created_pdr) modifies ts_PDU_PFCP_ := { seid := seid, sequence_number := seq_nr, message_body := { pfcp_session_establishment_response := { node_id := node_id, - cause := ts_PFCP_Cause(REQUEST_ACCEPTED) + cause := ts_PFCP_Cause(REQUEST_ACCEPTED), + offending_ie := omit, + UP_F_SEID := f_seid, + created_PDR_list := created_pdr, + load_control_information := omit, + overload_control_information := omit, + node_list := omit, + failed_rule_id := omit, + created_traffic_endpoint_list := omit } } } template (present) PDU_PFCP -tr_PFCP_Session_Est_Resp(template (present) OCT8 seid := ?) +tr_PFCP_Session_Est_Resp(template (present) LIN3_BO_LAST seq_nr := ?, + template (present) Node_ID node_id := ?, + template (present) OCT8 seid := ?, + template (present) F_SEID f_seid := ?, + template PFCP_Session_Establishment_Response.created_PDR_list created_pdr := *) modifies tr_PDU_PFCP_ := { seid := seid, sequence_number := ?, message_body := { pfcp_session_establishment_response := { - node_id := ?, + node_id := node_id, cause := tr_PFCP_Cause(REQUEST_ACCEPTED), offending_ie := *, UP_F_SEID := ?, - created_PDR_list := ?, + created_PDR_list := created_pdr, load_control_information := *, overload_control_information := *, node_list := *, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38101?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib0887f1150f87746f9048f2944cd18c65224a4c7 Gerrit-Change-Number: 38101 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in libosmo-abis[master]: tests: add unit tests for trau2rtp conversion, FR & EFR
by falconia 15 Sep '24

15 Sep '24

falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38139?usp=email ) Change subject: tests: add unit tests for trau2rtp conversion, FR & EFR ...................................................................... Patch Set 3: -Verified (1 comment) Patchset: PS3: > The actual builds are passing, but the linter is failing on the TEH acronym (TRAU-like Extension Hea […] The patch to osmo-ci.git that removes TEH from the offender word list has been merged, so the linter now passes. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie319900125baa8f20595cac83343771d780a5b4e Gerrit-Change-Number: 38139 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Sun, 15 Sep 2024 15:50:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>

1 0

[XS] Change in osmo-ci[master]: publish-tarballs: ignore some libosmo-sccp-legacy
by laforge 15 Sep '24

15 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38134?usp=email ) Change subject: publish-tarballs: ignore some libosmo-sccp-legacy ...................................................................... publish-tarballs: ignore some libosmo-sccp-legacy "make dist-bzip2" doesn't work in these versions, so don't attempt to build a tarball for them. It was fixed in 2.0.3. Related: https://gitea.osmocom.org/osmocom/libosmo-sccp-legacy/commit/27d2423b15463a… Change-Id: Id894d49c579998c02f32aa45f5585234fb11746b --- M scripts/tarballs/publish-tarballs-for-tags.sh 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 93e861b..0335bd3 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -111,6 +111,10 @@ osmo-trx:0.2.0, osmo-trx:0.3.0, osmo-trx:1.3.0, + + libosmo-sccp-legacy:2.0.0, + libosmo-sccp-legacy:2.0.1, + libosmo-sccp-legacy:2.0.2, " mkdir -p \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38134?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id894d49c579998c02f32aa45f5585234fb11746b Gerrit-Change-Number: 38134 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: on crash, wait until test stopped
by laforge 15 Sep '24

15 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38135?usp=email ) Change subject: testenv: on crash, wait until test stopped ...................................................................... testenv: on crash, wait until test stopped When the IUT (or other test component) crashes, wait until ttcn3-tcpdump-stop.sh has closed the pcap, as otherwise the last buffered data may be lost. Add a timeout of 2 minutes in case the test doesn't stop on its own. I considered making this feature optional, but impatient users can still immediately kill everything with ^C. Change-Id: If49263869b1d46103813e9d06deff47f8ba72896 --- M _testenv/testenv/daemons.py M _testenv/testenv/testsuite.py M ttcn3-tcpdump-start.sh M ttcn3-tcpdump-stop.sh 4 files changed, 47 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/daemons.py b/_testenv/testenv/daemons.py index c211cd7..c7e8722 100644 --- a/_testenv/testenv/daemons.py +++ b/_testenv/testenv/daemons.py @@ -9,6 +9,7 @@ import testenv import testenv.testdir import time +import sys daemons = {} run_shell_on_stop = False @@ -100,6 +101,24 @@ kill_process_tree(pid, ppids) +def check_if_crashed(): + crashed = False + for daemon_name, daemon_proc in daemons.items(): + if not testenv.testsuite.is_running(daemon_proc.pid): + crashed = True + break + if not crashed: + return + + current_test = testenv.testsuite.get_current_test() + if current_test: + logging.error(f"{daemon_name} crashed during {current_test}!") + testenv.testsuite.wait_until_test_stopped() + else: + logging.error(f"{daemon_name} crashed!") + sys.exit(1) + + def stop(): global daemons global run_shell_on_stop diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index d14d36f..7a42216 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -200,9 +200,7 @@ stop() break - for daemon_name, daemon_proc in testenv.daemons.daemons.items(): - if not is_running(daemon_proc.pid): - raise testenv.NoTraceException(f"{daemon_name} crashed!") + testenv.daemons.check_if_crashed() merge_log_files(cfg) format_log_files(cfg) @@ -217,6 +215,29 @@ testenv.cmd.run(section_data["prepare"]) +def get_current_test(): + path = os.path.join(testenv.testdir.testdir, "testsuite/.current_test") + try: + with open(path, "r") as h: + return h.readline().rstrip() + except: + # File may not exist, e.g. if test was stopped + return None + + +def wait_until_test_stopped(): + path = os.path.join(testenv.testdir.testdir, "testsuite/.current_test") + + logging.debug("Waiting until test has stopped...") + + for i in range(0, 1200): + time.sleep(0.1) + if not os.path.exists(path): + return + + raise testenv.NoTraceError("Timeout in wait_until_test_stopped()") + + def stop(): global testsuite_proc diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 4068b26..9575a68 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -120,3 +120,5 @@ fi done kill $PID + +echo "$TESTCASE" > "$TTCN3_PCAP_PATH/.current_test" diff --git a/ttcn3-tcpdump-stop.sh b/ttcn3-tcpdump-stop.sh index 0ac1b5e..def10d8 100755 --- a/ttcn3-tcpdump-stop.sh +++ b/ttcn3-tcpdump-stop.sh @@ -83,3 +83,5 @@ PCAP_FILENAME="$TTCN3_PCAP_PATH/$TESTCASE.$i.pcap" fi gzip -f "$PCAP_FILENAME" + +rm -f "$TTCN3_PCAP_PATH/.current_test" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38135?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If49263869b1d46103813e9d06deff47f8ba72896 Gerrit-Change-Number: 38135 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log