- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: ggsn: Set up diameter for open5gs
by pespin 06 Feb '22

06 Feb '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061 ) Change subject: ggsn: Set up diameter for open5gs ...................................................................... ggsn: Set up diameter for open5gs Change-Id: Iedadb98be2a2e851b75e4e67c22bca7047191fec --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh 3 files changed, 84 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 63e0696..0d134f6 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -31,9 +31,14 @@ import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; + import from DIAMETER_Types all; + import from DIAMETER_Templates all; + import from DIAMETER_Emulation all; + const integer GTP0_PORT := 3386; const integer GTP1C_PORT := 2123; const integer GTP1U_PORT := 2152; + const integer PCRF_PORT := 3868; type enumerated GGSN_Impl { GGSN_IMPL_OSMOCOM, @@ -118,6 +123,11 @@ port TELNETasp_PT GGSNVTY; var boolean use_gtpu_txseq := false; var boolean g_use_echo := false; + + /* emulated PCRF, used with m_ggsn_impl = GGSN_IMPL_OPEN5GS */ + var DIAMETER_Emulation_CT vc_DIAMETER; + port DIAMETER_PT DIAMETER_UNIT; + port DIAMETEREM_PROC_PT DIAMETER_PROC; } private function f_init_vty() runs on GT_CT { @@ -181,6 +191,42 @@ f_vty_transceive(GGSNVTY, "end"); } + private function DiameterForwardUnitdataCallback(PDU_DIAMETER msg) + runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { + DIAMETER_UNIT.send(msg); + return omit; + } + + private function f_init_diameter(charstring id) runs on GT_CT { + var DIAMETEROps ops := { + create_cb := refers(DIAMETER_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(DiameterForwardUnitdataCallback), + raw := true /* handler mode (single component for all IMSI)) */ + }; + var DIAMETER_conn_parameters pars := { + remote_ip := m_ggsn_ip_gtpc, + remote_sctp_port := -1, + local_ip := m_bind_ip_gtpc, + local_sctp_port := PCRF_PORT, + origin_host := "ttcn3ggsntest.localdomain", + origin_realm := "localdomain", + vendor_app_id := c_DIAMETER_3GPP_Gx_AID + }; + vc_DIAMETER := DIAMETER_Emulation_CT.create(id); + map(vc_DIAMETER:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_DIAMETER:DIAMETER_UNIT, self:DIAMETER_UNIT); + connect(vc_DIAMETER:DIAMETER_PROC, self:DIAMETER_PROC); + vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); + + f_diameter_wait_capability(DIAMETER_UNIT); + /* Give some time for our emulation to get out of SUSPECT list of SUT (3 watchdong ping-pongs): + * RFC6733 sec 5.1 + * RFC3539 sec 3.4.1 [5] + * https://github.com/freeDiameter/freeDiameter/blob/master/libfdcore/p_psm.c#… + */ + f_sleep(1.0); + } + function f_init() runs on GT_CT { if (g_initialized == true) { return; @@ -208,11 +254,13 @@ f_init_vty(); f_vty_set_gpdu_txseq(use_gtpu_txseq); f_vty_enable_echo_interval(g_use_echo); + } else if (m_ggsn_impl == GGSN_IMPL_OPEN5GS) { + f_init_diameter(testcasename()); } } /* Altstep implementing responses to any incoming echo requests */ - altstep pingpong() runs on GT_CT { + private altstep pingpong() runs on GT_CT { var Gtp1cUnitdata ud; var Gtp1uUnitdata udu; [g_use_echo] GTPC.receive(tr_GTPC_PING(?)) -> value ud { @@ -328,6 +376,28 @@ } } + private altstep as_DIA_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { + var PDU_DIAMETER rx_dia; + [] DIAMETER_UNIT.receive(tr_DIA_CCR(req_type := req_type)) -> value rx_dia { + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + DIAMETER_UNIT.send(ts_DIA_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + req_type, req_num)); + } + [] DIAMETER_UNIT.receive(PDU_DIAMETER:?) -> value rx_dia { + setverdict(fail, "Received unexpected DIAMETER ", rx_dia); + self.stop; + } + } + /* send a PDP context activation */ function f_pdp_ctx_act(inout PdpContext ctx, OCT1 exp_cause := '80'O) runs on GT_CT { var Gtp1cUnitdata ud; @@ -339,6 +409,9 @@ g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, ctx.uli)); T_default.start; d := activate(pingpong()); + if (DIAMETER_PROC.checkstate("Connected")) { + as_DIA_CCR(INITIAL_REQUEST); + } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { f_handle_create_req(ctx, ud, exp_cause); @@ -393,6 +466,9 @@ f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx.teic_remote, ctx.nsapi, teardown_ind)); T_default.start; d := activate(pingpong()); + if (DIAMETER_PROC.checkstate("Connected")) { + as_DIA_CCR(TERMINATION_REQUEST); + } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, expect_teid)) -> value ud { if (ud.gtpc.gtpc_pdu.deletePDPContextResponse.cause.causevalue == expect_causevalue) { diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index f9bae1c..6626467 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -52,9 +52,14 @@ FILES="BSSGP_EncDec.cc BSSGP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator/src +FILES="DIAMETER_EncDec.cc" +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn PAP_Types.ttcn " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn DIAMETER_Templates.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " gen_links $DIR $FILES diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index 7adbd0b..4bdc87a 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -5,6 +5,8 @@ FILES=" *.ttcn BSSGP_EncDec.cc + DIAMETER_CodecPort_CtrlFunctDef.cc + DIAMETER_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iedadb98be2a2e851b75e4e67c22bca7047191fec Gerrit-Change-Number: 27061 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: add module parameter 'mp_verify_talloc_count'
by fixeria 06 Feb '22

06 Feb '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27073 ) Change subject: BSC_Tests: add module parameter 'mp_verify_talloc_count' ...................................................................... BSC_Tests: add module parameter 'mp_verify_talloc_count' This parameter allows to enable/disable checking of the IUT's talloc report in f_shutdown_helper(). This may be useful when running the test suite against '-latest' with unfixed memory leaks. Change-Id: Ic7bf8d9def21083ebda1b94659d72dde2bb5e664 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 1510af8..dadd5bf 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -709,6 +709,9 @@ /* Value set in osmo-bsc.cfg "ms max power" */ uint8_t mp_exp_ms_power_level := 7; + + /* Whether to check for memory leaks */ + boolean mp_verify_talloc_count := true; } friend function f_gen_test_hdlr_pars(integer bssap_idx := 0) return TestHdlrParams { @@ -858,7 +861,7 @@ friend function f_shutdown_helper() runs on test_CT { /* Run the subscr and conn leak test only when the VTY is initialized */ - if (BSCVTY.checkstate("Mapped")) { + if (BSCVTY.checkstate("Mapped") and mp_verify_talloc_count) { f_verify_talloc_count(BSCVTY, {"struct bsc_subscr", "struct gsm_subscriber_connection"}); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic7bf8d9def21083ebda1b94659d72dde2bb5e664 Gerrit-Change-Number: 27073 Gerrit-PatchSet: 1 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-MessageType: merged

1 0

Change in osmo-hlr[master]: debian: add new 'libosmo-mslookup-utils' package
by fixeria 06 Feb '22

06 Feb '22

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/27075 to look at the new patch set (#2). Change subject: debian: add new 'libosmo-mslookup-utils' package ...................................................................... debian: add new 'libosmo-mslookup-utils' package Change-Id: I9dbe00187678a5032fb4ae32b496892fdc86ddb7 Related: OS#4706 --- M debian/control A debian/libosmo-mslookup-utils.install 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/75/27075/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/27075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I9dbe00187678a5032fb4ae32b496892fdc86ddb7 Gerrit-Change-Number: 27075 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Change in osmo-hlr[master]: debian: add new 'libosmo-mslookup-utils' package
by fixeria 06 Feb '22

06 Feb '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/27075 ) Change subject: debian: add new 'libosmo-mslookup-utils' package ...................................................................... debian: add new 'libosmo-mslookup-utils' package Change-Id: I9dbe00187678a5032fb4ae32b496892fdc86ddb7 Related: OS#4706 --- M debian/control A debian/libosmo-mslookup-utils.dirs A debian/libosmo-mslookup-utils.install 3 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/75/27075/1 diff --git a/debian/control b/debian/control index 5da3a4f..323f273 100644 --- a/debian/control +++ b/debian/control @@ -80,6 +80,16 @@ . This package contains the development headers. +Package: libosmo-mslookup-utils +Architecture: any +Section: utils +Depends: ${shlibs:Depends}, + libosmo-mslookup0 (= ${binary:Version}), + ${misc:Depends} +Multi-Arch: same +Description: Utilities for Osmocom MS lookup library + This package contains a simple MS lookup client utility. + Package: osmo-hlr-doc Architecture: all Section: doc diff --git a/debian/libosmo-mslookup-utils.dirs b/debian/libosmo-mslookup-utils.dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/libosmo-mslookup-utils.dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/libosmo-mslookup-utils.install b/debian/libosmo-mslookup-utils.install new file mode 100644 index 0000000..6409d0d --- /dev/null +++ b/debian/libosmo-mslookup-utils.install @@ -0,0 +1 @@ +usr/bin/osmo-mslookup-client -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/27075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I9dbe00187678a5032fb4ae32b496892fdc86ddb7 Gerrit-Change-Number: 27075 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-hlr[master]: fixup: debian: remove unneeded dependency libdbd-sqlite3
by fixeria 06 Feb '22

06 Feb '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/27074 ) Change subject: fixup: debian: remove unneeded dependency libdbd-sqlite3 ...................................................................... fixup: debian: remove unneeded dependency libdbd-sqlite3 Change-Id: I3ece7c32151f6f334d0595fdbf9099c930b22bb9 Fixes: I5bfe9c71740c1ced5bad0a41dfca568b9e00070c --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/74/27074/1 diff --git a/debian/control b/debian/control index 68bd475..5da3a4f 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Package: osmo-hlr Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libdbd-sqlite3 +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Osmocom Home Location Register OsmoHLR is a Osmocom implementation of HLR (Home Location Registrar) which works over GSUP protocol. The subscribers are store in sqlite DB. It supports both 2G and 3G authentication. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/27074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I3ece7c32151f6f334d0595fdbf9099c930b22bb9 Gerrit-Change-Number: 27074 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: add module parameter 'mp_verify_talloc_count'
by laforge 06 Feb '22

06 Feb '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27073 ) Change subject: BSC_Tests: add module parameter 'mp_verify_talloc_count' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic7bf8d9def21083ebda1b94659d72dde2bb5e664 Gerrit-Change-Number: 27073 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Feb 2022 18:00:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: add module parameter 'mp_verify_talloc_count'
by fixeria 06 Feb '22

06 Feb '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27073 ) Change subject: BSC_Tests: add module parameter 'mp_verify_talloc_count' ...................................................................... BSC_Tests: add module parameter 'mp_verify_talloc_count' This parameter allows to enable/disable checking of the IUT's talloc report in f_shutdown_helper(). This may be useful when running the test suite against '-latest' with unfixed memory leaks. Change-Id: Ic7bf8d9def21083ebda1b94659d72dde2bb5e664 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/27073/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 1510af8..dadd5bf 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -709,6 +709,9 @@ /* Value set in osmo-bsc.cfg "ms max power" */ uint8_t mp_exp_ms_power_level := 7; + + /* Whether to check for memory leaks */ + boolean mp_verify_talloc_count := true; } friend function f_gen_test_hdlr_pars(integer bssap_idx := 0) return TestHdlrParams { @@ -858,7 +861,7 @@ friend function f_shutdown_helper() runs on test_CT { /* Run the subscr and conn leak test only when the VTY is initialized */ - if (BSCVTY.checkstate("Mapped")) { + if (BSCVTY.checkstate("Mapped") and mp_verify_talloc_count) { f_verify_talloc_count(BSCVTY, {"struct bsc_subscr", "struct gsm_subscriber_connection"}); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic7bf8d9def21083ebda1b94659d72dde2bb5e664 Gerrit-Change-Number: 27073 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: open5gs-master: install dependencies using apt-get build-dep
by fixeria 06 Feb '22

06 Feb '22

Attention is currently required from: osmith. Hello osmith, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/27070 to look at the new patch set (#3). Change subject: open5gs-master: install dependencies using apt-get build-dep ...................................................................... open5gs-master: install dependencies using apt-get build-dep This is a 3-rd party project, which may introduce new dependencies in the future. Rather than maintaining our own list of packages to install, let's employ 'apt-get build-dep'. This tool parses 'debian/control' and installs all dependencies automatically. Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Related: SYS#5602 --- M open5gs-master/Dockerfile 1 file changed, 16 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/27070/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Gerrit-Change-Number: 27070 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in docker-playground[master]: make/Makefile: generalize passing additional build arguments
by fixeria 06 Feb '22

06 Feb '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27072 ) Change subject: make/Makefile: generalize passing additional build arguments ...................................................................... make/Makefile: generalize passing additional build arguments Building of some images may require additional options to be passed. Change-Id: Id1761062ac6ec1d1a4eb6a6b724e42cf576c848f --- M jenkins-common.sh M make/Makefile 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/72/27072/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 7130fe2..3faf6a9 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -169,7 +169,7 @@ echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" make -C "${IMAGE_DIR_PREFIX}/${dir}" \ - PULL="$pull_arg" \ + BUILD_ARGS="$pull_arg" \ UPSTREAM_DISTRO="$upstream_distro_arg" \ DISTRO="$distro_arg" \ IMAGE="$REPO_USER/$i" \ diff --git a/make/Makefile b/make/Makefile index 34d5d25..b2d344e 100644 --- a/make/Makefile +++ b/make/Makefile @@ -37,7 +37,7 @@ OSMO_SIP_BRANCH?=master OSMO_STP_BRANCH?=master OPEN5GS_BRANCH?=main -PULL?= +BUILD_ARGS?= UPSTREAM_DISTRO?=debian:bullseye DISTRO?=debian-bullseye @@ -114,7 +114,7 @@ --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ --build-arg OPEN5GS_BRANCH=$(OPEN5GS_BRANCH) \ - $(PULL) -t $(IMAGE):latest . + $(BUILD_ARGS) -t $(IMAGE):latest . @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id1761062ac6ec1d1a4eb6a6b724e42cf576c848f Gerrit-Change-Number: 27072 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libosmocore[master]: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros
by fixeria 06 Feb '22

06 Feb '22

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27046 ) Change subject: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > no commitlog rationale. […] I saw this is actively used in the kernel (and there it makes sense, indeed), and in open5gs. Where I believe using OSMO_UNLIKELY makes sense is OSMO_ASSERT, especially for osmo-{bsc,msc} where we assert() in lots of places 'just to be sure'. The scheduler in osmo-bts-trx could also benefit from this. I did not benchmark this though, so I cannot say how much do we gain... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 Gerrit-Change-Number: 27046 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Feb 2022 14:16:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log