- gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: rest_api: Fix cbs.data_user_len not set in 'payload_encoded'
by laforge 13 Jul '22

13 Jul '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28586 ) Change subject: rest_api: Fix cbs.data_user_len not set in 'payload_encoded' ...................................................................... rest_api: Fix cbs.data_user_len not set in 'payload_encoded' This is later used in cbcmsg_to_cbsp(), but only set for type 'payload_decoded' in parse_payload_decoded(). Change-Id: I519cf300cd01e8c2728babeaa77b8486f47115be --- M src/rest_api.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/rest_api.c b/src/rest_api.c index a779f3d..e596b77 100644 --- a/src/rest_api.c +++ b/src/rest_api.c @@ -317,7 +317,7 @@ if ((jtmp = json_object_get(in, "payload_encoded"))) { json_t *jpage_arr, *jpage; - int i, dcs, num_pages; + int i, dcs, num_pages, len; out->is_etws = false; /* Data Coding Scheme */ @@ -340,6 +340,7 @@ return -EINVAL; } out->cbs.num_pages = num_pages; + out->cbs.data_user_len = 0; json_array_foreach(jpage_arr, i, jpage) { const char *hexstr; if (!json_is_string(jpage)) { @@ -351,10 +352,12 @@ *errstr = "'pages' array must contain strings up to 88 hex nibbles"; return -EINVAL; } - if (osmo_hexparse(hexstr, out->cbs.data[i], sizeof(out->cbs.data[i])) < 0) { + len = osmo_hexparse(hexstr, out->cbs.data[i], sizeof(out->cbs.data[i])); + if (len < 0) { *errstr = "'pages' array must contain hex strings"; return -EINVAL; } + out->cbs.data_user_len += len; } return 0; } else if ((jtmp = json_object_get(in, "payload_decoded"))) { -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I519cf300cd01e8c2728babeaa77b8486f47115be Gerrit-Change-Number: 28586 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in osmo-cbc[master]: rest_api: Fix cbs.data_user_len not set in 'payload_encoded'
by laforge 13 Jul '22

13 Jul '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28586 ) Change subject: rest_api: Fix cbs.data_user_len not set in 'payload_encoded' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I519cf300cd01e8c2728babeaa77b8486f47115be Gerrit-Change-Number: 28586 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Jul 2022 05:31:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: tests/amr: fix less-than-zero comparison of an unsigned value
by laforge 13 Jul '22

13 Jul '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/28587 ) Change subject: tests/amr: fix less-than-zero comparison of an unsigned value ...................................................................... tests/amr: fix less-than-zero comparison of an unsigned value Change-Id: I3857095f6ec27330e95da7fe58bef8c053284a5f Fixes: CID#274725 --- M tests/amr/amr_test.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/amr/amr_test.c b/tests/amr/amr_test.c index 69ba723..d332eaa 100644 --- a/tests/amr/amr_test.c +++ b/tests/amr/amr_test.c @@ -209,7 +209,7 @@ { uint8_t buf[256]; uint8_t buf_chk[256]; - unsigned int ft; + int ft; unsigned int i = 0; int len; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/28587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3857095f6ec27330e95da7fe58bef8c053284a5f Gerrit-Change-Number: 28587 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

Change in libosmo-netif[master]: tests/amr: fix less-than-zero comparison of an unsigned value
by laforge 13 Jul '22

13 Jul '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/28587 ) Change subject: tests/amr: fix less-than-zero comparison of an unsigned value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/28587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I3857095f6ec27330e95da7fe58bef8c053284a5f Gerrit-Change-Number: 28587 Gerrit-PatchSet: 1 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Jul 2022 05:31:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...osmo_dia2gsup[master]: rebar.config: Switch from git://git.osmocom.org to https://gitea
by laforge 13 Jul '22

13 Jul '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28584 ) Change subject: rebar.config: Switch from git://git.osmocom.org to https://gitea ...................................................................... rebar.config: Switch from git://git.osmocom.org to https://gitea The old git URLs are still kept for compatibility, but we should use the official git repository (now in gitea). Change-Id: If9b70c42753e17f957241fe9be514163aee9e22d --- M rebar.config 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Verified fixeria: Looks good to me, approved diff --git a/rebar.config b/rebar.config index b0fdebd..69013aa 100644 --- a/rebar.config +++ b/rebar.config @@ -3,8 +3,8 @@ {deps, [ {setup, "2.0.2"}, {lager, {git, "https://github.com/erlang-lager/lager", {tag, "3.9.1"}}}, - {osmo_ss7, {git, "git://git.osmocom.org/erlang/osmo_ss7", {branch, "master"}}}, - {osmo_gsup, {git, "git://git.osmocom.org/erlang/osmo_gsup", {branch, "master"}}} + {osmo_ss7, {git, "https://gitea.osmocom.org/erlang/osmo_ss7", {branch, "master"}}}, + {osmo_gsup, {git, "https://gitea.osmocom.org/erlang/osmo_gsup", {branch, "master"}}} ]}. {minimum_otp_vsn, "20.3"}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: If9b70c42753e17f957241fe9be514163aee9e22d Gerrit-Change-Number: 28584 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in ...osmo_dia2gsup[master]: Add osmo_ss7 and osmo_gsup as dependencies to .app.src file
by laforge 13 Jul '22

13 Jul '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28585 ) Change subject: Add osmo_ss7 and osmo_gsup as dependencies to .app.src file ...................................................................... Add osmo_ss7 and osmo_gsup as dependencies to .app.src file We are depending on those applications, so they should be listed. Change-Id: I4a19439dff362f24efc108ee7b0790b143692d2f --- M src/osmo_dia2gsup.app.src 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Verified fixeria: Looks good to me, approved diff --git a/src/osmo_dia2gsup.app.src b/src/osmo_dia2gsup.app.src index 514ea59..941573a 100644 --- a/src/osmo_dia2gsup.app.src +++ b/src/osmo_dia2gsup.app.src @@ -6,7 +6,9 @@ kernel, stdlib, lager, - diameter + diameter, + osmo_gsup, + osmo_ss7 ]}, {mod, {osmo_dia2gsup_app, []}}, {env, []} -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I4a19439dff362f24efc108ee7b0790b143692d2f Gerrit-Change-Number: 28585 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in ...osmo_dia2gsup[master]: Add osmo_ss7 and osmo_gsup as dependencies to .app.src file
by laforge 13 Jul '22

13 Jul '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28585 ) Change subject: Add osmo_ss7 and osmo_gsup as dependencies to .app.src file ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I4a19439dff362f24efc108ee7b0790b143692d2f Gerrit-Change-Number: 28585 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 13 Jul 2022 05:31:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...osmo_dia2gsup[master]: rebar.config: Switch from git://git.osmocom.org to https://gitea
by laforge 13 Jul '22

13 Jul '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28584 ) Change subject: rebar.config: Switch from git://git.osmocom.org to https://gitea ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: If9b70c42753e17f957241fe9be514163aee9e22d Gerrit-Change-Number: 28584 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 13 Jul 2022 05:31:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...osmo_dia2gsup[master]: Add main/1 so rebar2 escriptize works
by laforge 13 Jul '22

13 Jul '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28583 ) Change subject: Add main/1 so rebar2 escriptize works ...................................................................... Add main/1 so rebar2 escriptize works Change-Id: Ifc3a58d09fbf5b9f36595515f47223a45ef13ba1 --- M rebar.config M src/osmo_dia2gsup.erl 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/rebar.config b/rebar.config index 66db6b5..b0fdebd 100644 --- a/rebar.config +++ b/rebar.config @@ -29,3 +29,7 @@ {plt_extra_apps, [kernel, stdlib, erts, tools, inets, compiler, diameter]}, {warnings, [no_improper_lists]} ]}. + +{escript_incl_apps, [osmo_dia2gsup]}. +{escript_main_app, osmo_dia2gsup}. +{escript_name, "osmo-dia2gsup"}. diff --git a/src/osmo_dia2gsup.erl b/src/osmo_dia2gsup.erl index f92c220..be8e87c 100644 --- a/src/osmo_dia2gsup.erl +++ b/src/osmo_dia2gsup.erl @@ -5,6 +5,8 @@ -include_lib("diameter/include/diameter_gen_base_rfc6733.hrl"). %-include_lib("diameter_settings.hrl"). +-export([main/1]). + % API -export([start_link/0]). -export([start/0, stop/0]). @@ -54,6 +56,10 @@ stop() -> gen_server:cast(?SERVER, stop). +main(_Args) -> + application:ensure_all_started(?MODULE), + timer:sleep(infinity). + %% ------------------------------------------------------------------ %% gen_server Function Definitions %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ifc3a58d09fbf5b9f36595515f47223a45ef13ba1 Gerrit-Change-Number: 28583 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in ...osmo_dia2gsup[master]: Add main/1 so rebar2 escriptize works
by laforge 13 Jul '22

13 Jul '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28583 ) Change subject: Add main/1 so rebar2 escriptize works ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ifc3a58d09fbf5b9f36595515f47223a45ef13ba1 Gerrit-Change-Number: 28583 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 13 Jul 2022 05:30:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

gerrit-log