- gerrit-log - lists.osmocom.org

[M] Change in docker-playground[master]: s1gw: add ttcn3-s1gw-test
by fixeria 14 Jun '24

14 Jun '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37230?usp=email ) Change subject: s1gw: add ttcn3-s1gw-test ...................................................................... s1gw: add ttcn3-s1gw-test Change-Id: I95000d7a9d778df1da830cd5059e5b6899391fbe Related: SYS#6772 --- A ttcn3-s1gw-test/Dockerfile A ttcn3-s1gw-test/Makefile A ttcn3-s1gw-test/S1GW_Tests.cfg A ttcn3-s1gw-test/jenkins.sh A ttcn3-s1gw-test/osmo-s1gw.config 5 files changed, 117 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/30/37230/1 diff --git a/ttcn3-s1gw-test/Dockerfile b/ttcn3-s1gw-test/Dockerfile new file mode 100644 index 0000000..296cd02 --- /dev/null +++ b/ttcn3-s1gw-test/Dockerfile @@ -0,0 +1,14 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-bookworm-titan + +ARG OSMO_TTCN3_BRANCH="master" + +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" s1gw + +VOLUME /data + +COPY S1GW_Tests.cfg /data/S1GW_Tests.cfg + +CMD ttcn3-docker-run s1gw S1GW_Tests diff --git a/ttcn3-s1gw-test/Makefile b/ttcn3-s1gw-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-s1gw-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-s1gw-test/S1GW_Tests.cfg b/ttcn3-s1gw-test/S1GW_Tests.cfg new file mode 100644 index 0000000..a831fa8 --- /dev/null +++ b/ttcn3-s1gw-test/S1GW_Tests.cfg @@ -0,0 +1,16 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/s1gw/S1GW_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +S1GW_Tests.mp_s1gw_ip := "172.18.10.100"; +S1GW_Tests.mp_mme_bind_ip := "172.18.10.101"; + +[MAIN_CONTROLLER] + +[EXECUTE] +S1GW_Tests.control diff --git a/ttcn3-s1gw-test/jenkins.sh b/ttcn3-s1gw-test/jenkins.sh new file mode 100755 index 0000000..9fcf5f1 --- /dev/null +++ b/ttcn3-s1gw-test/jenkins.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "osmo-s1gw-$IMAGE_SUFFIX" \ + "ttcn3-s1gw-test" + +set_clean_up_trap +set -e + +mkdir $VOL_BASE_DIR/s1gw-tester +cp S1GW_Tests.cfg $VOL_BASE_DIR/s1gw-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/s1gw-tester/S1GW_Tests.cfg" + +mkdir $VOL_BASE_DIR/s1gw +cp osmo-s1gw.config $VOL_BASE_DIR/s1gw/ + +network_create +network_replace_subnet_in_configs + +echo "Starting container with osmo-s1gw" +docker run --rm \ + $(docker_network_params $SUBNET 100) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/s1gw:/data \ + --name ${BUILD_TAG}-s1gw -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-s1gw-$IMAGE_SUFFIX + +# Give some time to osmo-s1gw to be fully started; it's a bit slow... +sleep 2 + +echo "Starting container with the S1GW testsuite" +docker run --rm \ + $(docker_network_params $SUBNET 101) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/s1gw-tester:/data \ + --name ${BUILD_TAG}-ttcn3-s1gw-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-s1gw-test diff --git a/ttcn3-s1gw-test/osmo-s1gw.config b/ttcn3-s1gw-test/osmo-s1gw.config new file mode 100644 index 0000000..4dabb8f --- /dev/null +++ b/ttcn3-s1gw-test/osmo-s1gw.config @@ -0,0 +1,34 @@ +%% -*- erlang -*- + +[%% ================================================================================ + %% application config + %% + %% eNB S1GW + %% +-----+ +----------------+ + %% | ... | --> | s1gw_bind_addr | MME + %% +-----+ +----------------+ +-----------------+ + %% | mme_loc_addr | --> | mme_rem_addr | + %% +----------------+ +-----------------+ + %% ================================================================================ + {osmo_s1gw, + [{s1gw_bind_addr, "172.18.10.100"}, %% S1GW bind address for incoming eNB connections + {mme_loc_addr, "172.18.10.100"}, %% local address for outgoing connections to the MME + {mme_rem_addr, "172.18.10.101"} %% remote address for outgoing connections to the MME + ]}, + %% ================================================================================ + %% kernel config + %% ================================================================================ + {kernel, + [{logger_level, debug}, + {logger, + [{handler, default, logger_std_h, + #{level => debug, + formatter => {logger_formatter, + #{template => [time, " ", + "[", level, "] ", + {pid, ["", pid, " "], ""}, + msg, + {mfa, [" (", mfa, ":", line, ")"], ""}, + "\n"]}}}}]}]}]. + +%% vim:set ts=2 sw=2 et: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37230?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I95000d7a9d778df1da830cd5059e5b6899391fbe Gerrit-Change-Number: 37230 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: codec: make osmo_hr_check_sid() more efficient
by falconia 14 Jun '24

14 Jun '24

Attention is currently required from: falconia. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/37227?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: codec: make osmo_hr_check_sid() more efficient ...................................................................... codec: make osmo_hr_check_sid() more efficient The operation of checking an HRv1 codec frame for the possibility of a perfect, error-free SID entails checking the last 79 bits out of 112, to see if they are all 1s. This operation can be done much more efficiently without using bitvec. Change-Id: Ib14204102c03c14d6c5aab42b0ffbef2c3dda3fd --- M src/codec/gsm620.c 1 file changed, 35 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/37227/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37227?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib14204102c03c14d6c5aab42b0ffbef2c3dda3fd Gerrit-Change-Number: 37227 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in ...osmo-s1gw[master]: osmo_s1gw.app.src: add logger_color_formatter
by fixeria 14 Jun '24

14 Jun '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37228?usp=email ) Change subject: osmo_s1gw.app.src: add logger_color_formatter ...................................................................... osmo_s1gw.app.src: add logger_color_formatter This patch fixes 'FORMATTER CRASH' in the logging when running escript. Change-Id: I6f10b22af406ef640bc2eaa2dddca34b009f7e6a Fixes: c5d3c625 "Rework logging config, colorize output" --- M src/osmo_s1gw.app.src 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/28/37228/1 diff --git a/src/osmo_s1gw.app.src b/src/osmo_s1gw.app.src index bc2a8d7..6fd8174 100644 --- a/src/osmo_s1gw.app.src +++ b/src/osmo_s1gw.app.src @@ -6,7 +6,8 @@ {registered, []}, {applications, [ kernel, - stdlib + stdlib, + logger_color_formatter ]}, {modules, []}, {mod, {osmo_s1gw_app, []}}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37228?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I6f10b22af406ef640bc2eaa2dddca34b009f7e6a Gerrit-Change-Number: 37228 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: codec: make osmo_hr_check_sid() more efficient
by Jenkins Builder 14 Jun '24

14 Jun '24

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/37227?usp=email ) Change subject: codec: make osmo_hr_check_sid() more efficient ...................................................................... Patch Set 1: (1 comment) File src/codec/gsm620.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16735): https://gerrit.osmocom.org/c/libosmocore/+/37227/comment/e40ff9b5_06c9dddd PS1, Line 281: {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; that open brace { should be on the previous line -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37227?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib14204102c03c14d6c5aab42b0ffbef2c3dda3fd Gerrit-Change-Number: 37227 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 13 Jun 2024 20:59:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: codec: make osmo_hr_check_sid() more efficient
by falconia 14 Jun '24

14 Jun '24

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/37227?usp=email ) Change subject: codec: make osmo_hr_check_sid() more efficient ...................................................................... codec: make osmo_hr_check_sid() more efficient The operation of checking an HRv1 codec frame for the possibility of a perfect, error-free SID entails checking the last 79 bits out of 112, to see if they are all 1s. This operation can be done much more efficiently without using bitvec. Change-Id: Ib14204102c03c14d6c5aab42b0ffbef2c3dda3fd --- M src/codec/gsm620.c 1 file changed, 35 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/37227/1 diff --git a/src/codec/gsm620.c b/src/codec/gsm620.c index ef1d3b9..0489748 100644 --- a/src/codec/gsm620.c +++ b/src/codec/gsm620.c @@ -23,8 +23,6 @@ #include <stdbool.h> #include <string.h> -#include <osmocom/core/bitvec.h> -#include <osmocom/core/utils.h> #include <osmocom/codec/codec.h> /* GSM HR unvoiced (mode=0) frames - subjective importance bit ordering */ @@ -270,21 +268,32 @@ * \param[in] rtp_payload Buffer with RTP payload * \param[in] payload_len Length of payload * \returns true if code word is found, false otherwise + * + * Note that this function checks only for a perfect, error-free SID. + * Unlike GSM 06.31 for FR or GSM 06.81 for EFR, GSM 06.41 spec for HR + * does not prescribe exact bit counting rules, hence detection of + * partially corrupted SID frames in downstream network elements + * without out-of-band indication is not possible. */ bool osmo_hr_check_sid(const uint8_t *rtp_payload, size_t payload_len) { - struct bitvec bv = { - .data = (uint8_t *)rtp_payload, - .data_len = payload_len, - }; + static const uint8_t all_ff_bytes[9] = + {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; - /* A SID frame is identified by a SID codeword consisting of 79 bits which are all 1, - * so we basically check if all bits in range r34..r112 (inclusive) are 1. */ - for (bv.cur_bit = 33; bv.cur_bit < bv.data_len * 8; bv.cur_bit++) - if (bitvec_get_bit_pos(&bv, bv.cur_bit) != ONE) - return false; + if (payload_len < GSM_HR_BYTES) + return false; - return true; + /* A SID frame is identified by a SID codeword consisting of 79 bits + * which are all 1, so we basically check if all bits in range + * r34..r112 (inclusive) are 1. However, given the position of + * these bits in the frame, the most efficient way to perform + * this check does not use any bit-level operations. */ + if ((rtp_payload[4] & 0x7F) != 0x7F) + return false; + if (memcmp(rtp_payload + 5, all_ff_bytes, 9) == 0) + return true; + else + return false; } /*! Reset the SID field of a potentially corrupted, but still valid GSM-HR -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37227?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib14204102c03c14d6c5aab42b0ffbef2c3dda3fd Gerrit-Change-Number: 37227 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1ap: add {enc,dec}_S1AP_Global_ENB_ID() API
by fixeria 14 Jun '24

14 Jun '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37226?usp=email ) Change subject: s1ap: add {enc,dec}_S1AP_Global_ENB_ID() API ...................................................................... s1ap: add {enc,dec}_S1AP_Global_ENB_ID() API Change-Id: I856fd426b92046dcae72149f46737da3e1b65219 --- M library/s1ap/S1AP_EncDec.cc M library/s1ap/S1AP_Types.ttcn M mme/MME_Tests.ttcn 3 files changed, 35 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/37226/1 diff --git a/library/s1ap/S1AP_EncDec.cc b/library/s1ap/S1AP_EncDec.cc index 6f82b2b..077ec31 100644 --- a/library/s1ap/S1AP_EncDec.cc +++ b/library/s1ap/S1AP_EncDec.cc @@ -30,4 +30,26 @@ return pdu; } +OCTETSTRING enc__S1AP__Global__ENB__ID(const S1AP__IEs::Global__ENB__ID &ie) +{ + TTCN_Buffer buf; + + buf.clear(); + ie.encode(S1AP__IEs::Global__ENB__ID_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +S1AP__IEs::Global__ENB__ID dec__S1AP__Global__ENB__ID(const OCTETSTRING &stream) +{ + S1AP__IEs::Global__ENB__ID ie; + TTCN_Buffer buf; + + buf.clear(); + buf.put_os(stream); + ie.decode(S1AP__IEs::Global__ENB__ID_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return ie; +} + } diff --git a/library/s1ap/S1AP_Types.ttcn b/library/s1ap/S1AP_Types.ttcn index 6730ff3..5d0ecbe 100644 --- a/library/s1ap/S1AP_Types.ttcn +++ b/library/s1ap/S1AP_Types.ttcn @@ -1,7 +1,11 @@ module S1AP_Types { import from S1AP_PDU_Descriptions language "ASN.1:1997" all; + import from S1AP_IEs language "ASN.1:1997" all; external function enc_S1AP_PDU(in S1AP_PDU pdu) return octetstring; external function dec_S1AP_PDU(in octetstring stream) return S1AP_PDU; + + external function enc_S1AP_Global_ENB_ID(in Global_ENB_ID ie) return octetstring; + external function dec_S1AP_Global_ENB_ID(in octetstring stream) return Global_ENB_ID; } diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 3ea17dd..931ad91 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -124,35 +124,6 @@ var UeParams g_ue_pars[NUM_UE]; } -/* Encode an S1AP Global-ENB-ID into an octetstring */ -private function enc_S1AP_Global_ENB_ID(Global_ENB_ID global_enb_id) return octetstring { - - /* Due to the limitations of libfftranscode, we can not define encoders (or decoders) for individual - * information elements (in S1AP_Types.cc). Unfortuantely Global-ENB-ID also appears in BSSGP in its - * encoded form. (see also: GTP-C 3GPP TS 48.018, section 11.3.70). To encode a given Global-ENB-ID - * we craft a full S1AP PDU and encode it. Then we can cut out the encoded Global-ENB-ID from the - * generated octetstring. */ - - var SupportedTAs supported_tas_dummy := {{ - tAC := '0000'O, - broadcastPLMNs := { '00f000'O }, - iE_Extensions := omit - }}; - var octetstring encoded; - var integer global_enb_id_len; - - if (ispresent(global_enb_id.eNB_ID.macroENB_ID)) { - global_enb_id_len := 8; - } else { - /* All other ENB ID types fit into 8 byte (homeENB_ID, short_macroENB_ID, long_macroENB_ID) */ - global_enb_id_len := 9; - } - - encoded := enc_S1AP_PDU(valueof(ts_S1AP_SetupReq(global_enb_id, supported_tas_dummy, v32))); - - return substr(encoded, 11, global_enb_id_len); -} - type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr, DIAMETER_ConnHdlr, GTP_ConnHdlr, GTP2_ConnHdlr { var ConnHdlrPars g_pars; timer g_Tguard := 30.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37226?usp=email 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: I856fd426b92046dcae72149f46737da3e1b65219 Gerrit-Change-Number: 37226 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-ttcn3-hacks[master]: {hnbap,ranap,rua,s1ap,sabp,sbcap}: use TITAN's ASN.1 PER codec
by fixeria 14 Jun '24

14 Jun '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37225?usp=email ) Change subject: {hnbap,ranap,rua,s1ap,sabp,sbcap}: use TITAN's ASN.1 PER codec ...................................................................... {hnbap,ranap,rua,s1ap,sabp,sbcap}: use TITAN's ASN.1 PER codec TITAN version 10.0.0 finally brings support for the ASN.1 PER codec. Drop libfftranscode dependency, use TTCN_EncDec::CT_PER / PER_ALIGNED. Change-Id: I990a9c01d965e185fc64bd751ea0685e5d3b869c --- M cbc/regen_makefile.sh M hnbgw/regen_makefile.sh M hnodeb/regen_makefile.sh M library/hnbap/HNBAP_EncDec.cc M library/hnbap/regen_makefile.sh M library/ranap/RANAP_EncDec.cc M library/ranap/regen_makefile.sh M library/rua/RUA_EncDec.cc M library/rua/regen_makefile.sh M library/s1ap/S1AP_EncDec.cc M library/s1ap/regen_makefile.sh M library/sabp/SABP_EncDec.cc M library/sabp/regen_makefile.sh M library/sbcap/SBC_AP_EncDec.cc M library/sbcap/regen_makefile.sh M mme/regen_makefile.sh M msc/regen_makefile.sh M s1gw/regen_makefile.sh M sgsn/regen_makefile.sh 19 files changed, 98 insertions(+), 310 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/37225/1 diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh index 96900b3..56da962 100755 --- a/cbc/regen_makefile.sh +++ b/cbc/regen_makefile.sh @@ -28,5 +28,3 @@ " ../regen-makefile.sh -e $NAME $FILES - -sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/hnbgw/regen_makefile.sh b/hnbgw/regen_makefile.sh index 13db985..2f5ab1a 100755 --- a/hnbgw/regen_makefile.sh +++ b/hnbgw/regen_makefile.sh @@ -37,5 +37,3 @@ " ../regen-makefile.sh -e $NAME $FILES - -sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/hnodeb/regen_makefile.sh b/hnodeb/regen_makefile.sh index cf5fed3..91603d0 100755 --- a/hnodeb/regen_makefile.sh +++ b/hnodeb/regen_makefile.sh @@ -36,5 +36,3 @@ " ../regen-makefile.sh -e $NAME $FILES - -sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/library/hnbap/HNBAP_EncDec.cc b/library/hnbap/HNBAP_EncDec.cc index 37d764f..eaf1013 100644 --- a/library/hnbap/HNBAP_EncDec.cc +++ b/library/hnbap/HNBAP_EncDec.cc @@ -1,11 +1,8 @@ - -#include <string.h> -#include <stdarg.h> #include "HNBAP_PDU_Descriptions.hh" -extern "C" { -#include <fftranscode/transcode.h> -} +/* 3GPP TS 25.469, section 9.4 Message transfer syntax: + * HNBAP shall use the ASN.1 Basic Packed Encoding Rules (BASIC-PER) Aligned Variant + * as transfer syntax as specified in ref. ITU-T Rec. X.691 */ namespace HNBAP__Types { @@ -13,52 +10,24 @@ OCTETSTRING enc__HNBAP__PDU(const HNBAP__PDU__Descriptions::HNBAP__PDU &pdu) { - uint8_t *aper_buf; - int aper_buf_len; - TTCN_Buffer TTCN_buf; - TTCN_buf.clear(); + TTCN_Buffer buf; - /* Encode from abstract data type into BER/DER */ - pdu.encode(HNBAP__PDU__Descriptions::HNBAP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ENCODE_DER); - - aper_buf_len = fftranscode_ber2aper(FFTRANSC_T_HNBAP, &aper_buf, TTCN_buf.get_data(), TTCN_buf.get_len()); - if (aper_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* make octetstring from output buffer */ - OCTETSTRING ret_val(aper_buf_len, aper_buf); - - /* release dynamically-allocated output buffer */ - fftranscode_free(aper_buf); - - return ret_val; + buf.clear(); + pdu.encode(HNBAP__PDU__Descriptions::HNBAP__PDU_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(buf.get_len(), buf.get_data()); } HNBAP__PDU__Descriptions::HNBAP__PDU dec__HNBAP__PDU(const OCTETSTRING &stream) { - uint8_t *ber_buf; - int ber_buf_len; - - /* First, decode APER + re-encode as BER */ - ber_buf_len = fftranscode_aper2ber(FFTRANSC_T_HNBAP, &ber_buf, (const unsigned char *)stream, stream.lengthof()); - if (ber_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* Then, re-encode from BER to TITAN representation */ - HNBAP__PDU__Descriptions::HNBAP__PDU ret_dcc; + HNBAP__PDU__Descriptions::HNBAP__PDU pdu; TTCN_Buffer TTCN_buf; + TTCN_buf.clear(); - TTCN_buf.put_s(ber_buf_len, ber_buf); - - ret_dcc.decode(HNBAP__PDU__Descriptions::HNBAP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - - fftranscode_free(ber_buf); - - return ret_dcc; + TTCN_buf.put_os(stream); + pdu.decode(HNBAP__PDU__Descriptions::HNBAP__PDU_descr_, TTCN_buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return pdu; } } diff --git a/library/hnbap/regen_makefile.sh b/library/hnbap/regen_makefile.sh index 4da6872..02e7fae 100755 --- a/library/hnbap/regen_makefile.sh +++ b/library/hnbap/regen_makefile.sh @@ -3,7 +3,3 @@ FILES="*.asn *.ttcn HNBAP_EncDec.cc" ../../regen-makefile.sh $FILES - -sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile -sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile -sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/ranap/RANAP_EncDec.cc b/library/ranap/RANAP_EncDec.cc index 7626b7b..5cee694 100644 --- a/library/ranap/RANAP_EncDec.cc +++ b/library/ranap/RANAP_EncDec.cc @@ -1,11 +1,8 @@ - -#include <string.h> -#include <stdarg.h> #include "RANAP_PDU_Descriptions.hh" -extern "C" { -#include <fftranscode/transcode.h> -} +/* 3GPP TS 25.413, section 9.4 Message transfer syntax: + * RANAP shall use the ASN.1 Basic Packed Encoding Rules (BASIC-PER) Aligned Variant + * as transfer syntax as specified in ref. ITU-T Rec. X.691 */ namespace RANAP__Types { @@ -13,54 +10,24 @@ OCTETSTRING enc__RANAP__PDU(const RANAP__PDU__Descriptions::RANAP__PDU &pdu) { - uint8_t *aper_buf; - int aper_buf_len; - TTCN_Buffer TTCN_buf; - TTCN_buf.clear(); + TTCN_Buffer buf; - /* Encode from abstract data type into BER/DER */ - pdu.encode(RANAP__PDU__Descriptions::RANAP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ENCODE_DER); - - aper_buf_len = fftranscode_ber2aper(FFTRANSC_T_RANAP, &aper_buf, TTCN_buf.get_data(), TTCN_buf.get_len()); - if (aper_buf_len < 0) { - TTCN_Logger::begin_event_log2str(); - TTCN_buf.log(); - TTCN_error("fftranscode_ber2aper failed: %s", (const char *) TTCN_Logger::end_event_log2str()); - } - - /* make octetstring from output buffer */ - OCTETSTRING ret_val(aper_buf_len, aper_buf); - - /* release dynamically-allocated output buffer */ - fftranscode_free(aper_buf); - - return ret_val; + buf.clear(); + pdu.encode(RANAP__PDU__Descriptions::RANAP__PDU_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(buf.get_len(), buf.get_data()); } RANAP__PDU__Descriptions::RANAP__PDU dec__RANAP__PDU(const OCTETSTRING &stream) { - uint8_t *ber_buf; - int ber_buf_len; - - /* First, decode APER + re-encode as BER */ - ber_buf_len = fftranscode_aper2ber(FFTRANSC_T_RANAP, &ber_buf, (const unsigned char *)stream, stream.lengthof()); - if (ber_buf_len < 0) { - TTCN_error("fftranscode_aper2ber failed."); - } - - /* Then, re-encode from BER to TITAN representation */ - RANAP__PDU__Descriptions::RANAP__PDU ret_dcc; + RANAP__PDU__Descriptions::RANAP__PDU pdu; TTCN_Buffer TTCN_buf; + TTCN_buf.clear(); - TTCN_buf.put_s(ber_buf_len, ber_buf); - - ret_dcc.decode(RANAP__PDU__Descriptions::RANAP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - - fftranscode_free(ber_buf); - - return ret_dcc; + TTCN_buf.put_os(stream); + pdu.decode(RANAP__PDU__Descriptions::RANAP__PDU_descr_, TTCN_buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return pdu; } } diff --git a/library/ranap/regen_makefile.sh b/library/ranap/regen_makefile.sh index 0ae1cfd..2d553b7 100755 --- a/library/ranap/regen_makefile.sh +++ b/library/ranap/regen_makefile.sh @@ -3,7 +3,3 @@ FILES="*.asn *.ttcn RANAP_EncDec.cc" ../../regen-makefile.sh $FILES - -sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile -sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile -sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/rua/RUA_EncDec.cc b/library/rua/RUA_EncDec.cc index 808e317..c702f54 100644 --- a/library/rua/RUA_EncDec.cc +++ b/library/rua/RUA_EncDec.cc @@ -1,11 +1,8 @@ - -#include <string.h> -#include <stdarg.h> #include "RUA_PDU_Descriptions.hh" -extern "C" { -#include <fftranscode/transcode.h> -} +/* 3GPP TS 25.468, section 9.4 Message transfer syntax: + * RUA shall use the ASN.1 Basic Packed Encoding Rules (BASIC-PER) Aligned Variant + * as transfer syntax as specified in ref. ITU-T Rec. X.691 */ namespace RUA__Types { @@ -13,52 +10,24 @@ OCTETSTRING enc__RUA__PDU(const RUA__PDU__Descriptions::RUA__PDU &pdu) { - uint8_t *aper_buf; - int aper_buf_len; - TTCN_Buffer TTCN_buf; - TTCN_buf.clear(); + TTCN_Buffer buf; - /* Encode from abstract data type into BER/DER */ - pdu.encode(RUA__PDU__Descriptions::RUA__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ENCODE_DER); - - aper_buf_len = fftranscode_ber2aper(FFTRANSC_T_RUA, &aper_buf, TTCN_buf.get_data(), TTCN_buf.get_len()); - if (aper_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* make octetstring from output buffer */ - OCTETSTRING ret_val(aper_buf_len, aper_buf); - - /* release dynamically-allocated output buffer */ - fftranscode_free(aper_buf); - - return ret_val; + buf.clear(); + pdu.encode(RUA__PDU__Descriptions::RUA__PDU_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(buf.get_len(), buf.get_data()); } RUA__PDU__Descriptions::RUA__PDU dec__RUA__PDU(const OCTETSTRING &stream) { - uint8_t *ber_buf; - int ber_buf_len; - - /* First, decode APER + re-encode as BER */ - ber_buf_len = fftranscode_aper2ber(FFTRANSC_T_RUA, &ber_buf, (const unsigned char *)stream, stream.lengthof()); - if (ber_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* Then, re-encode from BER to TITAN representation */ - RUA__PDU__Descriptions::RUA__PDU ret_dcc; + RUA__PDU__Descriptions::RUA__PDU pdu; TTCN_Buffer TTCN_buf; + TTCN_buf.clear(); - TTCN_buf.put_s(ber_buf_len, ber_buf); - - ret_dcc.decode(RUA__PDU__Descriptions::RUA__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - - fftranscode_free(ber_buf); - - return ret_dcc; + TTCN_buf.put_os(stream); + pdu.decode(RUA__PDU__Descriptions::RUA__PDU_descr_, TTCN_buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return pdu; } } diff --git a/library/rua/regen_makefile.sh b/library/rua/regen_makefile.sh index 1f45203..b67ef8e 100755 --- a/library/rua/regen_makefile.sh +++ b/library/rua/regen_makefile.sh @@ -3,7 +3,3 @@ FILES="*.asn *.ttcn RUA_EncDec.cc" ../../regen-makefile.sh $FILES - -sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile -sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile -sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/s1ap/S1AP_EncDec.cc b/library/s1ap/S1AP_EncDec.cc index a17f20e..6f82b2b 100644 --- a/library/s1ap/S1AP_EncDec.cc +++ b/library/s1ap/S1AP_EncDec.cc @@ -1,11 +1,8 @@ - -#include <string.h> -#include <stdarg.h> #include "S1AP_PDU_Descriptions.hh" -extern "C" { -#include <fftranscode/transcode.h> -} +/* 3GPP TS 36.413, section 9.4 Message transfer syntax: + * S1AP shall use the ASN.1 Basic Packed Encoding Rules (BASIC-PER) Aligned Variant + * as transfer syntax as specified in ref. ITU-T Rec. X.691 */ namespace S1AP__Types { @@ -13,52 +10,24 @@ OCTETSTRING enc__S1AP__PDU(const S1AP__PDU__Descriptions::S1AP__PDU &pdu) { - uint8_t *aper_buf; - int aper_buf_len; - TTCN_Buffer TTCN_buf; - TTCN_buf.clear(); + TTCN_Buffer buf; - /* Encode from abstract data type into BER/DER */ - pdu.encode(S1AP__PDU__Descriptions::S1AP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ENCODE_DER); - - aper_buf_len = fftranscode_ber2aper(FFTRANSC_T_S1AP, &aper_buf, TTCN_buf.get_data(), TTCN_buf.get_len()); - if (aper_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* make octetstring from output buffer */ - OCTETSTRING ret_val(aper_buf_len, aper_buf); - - /* release dynamically-allocated output buffer */ - fftranscode_free(aper_buf); - - return ret_val; + buf.clear(); + pdu.encode(S1AP__PDU__Descriptions::S1AP__PDU_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(buf.get_len(), buf.get_data()); } S1AP__PDU__Descriptions::S1AP__PDU dec__S1AP__PDU(const OCTETSTRING &stream) { - uint8_t *ber_buf; - int ber_buf_len; - - /* First, decode APER + re-encode as BER */ - ber_buf_len = fftranscode_aper2ber(FFTRANSC_T_S1AP, &ber_buf, (const unsigned char *)stream, stream.lengthof()); - if (ber_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* Then, re-encode from BER to TITAN representation */ - S1AP__PDU__Descriptions::S1AP__PDU ret_dcc; + S1AP__PDU__Descriptions::S1AP__PDU pdu; TTCN_Buffer TTCN_buf; + TTCN_buf.clear(); - TTCN_buf.put_s(ber_buf_len, ber_buf); - - ret_dcc.decode(S1AP__PDU__Descriptions::S1AP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - - fftranscode_free(ber_buf); - - return ret_dcc; + TTCN_buf.put_os(stream); + pdu.decode(S1AP__PDU__Descriptions::S1AP__PDU_descr_, TTCN_buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return pdu; } } diff --git a/library/s1ap/regen_makefile.sh b/library/s1ap/regen_makefile.sh index fae086c..059c6b3 100755 --- a/library/s1ap/regen_makefile.sh +++ b/library/s1ap/regen_makefile.sh @@ -3,7 +3,3 @@ FILES="*.asn *.ttcn S1AP_EncDec.cc" ../../regen-makefile.sh $FILES - -sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile -sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile -sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/sabp/SABP_EncDec.cc b/library/sabp/SABP_EncDec.cc index 3c60e82..4aa0498 100644 --- a/library/sabp/SABP_EncDec.cc +++ b/library/sabp/SABP_EncDec.cc @@ -1,11 +1,8 @@ - -#include <string.h> -#include <stdarg.h> #include "SABP_PDU_Descriptions.hh" -extern "C" { -#include <fftranscode/transcode.h> -} +/* 3GPP TS 25.419, section 9.4 Message transfer syntax: + * SABP shall use the ASN.1 Basic Packed Encoding Rules (BASIC-PER) Aligned Variant + * as transfer syntax as specified in ref. ITU-T Rec. X.691 */ namespace SABP__Types { @@ -13,52 +10,24 @@ OCTETSTRING enc__SABP__PDU(const SABP__PDU__Descriptions::SABP__PDU &pdu) { - uint8_t *aper_buf; - int aper_buf_len; - TTCN_Buffer TTCN_buf; - TTCN_buf.clear(); + TTCN_Buffer buf; - /* Encode from abstract data type into BER/DER */ - pdu.encode(SABP__PDU__Descriptions::SABP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ENCODE_DER); - - aper_buf_len = fftranscode_ber2aper(FFTRANSC_T_SABP, &aper_buf, TTCN_buf.get_data(), TTCN_buf.get_len()); - if (aper_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* make octetstring from output buffer */ - OCTETSTRING ret_val(aper_buf_len, aper_buf); - - /* release dynamically-allocated output buffer */ - fftranscode_free(aper_buf); - - return ret_val; + buf.clear(); + pdu.encode(SABP__PDU__Descriptions::SABP__PDU_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(buf.get_len(), buf.get_data()); } SABP__PDU__Descriptions::SABP__PDU dec__SABP__PDU(const OCTETSTRING &stream) { - uint8_t *ber_buf; - int ber_buf_len; - - /* First, decode APER + re-encode as BER */ - ber_buf_len = fftranscode_aper2ber(FFTRANSC_T_SABP, &ber_buf, (const unsigned char *)stream, stream.lengthof()); - if (ber_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* Then, re-encode from BER to TITAN representation */ - SABP__PDU__Descriptions::SABP__PDU ret_dcc; + SABP__PDU__Descriptions::SABP__PDU pdu; TTCN_Buffer TTCN_buf; + TTCN_buf.clear(); - TTCN_buf.put_s(ber_buf_len, ber_buf); - - ret_dcc.decode(SABP__PDU__Descriptions::SABP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - - fftranscode_free(ber_buf); - - return ret_dcc; + TTCN_buf.put_os(stream); + pdu.decode(SABP__PDU__Descriptions::SABP__PDU_descr_, TTCN_buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return pdu; } } diff --git a/library/sabp/regen_makefile.sh b/library/sabp/regen_makefile.sh index 382fbd5..d53a09c 100755 --- a/library/sabp/regen_makefile.sh +++ b/library/sabp/regen_makefile.sh @@ -3,7 +3,3 @@ FILES="*.asn *.ttcn SABP_EncDec.cc" ../../regen-makefile.sh $FILES - -sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile -sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile -sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/library/sbcap/SBC_AP_EncDec.cc b/library/sbcap/SBC_AP_EncDec.cc index 08ee75f..26e3364 100644 --- a/library/sbcap/SBC_AP_EncDec.cc +++ b/library/sbcap/SBC_AP_EncDec.cc @@ -1,11 +1,8 @@ - -#include <string.h> -#include <stdarg.h> #include "SBC_AP_PDU_Descriptions.hh" -extern "C" { -#include <fftranscode/transcode.h> -} +/* 3GPP TS 29.168, section 9.4 Message transfer syntax: + * SBC-AP shall use the ASN.1 Basic Packed Encoding Rules (BASIC-PER) Aligned Variant + * as transfer syntax as specified in ref. ITU-T Rec. X.691 */ namespace SBC__AP__Types { @@ -13,52 +10,24 @@ OCTETSTRING enc__SBC__AP__PDU(const SBC__AP__PDU__Descriptions::SBC__AP__PDU &pdu) { - uint8_t *aper_buf; - int aper_buf_len; - TTCN_Buffer TTCN_buf; - TTCN_buf.clear(); + TTCN_Buffer buf; - /* Encode from abstract data type into BER/DER */ - pdu.encode(SBC__AP__PDU__Descriptions::SBC__AP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ENCODE_DER); - - aper_buf_len = fftranscode_ber2aper(FFTRANSC_T_SBCAP, &aper_buf, TTCN_buf.get_data(), TTCN_buf.get_len()); - if (aper_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* make octetstring from output buffer */ - OCTETSTRING ret_val(aper_buf_len, aper_buf); - - /* release dynamically-allocated output buffer */ - fftranscode_free(aper_buf); - - return ret_val; + buf.clear(); + pdu.encode(SBC__AP__PDU__Descriptions::SBC__AP__PDU_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(buf.get_len(), buf.get_data()); } SBC__AP__PDU__Descriptions::SBC__AP__PDU dec__SBC__AP__PDU(const OCTETSTRING &stream) { - uint8_t *ber_buf; - int ber_buf_len; - - /* First, decode APER + re-encode as BER */ - ber_buf_len = fftranscode_aper2ber(FFTRANSC_T_SBCAP, &ber_buf, (const unsigned char *)stream, stream.lengthof()); - if (ber_buf_len < 0) { - TTCN_error("fftranscode failed."); - } - - /* Then, re-encode from BER to TITAN representation */ - SBC__AP__PDU__Descriptions::SBC__AP__PDU ret_dcc; + SBC__AP__PDU__Descriptions::SBC__AP__PDU pdu; TTCN_Buffer TTCN_buf; + TTCN_buf.clear(); - TTCN_buf.put_s(ber_buf_len, ber_buf); - - ret_dcc.decode(SBC__AP__PDU__Descriptions::SBC__AP__PDU_descr_, TTCN_buf, - TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - - fftranscode_free(ber_buf); - - return ret_dcc; + TTCN_buf.put_os(stream); + pdu.decode(SBC__AP__PDU__Descriptions::SBC__AP__PDU_descr_, TTCN_buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return pdu; } } diff --git a/library/sbcap/regen_makefile.sh b/library/sbcap/regen_makefile.sh index 0cd6083..064979e 100755 --- a/library/sbcap/regen_makefile.sh +++ b/library/sbcap/regen_makefile.sh @@ -3,7 +3,3 @@ FILES="*.asn *.ttcn SBC_AP_EncDec.cc" ../../regen-makefile.sh $FILES - -sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile -sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile -sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 6e86346..3520296 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -34,4 +34,4 @@ ../regen-makefile.sh -e $NAME $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lgnutls/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lgnutls/' Makefile diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index 081d2cb..6034e1f 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -46,4 +46,4 @@ ../regen-makefile.sh -e $NAME $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lssl/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lssl/' Makefile diff --git a/s1gw/regen_makefile.sh b/s1gw/regen_makefile.sh index 7eef51b..50cce0e 100755 --- a/s1gw/regen_makefile.sh +++ b/s1gw/regen_makefile.sh @@ -20,7 +20,3 @@ " ../regen-makefile.sh -e $NAME $FILES - -sed -i -e '/^CPPFLAGS/ s/$/ `pkg-config --cflags libfftranscode`/' Makefile -sed -i -e '/^LDFLAGS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile -sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libfftranscode`/' Makefile diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index 5c9c5ea..1f89dee 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -33,5 +33,3 @@ " ../regen-makefile.sh -e $NAME $FILES - -sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37225?usp=email 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: I990a9c01d965e185fc64bd751ea0685e5d3b869c Gerrit-Change-Number: 37225 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: refactor prim management in tx_tch[fh]_fn()
by fixeria 14 Jun '24

14 Jun '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36915?usp=email ) Change subject: trxcon/l1sched: refactor prim management in tx_tch[fh]_fn() ...................................................................... trxcon/l1sched: refactor prim management in tx_tch[fh]_fn() The code path below the switch statement in tx_tch[fh]_fn() is no longer common since we added CSD specific channel coding. This is why we had to jump over it in several case statements. This patch significantly reduces the number of goto statements in these two functions and makes them easier to read/follow at the price of code duplication, which is tolerable. Change-Id: I5292abf6fcd308c9f7f12c7145d004103c9c7675 --- M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 87 insertions(+), 69 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/trxcon/src/sched_lchan_tchf.c b/src/host/trxcon/src/sched_lchan_tchf.c index 7cc1856..985bea4 100644 --- a/src/host/trxcon/src/sched_lchan_tchf.c +++ b/src/host/trxcon/src/sched_lchan_tchf.c @@ -3,7 +3,7 @@ * TDMA scheduler: handlers for DL / UL bursts on logical channels * * (C) 2017-2022 by Vadim Yanitskiy <axilirator(a)gmail.com> - * (C) 2021-2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2021-2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * All Rights Reserved * @@ -290,39 +290,49 @@ /* fall-through */ case GSM48_CMODE_SPEECH_V1: case GSM48_CMODE_SPEECH_EFR: - if (msg == NULL) { - /* transmit a dummy speech block with inverted CRC3 */ - gsm0503_tch_fr_encode(bursts_p, NULL, 0, 1); - goto send_burst; - } + /* if msg == NULL, transmit a dummy speech block with inverted CRC3 */ rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), - msgb_l2(msg), - msgb_l2len(msg), 1); + msg ? msgb_l2(msg) : NULL, + msg ? msgb_l2len(msg) : 0, 1); + /* confirm traffic sending (pass ownership of the msgb/prim) */ + if (OSMO_LIKELY(rc == 0)) + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + else /* unlikely: encoding failed, drop msgb/prim */ + msgb_free(msg); + /* drop the other msgb/prim */ + msgb_free((msg == msg_facch) ? msg_tch : msg_facch); break; case GSM48_CMODE_SPEECH_AMR: { bool amr_fn_is_cmr = !sched_tchf_ul_amr_cmi_map[br->fn % 26]; - const uint8_t *data = msg ? msgb_l2(msg) : NULL; - size_t data_len = msg ? msgb_l2len(msg) : 0; + unsigned int offset = 0; if (msg != NULL && msg != msg_facch) { /* TCH/AFS: speech */ - if (!l1sched_lchan_amr_prim_is_valid(lchan, msg, amr_fn_is_cmr)) - goto free_bad_msg; + if (!l1sched_lchan_amr_prim_is_valid(lchan, msg, amr_fn_is_cmr)) { + msgb_free(msg); + msg_tch = NULL; + msg = NULL; + } /* pull the AMR header - sizeof(struct amr_hdr) */ - data_len -= 2; - data += 2; + offset = 2; } /* if msg == NULL, transmit a dummy speech block with inverted CRC6 */ rc = gsm0503_tch_afs_encode(BUFPOS(bursts_p, 0), - data, data_len, + msg ? msgb_l2(msg) + offset : NULL, + msg ? msgb_l2len(msg) - offset : 0, amr_fn_is_cmr, lchan->amr.codec, lchan->amr.codecs, lchan->amr.ul_ft, lchan->amr.ul_cmr); - if (msg == NULL) - goto send_burst; + /* confirm traffic sending (pass ownership of the msgb/prim) */ + if (OSMO_LIKELY(rc == 0)) + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + else /* unlikely: encoding failed, drop prim */ + msgb_free(msg); + /* drop the other primitive */ + msgb_free((msg == msg_facch) ? msg_tch : msg_facch); break; } /* CSD (TCH/F14.4): 14.5 kbit/s radio interface rate */ @@ -342,7 +352,7 @@ /* Confirm FACCH sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); } - goto send_burst; + break; /* CSD (TCH/F9.6): 12.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_12k0: if ((msg = msg_tch) != NULL) { @@ -360,7 +370,7 @@ /* Confirm FACCH sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); } - goto send_burst; + break; /* CSD (TCH/F4.8): 6.0 kbit/s radio interface rate */ case GSM48_CMODE_DATA_6k0: if ((msg = msg_tch) != NULL) { @@ -378,42 +388,33 @@ /* Confirm FACCH sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); } - goto send_burst; + break; /* CSD (TCH/F2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: if ((msg = msg_facch) != NULL) { /* FACCH/F does steal a TCH/F2.4 frame completely */ - rc = gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + gsm0503_tch_fr_facch_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + msgb_free(msg_tch); } else if ((msg = msg_tch) != NULL) { OSMO_ASSERT(msgb_l2len(msg) == 2 * 36); - rc = gsm0503_tch_fr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + gsm0503_tch_fr24_encode(BUFPOS(bursts_p, 0), msgb_l2(msg)); + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); } else { ubit_t idle[2 * 36]; memset(&idle[0], 0x01, sizeof(idle)); gsm0503_tch_fr24_encode(BUFPOS(bursts_p, 0), &idle[0]); - goto send_burst; } break; default: LOGP_LCHAND(lchan, LOGL_ERROR, "TCH mode %s is unknown or not supported\n", gsm48_chan_mode_name(lchan->tch_mode)); - goto free_bad_msg; - } - - if (rc) { - LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%u): %s\n", - msgb_l2len(msg), msgb_hexdump_l2(msg)); -free_bad_msg: msgb_free(msg_facch); msgb_free(msg_tch); - return -EINVAL; + break; } - /* Confirm data / traffic sending (pass ownership of the msgb/prim) */ - l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); - msgb_free((msg == msg_facch) ? msg_tch : msg_facch); - send_burst: /* Determine which burst should be sent */ burst = BUFPOS(bursts_p, br->bid); diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index 6c88d19..d684976 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -4,7 +4,7 @@ * * (C) 2018-2022 by Vadim Yanitskiy <axilirator(a)gmail.com> * (C) 2018 by Harald Welte <laforge(a)gnumonks.org> - * (C) 2020-2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2020-2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * All Rights Reserved * @@ -497,39 +497,53 @@ msg = l1sched_lchan_prim_dummy_lapdm(lchan); /* fall-through */ case GSM48_CMODE_SPEECH_V1: - if (msg == NULL) { - /* transmit a dummy speech block with inverted CRC3 */ - gsm0503_tch_hr_encode(bursts_p, NULL, 0); - goto send_burst; - } + /* if msg == NULL, transmit a dummy speech block with inverted CRC3 */ rc = gsm0503_tch_hr_encode(BUFPOS(bursts_p, 0), - msgb_l2(msg), - msgb_l2len(msg)); + msg ? msgb_l2(msg) : NULL, + msg ? msgb_l2len(msg) : 0); + /* confirm traffic sending (pass ownership of the msgb/prim) */ + if (OSMO_LIKELY(rc == 0)) { + if (msg && msgb_l2len(msg) == GSM_MACBLOCK_LEN) + lchan->ul_facch_blocks = 6; + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } else /* unlikely: encoding failed, drop msgb/prim */ + msgb_free(msg); + /* drop the other msgb/prim */ + msgb_free((msg == msg_facch) ? msg_tch : msg_facch); break; case GSM48_CMODE_SPEECH_AMR: { bool amr_fn_is_cmr = !sched_tchh_ul_amr_cmi_map[br->fn % 26]; - const uint8_t *data = msg ? msgb_l2(msg) : NULL; - size_t data_len = msg ? msgb_l2len(msg) : 0; + unsigned int offset = 0; if (msg != NULL && msg != msg_facch) { /* TCH/AHS: speech */ - if (!l1sched_lchan_amr_prim_is_valid(lchan, msg, amr_fn_is_cmr)) - goto free_bad_msg; + if (!l1sched_lchan_amr_prim_is_valid(lchan, msg, amr_fn_is_cmr)) { + msgb_free(msg); + msg_tch = NULL; + msg = NULL; + } /* pull the AMR header - sizeof(struct amr_hdr) */ - data_len -= 2; - data += 2; + offset = 2; } /* if msg == NULL, transmit a dummy speech block with inverted CRC6 */ rc = gsm0503_tch_ahs_encode(BUFPOS(bursts_p, 0), - data, data_len, + msg ? msgb_l2(msg) + offset : NULL, + msg ? msgb_l2len(msg) - offset : 0, amr_fn_is_cmr, lchan->amr.codec, lchan->amr.codecs, lchan->amr.ul_ft, lchan->amr.ul_cmr); - if (msg == NULL) - goto send_burst; + /* confirm traffic sending (pass ownership of the msgb/prim) */ + if (OSMO_LIKELY(rc == 0)) { + if (msg && msgb_l2len(msg) == GSM_MACBLOCK_LEN) + lchan->ul_facch_blocks = 6; + l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); + } else /* unlikely: encoding failed, drop msgb/prim */ + msgb_free(msg); + /* drop the other msgb/prim */ + msgb_free((msg == msg_facch) ? msg_tch : msg_facch); break; } /* CSD (TCH/H4.8): 6.0 kbit/s radio interface rate */ @@ -549,7 +563,7 @@ /* Confirm FACCH sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); } - goto send_burst; + break; /* CSD (TCH/H2.4): 3.6 kbit/s radio interface rate */ case GSM48_CMODE_DATA_3k6: if ((msg = msg_tch) != NULL) { @@ -567,30 +581,16 @@ /* Confirm FACCH sending (pass ownership of the msgb/prim) */ l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); } - goto send_burst; + break; default: LOGP_LCHAND(lchan, LOGL_ERROR, "TCH mode %s is unknown or not supported\n", gsm48_chan_mode_name(lchan->tch_mode)); - goto free_bad_msg; - } - - if (rc) { - LOGP_LCHAND(lchan, LOGL_ERROR, "Failed to encode L2 payload (len=%u): %s\n", - msgb_l2len(msg), msgb_hexdump_l2(msg)); -free_bad_msg: msgb_free(msg_facch); msgb_free(msg_tch); - return -EINVAL; + break; } - if (msgb_l2len(msg) == GSM_MACBLOCK_LEN) - lchan->ul_facch_blocks = 6; - - /* Confirm data / traffic sending (pass ownership of the msgb/prim) */ - l1sched_lchan_emit_data_cnf(lchan, msg, br->fn); - msgb_free((msg == msg_facch) ? msg_tch : msg_facch); - send_burst: /* Determine which burst should be sent */ burst = BUFPOS(bursts_p, br->bid); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36915?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5292abf6fcd308c9f7f12c7145d004103c9c7675 Gerrit-Change-Number: 36915 Gerrit-PatchSet: 3 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> Gerrit-MessageType: merged

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: refactor prim management in tx_tch[fh]_fn()
by fixeria 14 Jun '24

14 Jun '24

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36915?usp=email ) Change subject: trxcon/l1sched: refactor prim management in tx_tch[fh]_fn() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36915?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5292abf6fcd308c9f7f12c7145d004103c9c7675 Gerrit-Change-Number: 36915 Gerrit-PatchSet: 3 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> Gerrit-Comment-Date: Thu, 13 Jun 2024 18:00:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-qcdiag[master]: Makefile: use $(shell ...) to invoke pkg-config
by fixeria 14 Jun '24

14 Jun '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-qcdiag/+/37220?usp=email ) Change subject: Makefile: use $(shell ...) to invoke pkg-config ...................................................................... Makefile: use $(shell ...) to invoke pkg-config This way the values are evaluated by make itself (not by the shell), and can be seen in the output when running make. Change-Id: I44db058c92377b741e24c7cdf4891ae020f37ff1 --- M src/Makefile 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-qcdiag refs/changes/20/37220/1 diff --git a/src/Makefile b/src/Makefile index 3591ece..ef1c7ed 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ -CPPFLAGS ?= -g -O0 -Wall `pkg-config --cflags libosmocore` `pkg-config --cflags qmi-glib` -LIBS ?= `pkg-config --libs libosmocore` `pkg-config --libs qmi-glib` +CPPFLAGS ?= -g -O0 -Wall $(shell pkg-config --cflags libosmocore qmi-glib) +LIBS ?= $(shell pkg-config --libs libosmocore qmi-glib) all: osmo-qcdiag-log MODS_LOG = gprs_l1.c gprs_rlc.o gprs_mac.o diag_gsm.o diag_log.o diag_log_gsm.o diag_log_gprs.o diag_log_wcdma.o diag_log_umts.o diag_log_qmi.o diag_dpl.o diag_log_simcard.o diag_event.o -- To view, visit https://gerrit.osmocom.org/c/osmo-qcdiag/+/37220?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-qcdiag Gerrit-Branch: master Gerrit-Change-Id: I44db058c92377b741e24c7cdf4891ae020f37ff1 Gerrit-Change-Number: 37220 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log