July 2022 - gerrit-log - lists.osmocom.org

Change in libasn1c[master]: fix 3 indents to avoid build failure with -Werror

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libasn1c/+/28654 ) Change subject: fix 3 indents to avoid build failure with -Werror ...................................................................... fix 3 indents to avoid build failure with -Werror The build failures complain about misleading indentation: ../../../src/libasn1c/src/per_decoder.c:161:9: error: this 'if' clause does not guard... [-Werror=misleading-indentation] 161 | if(!td->aper_decoder) | ^~ ../../../src/libasn1c/src/per_decoder.c:163:17: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 163 | rval = td->aper_decoder(opt_codec_ctx, td, 0, sptr, &pd); | ^~~~ Change-Id: I9ebd0de9135722bb718e2a5067f9b8238d0483dc --- M src/INTEGER.c M src/constr_CHOICE.c M src/per_decoder.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve diff --git a/src/INTEGER.c b/src/INTEGER.c index b3f0da1..042fd75 100644 --- a/src/INTEGER.c +++ b/src/INTEGER.c @@ -775,8 +775,8 @@ ? asn_ulong2INTEGER(st, value) : asn_long2INTEGER(st, value)) _ASN_DECODE_FAILED; - ASN_DEBUG("Got value %ld + low %lld", - value, ct->lower_bound); + ASN_DEBUG("Got value %ld + low %lld", + value, ct->lower_bound); } return rval; } else { diff --git a/src/constr_CHOICE.c b/src/constr_CHOICE.c index 18c24cd..df68feb 100644 --- a/src/constr_CHOICE.c +++ b/src/constr_CHOICE.c @@ -1134,8 +1134,8 @@ if(per_put_few_bits(po, present, ct->range_bits)) _ASN_ENCODE_FAILED; - return elm->type->aper_encoder(elm->type, elm->per_constraints, - memb_ptr, po); + return elm->type->aper_encoder(elm->type, elm->per_constraints, + memb_ptr, po); } else { asn_enc_rval_t rval; if(specs->ext_start == -1) diff --git a/src/per_decoder.c b/src/per_decoder.c index 20fe1a1..b5056b5 100644 --- a/src/per_decoder.c +++ b/src/per_decoder.c @@ -160,7 +160,7 @@ */ if(!td->aper_decoder) _ASN_DECODE_FAILED; /* PER is not compiled in */ - rval = td->aper_decoder(opt_codec_ctx, td, 0, sptr, &pd); + rval = td->aper_decoder(opt_codec_ctx, td, 0, sptr, &pd); if(rval.code == RC_OK) { /* Return the number of consumed bits */ rval.consumed = ((pd.buffer - (const uint8_t *)buffer) << 3) -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/28654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I9ebd0de9135722bb718e2a5067f9b8238d0483dc Gerrit-Change-Number: 28654 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: implement GTP tunnel mapping via netfilter

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28309 ) Change subject: implement GTP tunnel mapping via netfilter ...................................................................... implement GTP tunnel mapping via netfilter Implement support for PFCP rulesets that ask for mapping a GTP tunnel: forwarding GTP payload between two GTP tunnels. For a GTP tunnel mapping, dispatch netfilter rules that detect GTP packets with a given source address and TEID, and replace the TEID and destination address according to the PFCP ruleset. The netfilter implementation is chosen to effect the packet rewriting and forwarding to take place directly in the kernel, for high throughput of GTP packets. Related: SYS#5599 Change-Id: Ic0d319eb4f98cd51a5999c804c4203ab0bdda650 --- M doc/examples/osmo-upf/osmo-upf-mockup.cfg M include/osmocom/upf/upf.h M include/osmocom/upf/upf_nft.h M src/osmo-upf/Makefile.am M src/osmo-upf/osmo_upf_main.c M src/osmo-upf/up_gtp_action.c M src/osmo-upf/up_session.c M src/osmo-upf/upf.c A src/osmo-upf/upf_nft.c M src/osmo-upf/upf_vty.c 10 files changed, 455 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/examples/osmo-upf/osmo-upf-mockup.cfg b/doc/examples/osmo-upf/osmo-upf-mockup.cfg index 50003be..e943a57 100644 --- a/doc/examples/osmo-upf/osmo-upf-mockup.cfg +++ b/doc/examples/osmo-upf/osmo-upf-mockup.cfg @@ -15,3 +15,5 @@ local-addr 127.0.0.1 gtp mockup +nft + mockup diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index 3802057..0380855 100644 --- a/include/osmocom/upf/upf.h +++ b/include/osmocom/upf/upf.h @@ -33,6 +33,7 @@ struct ctrl_handle; struct upf_gtp_dev; +struct nft_ctx; #define UPF_PFCP_LISTEN_DEFAULT "0.0.0.0" @@ -72,6 +73,8 @@ struct pfcp_vty_cfg vty_cfg; struct up_endpoint *ep; } pfcp; + + /* Tunnel encaps decaps via GTP kernel module */ struct { /* if true, don't actually send commands to the GTP kernel module, just return success. */ bool mockup; @@ -85,6 +88,17 @@ struct mnl_socket *nl; int32_t genl_id; } gtp; + + /* Tunnel forwarding via linux netfilter */ + struct { + /* if true, don't actually send commands to nftables, just return success. */ + bool mockup; + + struct nft_ctx *nft_ctx; + char *table_name; + int priority; + uint32_t next_id_state; + } nft; }; extern struct g_upf *g_upf; @@ -94,6 +108,7 @@ DPEER, DSESSION, DGTP, + DNFT, }; void g_upf_alloc(void *ctx); diff --git a/include/osmocom/upf/upf_nft.h b/include/osmocom/upf/upf_nft.h index 569eadb..113bfd8 100644 --- a/include/osmocom/upf/upf_nft.h +++ b/include/osmocom/upf/upf_nft.h @@ -27,6 +27,8 @@ #include <osmocom/core/socket.h> +#define NFT_CHAIN_NAME_PREFIX_TUNMAP "tunmap" + struct upf_nft_tunmap_desc { struct { struct osmo_sockaddr gtp_remote_addr; diff --git a/src/osmo-upf/Makefile.am b/src/osmo-upf/Makefile.am index 37a8543..1265051 100644 --- a/src/osmo-upf/Makefile.am +++ b/src/osmo-upf/Makefile.am @@ -37,6 +37,7 @@ up_session.c \ upf.c \ upf_gtp.c \ + upf_nft.c \ upf_vty.c \ $(NULL) diff --git a/src/osmo-upf/osmo_upf_main.c b/src/osmo-upf/osmo_upf_main.c index 302d957..81102dd 100644 --- a/src/osmo-upf/osmo_upf_main.c +++ b/src/osmo-upf/osmo_upf_main.c @@ -44,6 +44,7 @@ #include <osmocom/upf/upf.h> #include <osmocom/upf/up_endpoint.h> #include <osmocom/upf/upf_gtp.h> +#include <osmocom/upf/upf_nft.h> #define _GNU_SOURCE #include <getopt.h> @@ -237,6 +238,12 @@ .enabled = 0, .loglevel = LOGL_NOTICE, .color = OSMO_LOGCOLOR_PURPLE, }, + [DNFT] = { + .name = "DNFT", + .description = "GTP forwarding rules via linux netfilter", + .enabled = 0, .loglevel = LOGL_NOTICE, + .color = OSMO_LOGCOLOR_PURPLE, + }, }; const struct log_info log_info = { @@ -330,6 +337,9 @@ if (upf_gtp_devs_open()) return -1; + if (upf_nft_init()) + return -1; + if (upf_pfcp_listen()) return -1; @@ -356,6 +366,8 @@ upf_gtp_genl_close(); + upf_nft_free(); + /* Report the heap state of talloc contexts, then free, so both ASAN and Valgrind are happy... */ talloc_report_full(tall_upf_ctx, stderr); talloc_free(tall_upf_ctx); diff --git a/src/osmo-upf/up_gtp_action.c b/src/osmo-upf/up_gtp_action.c index bffb85a..9b8d528 100644 --- a/src/osmo-upf/up_gtp_action.c +++ b/src/osmo-upf/up_gtp_action.c @@ -109,9 +109,42 @@ } LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "%s GTP tunnel\n", enable ? "Enabled" : "Disabled"); return 0; + case UP_GTP_U_TUNMAP: - LOG_UP_GTP_ACTION(a, LOGL_ERROR, "TEID translation not yet implemented\n"); - return -ENOTSUP; + if (g_upf->nft.mockup) { + LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "nft/mockup active, skipping nftables ruleset %s\n", + enable ? "enable" : "disable"); + return 0; + } + + if (enable && a->tunmap.id != 0) { + LOG_UP_GTP_ACTION(a, LOGL_ERROR, + "Cannot enable: nft GTP tunnel mapping rule has been enabled before" + " as " NFT_CHAIN_NAME_PREFIX_TUNMAP "%u\n", a->tunmap.id); + return -EALREADY; + } + if (!enable && a->tunmap.id == 0) { + LOG_UP_GTP_ACTION(a, LOGL_ERROR, + "Cannot disable: nft GTP tunnel mapping rule has not been enabled" + " (no " NFT_CHAIN_NAME_PREFIX_TUNMAP " id)\n"); + return -ENOENT; + } + if (enable) + rc = upf_nft_tunmap_create(&a->tunmap); + else + rc = upf_nft_tunmap_delete(&a->tunmap); + if (rc) { + LOG_UP_GTP_ACTION(a, LOGL_ERROR, + "Failed to %s nft GTP tunnel mapping " NFT_CHAIN_NAME_PREFIX_TUNMAP "%u:" + " %d %s\n", enable ? "enable" : "disable", a->tunmap.id, rc, strerror(-rc)); + return rc; + } + LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "%s nft GTP tunnel mapping " NFT_CHAIN_NAME_PREFIX_TUNMAP "%u\n", + enable ? "Enabled" : "Disabled", a->tunmap.id); + if (!enable) + a->tunmap.id = 0; + return 0; + default: LOG_UP_GTP_ACTION(a, LOGL_ERROR, "Invalid action\n"); return -ENOTSUP; diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index 1cb65d7..a2ea5e5 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -1141,7 +1141,107 @@ static void add_gtp_action_forw(void *ctx, struct llist_head *dst, struct pdr *pdr) { - /* TODO implement GTP forwarding with TEID translation */ + struct up_session *session = pdr->session; + struct up_gtp_action *a; + struct pdr *rpdr; + struct far *far; + struct osmo_pfcp_ie_forw_params *far_forw; + struct far *rfar; + struct osmo_pfcp_ie_forw_params *rfar_forw; + + OSMO_ASSERT(pdr->far); + OSMO_ASSERT(pdr->reverse_pdr); + OSMO_ASSERT(pdr->reverse_pdr->far); + + far = pdr->far; + far_forw = &far->desc.forw_params; + rpdr = pdr->reverse_pdr; + rfar = rpdr->far; + rfar_forw = &rfar->desc.forw_params; + + /* To decaps, we need to have a local TEID assigned for which to receive GTP packets. */ + /* decaps from CORE */ + if (!pdr->local_f_teid || pdr->local_f_teid->choose_flag) { + log_inactive_pdr_set(pdr, "missing local TEID (CORE side)", pdr); + return; + } + /* decaps from ACCESS */ + if (!rpdr->local_f_teid || rpdr->local_f_teid->choose_flag) { + log_inactive_pdr_set(pdr, "missing local TEID (ACCESS side)", pdr); + return; + } + + /* To encaps, we need to have a remote TEID assigned to send out in GTP packets, and we need to know where to + * send GTP to. */ + /* encaps towards ACCESS */ + if (!far->desc.forw_params_present) { + log_inactive_pdr_set(pdr, "missing FAR Forwarding Parameters", pdr); + return; + } + if (!far_forw->outer_header_creation_present) { + log_inactive_pdr_set(pdr, "missing FAR Outer Header Creation", pdr); + return; + } + if (!far_forw->outer_header_creation.teid_present) { + log_inactive_pdr_set(pdr, "missing TEID in FAR Outer Header Creation", pdr); + return; + } + if (!far_forw->outer_header_creation.ip_addr.v4_present) { + log_inactive_pdr_set(pdr, "missing IPv4 in FAR Outer Header Creation", pdr); + return; + } + /* encaps towards CORE */ + if (!rfar->desc.forw_params_present) { + log_inactive_pdr_set(pdr, "missing FAR Forwarding Parameters", rpdr); + return; + } + if (!rfar_forw->outer_header_creation_present) { + log_inactive_pdr_set(pdr, "missing FAR Outer Header Creation", rpdr); + return; + } + if (!rfar_forw->outer_header_creation.teid_present) { + log_inactive_pdr_set(pdr, "missing TEID in FAR Outer Header Creation", rpdr); + return; + } + if (!rfar_forw->outer_header_creation.ip_addr.v4_present) { + log_inactive_pdr_set(pdr, "missing IPv4 in FAR Outer Header Creation", rpdr); + return; + } + + pdr->active = true; + far->active = true; + rpdr->active = true; + rfar->active = true; + LOGPFSML(session->fi, LOGL_DEBUG, "Active PDR set: %s\n", pdr_to_str_c(OTC_SELECT, pdr)); + LOGPFSML(session->fi, LOGL_DEBUG, "Active PDR set: + %s\n", pdr_to_str_c(OTC_SELECT, rpdr)); + + talloc_free(pdr->inactive_reason); + pdr->inactive_reason = NULL; + talloc_free(rpdr->inactive_reason); + rpdr->inactive_reason = NULL; + + a = talloc(ctx, struct up_gtp_action); + OSMO_ASSERT(a); + *a = (struct up_gtp_action){ + .session = session, + .pdr_core = pdr->desc.pdr_id, + .pdr_access = rpdr->desc.pdr_id, + .kind = UP_GTP_U_TUNMAP, + .tunmap = { + .core = { + .local_teid = pdr->local_f_teid->fixed.teid, + .remote_teid = rfar_forw->outer_header_creation.teid, + .gtp_remote_addr = rfar_forw->outer_header_creation.ip_addr.v4, + }, + .access = { + .local_teid = rpdr->local_f_teid->fixed.teid, + .remote_teid = far_forw->outer_header_creation.teid, + .gtp_remote_addr = far_forw->outer_header_creation.ip_addr.v4, + }, + }, + }; + + llist_add_tail(&a->entry, dst); } /* Analyse all PDRs and FARs and find configurations that match either a GTP encaps/decaps or a GTP forward rule. Add to @@ -1294,11 +1394,12 @@ { struct llist_head empty; INIT_LLIST_HEAD(&empty); + /* Call setup_gtp_actions() with an empty list, to clean up all active GTP actions */ setup_gtp_actions(session, &empty); } -/* Check whether the Packet Detection and Forwarding Action Rules amount to an encaps/decaps of GTP or a GTP forwarding, - * or none of the two. */ +/* Check whether the Packet Detection and Forwarding Action Rules amount to an encaps/decaps of GTP or a GTP tunnel + * mapping, or none of the two. */ static enum osmo_pfcp_cause up_session_setup_gtp(struct up_session *session) { enum osmo_pfcp_cause cause; diff --git a/src/osmo-upf/upf.c b/src/osmo-upf/upf.c index 936307f..70891ab 100644 --- a/src/osmo-upf/upf.c +++ b/src/osmo-upf/upf.c @@ -50,6 +50,9 @@ .local_port = OSMO_PFCP_PORT, }, }, + .nft = { + .priority = -300, + }, }; INIT_LLIST_HEAD(&g_upf->gtp.vty_cfg.devs); diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c new file mode 100644 index 0000000..c035016 --- /dev/null +++ b/src/osmo-upf/upf_nft.c @@ -0,0 +1,218 @@ +/* + * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved. + * + * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <errno.h> +#include <nftables/libnftables.h> + +#include <osmocom/core/talloc.h> +#include <osmocom/core/logging.h> + +#include <osmocom/upf/upf.h> +#include <osmocom/upf/upf_nft.h> + +static char *upf_nft_ruleset_table_create(void *ctx, const char *table_name) +{ + return talloc_asprintf(ctx, "add table inet %s\n", table_name); +} + +static int upf_nft_run(const char *ruleset) +{ + int rc; + + if (g_upf->nft.mockup) { + LOGP(DNFT, LOGL_NOTICE, "--mockup-gtp active, not running nft ruleset: '%s'\n", ruleset); + return 0; + } + + if (!g_upf->nft.nft_ctx) { + rc = upf_nft_init(); + if (rc) + return rc; + } + + rc = nft_run_cmd_from_buffer(g_upf->nft.nft_ctx, ruleset); + if (rc < 0) { + LOGP(DNFT, LOGL_ERROR, "error running nft ruleset: rc=%d ruleset=%s\n", + rc, osmo_quote_str_c(OTC_SELECT, ruleset, -1)); + return -EIO; + } + return 0; +} + +int upf_nft_init() +{ + int rc; + if (g_upf->nft.mockup) { + LOGP(DNFT, LOGL_NOTICE, "--mockup-gtp active, not allocating libnftables nft_ctx\n"); + return 0; + } + + g_upf->nft.nft_ctx = nft_ctx_new(NFT_CTX_DEFAULT); + if (!g_upf->nft.nft_ctx) { + LOGP(DNFT, LOGL_ERROR, "cannot allocate libnftables nft_ctx\n"); + return -EIO; + } + + if (!g_upf->nft.table_name) + g_upf->nft.table_name = talloc_strdup(g_upf, "osmo-upf"); + + rc = upf_nft_run(upf_nft_ruleset_table_create(OTC_SELECT, g_upf->nft.table_name)); + if (rc) { + LOGP(DNFT, LOGL_ERROR, "Failed to create nft table %s\n", + osmo_quote_str_c(OTC_SELECT, g_upf->nft.table_name, -1)); + return rc; + } + LOGP(DNFT, LOGL_NOTICE, "Created nft table %s\n", osmo_quote_str_c(OTC_SELECT, g_upf->nft.table_name, -1)); + return 0; +} + +int upf_nft_free() +{ + if (!g_upf->nft.nft_ctx) + return 0; + nft_ctx_free(g_upf->nft.nft_ctx); + g_upf->nft.nft_ctx = NULL; + return 0; +} + +struct upf_nft_args_peer { + /* The source IP address in packets received from this peer */ + const struct osmo_sockaddr *addr; + /* The TEID that we send to the peer in GTP packets. */ + uint32_t teid_remote; + /* The TEID that the peer sends to us in GTP packets. */ + uint32_t teid_local; +}; + +struct upf_nft_args { + /* global table name */ + const char *table_name; + /* chain name for this specific tunnel mapping */ + uint32_t chain_id; + int priority; + + struct upf_nft_args_peer peer_a; + struct upf_nft_args_peer peer_b; +}; + +static int tunmap_single_direction(char *buf, size_t buflen, + const struct upf_nft_args *args, + const struct upf_nft_args_peer *from_peer, + const struct upf_nft_args_peer *to_peer) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buflen }; + OSMO_STRBUF_PRINTF(sb, "add rule inet %s " NFT_CHAIN_NAME_PREFIX_TUNMAP "%u", args->table_name, args->chain_id); + + /* Match only UDP packets */ + OSMO_STRBUF_PRINTF(sb, " meta l4proto udp"); + + /* Match on packets coming in from from_peer */ + OSMO_STRBUF_PRINTF(sb, " ip saddr "); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, from_peer->addr); + + /* Match on the TEID in the header */ + OSMO_STRBUF_PRINTF(sb, " @ih,32,32 0x%08x", from_peer->teid_local); + + /* Change destination address to to_peer */ + OSMO_STRBUF_PRINTF(sb, " ip daddr set "); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, to_peer->addr); + + /* Change the TEID in the header to the one to_peer expects */ + OSMO_STRBUF_PRINTF(sb, " @ih,32,32 set 0x%08x", to_peer->teid_remote); + + OSMO_STRBUF_PRINTF(sb, " counter\n"); + + return sb.chars_needed; +} + +static int upf_nft_ruleset_tunmap_create_buf(char *buf, size_t buflen, const struct upf_nft_args *args) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buflen }; + + /* Add a chain for this tunnel mapping */ + OSMO_STRBUF_PRINTF(sb, "add chain inet %s " NFT_CHAIN_NAME_PREFIX_TUNMAP "%u { type filter hook prerouting priority %d; }\n", + args->table_name, args->chain_id, args->priority); + + /* Forwarding from peer_a to peer_b */ + OSMO_STRBUF_APPEND(sb, tunmap_single_direction, args, &args->peer_a, &args->peer_b); + /* And from peer_b to peer_a */ + OSMO_STRBUF_APPEND(sb, tunmap_single_direction, args, &args->peer_b, &args->peer_a); + + return sb.chars_needed; +} + +static char *upf_nft_ruleset_tunmap_create_c(void *ctx, const struct upf_nft_args *args) +{ + OSMO_NAME_C_IMPL(ctx, 512, "ERROR", upf_nft_ruleset_tunmap_create_buf, args) +} + +static int upf_nft_ruleset_tunmap_delete_buf(char *buf, size_t buflen, const struct upf_nft_args *args) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buflen }; + OSMO_STRBUF_PRINTF(sb, "delete chain inet %s " NFT_CHAIN_NAME_PREFIX_TUNMAP "%u\n", + args->table_name, args->chain_id); + return sb.chars_needed; +} + +static char *upf_nft_ruleset_tunmap_delete_c(void *ctx, const struct upf_nft_args *args) +{ + OSMO_NAME_C_IMPL(ctx, 64, "ERROR", upf_nft_ruleset_tunmap_delete_buf, args) +} + +static void upf_nft_args_from_tunmap_desc(struct upf_nft_args *args, const struct upf_nft_tunmap_desc *tunmap) +{ + *args = (struct upf_nft_args){ + .table_name = g_upf->nft.table_name, + .chain_id = tunmap->id, + .priority = g_upf->nft.priority, + .peer_a = { + .addr = &tunmap->access.gtp_remote_addr, + .teid_remote = tunmap->access.remote_teid, + .teid_local = tunmap->access.local_teid, + }, + .peer_b = { + .addr = &tunmap->core.gtp_remote_addr, + .teid_remote = tunmap->core.remote_teid, + .teid_local = tunmap->core.local_teid, + }, + }; +} + +int upf_nft_tunmap_create(struct upf_nft_tunmap_desc *tunmap) +{ + struct upf_nft_args args; + + /* Give this tunnel mapping a new id, returned to the caller so that the tunnel mapping can be deleted later */ + g_upf->nft.next_id_state++; + tunmap->id = g_upf->nft.next_id_state; + + upf_nft_args_from_tunmap_desc(&args, tunmap); + return upf_nft_run(upf_nft_ruleset_tunmap_create_c(OTC_SELECT, &args)); +} + +int upf_nft_tunmap_delete(struct upf_nft_tunmap_desc *tunmap) +{ + struct upf_nft_args args; + upf_nft_args_from_tunmap_desc(&args, tunmap); + return upf_nft_run(upf_nft_ruleset_tunmap_delete_c(OTC_SELECT, &args)); +} diff --git a/src/osmo-upf/upf_vty.c b/src/osmo-upf/upf_vty.c index 1212864..386aa2f 100644 --- a/src/osmo-upf/upf_vty.c +++ b/src/osmo-upf/upf_vty.c @@ -41,6 +41,7 @@ enum upf_vty_node { PFCP_NODE = _LAST_OSMOVTY_NODE + 1, GTP_NODE, + NFT_NODE, }; static struct cmd_node cfg_pfcp_node = { @@ -85,7 +86,7 @@ DEFUN(cfg_gtp, cfg_gtp_cmd, "gtp", - "Enter the GTP configuration node\n") + "Enter the 'gtp' node to configure GTP kernel module usage\n") { vty->node = GTP_NODE; return CMD_SUCCESS; @@ -189,6 +190,60 @@ return CMD_SUCCESS; } +static struct cmd_node cfg_nft_node = { + NFT_NODE, + "%s(config-nft)# ", + 1, +}; + +DEFUN(cfg_nft, cfg_nft_cmd, + "nft", + "Enter the 'nft' node to configure nftables usage\n") +{ + vty->node = NFT_NODE; + return CMD_SUCCESS; +} + +static int config_write_nft(struct vty *vty) +{ + vty_out(vty, "nft%s", VTY_NEWLINE); + + if (g_upf->nft.mockup) + vty_out(vty, " mockup%s", VTY_NEWLINE); + + if (g_upf->nft.table_name && strcmp(g_upf->nft.table_name, "osmo-upf")) + vty_out(vty, " table-name %s%s", g_upf->nft.table_name, VTY_NEWLINE); + return CMD_SUCCESS; +} + +DEFUN(cfg_nft_mockup, cfg_nft_mockup_cmd, + "mockup", + "don't actually send rulesets to nftables, just return success\n") +{ + g_upf->nft.mockup = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_nft_no_mockup, cfg_nft_no_mockup_cmd, + "no mockup", + NO_STR + "operate nftables rulesets normally\n") +{ + g_upf->nft.mockup = false; + return CMD_SUCCESS; +} + +DEFUN(cfg_nft_table_name, cfg_nft_table_name_cmd, + "table-name TABLE_NAME", + "Set the nft inet table name to create and place GTP tunnel forwarding chains in" + " (as in 'nft add table inet foo'). If multiple instances of osmo-upf are running on the same system, each" + " osmo-upf must have its own table name. Otherwise the names of created forwarding chains will collide.\n" + "nft inet table name\n") +{ + osmo_talloc_replace_string(g_upf, &g_upf->nft.table_name, argv[0]); + return CMD_SUCCESS; +} + DEFUN(show_pdr, show_pdr_cmd, "show pdr", SHOW_STR @@ -304,5 +359,11 @@ install_element(GTP_NODE, &cfg_gtp_dev_create_cmd); install_element(GTP_NODE, &cfg_gtp_dev_use_cmd); install_element(GTP_NODE, &cfg_gtp_dev_del_cmd); -} + install_node(&cfg_nft_node, config_write_nft); + install_element(CONFIG_NODE, &cfg_nft_cmd); + + install_element(NFT_NODE, &cfg_nft_mockup_cmd); + install_element(NFT_NODE, &cfg_nft_no_mockup_cmd); + install_element(NFT_NODE, &cfg_nft_table_name_cmd); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ic0d319eb4f98cd51a5999c804c4203ab0bdda650 Gerrit-Change-Number: 28309 Gerrit-PatchSet: 9 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: add VTY option gtp/mockup, for VTY tests

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28686 ) Change subject: add VTY option gtp/mockup, for VTY tests ...................................................................... add VTY option gtp/mockup, for VTY tests To avoid actions that require cap_net_admin permissions on build servers, add this option to "dry run" all kernel GTP actions. Same will be added for netfilter rules. On startup, osmo-upf opens sockets to GTP kernel module / NFT ctx. However, on build servers, this would require giving cap_net_admin permissions just to run the VTY tests. Related: SYS#5599 Change-Id: I3b9c796186307fd8562abcff3f0ccfab0e88b6c8 --- A doc/examples/osmo-upf/osmo-upf-mockup.cfg M include/osmocom/upf/upf.h M osmoappdesc.py M src/osmo-upf/up_gtp_action.c M src/osmo-upf/upf_gtp.c M src/osmo-upf/upf_vty.c M tests/Makefile.am 7 files changed, 64 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/doc/examples/osmo-upf/osmo-upf-mockup.cfg b/doc/examples/osmo-upf/osmo-upf-mockup.cfg new file mode 100644 index 0000000..50003be --- /dev/null +++ b/doc/examples/osmo-upf/osmo-upf-mockup.cfg @@ -0,0 +1,17 @@ +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all debug + logging level set-all notice + logging level set-all info + +timer pfcp x24 5000 +pfcp + local-addr 127.0.0.1 +gtp + mockup diff --git a/include/osmocom/upf/upf.h b/include/osmocom/upf/upf.h index b8065dd..3802057 100644 --- a/include/osmocom/upf/upf.h +++ b/include/osmocom/upf/upf.h @@ -73,6 +73,9 @@ struct up_endpoint *ep; } pfcp; struct { + /* if true, don't actually send commands to the GTP kernel module, just return success. */ + bool mockup; + /* GTP devices as in osmo-upf.cfg */ struct gtp_vty_cfg vty_cfg; diff --git a/osmoappdesc.py b/osmoappdesc.py index 0cdbd1d..796c112 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -15,13 +15,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/> app_configs = { - "osmo-upf": ["doc/examples/osmo-upf/osmo-upf.cfg"] + "osmo-upf": ["doc/examples/osmo-upf/osmo-upf-mockup.cfg"] } apps = [(4275, "src/osmo-upf/osmo-upf", "OsmoUPF", "osmo-upf") ] vty_command = ["./src/osmo-upf/osmo-upf", "-c", - "doc/examples/osmo-upf/osmo-upf.cfg"] + "doc/examples/osmo-upf/osmo-upf-mockup.cfg"] vty_app = apps[0] diff --git a/src/osmo-upf/up_gtp_action.c b/src/osmo-upf/up_gtp_action.c index 47aa3ac..bffb85a 100644 --- a/src/osmo-upf/up_gtp_action.c +++ b/src/osmo-upf/up_gtp_action.c @@ -83,6 +83,12 @@ switch (a->kind) { case UP_GTP_U_ENDECAPS: + if (g_upf->gtp.mockup) { + LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "gtp/mockup active, skipping GTP action %s\n", + enable ? "enable" : "disable"); + return 0; + } + /* use the first available GTP device. * TODO: select by interface name? */ diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index e3435a9..6a8deac 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -167,7 +167,14 @@ }, }; int rc; - struct upf_gtp_dev *dev = upf_gtp_dev_alloc(name, local_addr); + struct upf_gtp_dev *dev; + + if (g_upf->gtp.mockup) { + LOGP(DGTP, LOGL_NOTICE, "gtp/mockup active: not opening GTP device '%s'\n", name); + return 0; + } + + dev = upf_gtp_dev_alloc(name, local_addr); if (!dev) return -EIO; @@ -245,6 +252,11 @@ /* Open an MNL socket which allows to create and remove GTP devices (requires CAP_NET_ADMIN). */ int upf_gtp_genl_open() { + if (g_upf->gtp.mockup) { + LOGP(DGTP, LOGL_NOTICE, "gtp/mockup active: not opening mnl_socket\n"); + return 0; + } + if (g_upf->gtp.nl && g_upf->gtp.genl_id >= 0) return 0; diff --git a/src/osmo-upf/upf_vty.c b/src/osmo-upf/upf_vty.c index 73d86d1..1212864 100644 --- a/src/osmo-upf/upf_vty.c +++ b/src/osmo-upf/upf_vty.c @@ -96,6 +96,9 @@ struct gtp_vty_cfg_dev *d; vty_out(vty, "gtp%s", VTY_NEWLINE); + if (g_upf->gtp.mockup) + vty_out(vty, " mockup%s", VTY_NEWLINE); + llist_for_each_entry(d, &gtp_vty.devs, entry) { if (d->create) { vty_out(vty, " dev create %s", d->dev_name); @@ -111,6 +114,23 @@ #define DEV_STR "Configure the GTP device to use for encaps/decaps.\n" +DEFUN(cfg_gtp_mockup, cfg_gtp_mockup_cmd, + "mockup", + "don't actually send commands to the GTP kernel module, just return success\n") +{ + g_upf->gtp.mockup = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_gtp_no_mockup, cfg_gtp_no_mockup_cmd, + "no mockup", + NO_STR + "operate GTP kernel module normally\n") +{ + g_upf->gtp.mockup = false; + return CMD_SUCCESS; +} + DEFUN(cfg_gtp_dev_create, cfg_gtp_dev_create_cmd, "dev create DEVNAME [LISTEN_ADDR]", DEV_STR @@ -279,6 +299,8 @@ install_node(&cfg_gtp_node, config_write_gtp); install_element(CONFIG_NODE, &cfg_gtp_cmd); + install_element(GTP_NODE, &cfg_gtp_mockup_cmd); + install_element(GTP_NODE, &cfg_gtp_no_mockup_cmd); install_element(GTP_NODE, &cfg_gtp_dev_create_cmd); install_element(GTP_NODE, &cfg_gtp_dev_use_cmd); install_element(GTP_NODE, &cfg_gtp_dev_del_cmd); diff --git a/tests/Makefile.am b/tests/Makefile.am index 66510f0..dbdb5f2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -48,7 +48,7 @@ vty-test: osmo_verify_transcript_vty.py -v \ -n OsmoUPF -p 4275 \ - -r "$(top_builddir)/src/osmo-upf/osmo-upf -c $(top_srcdir)/doc/examples/osmo-upf/osmo-upf.cfg" \ + -r "$(top_builddir)/src/osmo-upf/osmo-upf -c $(top_srcdir)/doc/examples/osmo-upf/osmo-upf-mockup.cfg" \ $(U) $(srcdir)/$(VTY_TEST) check-local: atconfig $(TESTSUITE) -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3b9c796186307fd8562abcff3f0ccfab0e88b6c8 Gerrit-Change-Number: 28686 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework L1CTL socket API to support multiple clients

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28669 ) Change subject: trxcon: rework L1CTL socket API to support multiple clients ...................................................................... Patch Set 5: (1 comment) File src/host/trxcon/src/l1ctl_link.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28669/comment/a1e7b772_6238b231 PS5, Line 223: osmo_fd_setup(&server->ofd, -1, OSMO_FD_READ, &l1ctl_server_conn_cb, server, 0); > Are you sure passing &func is correct here? look at all the osmo_fd_setup in osmocom code. I am not getting the question. What's wrong with passing &func? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1cfc49f36ead6e2ba0a6110b0fb65c55412ef5e3 Gerrit-Change-Number: 28669 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(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 Jul 2022 02:12:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Build failure of network:osmocom:nightly/osmo-ggsn in Raspbian_11/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-ggsn failed to build in Raspbian_11/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 507s] target_alias='' [ 507s] [ 507s] ## ----------- ## [ 507s] ## confdefs.h. ## [ 507s] ## ----------- ## [ 507s] [ 507s] /* confdefs.h */ [ 507s] #define PACKAGE_NAME "osmo-ggsn" [ 507s] #define PACKAGE_TARNAME "osmo-ggsn" [ 507s] #define PACKAGE_VERSION "1.9.0" [ 507s] #define PACKAGE_STRING "osmo-ggsn 1.9.0" [ 507s] #define PACKAGE_BUGREPORT "osmocom-net-gprs(a)lists.osmocom.org" [ 507s] #define PACKAGE_URL "" [ 507s] [ 507s] configure: exit 77 [ 507s] dh_auto_configure: error: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/arm-linux-gnueabihf --libexecdir=\${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking --enable-gtp-linux --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 77 [ 507s] make[1]: *** [debian/rules:22: override_dh_auto_configure] Error 25 [ 507s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 507s] make: *** [debian/rules:15: build] Error 2 [ 507s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 507s] ### VM INTERACTION START ### [ 507s] Failed to write wtmp record, ignoring: Read-only file system [ 507s] Failed to write utmp record: Read-only file system [ 507s] Powering off. [ 507s] [ 481.923406] reboot: Power down [ 507s] ### VM INTERACTION END ### [ 507s] [ 507s] armbuild01 failed "build osmo-ggsn_1.9.0.202207210052.dsc" at Thu Jul 21 02:11:29 UTC 2022. [ 507s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbc_vty: print correct protocol when writing config

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28706 ) Change subject: cbc_vty: print correct protocol when writing config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Id9fc0b42827f9a74ff1de4b35339de02aeeefee2 Gerrit-Change-Number: 28706 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: Thu, 21 Jul 2022 00:37:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbc_vty: Use value_string to define proto names used in vty

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28705 ) Change subject: cbc_vty: Use value_string to define proto names used in vty ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I125c7e5ca1f86c2ef390a85975465330c3ae1eb0 Gerrit-Change-Number: 28705 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: Thu, 21 Jul 2022 00:37:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Use cbc_{cbsp,sbcap}_link_close when possible

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28704 ) Change subject: Use cbc_{cbsp,sbcap}_link_close when possible ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File src/cbsp_link.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28704/comment/812656ea_f2a13665 PS1, Line 155: cbc_cbsp_link_close(link); Unrelated: looks like we leak memory here. I think we need to: osmo_fsm_inst_free(link->fi); llist_del(&link->list); talloc_free(link); before returning -1. File src/sbcap_link.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28704/comment/251e47ca_e8742672 PS1, Line 183: cbc_sbcap_link_close(link); Same memleak problem here as in cbsp_cbc_accept_cb(). -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie020b9b5ee93ae8d0c9e7266177728185e8635f2 Gerrit-Change-Number: 28704 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: Thu, 21 Jul 2022 00:36:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: debian: add generate_build_dep.sh to vendor erlang dependencies

by lynxis lazus

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28653 ) Change subject: debian: add generate_build_dep.sh to vendor erlang dependencies ...................................................................... debian: add generate_build_dep.sh to vendor erlang dependencies To build on OBS the source package must include all dependencies. Downloading dependencies isn't allowed. generate_build_dep.sh will download all dependencies. The jenkins job to update OBS should do this before calling `dpkg-buildpackage -S` to build a source package. Related: SYS#6006 Change-Id: I22041887fd1b72ea328605d18801d412b86bfc9c --- A contrib/generate_build_dep.sh M debian/rules 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: daniel: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh new file mode 100755 index 0000000..2c0dc81 --- /dev/null +++ b/contrib/generate_build_dep.sh @@ -0,0 +1,17 @@ +#!/bin/sh -e + +# execute the script from the top dir of this repository to generate +# a build_dep.tar.gz for building with debian/OBS + +if [ ! -e rebar.config ] ; then + echo "Please execute $0 from the top directory of the osmo_dia2gsup directory" + exit 1 +fi + +set -x +rm -rf _checkouts _build +rebar3 get-deps +mkdir _checkouts +mv ./_build/default/lib/* _checkouts/ +mv ./_build/default/plugins/* _checkouts/ +tar czf build_dep.tar.gz ./_checkouts diff --git a/debian/rules b/debian/rules index 22b84ed..89863f8 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,11 @@ override_dh_auto_build: dh_auto_build + if [ -e build_dep.tar.gz ] ; then tar xzf ./build_dep.tar.gz ; fi rebar3 compile rebar3 escriptize rebar3 eunit override_dh_clean: dh_clean - rm -rf _build + rm -rf _build _checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I22041887fd1b72ea328605d18801d412b86bfc9c Gerrit-Change-Number: 28653 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: debian: rework packaging

by lynxis lazus

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28652 ) Change subject: debian: rework packaging ...................................................................... debian: rework packaging - use the rebar3' debian/rules as template - use override targets instead of the exact targets - only install the escriptize osmo_dia2gsup file Related: SYS#6006 Change-Id: I40add168875de87ef0cc62deeb5377d2ce080e45 --- M contrib/systemd/osmo_dia2gsup.service M debian/osmo-diameter2gsup.install M debian/rules 3 files changed, 16 insertions(+), 16 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/systemd/osmo_dia2gsup.service b/contrib/systemd/osmo_dia2gsup.service index 3ae9b68..df56e71 100644 --- a/contrib/systemd/osmo_dia2gsup.service +++ b/contrib/systemd/osmo_dia2gsup.service @@ -7,7 +7,7 @@ Restart=always Environment="HOME=/var/lib/osmo_dia2gsup" ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo_dia2gsup -ExecStart=/usr/bin/erl -noshell -sname osmo_dia2gsup -eval "osmo_dia2gsup:start()." +ExecStart=/usr/bin/osmo-dia2gsup RestartSec=2 [Install] diff --git a/debian/osmo-diameter2gsup.install b/debian/osmo-diameter2gsup.install index 6d442ad..398a000 100644 --- a/debian/osmo-diameter2gsup.install +++ b/debian/osmo-diameter2gsup.install @@ -1,2 +1,2 @@ /contrib/systemd/osmo_dia2gsup.service /lib/systemd/system/ -/_lib/* /usr/lib/erlang/lib/ +/_build/default/bin/osmo-dia2gsup /usr/bin/ diff --git a/debian/rules b/debian/rules index 607a359..22b84ed 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,18 @@ #!/usr/bin/make -f - -build: - rebar3 compile - rebar3 escriptize - rebar3 eunit - for i in _build/default/lib/*; do \ - libdir=_lib/"$$(basename "$$i")"; \ - mkdir -pv "$$libdir"; \ - cp -rv "$$i/ebin" "$$libdir"; \ - done - find _lib -name .empty -delete - -clean: - rm -rf _build _lib +export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk +export ERL_COMPILER_OPTIONS=deterministic %: dh $@ + +override_dh_auto_build: + dh_auto_build + rebar3 compile + rebar3 escriptize + rebar3 eunit + +override_dh_clean: + dh_clean + rm -rf _build -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I40add168875de87ef0cc62deeb5377d2ce080e45 Gerrit-Change-Number: 28652 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022