April 2023 - gerrit-log - lists.osmocom.org

[S] Change in simtrace2[master]: Cosmetic: fix CI errors

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/32487 ) Change subject: Cosmetic: fix CI errors ...................................................................... Cosmetic: fix CI errors * Fix UTF-8 encoding in: firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h This caused the endianness check to fail, which reads all .c and .h files. * Add .checkpatch.conf to skip linting for: firmware/atmel_softpack_libraries Change-Id: Ibb2e42e9b4307275a33e4000c201847a6bd60137 --- A .checkpatch.conf M firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/87/32487/1 diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..591ff65 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1 @@ +--exclude ^firmware/atmel_softpack_libraries/.*$ diff --git a/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h b/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h index 84b5ef6..aada0f1 100644 --- a/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h +++ b/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h @@ -296,7 +296,7 @@ */ #pragma pack(1) -#if defined ( __CC_ARM ) /* Keil µVision 4 */ +#if defined ( __CC_ARM ) /* Keil ÂµVision 4 */ #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */ #define __attribute__(...) #elif defined ( __GNUC__ ) /* GCC CS3 2009q3-68 */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/32487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ibb2e42e9b4307275a33e4000c201847a6bd60137 Gerrit-Change-Number: 32487 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Remove dots from OOM

by matanp

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32443 ) Change subject: ctrl: Remove dots from OOM ...................................................................... ctrl: Remove dots from OOM Change-Id: Ic2c6a052a9f9dcdca225225b38eb0ebdd05ac959 --- M src/osmo-bsc/bsc_ctrl.c M src/osmo-bsc/bts_ctrl.c 2 files changed, 14 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index 8eb7caf..6f80beb 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -332,7 +332,7 @@ cmd->reply = talloc_asprintf(cmd, "%u", locked); if (!cmd->reply) { - cmd->reply = "OOM."; + cmd->reply = "OOM"; return CTRL_CMD_ERROR; } @@ -367,7 +367,7 @@ { cmd->reply = bsc_rf_states_c(cmd); if (!cmd->reply) { - cmd->reply = "OOM."; + cmd->reply = "OOM"; return CTRL_CMD_ERROR; } return CTRL_CMD_REPLY; diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index f19a7e2..a971fab 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -431,7 +431,7 @@ cmd->reply = talloc_asprintf(cmd, "%s,%s,%s", oper, admin, policy); if (!cmd->reply) { - cmd->reply = "OOM."; + cmd->reply = "OOM"; return CTRL_CMD_ERROR; } @@ -454,7 +454,7 @@ cmd->reply = bsc_rf_states_of_bts_c(cmd, bts); if (!cmd->reply) { - cmd->reply = "OOM."; + cmd->reply = "OOM"; return CTRL_CMD_ERROR; } @@ -483,7 +483,7 @@ cmd->reply = talloc_asprintf(cmd, "%u", bts->c0_max_power_red_db); if (!cmd->reply) { - cmd->reply = "OOM."; + cmd->reply = "OOM"; return CTRL_CMD_ERROR; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32443 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic2c6a052a9f9dcdca225225b38eb0ebdd05ac959 Gerrit-Change-Number: 32443 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: sm: Destroy PDP Context if activation fails

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32485 ) Change subject: sm: Destroy PDP Context if activation fails ...................................................................... sm: Destroy PDP Context if activation fails There's no use in keeping them in inactive state. This allows upper layers recreating them upon next SMREG-PDP_ACT.req. Change-Id: Ic9f9ae3becb0c26a55a3b08959a00a7df0bdb5b2 --- M src/sm/sm_ms_fsm.c 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sm/sm_ms_fsm.c b/src/sm/sm_ms_fsm.c index 297e81c..14f5ee7 100644 --- a/src/sm/sm_ms_fsm.c +++ b/src/sm/sm_ms_fsm.c @@ -41,6 +41,13 @@ #define sm_ms_fsm_state_chg(fi, NEXT_STATE) \ osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, sm_ms_fsm_timeouts, g_sm_ctx->T_defs, -1) +static void st_sm_ms_pdp_inactive_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + /* PDP became inactive, there's no use in keeping it */ + struct gprs_sm_ms_fsm_ctx *ctx = (struct gprs_sm_ms_fsm_ctx *)fi->priv; + gprs_sm_entity_free(ctx->sme); +} + static void st_sm_ms_pdp_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { @@ -176,6 +183,7 @@ .out_state_mask = X(GPRS_SM_MS_ST_PDP_ACTIVE_PENDING), .name = "INACTIVE", + .onenter = st_sm_ms_pdp_inactive_on_enter, .action = st_sm_ms_pdp_inactive, }, [GPRS_SM_MS_ST_PDP_ACTIVE_PENDING] = { -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic9f9ae3becb0c26a55a3b08959a00a7df0bdb5b2 Gerrit-Change-Number: 32485 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: sm: Fix potential null access due to missing check

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32486 ) Change subject: sm: Fix potential null access due to missing check ...................................................................... sm: Fix potential null access due to missing check Change-Id: I15532898f00c62cb2a63973decb401e929517cb3 --- M src/sm/sm_prim.c 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sm/sm_prim.c b/src/sm/sm_prim.c index 6ec8af8..c0fbca4 100644 --- a/src/sm/sm_prim.c +++ b/src/sm/sm_prim.c @@ -239,8 +239,10 @@ OSMO_ASSERT(ms); } else { sme = gprs_sm_ms_get_pdp_ctx(ms, smreg->pdp_act_req.nsapi); - LOGSME(sme, LOGL_ERROR, "Rx SMREG-PDP-ACT.req for already existing PDP context\n"); - return -EINVAL; + if (sme) { + LOGSME(sme, LOGL_ERROR, "Rx SMREG-PDP-ACT.req for already existing PDP context\n"); + return -EINVAL; + } } sme = gprs_sm_entity_alloc(ms, smreg->pdp_act_req.nsapi); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I15532898f00c62cb2a63973decb401e929517cb3 Gerrit-Change-Number: 32486 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Allow cb callers to take ownsership of msgb primitive

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32483 ) Change subject: gmm: Allow cb callers to take ownsership of msgb primitive ...................................................................... gmm: Allow cb callers to take ownsership of msgb primitive Change-Id: Ic60e73d8ba13681217bcb35e4b66cc565239cfd2 --- M src/gmm/gmm_prim.c 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index 69e74a2..b1119fe 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -346,7 +346,10 @@ rc = g_gmm_ctx->gmm_up_cb(gmm_prim, g_gmm_ctx->gmm_up_cb_user_data); else rc = gmm_up_cb_dummy(gmm_prim, g_gmm_ctx->gmm_up_cb_user_data); - msgb_free(gmm_prim->oph.msg); + if (rc != 1) + msgb_free(gmm_prim->oph.msg); + else + rc = 0; return rc; } @@ -505,7 +508,10 @@ rc = g_gmm_ctx->gmm_down_cb(gmm_prim, g_gmm_ctx->gmm_down_cb_user_data); else rc = gmm_down_cb_dummy(gmm_prim, g_gmm_ctx->gmm_down_cb_user_data); - msgb_free(gmm_prim->oph.msg); + if (rc != 1) + msgb_free(gmm_prim->oph.msg); + else + rc = 0; return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32483 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic60e73d8ba13681217bcb35e4b66cc565239cfd2 Gerrit-Change-Number: 32483 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: sm: Fix potential null access due to missing check

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32486 ) Change subject: sm: Fix potential null access due to missing check ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I15532898f00c62cb2a63973decb401e929517cb3 Gerrit-Change-Number: 32486 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Apr 2023 15:24:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: sm: Destroy PDP Context if activation fails

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32485 ) Change subject: sm: Destroy PDP Context if activation fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic9f9ae3becb0c26a55a3b08959a00a7df0bdb5b2 Gerrit-Change-Number: 32485 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Apr 2023 15:23:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: sm: Destroy PDP Context if activation fails

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32485 ) Change subject: sm: Destroy PDP Context if activation fails ...................................................................... sm: Destroy PDP Context if activation fails There's no use in keeping them in inactive state. This allows upper layers recreating them upon next SMREG-PDP_ACT.req. Change-Id: Ic9f9ae3becb0c26a55a3b08959a00a7df0bdb5b2 --- M src/sm/sm_ms_fsm.c 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/85/32485/1 diff --git a/src/sm/sm_ms_fsm.c b/src/sm/sm_ms_fsm.c index 297e81c..14f5ee7 100644 --- a/src/sm/sm_ms_fsm.c +++ b/src/sm/sm_ms_fsm.c @@ -41,6 +41,13 @@ #define sm_ms_fsm_state_chg(fi, NEXT_STATE) \ osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, sm_ms_fsm_timeouts, g_sm_ctx->T_defs, -1) +static void st_sm_ms_pdp_inactive_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + /* PDP became inactive, there's no use in keeping it */ + struct gprs_sm_ms_fsm_ctx *ctx = (struct gprs_sm_ms_fsm_ctx *)fi->priv; + gprs_sm_entity_free(ctx->sme); +} + static void st_sm_ms_pdp_inactive(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch (event) { @@ -176,6 +183,7 @@ .out_state_mask = X(GPRS_SM_MS_ST_PDP_ACTIVE_PENDING), .name = "INACTIVE", + .onenter = st_sm_ms_pdp_inactive_on_enter, .action = st_sm_ms_pdp_inactive, }, [GPRS_SM_MS_ST_PDP_ACTIVE_PENDING] = { -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic9f9ae3becb0c26a55a3b08959a00a7df0bdb5b2 Gerrit-Change-Number: 32485 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: sm: Fix potential null access due to missing check

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32486 ) Change subject: sm: Fix potential null access due to missing check ...................................................................... sm: Fix potential null access due to missing check Change-Id: I15532898f00c62cb2a63973decb401e929517cb3 --- M src/sm/sm_prim.c 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/86/32486/1 diff --git a/src/sm/sm_prim.c b/src/sm/sm_prim.c index 6ec8af8..c0fbca4 100644 --- a/src/sm/sm_prim.c +++ b/src/sm/sm_prim.c @@ -239,8 +239,10 @@ OSMO_ASSERT(ms); } else { sme = gprs_sm_ms_get_pdp_ctx(ms, smreg->pdp_act_req.nsapi); - LOGSME(sme, LOGL_ERROR, "Rx SMREG-PDP-ACT.req for already existing PDP context\n"); - return -EINVAL; + if (sme) { + LOGSME(sme, LOGL_ERROR, "Rx SMREG-PDP-ACT.req for already existing PDP context\n"); + return -EINVAL; + } } sme = gprs_sm_entity_alloc(ms, smreg->pdp_act_req.nsapi); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I15532898f00c62cb2a63973decb401e929517cb3 Gerrit-Change-Number: 32486 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libusrp[master]: debian: set compat level to 10

by osmith

osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/libusrp/+/32455 ) Change subject: debian: set compat level to 10 ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/32455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: If42ed8736658d23c99fdd8cbbe511819b1568cbe Gerrit-Change-Number: 32455 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023