March 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... Patch Set 1: (1 comment) File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/c/osmo-ci/+/36384/comment/acf457ab_63b6fcba PS1, Line 405: simtester > FYI: it's intentionally `simtester` machine here, so that we can benefit from having all dependency […] I don't like that, as I fear it makes the pre-commit tests take even longer. "simtester" is a very small APU system and executing the tests with physical cards already takes ages. If that job could run on another node, it would not add to the total verification time for each commit, but could run in parallel. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 1 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-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:28:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: libosmocore: io_uring nodes

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36370?usp=email ) Change subject: jobs/master-builds: libosmocore: io_uring nodes ...................................................................... jobs/master-builds: libosmocore: io_uring nodes Like the gerrit-verification jobs for libosmocore, run the master-builds jobs on nodes with the io_uring label. Related: OS#6405 Change-Id: Iea6791b3fbb5c445a539c2b4636a643d6c8d517b --- M jobs/master-builds.yml 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 8b8d551..66043e5 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -166,6 +166,7 @@ master-osmo-sgsn - libosmocore: + slave_axis: !!python/tuple [io_uring] # OS#6405 a1_name: arch a1: !!python/tuple [arm-none-eabi, amd64] combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36370?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iea6791b3fbb5c445a539c2b4636a643d6c8d517b Gerrit-Change-Number: 36370 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733 Gerrit-Change-Number: 36115 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 06:40:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: libosmocore: io_uring nodes

by fixeria

Attention is currently required from: jolly, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36370?usp=email ) Change subject: jobs/master-builds: libosmocore: io_uring nodes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36370?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iea6791b3fbb5c445a539c2b4636a643d6c8d517b Gerrit-Change-Number: 36370 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 22 Mar 2024 06:32:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: Get Rid of private copy of f_mgcp_addr2addrtype()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?usp=email ) Change subject: sip: Get Rid of private copy of f_mgcp_addr2addrtype() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?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: I27ce46b6d23ba0f2704dd0cee290ed519dec278e Gerrit-Change-Number: 36382 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 06:30:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Move SDP templates to its own SDP_Templates.ttcn file

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?usp=email ) Change subject: Move SDP templates to its own SDP_Templates.ttcn file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?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: I0610b4cf5533e46a3401c65e60c7cce975c85412 Gerrit-Change-Number: 36381 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 06:29:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Move f_addrstr2addr() to library/Misc_Helpers.ttcn

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?usp=email ) Change subject: Move f_addrstr2addr() to library/Misc_Helpers.ttcn ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?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: I4243ec5551f128629b6504ccc59efeb456a6855d Gerrit-Change-Number: 36380 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 06:28:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in osmo-hnbgw[master]: per-HNB GTP-U traffic counters via nft

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36385?usp=email ) Change subject: per-HNB GTP-U traffic counters via nft ...................................................................... per-HNB GTP-U traffic counters via nft Add external dependency libnftables. When an hNodeB registers, set up netfilter rules to count GTP-U packets (UDP port 2152) to and from that hNodeB's address -- we are assuming that it is the same address that Iuh is connecting from. This is a "workaround" to get performance indicators per hNodeB, without needing a UPF that supports URR. Related: SYS#6773 Change-Id: I35b7e97fd039e36633dfde1317170527c82f9f68 --- M configure.ac M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/nft_kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/nft_kpi.c M src/osmo-hnbgw/tdefs.c 9 files changed, 447 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/85/36385/1 diff --git a/configure.ac b/configure.ac index bb8d29e..bea9a76 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOHNBAP, libosmo-hnbap >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.12.0) +PKG_CHECK_MODULES(LIBNFTABLES, libnftables >= 1.0.2) # Enable PFCP support for GTP tunnel mapping via UPF AC_ARG_ENABLE([pfcp], [AS_HELP_STRING([--enable-pfcp], [Build with PFCP support, for GTP tunnel mapping via UPF])], diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index b3ba3b2..fd36168 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -6,6 +6,7 @@ #include <osmocom/core/write_queue.h> #include <osmocom/core/timer.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/sockaddr_str.h> #include <osmocom/gsm/gsm23003.h> #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/osmo_ss7.h> @@ -18,6 +19,8 @@ #include <osmocom/mgcp_client/mgcp_client.h> #include <osmocom/mgcp_client/mgcp_client_pool.h> +#include <osmocom/hnbgw/nft_kpi.h> + #define STORE_UPTIME_INTERVAL 10 /* seconds */ #define HNB_STORE_RAB_DURATIONS_INTERVAL 1 /* seconds */ @@ -29,6 +32,7 @@ DMGW, DHNB, DCN, + DNFT, }; extern const struct log_info hnbgw_log_info; @@ -132,6 +136,11 @@ HNB_CTR_CS_PAGING_ATTEMPTED, HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL, + + HNB_CTR_GTPU_DOWNLOAD_PACKETS, + HNB_CTR_GTPU_DOWNLOAD_GTP_BYTES, + HNB_CTR_GTPU_UPLOAD_PACKETS, + HNB_CTR_GTPU_UPLOAD_GTP_BYTES, }; enum hnb_stat { @@ -353,6 +362,14 @@ struct rate_ctr_group *ctrs; struct osmo_stat_item_group *statg; + + struct { + struct osmo_sockaddr_str addr_remote; + struct { + struct nft_kpi_val rx; + struct nft_kpi_val tx; + } last; + } nft_kpi; }; struct ue_context { @@ -450,7 +467,9 @@ void hnb_context_release_ue_state(struct hnb_context *ctx); struct hnb_persistent *hnb_persistent_alloc(const struct umts_cell_id *id); -struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id); +struct hnb_persistent *hnb_persistent_find_by_id(const struct umts_cell_id *id_str); +struct hnb_persistent *hnb_persistent_find_by_id_str(const char *id); +void hnb_persistent_update_addr(struct hnb_persistent *hnbp, int new_fd); void hnb_persistent_free(struct hnb_persistent *hnbp); void hnbgw_vty_init(void); diff --git a/include/osmocom/hnbgw/nft_kpi.h b/include/osmocom/hnbgw/nft_kpi.h new file mode 100644 index 0000000..d56946f --- /dev/null +++ b/include/osmocom/hnbgw/nft_kpi.h @@ -0,0 +1,14 @@ +#pragma once +#include <stdint.h> + +struct hnb_persistent; + +struct nft_kpi_val { + uint64_t packets; + uint64_t bytes; +}; + +int hnb_nft_kpi_start(struct hnb_persistent *hnbp); +int hnb_nft_kpi_end(struct hnb_persistent *hnbp); + +const char *nft_kpi_read_counters(void); diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index 0727f30..1ee6e44 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -20,6 +20,7 @@ $(LIBOSMORANAP_CFLAGS) \ $(LIBOSMOHNBAP_CFLAGS) \ $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBNFTABLES_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -46,6 +47,7 @@ mgw_fsm.c \ kpi_ranap.c \ tdefs.c \ + nft_kpi.c \ $(NULL) libhnbgw_la_LIBADD = \ @@ -62,6 +64,7 @@ $(LIBOSMOHNBAP_LIBS) \ $(LIBSCTP_LIBS) \ $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBNFTABLES_LIBS) \ $(NULL) if ENABLE_PFCP diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index fff900a..1e27ee2 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -340,8 +340,10 @@ } /* remove back reference from hnb_persistent to context */ - if (ctx->persistent) + if (ctx->persistent) { + hnb_nft_kpi_end(ctx->persistent); ctx->persistent->ctx = NULL; + } talloc_free(ctx); } @@ -455,6 +457,24 @@ [HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL] = { "rab:cs:active_milliseconds:total", "Cumulative number of milliseconds of CS RAB activity" }, + + [HNB_CTR_GTPU_DOWNLOAD_PACKETS] = { + "gtpu:dl:packets", + "Count of total GTP-U packets sent to the HNB.", + }, + [HNB_CTR_GTPU_DOWNLOAD_GTP_BYTES] = { + "gtpu:dl:gtpbytes", + "Count of total GTP-U bytes sent to the HNB, including the GTP-U header.", + }, + [HNB_CTR_GTPU_UPLOAD_PACKETS] = { + "gtpu:ul:packets", + "Count of total GTP-U packets received from the HNB.", + }, + [HNB_CTR_GTPU_UPLOAD_GTP_BYTES] = { + "gtpu:ul:gtpbytes", + "Count of total GTP-U bytes received from the HNB, including the GTP-U header.", + }, + }; const struct rate_ctr_group_desc hnb_ctrg_desc = { @@ -517,9 +537,49 @@ return NULL; } +struct hnb_persistent *hnb_persistent_find_by_id_str(const char *id_str) +{ + struct hnb_persistent *hnbp; + llist_for_each_entry(hnbp, &g_hnbgw->hnb_persistent_list, list) { + if (strcmp(hnbp->id_str, id_str)) + continue; + return hnbp; + } + return NULL; +} + +void hnb_persistent_update_addr(struct hnb_persistent *hnbp, int new_fd) +{ + int rc; + socklen_t socklen; + struct osmo_sockaddr osa; + struct osmo_sockaddr_str remote_str; + + socklen = sizeof(struct osmo_sockaddr); + rc = getpeername(new_fd, &osa.u.sa, &socklen); + if (!rc) + rc = osmo_sockaddr_str_from_osa(&remote_str, &osa); + if (rc < 0) { + LOGP(DHNB, LOGL_ERROR, "cannot read remote hNodeB address from Iuh file descriptor\n"); + return; + } + + if (!osmo_sockaddr_str_cmp(&remote_str, &hnbp->nft_kpi.addr_remote)) { + /* The remote address is unchanged, no need to update the nft probe */ + return; + } + + /* The remote address has changed. Cancel previous probe, if any, and start a new one. */ + if (osmo_sockaddr_str_is_nonzero(&hnbp->nft_kpi.addr_remote)) + hnb_nft_kpi_end(hnbp); + hnbp->nft_kpi.addr_remote = remote_str; + hnb_nft_kpi_start(hnbp); +} + void hnb_persistent_free(struct hnb_persistent *hnbp) { /* FIXME: check if in use? */ + hnb_nft_kpi_end(hnbp); llist_del(&hnbp->list); talloc_free(hnbp); } @@ -845,6 +905,11 @@ .color = OSMO_LOGCOLOR_DARKYELLOW, .description = "Core Network side (via SCCP)", }, + [DNFT] = { + .name = "DNFT", .loglevel = LOGL_NOTICE, .enabled = 1, + .color = OSMO_LOGCOLOR_BLUE, + .description = "netfilter counters for per-HNB traffic counters", + }, }; const struct log_info hnbgw_log_info = { diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index b2ff911..4a2e1b9 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -494,6 +494,8 @@ ctx->hnb_registered = true; + hnb_persistent_update_addr(ctx->persistent, osmo_stream_srv_get_fd(ctx->conn)); + /* Send HNBRegisterAccept */ rc = hnbgw_tx_hnb_register_acc(ctx); hnbap_free_hnbregisterrequesties(&ies); diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index c5af249..832ffb6 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -35,6 +35,7 @@ #include <osmocom/hnbgw/hnbgw_cn.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbgw/tdefs.h> +#include <osmocom/hnbgw/nft_kpi.h> #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/netif/stream.h> @@ -741,6 +742,14 @@ return CMD_SUCCESS; } +DEFUN(show_nft, show_nft_cmd, + "show nft", + SHOW_STR "nft counters") +{ + vty_out(vty, "%s%s", nft_kpi_read_counters(), VTY_NEWLINE); + return CMD_SUCCESS; +} + /* Hidden since it exists only for use by ttcn3 tests */ DEFUN_HIDDEN(cnpool_roundrobin_next, cnpool_roundrobin_next_cmd, "cnpool roundrobin next (msc|sgsn) " CNLINK_NR_RANGE, @@ -1164,4 +1173,6 @@ install_element_ve(&show_nri_cmd); install_element(ENABLE_NODE, &cnpool_roundrobin_next_cmd); install_element(ENABLE_NODE, &cnlink_ranap_reset_cmd); + + install_element_ve(&show_nft_cmd); } diff --git a/src/osmo-hnbgw/nft_kpi.c b/src/osmo-hnbgw/nft_kpi.c new file mode 100644 index 0000000..3360bcb --- /dev/null +++ b/src/osmo-hnbgw/nft_kpi.c @@ -0,0 +1,310 @@ +/* Set up and read internet traffic counters using netfilter */ +/* Copyright (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + */ + +#include <stdbool.h> +#include <ctype.h> + +#include <nftables/libnftables.h> + +#include <osmocom/core/logging.h> +#include <osmocom/core/timer.h> +#include <osmocom/hnbgw/nft_kpi.h> +#include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/tdefs.h> + +struct nft_kpi_state { + struct { + struct nft_ctx *nft_ctx; + char *table_name; + bool table_created; + } nft; + struct osmo_timer_list period; +}; + +static struct nft_kpi_state g_nft_kpi_state = {}; + +static struct nft_ctx *g_nft_ctx(void) +{ + struct nft_kpi_state *s = &g_nft_kpi_state; + + if (s->nft.nft_ctx) + return s->nft.nft_ctx; + + s->nft.nft_ctx = nft_ctx_new(NFT_CTX_DEFAULT); + if (!s->nft.nft_ctx) { + LOGP(DNFT, LOGL_ERROR, "cannot allocate libnftables nft_ctx\n"); + OSMO_ASSERT(false); + } + + return s->nft.nft_ctx; +} + +static int nft_run_now(const char *buffer) +{ + int rc; + const int logmax = 256; + + rc = nft_run_cmd_from_buffer(g_nft_ctx(), buffer); + if (rc < 0) { + LOGP(DNFT, LOGL_ERROR, "error running nft buffer: rc=%d buffer=%s\n", + rc, osmo_quote_str_c(OTC_SELECT, buffer, -1)); + return -EIO; + } + + if (log_check_level(DNFT, LOGL_DEBUG)) { + size_t l = strlen(buffer); + LOGP(DNFT, LOGL_DEBUG, "ran nft buffer, %zu chars: \"%s%s\"\n", + l, + osmo_escape_cstr_c(OTC_SELECT, buffer, OSMO_MIN(logmax, l)), + l > logmax ? "..." : ""); + } + + return 0; +} + +static void nft_kpi_period_cb(void *data); + +static void nft_kpi_period_schedule(void) +{ + unsigned long period = osmo_tdef_get(hnbgw_T_defs, -34, OSMO_TDEF_S, 10); + if (period < 1) + period = 1; + osmo_timer_setup(&g_nft_kpi_state.period, nft_kpi_period_cb, NULL); + osmo_timer_schedule(&g_nft_kpi_state.period, period, 0); +} + +static int nft_kpi_init(void) +{ + struct nft_kpi_state *s = &g_nft_kpi_state; + + if (s->nft.table_created) + return 0; + + if (!s->nft.table_name || !*s->nft.table_name) + s->nft.table_name = talloc_strdup(g_hnbgw, "osmo-hnbgw"); + + if (nft_run_now(talloc_asprintf(OTC_SELECT, "add table inet %s { flags owner; };\n", s->nft.table_name))) + return -EIO; + + s->nft.table_created = true; + nft_kpi_period_schedule(); + return 0; +} + +/* Set up counters for the hNodeB's remote address */ +int hnb_nft_kpi_start(struct hnb_persistent *hnbp) +{ + struct nft_kpi_state *s = &g_nft_kpi_state; + char *cmd; + + nft_kpi_init(); + + hnbp->nft_kpi.last.rx = (struct nft_kpi_val){}; + hnbp->nft_kpi.last.tx = (struct nft_kpi_val){}; + + cmd = talloc_asprintf(OTC_SELECT, + "add chain inet %s hnb-rx-%s {" + " type filter hook input priority filter;" + " ip protocol udp udp sport 2152 udp dport 2152 ip saddr %s counter;" + "};\n" + "add chain inet %s hnb-tx-%s {" + " type filter hook output priority filter;" + " ip protocol udp udp sport 2152 udp dport 2152 ip daddr %s counter;" + "};\n", + s->nft.table_name, + hnbp->id_str, + hnbp->nft_kpi.addr_remote.ip, + s->nft.table_name, + hnbp->id_str, + hnbp->nft_kpi.addr_remote.ip); + return nft_run_now(cmd); +} + +int hnb_nft_kpi_end(struct hnb_persistent *hnbp) +{ + struct nft_kpi_state *s = &g_nft_kpi_state; + char *cmd; + + if (!s->nft.table_created) + return 0; + + if (!osmo_sockaddr_str_is_nonzero(&hnbp->nft_kpi.addr_remote)) + return 0; + hnbp->nft_kpi.addr_remote = (struct osmo_sockaddr_str){}; + + cmd = talloc_asprintf(OTC_SELECT, + "delete chain inet %s hnb-rx-%s;\n" + "delete chain inet %s hnb-tx-%s;\n", + s->nft.table_name, + hnbp->id_str, + s->nft.table_name, + hnbp->id_str); + return nft_run_now(cmd); +} + +static void update_ctr(struct rate_ctr_group *cg, int cgidx, uint64_t *last_val, uint64_t new_val) +{ + if (new_val <= *last_val) + return; + rate_ctr_add2(cg, cgidx, new_val - *last_val); + *last_val = new_val; +} + +static void hnb_update_counters(struct hnb_persistent *hnbp, bool rx, int64_t packets, int64_t bytes) +{ + update_ctr(hnbp->ctrs, + rx ? HNB_CTR_GTPU_UPLOAD_PACKETS : HNB_CTR_GTPU_DOWNLOAD_PACKETS, + rx ? &hnbp->nft_kpi.last.rx.packets : &hnbp->nft_kpi.last.tx.packets, + packets); + update_ctr(hnbp->ctrs, + rx ? HNB_CTR_GTPU_UPLOAD_GTP_BYTES : HNB_CTR_GTPU_DOWNLOAD_GTP_BYTES, + rx ? &hnbp->nft_kpi.last.rx.bytes : &hnbp->nft_kpi.last.tx.bytes, + bytes); +} + +const char *nft_kpi_read_counters(void) +{ + int rc; + const int logmax = 256; + struct nft_kpi_state *s = &g_nft_kpi_state; + struct nft_ctx *nft = s->nft.nft_ctx; + char *cmd; + const char *output = NULL; + const char *pos; + char buf[128]; + + if (!nft) + return NULL; + + cmd = talloc_asprintf(OTC_SELECT, "list table inet %s", s->nft.table_name); + + rc = nft_ctx_buffer_output(nft); + if (rc) { + LOGP(DNFT, LOGL_ERROR, "error: nft_ctx_buffer_output() returned failure: rc=%d cmd=%s\n", + rc, osmo_quote_str_c(OTC_SELECT, cmd, -1)); + goto unbuffer_and_exit; + } + rc = nft_run_cmd_from_buffer(nft, cmd); + if (rc < 0) { + LOGP(DNFT, LOGL_ERROR, "error running nft cmd: rc=%d cmd=%s\n", + rc, osmo_quote_str_c(OTC_SELECT, cmd, -1)); + goto unbuffer_and_exit; + } + if (log_check_level(DNFT, LOGL_DEBUG)) { + size_t l = strlen(cmd); + LOGP(DNFT, LOGL_DEBUG, "ran nft request, %zu chars: \"%s%s\"\n", + l, + osmo_escape_cstr_c(OTC_SELECT, cmd, OSMO_MIN(logmax, l)), + l > logmax ? "..." : ""); + } + + output = nft_ctx_get_output_buffer(nft); + + pos = output; + while (*pos) { + const char *id, *id_end; + const char *chain_end; + const char *counter; + const char *counter_end; + int64_t packets; + int64_t bytes; + bool rx; + struct hnb_persistent *hnbp; + + id = strstr(pos, "chain hnb-"); + if (!id) + break; + id += 10; + + if (osmo_str_startswith(id, "rx-")) + rx = true; + else if (osmo_str_startswith(id, "tx-")) + rx = false; + else + break; + id += 3; + + id_end = id; + while (*id_end && *id_end != ' ' && *id_end != '{') + id_end++; + + osmo_strlcpy(buf, id, OSMO_MIN(sizeof(buf), id_end - id + 1)); + + hnbp = hnb_persistent_find_by_id_str(buf); + if (!hnbp) + break; + + if (!osmo_str_startswith(id_end, " {")) + break; + chain_end = id_end + 2; + while (*chain_end && *chain_end != '}') + chain_end++; + + counter = strstr(id_end + 2, "counter packets "); + if (!counter) + break; + counter += 16; + if (counter > chain_end) + break; + if (!isdigit(*counter)) + break; + + counter_end = counter; + while (isdigit(*counter_end)) + counter_end++; + if (counter_end > chain_end) + break; + osmo_strlcpy(buf, counter, OSMO_MIN(sizeof(buf), counter_end - counter + 1)); + if (osmo_str_to_int64(&packets, buf, 10, 0, INT64_MAX)) + break; + if (packets < 0) + break; + + counter = strstr(counter_end, " bytes "); + if (!counter) + break; + counter += 7; + if (counter > chain_end) + break; + if (!isdigit(*counter)) + break; + counter_end = counter; + while (isdigit(*counter_end)) + counter_end++; + if (counter_end > chain_end) + break; + osmo_strlcpy(buf, counter, OSMO_MIN(sizeof(buf), counter_end - counter + 1)); + if (osmo_str_to_int64(&bytes, buf, 10, 0, INT64_MAX)) + break; + if (bytes < 0) + break; + + hnb_update_counters(hnbp, rx, packets, bytes); + + pos = chain_end + 1; + } + +unbuffer_and_exit: + nft_ctx_unbuffer_output(nft); + return output; +} + +static void nft_kpi_period_cb(void *data) +{ + nft_kpi_read_counters(); + nft_kpi_period_schedule(); +} diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c index af09d17..bb54049 100644 --- a/src/osmo-hnbgw/tdefs.c +++ b/src/osmo-hnbgw/tdefs.c @@ -36,6 +36,7 @@ {.T = 4, .default_val = 5, .desc = "Timeout to receive RANAP RESET ACKNOWLEDGE from an MSC/SGSN" }, {.T = -31, .default_val = 15, .desc = "Timeout for establishing and releasing context maps (RUA <-> SCCP)" }, {.T = -1002, .default_val = 10, .desc = "Timeout for the HNB to respond to PS RAB Assignment Request" }, + {.T = -34, .default_val = 10, .desc = "Period to query network traffic stats from netfilter" }, { } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36385?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I35b7e97fd039e36633dfde1317170527c82f9f68 Gerrit-Change-Number: 36385 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by fixeria

Attention is currently required from: jolly, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email ) Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 06:01:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by fixeria

Attention is currently required from: jolly, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email ) Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... Patch Set 1: (1 comment) File library/MGCP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379/comment/40a026dd_43e1… PS1, Line 241: template MgcpConnectionId conn_id := omit) return template MgcpCommand { please fix alignment here and below (it was aligned before your patch) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 06:01:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by fixeria

Attention is currently required from: laforge, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... Patch Set 1: (1 comment) File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/c/osmo-ci/+/36384/comment/71b60a56_be6f7abf PS1, Line 405: simtester FYI: it's intentionally `simtester` machine here, so that we can benefit from having all dependency packages already fetched. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 1 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-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 22 Mar 2024 05:58:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by char

Attention is currently required from: fixeria. char has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > > Calling each binary with --help during build and checking if it crashes is a fairly simple "smoke […] Very cool! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 18:37:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: char <osmocom(a)hypodyne.net> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by char

Attention is currently required from: fixeria. char has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Looks good to me! -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 18:36:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: contrib/jenkins.sh: add 'distcheck' job to check package integrity

by char

Attention is currently required from: fixeria. char has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36383?usp=email ) Change subject: contrib/jenkins.sh: add 'distcheck' job to check package integrity ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Looks good to me! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36383?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Gerrit-Change-Number: 36383 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 18:36:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by fixeria

Attention is currently required from: char. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Calling each binary with --help during build and checking if it crashes is a fairly simple "smoke test" I've seen done before. That would have caught the issue fixed by this patch, at least. Sounds like a good idea to me! I was about to mention some important details on how to implement this correctly (e.g. that we actually need to install pySim as a package) in `contrib/jenkins.sh`, but ended up writing a patch myself while exploring possible options ;) https://gerrit.osmocom.org/c/pysim/+/36383 contrib/jenkins.sh: add 'distcheck' job to check package integrity https://gerrit.osmocom.org/c/osmo-ci/+/36384 gerrit-verifications: execute 'distcheck' job for pysim -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: char <osmocom(a)hypodyne.net> Gerrit-Comment-Date: Thu, 21 Mar 2024 18:23:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: char <osmocom(a)hypodyne.net> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... gerrit-verifications: execute 'distcheck' job for pysim Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Related: pysim.git Ic72d58494e8fd0cab8d66ce60f7b70593b770872 --- M jobs/gerrit-verifications.yml 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/36384/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 492c06e..f1036c9 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -399,9 +399,10 @@ concurrent: false slave_axis: !!python/tuple [simtester,osmocom-gerrit] a2_name: JOB_TYPE - a2: !!python/tuple ["test", "pylint", "docs"] + a2: !!python/tuple ["test", "distcheck", "pylint", "docs"] combination_filter: > (JOB_TYPE == "test" && label == "simtester") || + (JOB_TYPE == "distcheck" && label == "simtester") || (JOB_TYPE == "pylint" && label == "osmocom-gerrit") || (JOB_TYPE == "docs" && label == "osmocom-gerrit") cmd: | -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: contrib/jenkins.sh: add 'distcheck' job to check package integrity

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36383?usp=email ) Change subject: contrib/jenkins.sh: add 'distcheck' job to check package integrity ...................................................................... contrib/jenkins.sh: add 'distcheck' job to check package integrity The idea of this new job is to catch package integrity problems, like the missing entries in setup.py/packages[] or missing deps. Change-Id: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Related: osmo-ci.git I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d --- M contrib/jenkins.sh 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/83/36383/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a5993da..6fb3d1a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,7 +4,7 @@ # environment variables: # * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") -# * JOB_TYPE: one of 'test', 'pylint', 'docs' +# * JOB_TYPE: one of 'test', 'distcheck', 'pylint', 'docs' # export PYTHONUNBUFFERED=1 @@ -32,6 +32,17 @@ ../tests/pySim-prog_test.sh ../tests/pySim-trace_test.sh ;; +"distcheck") + virtualenv -p python3 venv --system-site-packages + . venv/bin/activate + + pip install . + pip install pyshark + + for prog in venv/bin/pySim-*.py; do + $prog --help > /dev/null + done + ;; "pylint") # Print pylint version pip3 freeze | grep pylint -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36383?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Gerrit-Change-Number: 36383 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by char

Attention is currently required from: fixeria. char has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Thanks, the fix looks good. […] Calling each binary with `--help` during build and checking if it crashes is a fairly simple "smoke test" I've seen done before. That would have caught the issue fixed by this patch, at least. If you'd like me to do that, I'll add it in a separate patch set. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 17:41:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: char <osmocom(a)hypodyne.net> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: Get Rid of private copy of f_mgcp_addr2addrtype()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?usp=email ) Change subject: sip: Get Rid of private copy of f_mgcp_addr2addrtype() ...................................................................... sip: Get Rid of private copy of f_mgcp_addr2addrtype() The function was copied from MGCP_Templates.ttcn since the logic is the same for SDP, but copied in order to avoid depending on whole MGCP file. Since now SDP logic has been moved to its own SDP_Templates and a new f_sdp_addr2addrtype() was added, use that one. Change-Id: I27ce46b6d23ba0f2704dd0cee290ed519dec278e --- M sip/SIP_Tests.ttcn M sip/gen_links.sh 2 files changed, 23 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/36382/1 diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 9f8f8f8..9d92b87 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -26,6 +26,7 @@ import from MNCC_Types all; import from SDP_Types all; +import from SDP_Templates all; import from SIP_Emulation all; import from SIPmsg_Types all; @@ -110,14 +111,6 @@ cp.comp.sip_body := ""; } -private function f_mgcp_addr2addrtype(charstring addr) return charstring { - for (var integer i := 0; i < lengthof(addr); i := i + 1) { - if (addr[i] == ":") { - return "IP6"; - } - } - return "IP4"; -} function f_init_mncc(charstring id) runs on test_CT { id := id & "-MNCC"; var MnccOps ops := { @@ -304,7 +297,7 @@ /* MSC -> OSC: SDP that the MSC will send via MNCC */ var charstring cn_sdp := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & + f_sdp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.cn_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; /* OSC -> SIP: what SDP to expect in SIP from osmo-sip-connector */ @@ -396,7 +389,7 @@ */ var charstring cn_sdp := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & + f_sdp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.cn_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; @@ -518,7 +511,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -555,7 +548,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -582,7 +575,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -619,7 +612,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -645,7 +638,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0); diff --git a/sip/gen_links.sh b/sip/gen_links.sh index cf09731..81c1578 100755 --- a/sip/gen_links.sh +++ b/sip/gen_links.sh @@ -43,6 +43,7 @@ FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " +FILES+="SDP_Templates.ttcn " FILES+="SIP_Emulation.ttcn SIP_Templates.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?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: I27ce46b6d23ba0f2704dd0cee290ed519dec278e Gerrit-Change-Number: 36382 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Move SDP templates to its own SDP_Templates.ttcn file

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?usp=email ) Change subject: Move SDP templates to its own SDP_Templates.ttcn file ...................................................................... Move SDP templates to its own SDP_Templates.ttcn file SDP is used in other protocols than MGCP, eg. SIP. Change-Id: I0610b4cf5533e46a3401c65e60c7cce975c85412 --- M bsc-nat/BSC_MS_ConnectionHandler.ttcn M bsc-nat/gen_links.sh M bsc/BSC_Tests_LCLS.ttcn M bsc/MSC_ConnectionHandler.ttcn M bsc/gen_links.sh M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M library/MGCP_Templates.ttcn A library/SDP_Templates.ttcn M mgw/MGCP_Test.ttcn M mgw/gen_links.sh M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/gen_links.sh M smlc/gen_links.sh 15 files changed, 184 insertions(+), 142 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/36381/1 diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn index 1a3f951..8aea74a 100644 --- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn +++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn @@ -24,6 +24,7 @@ import from MGCP_Types all; import from MGCP_Templates all; import from SDP_Types all; +import from SDP_Templates all; type function void_fn_bsc_ms(charstring id) runs on BSC_MS_ConnHdlr; diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 9bd1faf..395f50e 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -52,7 +52,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_VTY_Functions.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn BSSAP_CodecPort.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_VTY_Functions.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn BSSAP_CodecPort.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" gen_links $DIR $FILES ignore_pp_results diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 6686a34..2b9886b 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -38,6 +38,7 @@ import from MGCP_Emulation all; import from MGCP_Templates all; import from SDP_Types all; +import from SDP_Templates all; import from Native_Functions all; import from Osmocom_CTRL_Functions all; diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index b499244..88a1b58 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -32,6 +32,7 @@ import from MGCP_Templates all; import from MGCP_Emulation all; import from SDP_Types all; +import from SDP_Templates all; import from StatsD_Checker all; diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 538824d..cb9f12f 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn " FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 15fc85f..89b243b 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -56,6 +56,7 @@ import from MGCP_Templates all; import from MGCP_CodecPort all; import from SDP_Types all; +import from SDP_Templates all; import from PFCP_Types all; import from PFCP_Emulation all; diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index b651113..62b3e44 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -98,7 +98,7 @@ DIR=../library FILES="Iuh_Types.ttcn Iuh_CodecPort.ttcn Iuh_CodecPort_CtrlFunctDef.cc Iuh_CodecPort_CtrlFunct.ttcn Iuh_Emulation.ttcn DNS_Helpers.ttcn " -FILES+="MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " +FILES+="SDP_Templates.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="RAN_Adapter.ttcnpp RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn SCCP_Templates.ttcn " FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn " FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn " diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn index 122d005..665def7 100644 --- a/library/MGCP_Templates.ttcn +++ b/library/MGCP_Templates.ttcn @@ -12,6 +12,7 @@ import from MGCP_Types all; import from SDP_Types all; +import from SDP_Templates all; function f_mgcp_par_append(inout template MgcpParameterList list, template MgcpParameter par) { var integer len := lengthof(list); @@ -288,142 +289,6 @@ sdp := * } -/* SDP Templates */ -template SDP_Origin ts_SDP_origin(charstring addr, charstring session_id, - charstring session_version := "1", - charstring addr_type := "IP4", - charstring user_name := "-") := { - user_name := user_name, - session_id := session_id, - session_version := session_version, - net_type := "IN", - addr_type := addr_type, - addr := addr -} - -template SDP_connection ts_SDP_connection_IP(charstring addr, charstring addr_type := "IP4", - template integer ttl := omit, - template integer num_of_addr := omit) :={ - net_type := "IN", - addr_type := addr_type, - conn_addr := { - addr := addr, - ttl := ttl, - num_of_addr := num_of_addr - } -} - -template SDP_connection tr_SDP_connection_IP(template charstring addr, template charstring addr_type := ?, - template integer ttl := *, - template integer num_of_addr := *) := { - net_type := "IN", - addr_type := addr_type, - conn_addr := { - addr := addr, - ttl := ttl, - num_of_addr := num_of_addr - } -} - -template SDP_time ts_SDP_time(charstring beg, charstring end) := { - time_field := { - start_time := beg, - stop_time := end - }, - time_repeat := omit -} - -template SDP_media_desc ts_SDP_media_desc(integer port_number, SDP_fmt_list fmts, - SDP_attribute_list attributes) := { - media_field := { - media := "audio", - ports := { - port_number := port_number, - num_of_ports := omit - }, - transport := "RTP/AVP", - fmts := fmts - }, - information := omit, - connections := omit, - bandwidth := omit, - key := omit, - attributes := attributes -} - -template SDP_media_desc tr_SDP_media_desc(template integer port_number := ?, - template SDP_fmt_list fmts := ?, - template SDP_attribute_list attributes := ?) := { - media_field := { - media := "audio", - ports := { - port_number := port_number, - num_of_ports := omit - }, - transport := "RTP/AVP", - fmts := fmts - }, - information := *, - connections := *, - bandwidth := *, - key := *, - attributes := attributes -} - -/* master template for generating SDP based in template arguments */ -template SDP_Message ts_SDP(charstring local_addr, charstring remote_addr, - charstring session_id, charstring session_version, - integer rtp_port, SDP_fmt_list fmts, - SDP_attribute_list attributes) := { - protocol_version := 0, - origin := ts_SDP_origin(local_addr, session_id, session_version, f_mgcp_addr2addrtype(local_addr)), - session_name := "-", - information := omit, - uri := omit, - emails := omit, - phone_numbers := omit, - connection := ts_SDP_connection_IP(remote_addr, f_mgcp_addr2addrtype(remote_addr)), - bandwidth := omit, - times := { ts_SDP_time("0","0") }, - timezone_adjustments := omit, - key := omit, - attributes := omit, - media_list := { ts_SDP_media_desc(rtp_port, fmts, attributes) } -} - -template SDP_Message tr_SDP(template charstring remote_addr := ?, template integer rtp_port := ?) := { - protocol_version := 0, - origin := ?, - session_name := ?, - information := *, - uri := *, - emails := *, - phone_numbers := *, - connection := tr_SDP_connection_IP(remote_addr, ?), - bandwidth := *, - times := ?, - timezone_adjustments := *, - key := *, - attributes := *, - media_list := { tr_SDP_media_desc(rtp_port) } -} - -template SDP_attribute ts_SDP_rtpmap(integer fmt, charstring val) := { - rtpmap := { - attr_value := int2str(fmt) & " " & val - } -} -template SDP_attribute ts_SDP_ptime(integer p) := { - ptime := { - attr_value := int2str(p) - } -} -template SDP_attribute ts_SDP_fmtp(integer fmt, charstring val) := { - fmtp := { - attr_value := int2str(fmt) & " " & val - } -} - function f_mgcp_addr2addrtype(charstring addr) return charstring { for (var integer i := 0; i < lengthof(addr); i := i + 1) { if (addr[i] == ":") { diff --git a/library/SDP_Templates.ttcn b/library/SDP_Templates.ttcn new file mode 100644 index 0000000..e948348 --- /dev/null +++ b/library/SDP_Templates.ttcn @@ -0,0 +1,159 @@ +module SDP_Templates { + +/* SDP Templates, building on top of SDP_Types from Ericsson. + * + * (C) 2017 by Harald Welte <laforge(a)gnumonks.org> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from SDP_Types all; + +/* SDP Templates */ +template SDP_Origin ts_SDP_origin(charstring addr, charstring session_id, + charstring session_version := "1", + charstring addr_type := "IP4", + charstring user_name := "-") := { + user_name := user_name, + session_id := session_id, + session_version := session_version, + net_type := "IN", + addr_type := addr_type, + addr := addr +} + +template SDP_connection ts_SDP_connection_IP(charstring addr, charstring addr_type := "IP4", + template integer ttl := omit, + template integer num_of_addr := omit) :={ + net_type := "IN", + addr_type := addr_type, + conn_addr := { + addr := addr, + ttl := ttl, + num_of_addr := num_of_addr + } +} + +template SDP_connection tr_SDP_connection_IP(template charstring addr, template charstring addr_type := ?, + template integer ttl := *, + template integer num_of_addr := *) := { + net_type := "IN", + addr_type := addr_type, + conn_addr := { + addr := addr, + ttl := ttl, + num_of_addr := num_of_addr + } +} + +template SDP_time ts_SDP_time(charstring beg, charstring end) := { + time_field := { + start_time := beg, + stop_time := end + }, + time_repeat := omit +} + +template SDP_media_desc ts_SDP_media_desc(integer port_number, SDP_fmt_list fmts, + SDP_attribute_list attributes) := { + media_field := { + media := "audio", + ports := { + port_number := port_number, + num_of_ports := omit + }, + transport := "RTP/AVP", + fmts := fmts + }, + information := omit, + connections := omit, + bandwidth := omit, + key := omit, + attributes := attributes +} + +template SDP_media_desc tr_SDP_media_desc(template integer port_number := ?, + template SDP_fmt_list fmts := ?, + template SDP_attribute_list attributes := ?) := { + media_field := { + media := "audio", + ports := { + port_number := port_number, + num_of_ports := omit + }, + transport := "RTP/AVP", + fmts := fmts + }, + information := *, + connections := *, + bandwidth := *, + key := *, + attributes := attributes +} + +/* master template for generating SDP based in template arguments */ +template SDP_Message ts_SDP(charstring local_addr, charstring remote_addr, + charstring session_id, charstring session_version, + integer rtp_port, SDP_fmt_list fmts, + SDP_attribute_list attributes) := { + protocol_version := 0, + origin := ts_SDP_origin(local_addr, session_id, session_version, f_sdp_addr2addrtype(local_addr)), + session_name := "-", + information := omit, + uri := omit, + emails := omit, + phone_numbers := omit, + connection := ts_SDP_connection_IP(remote_addr, f_sdp_addr2addrtype(remote_addr)), + bandwidth := omit, + times := { ts_SDP_time("0","0") }, + timezone_adjustments := omit, + key := omit, + attributes := omit, + media_list := { ts_SDP_media_desc(rtp_port, fmts, attributes) } +} + +template SDP_Message tr_SDP(template charstring remote_addr := ?, template integer rtp_port := ?) := { + protocol_version := 0, + origin := ?, + session_name := ?, + information := *, + uri := *, + emails := *, + phone_numbers := *, + connection := tr_SDP_connection_IP(remote_addr, ?), + bandwidth := *, + times := ?, + timezone_adjustments := *, + key := *, + attributes := *, + media_list := { tr_SDP_media_desc(rtp_port) } +} + +template SDP_attribute ts_SDP_rtpmap(integer fmt, charstring val) := { + rtpmap := { + attr_value := int2str(fmt) & " " & val + } +} +template SDP_attribute ts_SDP_ptime(integer p) := { + ptime := { + attr_value := int2str(p) + } +} +template SDP_attribute ts_SDP_fmtp(integer fmt, charstring val) := { + fmtp := { + attr_value := int2str(fmt) & " " & val + } +} + +function f_sdp_addr2addrtype(charstring addr) return charstring { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return "IP6"; + } + } + return "IP4"; +} + +} diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 7568ac9..b7d6b46 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -15,6 +15,7 @@ import from MGCP_Types all; import from MGCP_Templates all; import from SDP_Types all; + import from SDP_Templates all; import from MGCP_CodecPort all; import from MGCP_CodecPort_CtrlFunct all; import from RTP_CodecPort all; diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index a7b1684..2fd2b0d 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -38,7 +38,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="AMR_Types.ttcn " FILES+="RTP_CodecPort.ttcn RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_Emulation.ttcn IuUP_EncDec.cc " diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 92ec3b1..b3d915c 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -41,6 +41,7 @@ import from MGCP_Emulation all; import from MGCP_Templates all; import from SDP_Types all; +import from SDP_Templates all; import from MobileL3_Types all; import from MobileL3_CommonIE_Types all; diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 7f993c4..9db18d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -46,6 +46,7 @@ import from MGCP_Types all; import from MGCP_Templates all; import from SDP_Types all; +import from SDP_Templates all; import from GSUP_Types all; import from GSUP_Templates all; diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 8463976..a15c42d 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -96,7 +96,7 @@ FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn L3_Common.ttcn " -FILES+="RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn RAN_Adapter.ttcnpp MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " +FILES+="RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn RAN_Adapter.ttcnpp SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " diff --git a/smlc/gen_links.sh b/smlc/gen_links.sh index 092b963..cf715f6 100755 --- a/smlc/gen_links.sh +++ b/smlc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSAP_LE_Types.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSAP_LE_Types.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " FILES+="BSSAP_LE_CodecPort.ttcn BSSAP_LE_Emulation.ttcn BSSAP_LE_Adapter.ttcn BSSLAP_Types.ttcn BSSMAP_LE_Templates.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?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: I0610b4cf5533e46a3401c65e60c7cce975c85412 Gerrit-Change-Number: 36381 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Move f_addrstr2addr() to library/Misc_Helpers.ttcn

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Move f_addrstr2addr() to library/Misc_Helpers.ttcn ...................................................................... Move f_addrstr2addr() to library/Misc_Helpers.ttcn This function can easily be reused in other testsuites supporting both IPv4 and IPv6 addresses. Change-Id: I4243ec5551f128629b6504ccc59efeb456a6855d --- M hlr/gen_links.sh M hlr/regen_makefile.sh M library/Misc_Helpers.ttcn M sip/SIP_Tests.ttcn M sysinfo/gen_links.sh M sysinfo/regen_makefile.sh 6 files changed, 26 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/36380/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?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: I4243ec5551f128629b6504ccc59efeb456a6855d Gerrit-Change-Number: 36380 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Move f_addrstr2addr() to library/Misc_Helpers.ttcn

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?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: Move f_addrstr2addr() to library/Misc_Helpers.ttcn ...................................................................... Move f_addrstr2addr() to library/Misc_Helpers.ttcn This function can easily be reused in other testsuites supporting both IPv4 and IPv6 addresses. Change-Id: I4243ec5551f128629b6504ccc59efeb456a6855d --- M hlr/gen_links.sh M hlr/regen_makefile.sh M library/Misc_Helpers.ttcn M sip/SIP_Tests.ttcn 4 files changed, 24 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/36380/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?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: I4243ec5551f128629b6504ccc59efeb456a6855d Gerrit-Change-Number: 36380 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Move f_addrstr2addr() to library/Misc_Helpers.ttcn

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?usp=email ) Change subject: Move f_addrstr2addr() to library/Misc_Helpers.ttcn ...................................................................... Move f_addrstr2addr() to library/Misc_Helpers.ttcn This function can easily be reused in other testsuites supporting both IPv4 and IPv6 addresses. Change-Id: I4243ec5551f128629b6504ccc59efeb456a6855d --- M library/Misc_Helpers.ttcn M sip/SIP_Tests.ttcn 2 files changed, 22 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/36380/1 diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index e01c170..dda2c2c 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -1,5 +1,7 @@ module Misc_Helpers { +import from Native_Functions all; + modulepar { charstring mp_osmo_repo := "nightly"; } @@ -51,4 +53,12 @@ return false; } +function f_addrstr2addr(charstring addr) return octetstring { + if (f_addr_is_ipv6(addr)) { + return f_inet6_addr(addr); + } else { + return f_inet_addr(addr); + } +} + } diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 208cc01..9f8f8f8 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -118,15 +118,6 @@ } return "IP4"; } - -private function f_addrstr2addr(charstring addr) return octetstring { - if (f_addr_is_ipv6(addr)) { - return f_inet6_addr(addr); - } else { - return f_inet_addr(addr); - } -} - function f_init_mncc(charstring id) runs on test_CT { id := id & "-MNCC"; var MnccOps ops := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?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: I4243ec5551f128629b6504ccc59efeb456a6855d Gerrit-Change-Number: 36380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email ) Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... MGCP_Templates: Avoid extra indenation for most of the whole file Change-Id: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 --- M library/MGCP_Templates.ttcn 1 file changed, 514 insertions(+), 505 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/36379/1 diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn index 3a5f139..122d005 100644 --- a/library/MGCP_Templates.ttcn +++ b/library/MGCP_Templates.ttcn @@ -10,565 +10,565 @@ */ - import from MGCP_Types all; - import from SDP_Types all; +import from MGCP_Types all; +import from SDP_Types all; - function f_mgcp_par_append(inout template MgcpParameterList list, template MgcpParameter par) { - var integer len := lengthof(list); - list[len] := par; - } +function f_mgcp_par_append(inout template MgcpParameterList list, template MgcpParameter par) { + var integer len := lengthof(list); + list[len] := par; +} - /* 3.2.2.6 Connection Mode (sendonly, recvonly, sendrecv, confrnce, inactive, loopback, - * conttest, netwloop, netwtest) */ - template MgcpParameter t_MgcpParConnMode(template MgcpConnectionMode mode) := { "M", mode }; +/* 3.2.2.6 Connection Mode (sendonly, recvonly, sendrecv, confrnce, inactive, loopback, + * conttest, netwloop, netwtest) */ +template MgcpParameter t_MgcpParConnMode(template MgcpConnectionMode mode) := { "M", mode }; - /* 3.2.2.2 CallId: maximum 32 hex chars */ - template MgcpParameter ts_MgcpParCallId(MgcpCallId cid) := { - code := "C", - val := hex2str(cid) - }; +/* 3.2.2.2 CallId: maximum 32 hex chars */ +template MgcpParameter ts_MgcpParCallId(MgcpCallId cid) := { + code := "C", + val := hex2str(cid) +}; - /* 3.2.2.18 RequestIdentifier: Maximum 32 hex chars */ - template MgcpParameter ts_MgcpParReqId(MgcpRequestId rid) := { - code := "X", - val := hex2str(rid) - }; +/* 3.2.2.18 RequestIdentifier: Maximum 32 hex chars */ +template MgcpParameter ts_MgcpParReqId(MgcpRequestId rid) := { + code := "X", + val := hex2str(rid) +}; - /* 3.2.1.3 SpecificEndpointId */ - template MgcpParameter ts_MgcpParSpecEP(MgcpEndpoint ep) := { - code := "Z", - val := ep - }; +/* 3.2.1.3 SpecificEndpointId */ +template MgcpParameter ts_MgcpParSpecEP(MgcpEndpoint ep) := { + code := "Z", + val := ep +}; - /* 3.2.2.10: LocalConnectionOptions (codec, packetization, bandwidth, ToS, eco, gain, silence, ...) */ - template MgcpParameter t_MgcpParLocConnOpt(template charstring lco) := { "L", lco }; +/* 3.2.2.10: LocalConnectionOptions (codec, packetization, bandwidth, ToS, eco, gain, silence, ...) */ +template MgcpParameter t_MgcpParLocConnOpt(template charstring lco) := { "L", lco }; - /* 3.2.2.5: ConnectionId: maximum 32 hex chars */ - template MgcpParameter ts_MgcpParConnectionId(MgcpConnectionId cid) := { - code := "I", - val := hex2str(cid) - }; +/* 3.2.2.5: ConnectionId: maximum 32 hex chars */ +template MgcpParameter ts_MgcpParConnectionId(MgcpConnectionId cid) := { + code := "I", + val := hex2str(cid) +}; - /* Osmocom extension: X-Osmux: {*,%u} */ - template MgcpParameter ts_MgcpParOsmuxCID(MgcpOsmuxCID osmux_cid) := { - code := "X-OSMUX", - val := f_mgcp_osmux_cid_encode(osmux_cid) - }; +/* Osmocom extension: X-Osmux: {*,%u} */ +template MgcpParameter ts_MgcpParOsmuxCID(MgcpOsmuxCID osmux_cid) := { + code := "X-OSMUX", + val := f_mgcp_osmux_cid_encode(osmux_cid) +}; - /* Osmocom extension: X-Osmux: {*,%u} */ - template MgcpParameter t_MgcpParOsmoIGN(template charstring val) := { - code := "X-OSMO-IGN", - val := val - }; +/* Osmocom extension: X-Osmux: {*,%u} */ +template MgcpParameter t_MgcpParOsmoIGN(template charstring val) := { + code := "X-OSMO-IGN", + val := val +}; - /* osmo-bsc_mgcp implements L/C/M/X only, osmo-mgw adds 'I' */ - /* SDP: osmo-bsc_mgcp implements Tx of v,o,s,c,t,m,a */ +/* osmo-bsc_mgcp implements L/C/M/X only, osmo-mgw adds 'I' */ +/* SDP: osmo-bsc_mgcp implements Tx of v,o,s,c,t,m,a */ - template (value) MgcpResponse - ts_MgcpResp_Err(template (value) MgcpTransId trans_id, - template (value) MgcpResponseCode code, - template (value) charstring string := "FAIL") := { - line := { - code := code, - trans_id := trans_id, - string := string - }, - params := {}, - sdp := omit - } - template MgcpResponse - tr_MgcpResp_Err(template (present) MgcpResponseCode code) := { - line := { - code := code, - trans_id := ?, - string := ? - }, - params := {}, - sdp := omit - } - - template MgcpCommandLine t_MgcpCmdLine(template charstring verb, template MgcpTransId trans_id, template charstring ep) := { - verb := verb, +template (value) MgcpResponse +ts_MgcpResp_Err(template (value) MgcpTransId trans_id, + template (value) MgcpResponseCode code, + template (value) charstring string := "FAIL") := { + line := { + code := code, trans_id := trans_id, - ep := ep, - ver := "1.0" - }; + string := string + }, + params := {}, + sdp := omit +} +template MgcpResponse +tr_MgcpResp_Err(template (present) MgcpResponseCode code) := { + line := { + code := code, + trans_id := ?, + string := ? + }, + params := {}, + sdp := omit +} - template MgcpCommand ts_AUEP(MgcpTransId trans_id, charstring ep) := { - line := t_MgcpCmdLine("AUEP", trans_id, ep), - params := omit, - sdp := omit - } +template MgcpCommandLine t_MgcpCmdLine(template charstring verb, template MgcpTransId trans_id, template charstring ep) := { + verb := verb, + trans_id := trans_id, + ep := ep, + ver := "1.0" +}; - template MgcpResponse tr_AUEP_ACK := { - line := { - code := "200", - trans_id := ?, - string := "OK" - }, - params:= *, - sdp := omit - } +template MgcpCommand ts_AUEP(MgcpTransId trans_id, charstring ep) := { + line := t_MgcpCmdLine("AUEP", trans_id, ep), + params := omit, + sdp := omit +} - template MgcpCommand ts_CRCX(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("CRCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id), - //t_MgcpParReqId(omit), - t_MgcpParLocConnOpt("p:20, a:AMR") - }, - sdp := sdp - } +template MgcpResponse tr_AUEP_ACK := { + line := { + code := "200", + trans_id := ?, + string := "OK" + }, + params:= *, + sdp := omit +} - template MgcpCommand ts_CRCX_no_lco(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("CRCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id) - }, - sdp := sdp - } +template MgcpCommand ts_CRCX(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("CRCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id), + //t_MgcpParReqId(omit), + t_MgcpParLocConnOpt("p:20, a:AMR") + }, + sdp := sdp +} - template MgcpCommand ts_CRCX_osmux(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("CRCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id), - //t_MgcpParReqId(omit), - t_MgcpParLocConnOpt("p:20, a:AMR"), - ts_MgcpParOsmuxCID(osmux_cid) - }, - sdp := sdp - } +template MgcpCommand ts_CRCX_no_lco(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("CRCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id) + }, + sdp := sdp +} - template MgcpCommand tr_CRCX(template MgcpEndpoint ep := ?, template SDP_Message sdp := *) := { - line := t_MgcpCmdLine("CRCX", ?, ep), - params := *, - sdp := sdp - } +template MgcpCommand ts_CRCX_osmux(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("CRCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id), + //t_MgcpParReqId(omit), + t_MgcpParLocConnOpt("p:20, a:AMR"), + ts_MgcpParOsmuxCID(osmux_cid) + }, + sdp := sdp +} - template MgcpResponse tr_CRCX_ACK := { - line := { - code := "200", - trans_id := ?, - string := "OK" - }, - params:= { { "I", ? }, *}, - sdp := ? - } +template MgcpCommand tr_CRCX(template MgcpEndpoint ep := ?, template SDP_Message sdp := *) := { + line := t_MgcpCmdLine("CRCX", ?, ep), + params := *, + sdp := sdp +} - template MgcpResponse tr_CRCX_ACK_osmux := { - line := { - code := "200", - trans_id := ?, - string := "OK" - }, - params:= { { "I", ? }, {"X-OSMUX", ?}, *}, - sdp := ? - } +template MgcpResponse tr_CRCX_ACK := { + line := { + code := "200", + trans_id := ?, + string := "OK" + }, + params:= { { "I", ? }, *}, + sdp := ? +} - template MgcpResponse ts_CRCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := { - line := { - code := "200", - trans_id := trans_id, - string := "OK" - }, - params:= { ts_MgcpParConnectionId(conn_id) }, - sdp := sdp - } +template MgcpResponse tr_CRCX_ACK_osmux := { + line := { + code := "200", + trans_id := ?, + string := "OK" + }, + params:= { { "I", ? }, {"X-OSMUX", ?}, *}, + sdp := ? +} - template MgcpResponse ts_CRCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { - line := { - code := "200", - trans_id := trans_id, - string := "OK" - }, - params:= { - ts_MgcpParConnectionId(conn_id), - ts_MgcpParOsmuxCID(osmux_cid) - }, - sdp := sdp - } +template MgcpResponse ts_CRCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := { + line := { + code := "200", + trans_id := trans_id, + string := "OK" + }, + params:= { ts_MgcpParConnectionId(conn_id) }, + sdp := sdp +} - template MgcpCommand ts_MDCX(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("MDCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id), - ts_MgcpParConnectionId(conn_id), - //t_MgcpParReqId(omit), - t_MgcpParLocConnOpt("p:20, a:AMR") - }, - sdp := sdp - } +template MgcpResponse ts_CRCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { + line := { + code := "200", + trans_id := trans_id, + string := "OK" + }, + params:= { + ts_MgcpParConnectionId(conn_id), + ts_MgcpParOsmuxCID(osmux_cid) + }, + sdp := sdp +} - template MgcpCommand ts_MDCX_osmux(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("MDCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id), - ts_MgcpParConnectionId(conn_id), - //t_MgcpParReqId(omit), - t_MgcpParLocConnOpt("p:20, a:AMR"), - ts_MgcpParOsmuxCID(osmux_cid) - }, - sdp := sdp - } +template MgcpCommand ts_MDCX(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("MDCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id), + ts_MgcpParConnectionId(conn_id), + //t_MgcpParReqId(omit), + t_MgcpParLocConnOpt("p:20, a:AMR") + }, + sdp := sdp +} - template MgcpCommand tr_MDCX(template SDP_Message sdp := *) := { - line := t_MgcpCmdLine("MDCX", ?, ?), - params := *, - sdp := sdp - } +template MgcpCommand ts_MDCX_osmux(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("MDCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id), + ts_MgcpParConnectionId(conn_id), + //t_MgcpParReqId(omit), + t_MgcpParLocConnOpt("p:20, a:AMR"), + ts_MgcpParOsmuxCID(osmux_cid) + }, + sdp := sdp +} - template MgcpResponse tr_MDCX_ACK := { - line := { - code := "200", - trans_id := ?, - string := "OK" - }, - params := *, - sdp := ? - } +template MgcpCommand tr_MDCX(template SDP_Message sdp := *) := { + line := t_MgcpCmdLine("MDCX", ?, ?), + params := *, + sdp := sdp +} - template MgcpResponse ts_MDCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp); - template MgcpResponse ts_MDCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := ts_CRCX_ACK_osmux(trans_id, conn_id, osmux_cid, sdp); +template MgcpResponse tr_MDCX_ACK := { + line := { + code := "200", + trans_id := ?, + string := "OK" + }, + params := *, + sdp := ? +} - /* have a function that generates a template, rather than a template in order to handle - * optional parameters */ - function ts_DLCX(MgcpTransId trans_id, charstring ep, template MgcpCallId call_id := omit, - template MgcpConnectionId conn_id := omit) return template MgcpCommand { - var template MgcpCommand cmd; - cmd.line := t_MgcpCmdLine("DLCX", trans_id, ep); - cmd.params := {}; - cmd.sdp := omit; - if (isvalue(call_id)) { - f_mgcp_par_append(cmd.params, ts_MgcpParCallId(valueof(call_id))); - if (isvalue(conn_id)) { - f_mgcp_par_append(cmd.params, ts_MgcpParConnectionId(valueof(conn_id))); - } - } - return cmd; - } +template MgcpResponse ts_MDCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp); +template MgcpResponse ts_MDCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := ts_CRCX_ACK_osmux(trans_id, conn_id, osmux_cid, sdp); - template MgcpCommand tr_DLCX(template MgcpEndpoint ep := ?) := { - line := t_MgcpCmdLine("DLCX", ?, ep), - params := *, - sdp := * - } - - template MgcpResponse tr_DLCX_ACK := { - line := { - code := ("200", "250"), - trans_id := ?, - string := "OK" - }, - params:= *, - sdp := * - } - - template MgcpResponse ts_DLCX_ACK2(MgcpTransId trans_id) := { - line := { - code := "250", - trans_id := trans_id, - string := "OK" - }, - params:= { /* list of ConnectionIDs */ }, - sdp := omit - } - - - - template MgcpResponse ts_DLCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp); - - template MgcpCommand tr_RSIP := { - line := t_MgcpCmdLine("RSIP", ?, ?), - params := *, - sdp := * - } - - /* SDP Templates */ - template SDP_Origin ts_SDP_origin(charstring addr, charstring session_id, - charstring session_version := "1", - charstring addr_type := "IP4", - charstring user_name := "-") := { - user_name := user_name, - session_id := session_id, - session_version := session_version, - net_type := "IN", - addr_type := addr_type, - addr := addr - } - - template SDP_connection ts_SDP_connection_IP(charstring addr, charstring addr_type := "IP4", - template integer ttl := omit, - template integer num_of_addr := omit) :={ - net_type := "IN", - addr_type := addr_type, - conn_addr := { - addr := addr, - ttl := ttl, - num_of_addr := num_of_addr +/* have a function that generates a template, rather than a template in order to handle + * optional parameters */ +function ts_DLCX(MgcpTransId trans_id, charstring ep, template MgcpCallId call_id := omit, + template MgcpConnectionId conn_id := omit) return template MgcpCommand { + var template MgcpCommand cmd; + cmd.line := t_MgcpCmdLine("DLCX", trans_id, ep); + cmd.params := {}; + cmd.sdp := omit; + if (isvalue(call_id)) { + f_mgcp_par_append(cmd.params, ts_MgcpParCallId(valueof(call_id))); + if (isvalue(conn_id)) { + f_mgcp_par_append(cmd.params, ts_MgcpParConnectionId(valueof(conn_id))); } } + return cmd; +} - template SDP_connection tr_SDP_connection_IP(template charstring addr, template charstring addr_type := ?, - template integer ttl := *, - template integer num_of_addr := *) := { - net_type := "IN", - addr_type := addr_type, - conn_addr := { - addr := addr, - ttl := ttl, - num_of_addr := num_of_addr - } +template MgcpCommand tr_DLCX(template MgcpEndpoint ep := ?) := { + line := t_MgcpCmdLine("DLCX", ?, ep), + params := *, + sdp := * +} + +template MgcpResponse tr_DLCX_ACK := { + line := { + code := ("200", "250"), + trans_id := ?, + string := "OK" + }, + params:= *, + sdp := * +} + +template MgcpResponse ts_DLCX_ACK2(MgcpTransId trans_id) := { + line := { + code := "250", + trans_id := trans_id, + string := "OK" + }, + params:= { /* list of ConnectionIDs */ }, + sdp := omit +} + + + +template MgcpResponse ts_DLCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp); + +template MgcpCommand tr_RSIP := { + line := t_MgcpCmdLine("RSIP", ?, ?), + params := *, + sdp := * +} + +/* SDP Templates */ +template SDP_Origin ts_SDP_origin(charstring addr, charstring session_id, + charstring session_version := "1", + charstring addr_type := "IP4", + charstring user_name := "-") := { + user_name := user_name, + session_id := session_id, + session_version := session_version, + net_type := "IN", + addr_type := addr_type, + addr := addr +} + +template SDP_connection ts_SDP_connection_IP(charstring addr, charstring addr_type := "IP4", + template integer ttl := omit, + template integer num_of_addr := omit) :={ + net_type := "IN", + addr_type := addr_type, + conn_addr := { + addr := addr, + ttl := ttl, + num_of_addr := num_of_addr } +} - template SDP_time ts_SDP_time(charstring beg, charstring end) := { - time_field := { - start_time := beg, - stop_time := end +template SDP_connection tr_SDP_connection_IP(template charstring addr, template charstring addr_type := ?, + template integer ttl := *, + template integer num_of_addr := *) := { + net_type := "IN", + addr_type := addr_type, + conn_addr := { + addr := addr, + ttl := ttl, + num_of_addr := num_of_addr + } +} + +template SDP_time ts_SDP_time(charstring beg, charstring end) := { + time_field := { + start_time := beg, + stop_time := end + }, + time_repeat := omit +} + +template SDP_media_desc ts_SDP_media_desc(integer port_number, SDP_fmt_list fmts, + SDP_attribute_list attributes) := { + media_field := { + media := "audio", + ports := { + port_number := port_number, + num_of_ports := omit }, - time_repeat := omit - } + transport := "RTP/AVP", + fmts := fmts + }, + information := omit, + connections := omit, + bandwidth := omit, + key := omit, + attributes := attributes +} - template SDP_media_desc ts_SDP_media_desc(integer port_number, SDP_fmt_list fmts, - SDP_attribute_list attributes) := { - media_field := { - media := "audio", - ports := { - port_number := port_number, - num_of_ports := omit - }, - transport := "RTP/AVP", - fmts := fmts +template SDP_media_desc tr_SDP_media_desc(template integer port_number := ?, + template SDP_fmt_list fmts := ?, + template SDP_attribute_list attributes := ?) := { + media_field := { + media := "audio", + ports := { + port_number := port_number, + num_of_ports := omit }, - information := omit, - connections := omit, - bandwidth := omit, - key := omit, - attributes := attributes - } + transport := "RTP/AVP", + fmts := fmts + }, + information := *, + connections := *, + bandwidth := *, + key := *, + attributes := attributes +} - template SDP_media_desc tr_SDP_media_desc(template integer port_number := ?, - template SDP_fmt_list fmts := ?, - template SDP_attribute_list attributes := ?) := { - media_field := { - media := "audio", - ports := { - port_number := port_number, - num_of_ports := omit - }, - transport := "RTP/AVP", - fmts := fmts - }, - information := *, - connections := *, - bandwidth := *, - key := *, - attributes := attributes - } +/* master template for generating SDP based in template arguments */ +template SDP_Message ts_SDP(charstring local_addr, charstring remote_addr, + charstring session_id, charstring session_version, + integer rtp_port, SDP_fmt_list fmts, + SDP_attribute_list attributes) := { + protocol_version := 0, + origin := ts_SDP_origin(local_addr, session_id, session_version, f_mgcp_addr2addrtype(local_addr)), + session_name := "-", + information := omit, + uri := omit, + emails := omit, + phone_numbers := omit, + connection := ts_SDP_connection_IP(remote_addr, f_mgcp_addr2addrtype(remote_addr)), + bandwidth := omit, + times := { ts_SDP_time("0","0") }, + timezone_adjustments := omit, + key := omit, + attributes := omit, + media_list := { ts_SDP_media_desc(rtp_port, fmts, attributes) } +} - /* master template for generating SDP based in template arguments */ - template SDP_Message ts_SDP(charstring local_addr, charstring remote_addr, - charstring session_id, charstring session_version, - integer rtp_port, SDP_fmt_list fmts, - SDP_attribute_list attributes) := { - protocol_version := 0, - origin := ts_SDP_origin(local_addr, session_id, session_version, f_mgcp_addr2addrtype(local_addr)), - session_name := "-", - information := omit, - uri := omit, - emails := omit, - phone_numbers := omit, - connection := ts_SDP_connection_IP(remote_addr, f_mgcp_addr2addrtype(remote_addr)), - bandwidth := omit, - times := { ts_SDP_time("0","0") }, - timezone_adjustments := omit, - key := omit, - attributes := omit, - media_list := { ts_SDP_media_desc(rtp_port, fmts, attributes) } - } +template SDP_Message tr_SDP(template charstring remote_addr := ?, template integer rtp_port := ?) := { + protocol_version := 0, + origin := ?, + session_name := ?, + information := *, + uri := *, + emails := *, + phone_numbers := *, + connection := tr_SDP_connection_IP(remote_addr, ?), + bandwidth := *, + times := ?, + timezone_adjustments := *, + key := *, + attributes := *, + media_list := { tr_SDP_media_desc(rtp_port) } +} - template SDP_Message tr_SDP(template charstring remote_addr := ?, template integer rtp_port := ?) := { - protocol_version := 0, - origin := ?, - session_name := ?, - information := *, - uri := *, - emails := *, - phone_numbers := *, - connection := tr_SDP_connection_IP(remote_addr, ?), - bandwidth := *, - times := ?, - timezone_adjustments := *, - key := *, - attributes := *, - media_list := { tr_SDP_media_desc(rtp_port) } +template SDP_attribute ts_SDP_rtpmap(integer fmt, charstring val) := { + rtpmap := { + attr_value := int2str(fmt) & " " & val } +} +template SDP_attribute ts_SDP_ptime(integer p) := { + ptime := { + attr_value := int2str(p) + } +} +template SDP_attribute ts_SDP_fmtp(integer fmt, charstring val) := { + fmtp := { + attr_value := int2str(fmt) & " " & val + } +} - template SDP_attribute ts_SDP_rtpmap(integer fmt, charstring val) := { - rtpmap := { - attr_value := int2str(fmt) & " " & val +function f_mgcp_addr2addrtype(charstring addr) return charstring { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return "IP6"; } } - template SDP_attribute ts_SDP_ptime(integer p) := { - ptime := { - attr_value := int2str(p) + return "IP4"; +} + +/* -1 is wildcard, positive is translated as string */ +function f_mgcp_osmux_cid_encode(MgcpOsmuxCID osmux_cid) return charstring { + if (osmux_cid == -1) { + return "*"; + } + return int2str(osmux_cid); +} + +function f_mgcp_osmux_cid_decode(charstring osmux_cid) return MgcpOsmuxCID { + if (osmux_cid == "*") { + return -1; + } + return str2int(osmux_cid); +} + +function f_mgcp_contains_par(MgcpMessage msg, MgcpInfoCode code) return boolean { + var MgcpParameterList pars; + if (ischosen(msg.command)) { + pars := msg.command.params; + } else { + pars := msg.response.params; + } + for (var integer i := 0; i < lengthof(pars); i := i + 1) { + var MgcpParameter par := pars[i]; + if (par.code == code) { + return true; } } - template SDP_attribute ts_SDP_fmtp(integer fmt, charstring val) := { - fmtp := { - attr_value := int2str(fmt) & " " & val + return false; +} + +function f_mgcp_extract_par(MgcpMessage msg, MgcpInfoCode code) return charstring { + var MgcpParameterList pars; + if (ischosen(msg.command)) { + pars := msg.command.params; + } else { + pars := msg.response.params; + } + for (var integer i := 0; i < lengthof(pars); i := i + 1) { + var MgcpParameter par := pars[i]; + if (par.code == code) { + return par.val; } } + setverdict(fail, "Could not extract parameters for code ", code); + return ""; +} - function f_mgcp_addr2addrtype(charstring addr) return charstring { - for (var integer i := 0; i < lengthof(addr); i := i + 1) { - if (addr[i] == ":") { - return "IP6"; - } +function f_MgcpResp_extract_par(MgcpResponse resp, MgcpInfoCode code) return charstring { + var MgcpMessage msg := { + response := resp + } + return f_mgcp_extract_par(msg, code); +} + +function f_MgcpCmd_extract_par(MgcpCommand cmd, MgcpInfoCode code) return charstring { + var MgcpMessage msg := { + command := cmd + } + return f_mgcp_extract_par(msg, code); +} + +function f_MgcpCmd_contains_par(MgcpCommand cmd, MgcpInfoCode code) return boolean { + var MgcpMessage msg := { + command := cmd + } + return f_mgcp_contains_par(msg, code); +} + +function f_MgcpResp_extract_conn_id(MgcpResponse resp) return MgcpConnectionId { + return str2hex(f_MgcpResp_extract_par(resp, "I")); +} + +function f_MgcpCmd_extract_call_id(MgcpCommand cmd) return MgcpCallId { + return str2hex(f_MgcpCmd_extract_par(cmd, "C")); +} + +function f_MgcpCmd_extract_conn_id(MgcpCommand cmd) return MgcpConnectionId { + return str2hex(f_MgcpCmd_extract_par(cmd, "I")); +} + +function f_MgcpCmd_extract_osmux_cid(MgcpCommand cmd) return MgcpOsmuxCID { + return f_mgcp_osmux_cid_decode(f_MgcpCmd_extract_par(cmd, "X-OSMUX")); +} + + +function f_mgcp_alloc_tid() return MgcpTransId { + return int2str(float2int(rnd()*2147483647.0)); +} + +function f_mgcp_alloc_call_id() return MgcpCallId { + return int2hex(float2int(rnd()*2147483647.0), 8); +} + +function f_mgcp_alloc_conn_id() return MgcpConnectionId { + return int2hex(float2int(rnd()*2147483647.0), 8); +} + +/* those verbs that related to a connection (and hence have ConnectionId) */ +template MgcpVerb tr_MgcpVerb_ConnectionOriented := ("CRCX", "MDCX", "DLCX", "AUCX"); +/* entire command template matching only connection oriented verbs */ +template MgcpCommand tr_MgcpCommand_CO := { + line := { + verb := tr_MgcpVerb_ConnectionOriented, + trans_id := ?, + ep := ?, + ver := ? + }, + params := *, + sdp := * +} + +function f_mgcp_find_param_entry(MgcpParameterList pars, MgcpInfoCode code, out charstring ret) +return boolean { + for (var integer i := 0; i < sizeof(pars); i := i+1) { + if (pars[i].code == code) { + ret := pars[i].val; + return true; } - return "IP4"; } + return false; +} - /* -1 is wildcard, positive is translated as string */ - function f_mgcp_osmux_cid_encode(MgcpOsmuxCID osmux_cid) return charstring { - if (osmux_cid == -1) { - return "*"; - } - return int2str(osmux_cid); +function f_mgcp_find_param(MgcpMessage msg, MgcpInfoCode code, out charstring ret) +return boolean { + var MgcpParameterList pars; + if (ischosen(msg.command)) { + pars := msg.command.params; + } else { + pars := msg.response.params; } + return f_mgcp_find_param_entry(pars, code, ret); +} - function f_mgcp_osmux_cid_decode(charstring osmux_cid) return MgcpOsmuxCID { - if (osmux_cid == "*") { - return -1; - } - return str2int(osmux_cid); - } - - function f_mgcp_contains_par(MgcpMessage msg, MgcpInfoCode code) return boolean { - var MgcpParameterList pars; - if (ischosen(msg.command)) { - pars := msg.command.params; - } else { - pars := msg.response.params; - } - for (var integer i := 0; i < lengthof(pars); i := i + 1) { - var MgcpParameter par := pars[i]; - if (par.code == code) { - return true; - } - } - return false; - } - - function f_mgcp_extract_par(MgcpMessage msg, MgcpInfoCode code) return charstring { - var MgcpParameterList pars; - if (ischosen(msg.command)) { - pars := msg.command.params; - } else { - pars := msg.response.params; - } - for (var integer i := 0; i < lengthof(pars); i := i + 1) { - var MgcpParameter par := pars[i]; - if (par.code == code) { - return par.val; - } - } - setverdict(fail, "Could not extract parameters for code ", code); - return ""; - } - - function f_MgcpResp_extract_par(MgcpResponse resp, MgcpInfoCode code) return charstring { - var MgcpMessage msg := { - response := resp - } - return f_mgcp_extract_par(msg, code); - } - - function f_MgcpCmd_extract_par(MgcpCommand cmd, MgcpInfoCode code) return charstring { - var MgcpMessage msg := { - command := cmd - } - return f_mgcp_extract_par(msg, code); - } - - function f_MgcpCmd_contains_par(MgcpCommand cmd, MgcpInfoCode code) return boolean { - var MgcpMessage msg := { - command := cmd - } - return f_mgcp_contains_par(msg, code); - } - - function f_MgcpResp_extract_conn_id(MgcpResponse resp) return MgcpConnectionId { - return str2hex(f_MgcpResp_extract_par(resp, "I")); - } - - function f_MgcpCmd_extract_call_id(MgcpCommand cmd) return MgcpCallId { - return str2hex(f_MgcpCmd_extract_par(cmd, "C")); - } - - function f_MgcpCmd_extract_conn_id(MgcpCommand cmd) return MgcpConnectionId { - return str2hex(f_MgcpCmd_extract_par(cmd, "I")); - } - - function f_MgcpCmd_extract_osmux_cid(MgcpCommand cmd) return MgcpOsmuxCID { - return f_mgcp_osmux_cid_decode(f_MgcpCmd_extract_par(cmd, "X-OSMUX")); - } - - - function f_mgcp_alloc_tid() return MgcpTransId { - return int2str(float2int(rnd()*2147483647.0)); - } - - function f_mgcp_alloc_call_id() return MgcpCallId { - return int2hex(float2int(rnd()*2147483647.0), 8); - } - - function f_mgcp_alloc_conn_id() return MgcpConnectionId { - return int2hex(float2int(rnd()*2147483647.0), 8); - } - - /* those verbs that related to a connection (and hence have ConnectionId) */ - template MgcpVerb tr_MgcpVerb_ConnectionOriented := ("CRCX", "MDCX", "DLCX", "AUCX"); - /* entire command template matching only connection oriented verbs */ - template MgcpCommand tr_MgcpCommand_CO := { - line := { - verb := tr_MgcpVerb_ConnectionOriented, - trans_id := ?, - ep := ?, - ver := ? - }, - params := *, - sdp := * - } - - function f_mgcp_find_param_entry(MgcpParameterList pars, MgcpInfoCode code, out charstring ret) - return boolean { - for (var integer i := 0; i < sizeof(pars); i := i+1) { - if (pars[i].code == code) { - ret := pars[i].val; - return true; - } - } - return false; - } - - function f_mgcp_find_param(MgcpMessage msg, MgcpInfoCode code, out charstring ret) - return boolean { - var MgcpParameterList pars; - if (ischosen(msg.command)) { - pars := msg.command.params; - } else { - pars := msg.response.params; - } - return f_mgcp_find_param_entry(pars, code, ret); - } - - /* template to determine if a MGCP endpoint is a wildcard endpoint */ - template charstring t_MGCP_EP_wildcard := (pattern "\*@*", pattern "rtpbridge/\*@*"); +/* template to determine if a MGCP endpoint is a wildcard endpoint */ +template charstring t_MGCP_EP_wildcard := (pattern "\*@*", pattern "rtpbridge/\*@*"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: make app configurable

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email ) Change subject: ms: make app configurable ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 11:42:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: make app configurable

by Hoernchen

Attention is currently required from: pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email ) Change subject: ms: make app configurable ...................................................................... Patch Set 4: (1 comment) File Transceiver52M/ms/ms_upper.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/36373/comment/f79e6661_bc85f5cf PS4, Line 209: // pow = energyDetect(sv, 20 * 4 /*sps*/); > so making the app configurable has something to do with disabling all this now? This is related to the build failure, it doesn't matter right now, that code might be reintroduced after my vacation and after the customer gave his lna/pa hw a try. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 11:08:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: make app configurable

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email ) Change subject: ms: make app configurable ...................................................................... Patch Set 4: (1 comment) File Transceiver52M/ms/ms_upper.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/36373/comment/cb18c587_8406c658 PS4, Line 209: // pow = energyDetect(sv, 20 * 4 /*sps*/); so making the app configurable has something to do with disabling all this now? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 11:05:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: ms: disabe uhd ms build

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36377?usp=email ) Change subject: ms: disabe uhd ms build ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36377?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9db1740b5c399a02a41b1d07792c645cf7d1bd1b Gerrit-Change-Number: 36377 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 11:02:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in osmo-ci[master]: jobs: add osmocom-obs-ewild

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36378?usp=email ) Change subject: jobs: add osmocom-obs-ewild ...................................................................... jobs: add osmocom-obs-ewild Similar to osmocom-obs-nhofmeyr, add a jenkins job that automatically picks up changes in Hoernchen/mssdr branches in the Osmocom projects, and builds binary packages in home:ewild:mssdr. Related: OS#6409 Change-Id: I9a8aaf00e3fae84a61ff3cab64750926f8a9e2e1 --- A jobs/osmocom-obs-ewild.yml 1 file changed, 86 insertions(+), 0 deletions(-) Approvals: Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/osmocom-obs-ewild.yml b/jobs/osmocom-obs-ewild.yml new file mode 100644 index 0000000..111ec09 --- /dev/null +++ b/jobs/osmocom-obs-ewild.yml @@ -0,0 +1,72 @@ +--- +- project: + name: Osmocom_OBS_ewild + jobs: + - Osmocom_OBS_ewild_{branch_suffix} + branch_suffix: + - mssdr + +- job-template: + name: 'Osmocom_OBS_ewild_{branch_suffix}' + project-type: freestyle + concurrent: false + defaults: global + description: | + Iterate over Osmocom projects, and update projects from the + "Hoernchen/{branch_suffix}" branch in OBS. If a package exists in OBS + for a project, but it doesn't have the git branch anymore then delete the + package from OBS. + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 30 + node: obs + parameters: + - string: + name: CI_BRANCH + description: osmo-ci.git branch + default: 'master' + builders: + - shell: | + export PYTHONUNBUFFERED=1 + BRANCH="Hoernchen/{branch_suffix}" + PROJ="home:ewild:{branch_suffix}" + VERSION_APPEND="~ewild.{branch_suffix}" + PACKAGE="$GERRIT_PROJECT" + + # When manually triggered, run on all Osmocom packages + if [ -z "$PACKAGE" ]; then + PACKAGE="ALL_OSMOCOM_PACKAGES" + fi + + ./scripts/obs/update_obs_project.py \ + --apiurl https://obs.osmocom.org \ + --conflict-pkgname "osmocom-nightly" \ + --delete \ + --docker \ + --feed "master" \ + --git-branch "$BRANCH" \ + --version-append "$VERSION_APPEND" \ + "$PROJ" \ + "$PACKAGE" + scm: + - git: + branches: + - '$CI_BRANCH' + url: https://gerrit.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + triggers: + - gerrit: + trigger-on: + - ref-updated-event + projects: + - project-compare-type: 'ANT' + project-pattern: '**' + branches: + - branch-pattern: 'Hoernchen/{branch_suffix}' + server-name: gerrit.osmocom.org + publishers: + - email: + notify-every-unstable-build: true + recipients: 'ewild(a)sysmocom.de' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36378?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9a8aaf00e3fae84a61ff3cab64750926f8a9e2e1 Gerrit-Change-Number: 36378 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[M] Change in osmo-ci[master]: jobs: add osmocom-obs-ewild

by Hoernchen

Attention is currently required from: osmith, pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36378?usp=email ) Change subject: jobs: add osmocom-obs-ewild ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36378?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9a8aaf00e3fae84a61ff3cab64750926f8a9e2e1 Gerrit-Change-Number: 36378 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 09:47:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[M] Change in osmo-ci[master]: jobs: add osmocom-obs-ewild

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36378?usp=email ) Change subject: jobs: add osmocom-obs-ewild ...................................................................... jobs: add osmocom-obs-ewild Similar to osmocom-obs-nhofmeyr, add a jenkins job that automatically picks up changes in Hoernchen/mssdr branches in the Osmocom projects, and builds binary packages in home:ewild:mssdr. Related: OS#6409 Change-Id: I9a8aaf00e3fae84a61ff3cab64750926f8a9e2e1 --- A jobs/osmocom-obs-ewild.yml 1 file changed, 86 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/78/36378/1 diff --git a/jobs/osmocom-obs-ewild.yml b/jobs/osmocom-obs-ewild.yml new file mode 100644 index 0000000..111ec09 --- /dev/null +++ b/jobs/osmocom-obs-ewild.yml @@ -0,0 +1,72 @@ +--- +- project: + name: Osmocom_OBS_ewild + jobs: + - Osmocom_OBS_ewild_{branch_suffix} + branch_suffix: + - mssdr + +- job-template: + name: 'Osmocom_OBS_ewild_{branch_suffix}' + project-type: freestyle + concurrent: false + defaults: global + description: | + Iterate over Osmocom projects, and update projects from the + "Hoernchen/{branch_suffix}" branch in OBS. If a package exists in OBS + for a project, but it doesn't have the git branch anymore then delete the + package from OBS. + properties: + - build-discarder: + days-to-keep: 30 + num-to-keep: 30 + node: obs + parameters: + - string: + name: CI_BRANCH + description: osmo-ci.git branch + default: 'master' + builders: + - shell: | + export PYTHONUNBUFFERED=1 + BRANCH="Hoernchen/{branch_suffix}" + PROJ="home:ewild:{branch_suffix}" + VERSION_APPEND="~ewild.{branch_suffix}" + PACKAGE="$GERRIT_PROJECT" + + # When manually triggered, run on all Osmocom packages + if [ -z "$PACKAGE" ]; then + PACKAGE="ALL_OSMOCOM_PACKAGES" + fi + + ./scripts/obs/update_obs_project.py \ + --apiurl https://obs.osmocom.org \ + --conflict-pkgname "osmocom-nightly" \ + --delete \ + --docker \ + --feed "master" \ + --git-branch "$BRANCH" \ + --version-append "$VERSION_APPEND" \ + "$PROJ" \ + "$PACKAGE" + scm: + - git: + branches: + - '$CI_BRANCH' + url: https://gerrit.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + triggers: + - gerrit: + trigger-on: + - ref-updated-event + projects: + - project-compare-type: 'ANT' + project-pattern: '**' + branches: + - branch-pattern: 'Hoernchen/{branch_suffix}' + server-name: gerrit.osmocom.org + publishers: + - email: + notify-every-unstable-build: true + recipients: 'ewild(a)sysmocom.de' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36378?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9a8aaf00e3fae84a61ff3cab64750926f8a9e2e1 Gerrit-Change-Number: 36378 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: make app configurable

by Hoernchen

Attention is currently required from: Hoernchen, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ms: make app configurable ...................................................................... ms: make app configurable This adds proper config options. The ul/dl freq lines can be copied from the osmo-trx (network side) cfg. Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 --- M Transceiver52M/Makefile.am M Transceiver52M/ms/bladerf_specific.h M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/ms/ms_upper.h A Transceiver52M/ms/mssdr_vty.c A Transceiver52M/ms/mssdr_vty.h M doc/examples/Makefile.am A doc/examples/osmo-trx-ms-blade/mssdr.cfg 10 files changed, 581 insertions(+), 197 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/73/36373/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: make app configurable

by Hoernchen

Attention is currently required from: pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email ) Change subject: ms: make app configurable ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-trx/+/36373/comment/48368d16_969b4ad0 PS2, Line 7: ms: add config file > This is quite misleading, this commit is doing tons of stuff other than "adding a config file". […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 08:58:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: ms: update osmocom-bb submodule

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36048?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ms: update osmocom-bb submodule ...................................................................... ms: update osmocom-bb submodule Change-Id: I0140f0a5333469f356c85a95660e10bbdd67cd25 --- M osmocom-bb 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/osmocom-bb b/osmocom-bb index a41ca4b..f12b17d 160000 --- a/osmocom-bb +++ b/osmocom-bb @@ -1 +1 @@ -Subproject commit a41ca4bbc42bc66557cdc7c646c539d1a4c1e30f +Subproject commit f12b17dffb782c7428a563620aa83ec047fd99c4 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36048?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0140f0a5333469f356c85a95660e10bbdd67cd25 Gerrit-Change-Number: 36048 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: ms: disabe uhd ms build

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/36377?usp=email ) Change subject: ms: disabe uhd ms build ...................................................................... ms: disabe uhd ms build This won't build, and has been in a untested non working state for a year, but might still be useful after fixing it up in the future in case someone needs it. Change-Id: I9db1740b5c399a02a41b1d07792c645cf7d1bd1b --- M Transceiver52M/Makefile.am 1 file changed, 23 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/77/36377/1 diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index dadfde9..0b63b16 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -127,16 +127,16 @@ $(UHD_LIBS) osmo_trx_uhd_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS) -if ENABLE_MS_TRX -bin_PROGRAMS += osmo-trx-ms-uhd -osmo_trx_ms_uhd_SOURCES = $(MS_LOWER_SRC) $(MS_UPPER_SRC) -osmo_trx_ms_uhd_LDADD = \ - $(builddir)/device/uhd/libdevice.la \ - $(COMMON_LDADD) \ - $(UHD_LIBS) \ - $(TRXCON_LDADD) -osmo_trx_ms_uhd_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS) -DBUILDUHD -endif +#if ENABLE_MS_TRX +#bin_PROGRAMS += osmo-trx-ms-uhd +#osmo_trx_ms_uhd_SOURCES = $(MS_LOWER_SRC) $(MS_UPPER_SRC) +#osmo_trx_ms_uhd_LDADD = \ +# $(builddir)/device/uhd/libdevice.la \ +# $(COMMON_LDADD) \ +# $(UHD_LIBS) \ +# $(TRXCON_LDADD) +#osmo_trx_ms_uhd_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS) -DBUILDUHD +#endif endif if DEVICE_USRP1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36377?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9db1740b5c399a02a41b1d07792c645cf7d1bd1b Gerrit-Change-Number: 36377 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: make app configurable

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ms: make app configurable ...................................................................... ms: make app configurable This adds proper config options. The ul/dl freq lines can be copied from the osmo-trx (network side) cfg. Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 --- M Transceiver52M/Makefile.am M Transceiver52M/ms/bladerf_specific.h M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/ms/ms_upper.h A Transceiver52M/ms/mssdr_vty.c A Transceiver52M/ms/mssdr_vty.h M doc/examples/Makefile.am A doc/examples/osmo-trx-ms-blade/mssdr.cfg 10 files changed, 580 insertions(+), 196 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/73/36373/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: docs/shell: Add missing :ref: when referencing other command

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36224?usp=email ) Change subject: docs/shell: Add missing :ref: when referencing other command ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I18f110e6313932d82b19ecaa7e07ef00c2339513 Gerrit-Change-Number: 36224 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 21 Mar 2024 05:55:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: docs/shell: Add missing :ref: when referencing other command

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36224?usp=email ) Change subject: docs/shell: Add missing :ref: when referencing other command ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I18f110e6313932d82b19ecaa7e07ef00c2339513 Gerrit-Change-Number: 36224 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 21 Mar 2024 05:54:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... Patch Set 1: (3 comments) File ipad/IPAd_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/3c492a8a_b31a… PS1, Line 51: function f_make_http_resp this looks more like a `template`? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/78e17be3_9256… PS1, Line 104: modulepar not critical, but we usually have module params on top https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/1ba0cc1c_bc56… PS1, Line 208: while(true) cosmetic: while is not a function (same below) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Mar 2024 05:50:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by fixeria

Attention is currently required from: char. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > These missing modules caused `pySim-shell. […] Thanks, the fix looks good. It's actually not the first time we're forgetting to update `packages[]`, so we should consider improving the build verification somehow. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: char <osmocom(a)hypodyne.net> Gerrit-Comment-Date: Thu, 21 Mar 2024 05:28:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: char <osmocom(a)hypodyne.net> Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by fixeria

Attention is currently required from: char. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: char <osmocom(a)hypodyne.net> Gerrit-Comment-Date: Thu, 21 Mar 2024 05:25:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by char

char has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: These missing modules caused `pySim-shell.py` to crash on startup for me when I installed pySim using the Arch Linux Package method described in the README. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Mar 2024 22:08:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by char

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/36376?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: add missing modules to setup.py ...................................................................... add missing modules to setup.py Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 --- M setup.py 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/76/36376/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by char

char has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... add missing modules to setup.py Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 --- M setup.py 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/76/36376/1 diff --git a/setup.py b/setup.py index 620e246..1a32977 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name='pySim', version='1.0', - packages=['pySim', 'pySim.legacy', 'pySim.transport', 'pySim.apdu', 'pySim.apdu_source'], + packages=['pySim', 'pySim.legacy', 'pySim.transport', 'pySim.apdu', 'pySim.apdu_source', 'pySim.esim', 'pySim.global_platform'], url='https://osmocom.org/projects/pysim/wiki', license='GPLv2', author_email='simtrace(a)lists.osmocom.org', -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 1 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: ms: prune ancient, unused code parts

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36375?usp=email ) Change subject: ms: prune ancient, unused code parts ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36375?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36dcb7ba9364b1eafbaa7267cde3574d82da5dd2 Gerrit-Change-Number: 36375 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 19:24:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: add config file

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email ) Change subject: ms: add config file ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-trx/+/36373/comment/de85458a_bbb133d3 PS2, Line 7: ms: add config file This is quite misleading, this commit is doing tons of stuff other than "adding a config file". Maybe "Make app configurable" or alike. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 19:24:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: ms: fix shutdown issues

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36374?usp=email ) Change subject: ms: fix shutdown issues ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36374?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I02e668a55dece96e421c82706b76bbb411ea6712 Gerrit-Change-Number: 36374 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 19:20:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: add config file

by Hoernchen

Hoernchen has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email ) Change subject: ms: add config file ...................................................................... ms: add config file This adds proper config options. The ul/dl freq lines can be copied from the osmo-trx (network side) cfg. Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 --- M Transceiver52M/Makefile.am M Transceiver52M/ms/bladerf_specific.h M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/ms_upper.cpp M Transceiver52M/ms/ms_upper.h A Transceiver52M/ms/mssdr_vty.c A Transceiver52M/ms/mssdr_vty.h M doc/examples/Makefile.am A doc/examples/osmo-trx-ms-blade/mssdr.cfg 10 files changed, 580 insertions(+), 196 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/73/36373/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

3 months, 1 week

1
0
0 0

[L] Change in osmo-trx[master]: ms: add config file

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email ) Change subject: ms: add config file ...................................................................... Patch Set 1: (1 comment) File Transceiver52M/ms/mssdr_vty.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15283): https://gerrit.osmocom.org/c/osmo-trx/+/36373/comment/c96a0196_5f378439 PS1, Line 264: } adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Mar 2024 18:48:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months, 1 week

1
0
0 0

[S] Change in osmo-trx[master]: ms: prune ancient, unused code parts

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/36375?usp=email ) Change subject: ms: prune ancient, unused code parts ...................................................................... ms: prune ancient, unused code parts Change-Id: I36dcb7ba9364b1eafbaa7267cde3574d82da5dd2 --- M Transceiver52M/ms/bladerf_specific.h M Transceiver52M/ms/ms.cpp M Transceiver52M/ms/ms.h M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/threadpool.h 5 files changed, 10 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/36375/1 diff --git a/Transceiver52M/ms/bladerf_specific.h b/Transceiver52M/ms/bladerf_specific.h index d31ea29..a440125 100644 --- a/Transceiver52M/ms/bladerf_specific.h +++ b/Transceiver52M/ms/bladerf_specific.h @@ -186,7 +186,6 @@ }; using dev_buf_t = typeof(blade_otw_buffer_helper<BLADE_BUFFER_SIZE, blade_speed_buffer_type::SS>::x); -// using buf_in_use = blade_otw_buffer<2, blade_speed_buffer_type::SS>; using bh_fn_t = std::function<int(dev_buf_t *)>; template <typename T> @@ -194,7 +193,6 @@ struct bladerf *dev; struct bladerf_stream *rx_stream; struct bladerf_stream *tx_stream; - // using pkt2buf = blade_otw_buffer<2, blade_speed_buffer_type::SS>; using tx_buf_q_type = spsc_cond_timeout<BLADE_NUM_BUFFERS, dev_buf_t *, true, false>; const unsigned int rxFullScale, txFullScale; const int rxtxdelay; diff --git a/Transceiver52M/ms/ms.cpp b/Transceiver52M/ms/ms.cpp index 4ae8668..f1a915c 100644 --- a/Transceiver52M/ms/ms.cpp +++ b/Transceiver52M/ms/ms.cpp @@ -22,19 +22,13 @@ #include "GSMCommon.h" #include <atomic> #include <cassert> -#include <complex> + #include <iostream> #include <cstdlib> #include <cstdio> -#include <thread> -#include <fstream> #include "ms.h" -extern "C" { -#include "sch.h" -} - #include "threadsched.h" dummylog ms_trx::dummy_log; diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h index e088f73..9ac2171 100644 --- a/Transceiver52M/ms/ms.h +++ b/Transceiver52M/ms/ms.h @@ -181,7 +181,6 @@ std::lock_guard<std::mutex> g(m); global_time_keeper.incTN(1); global_ts_keeper = new_ts; - // std::cerr << "u " << new_ts << std::endl; } void inc_and_update_safe(int64_t new_ts) { @@ -191,7 +190,6 @@ assert(diff > 0.5 * ONE_TS_BURST_LEN); global_time_keeper.incTN(1); global_ts_keeper = new_ts; - // std::cerr << "s " << new_ts << std::endl; } void dec_by_one() { @@ -217,8 +215,6 @@ } }; -using ts_hitter_q_t = spsc_cond<64, GSM::Time, true, false>; - // used to globally initialize the sched/hw information struct sched_hw_info { int hw_cpus; diff --git a/Transceiver52M/ms/ms_rx_lower.cpp b/Transceiver52M/ms/ms_rx_lower.cpp index 3527a8b..71d49aa 100644 --- a/Transceiver52M/ms/ms_rx_lower.cpp +++ b/Transceiver52M/ms/ms_rx_lower.cpp @@ -89,8 +89,6 @@ mBSIC = sch.bsic; mTSC = sch.bsic & 0x7; timekeeper.set(fn, 0); - // global_time_keeper.FN(fn); - // global_time_keeper.TN(0); } return true; @@ -261,7 +259,6 @@ clamp_array(bits->begin(), 148, 1.5f); float_to_sbit(&bits->begin()[0], (signed char *)&sch_demod_bits[0], 62, 148); - // float_to_sbit(&bits->begin()[106], &data[39], 62, 39); if (decode_sch((char *)sch_demod_bits, is_first_sch_acq)) { auto current_gsm_time_updated = timekeeper.gsmtime(); @@ -371,7 +368,6 @@ if (fracts) timekeeper.inc_both(); - // timekeeper.inc_and_update(first_sch_ts_start + 1 * ONE_TS_BURST_LEN); timekeeper.dec_by_one(); // oops, off by one? diff --git a/Transceiver52M/ms/threadpool.h b/Transceiver52M/ms/threadpool.h index 4b1eefd..0574236 100644 --- a/Transceiver52M/ms/threadpool.h +++ b/Transceiver52M/ms/threadpool.h @@ -21,7 +21,6 @@ */ #include <atomic> -#include <vector> #include <future> #include <mutex> #include <queue> -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36375?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36dcb7ba9364b1eafbaa7267cde3574d82da5dd2 Gerrit-Change-Number: 36375 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

3 months, 1 week

1
0
0 0

2024

2023

2022

gerrit-log March 2024