- gerrit-log - lists.osmocom.org

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

12 Jul '22

laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/85/28585/1 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-MessageType: newchange

1 0

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

12 Jul '22

laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/83/28583/1 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-MessageType: newchange

1 0

Change in osmo-bsc-nat[master]: bssap_conn: fix missing length check
by pespin 12 Jul '22

12 Jul '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582 ) Change subject: bssap_conn: fix missing length check ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc-nat/bssap_conn.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582/comment/d77337ca_9b640c33 PS2, Line 60: len = IP_V4_ADDR_LEN; > see line 74: this function copies all existing IEs except for AOIP_TRASP_ADDR. […] Ok I see. I think it would be a lot clearer by separating the 2 paths beforehand. gsm0808_enc_aoip_trasp_addr should take care of checking internally whether there's space in msg_new. if (tag == GSM0808_IE_AOIP_TRASP_ADDR) { rc = gsm0808_enc_aoip_trasp_addr(msg_new, ss); } else { if (len >= msgb_tailroom(msg_new)) { LOGP(DMAIN, LOGL_ERROR, "Tailroom too small to encode tag %d into copy of bssmap msg\n", tag); msgb_free(msg_new); return -EINVAL; } rc = tlv_encode_one(msg_new, def->def[tag].type, tag, len, val); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I1fc4c81e139bab3d7d977ef9467f62d8088884db Gerrit-Change-Number: 28582 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Jul 2022 14:49:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bsc-nat[master]: bssap_conn: fix missing length check
by osmith 12 Jul '22

12 Jul '22

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582 ) Change subject: bssap_conn: fix missing length check ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc-nat/bssap_conn.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582/comment/89cc5a7d_c380740a PS2, Line 60: len = IP_V4_ADDR_LEN; > I'm lost. […] see line 74: this function copies all existing IEs except for AOIP_TRASP_ADDR. therefore I'm setting the correct len here, in case it's different from the original IE. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I1fc4c81e139bab3d7d977ef9467f62d8088884db Gerrit-Change-Number: 28582 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Jul 2022 14:43:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-cbc: Enable gsmtap log
by pespin 12 Jul '22

12 Jul '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28569 ) Change subject: ttcn3-cbc: Enable gsmtap log ...................................................................... ttcn3-cbc: Enable gsmtap log Change-Id: I15ecf18e062218efb4a4319e29f182ba4331a37b --- M ttcn3-cbc-test/osmo-cbc.cfg 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index 3b6610e..dab1c8b 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -2,6 +2,10 @@ ! OsmoCBC (0.1.0.5-e88e) configuration saved from vty !! ! +log gsmtap 172.18.27.100 + logging level set-all debug + logging filter all 1 +! log stderr logging filter all 1 logging color 1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28569 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I15ecf18e062218efb4a4319e29f182ba4331a37b Gerrit-Change-Number: 28569 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc-nat[master]: bsc_nat_print_addr: handle NULL
by pespin 12 Jul '22

12 Jul '22

Attention is currently required from: osmith, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28581 ) Change subject: bsc_nat_print_addr: handle NULL ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28581 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I37cfc7ae32d85142d73b523b2f13b94a0bffba7a Gerrit-Change-Number: 28581 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Jul 2022 14:41:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc-nat[master]: bssap_conn: fix missing length check
by pespin 12 Jul '22

12 Jul '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582 ) Change subject: bssap_conn: fix missing length check ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc-nat/bssap_conn.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582/comment/13ee9f0b_3ea3ee20 PS2, Line 60: len = IP_V4_ADDR_LEN; I'm lost. Why are you resetting len here? isn't it set by tlv_parse_one? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/28582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I1fc4c81e139bab3d7d977ef9467f62d8088884db Gerrit-Change-Number: 28582 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Jul 2022 14:40:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: jobs/gerrit-verifications: add osmo-opencm3-projects
by osmith 12 Jul '22

12 Jul '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28574 ) Change subject: jobs/gerrit-verifications: add osmo-opencm3-projects ...................................................................... jobs/gerrit-verifications: add osmo-opencm3-projects Related: SYS#6041 Change-Id: Ic514e96ff515c5703f39f5a31f419ff344179368 --- M jobs/gerrit-verifications.yml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index b873dbd..a4af343 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -242,6 +242,9 @@ - osmo-sysmon - osmo-remsim - simtrace2 + - osmo-opencm3-projects: + docker_img: '$USER/debian-bullseye-jenkins' + cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' - osmo-asf4-dfu - osmo-ccid-firmware - osmo-e1d -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic514e96ff515c5703f39f5a31f419ff344179368 Gerrit-Change-Number: 28574 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: jobs/master-builds: enable osmo-opencm3-projects
by osmith 12 Jul '22

12 Jul '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28573 ) Change subject: jobs/master-builds: enable osmo-opencm3-projects ...................................................................... jobs/master-builds: enable osmo-opencm3-projects Use debian-bullseye-jenkins to have picolibc-arm-none-eabi available. Related: OS#6041 Change-Id: Iefff6e3c3b18f4af99079635a45320faaac54e50 --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index a7c2ca0..acb8216 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -368,9 +368,9 @@ cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - osmo-opencm3-projects: + docker_img: '$USER/debian-bullseye-jenkins' cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - disabled: true - osmo-e1d - osmo-cbc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iefff6e3c3b18f4af99079635a45320faaac54e50 Gerrit-Change-Number: 28573 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: docker-rebuild: build erlang img on x86_64 only
by osmith 12 Jul '22

12 Jul '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28571 ) Change subject: docker-rebuild: build erlang img on x86_64 only ...................................................................... docker-rebuild: build erlang img on x86_64 only Build debian-bullseye-erlang on x86_64 nodes only, as the image doesn't get used on nodes with other arches. The image is only used by gerrit-verifications jobs for osmo_dia2gsum and osmo_gsup, which are restriected to run on these nodes: https://jenkins.osmocom.org/jenkins/label/osmocom-gerrit-debian9/ Remove the check and comments for not building for debian 10 x32, as that node has been replaced with a debian 11 one. Related: OS#5453 Change-Id: I5636dfc9e06a44b096f9dc55528d677ea2dfc352 --- M scripts/osmo-ci-docker-rebuild.sh 1 file changed, 1 insertion(+), 8 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 556ed82..c049b46 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -5,14 +5,7 @@ docker_images_require \ "debian-buster-jenkins" -if [ "$(arch)" = "i686" ] && \ - grep -q '^ID=debian' /etc/os-release && \ - grep -q '^VERSION_ID="10"' /etc/os-release; then - # Attempting to run debian-bullseye (11) in docker on debian 10 x86 - # doesn't work. Skip it here for gtp0-deb10build32 until we've moved it - # away from debian 10. - echo "Skipping build of debian-bullseye-erlang (OS#5453)" -else +if [ "$(arch)" = "x86_64" ]; then docker_images_require \ "debian-bullseye-erlang" fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5636dfc9e06a44b096f9dc55528d677ea2dfc352 Gerrit-Change-Number: 28571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

gerrit-log