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

Change in osmo-upf[master]: implement GTPv1-U ECHO response

by neels

Attention is currently required from: neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/28312 to look at the new patch set (#4). Change subject: implement GTPv1-U ECHO response ...................................................................... implement GTPv1-U ECHO response Accept data on the GTPv1-U socket and respond to GTPv1-U ECHO REQUEST messages. We should keep a deterministic recovery counter that increases with every restart. As a quick and dirty way just use the current time at startup for now, until osmo-upf reaches production maturity. Related: OS#5599 Change-Id: I135370a7723e2c667ec681f50c21107cde63ea5b --- M include/osmocom/upf/Makefile.am M include/osmocom/upf/upf.h A include/osmocom/upf/upf_gtpu_echo.h M src/osmo-upf/Makefile.am M src/osmo-upf/upf.c M src/osmo-upf/upf_gtp.c A src/osmo-upf/upf_gtpu_echo.c 7 files changed, 176 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/12/28312/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I135370a7723e2c667ec681f50c21107cde63ea5b Gerrit-Change-Number: 28312 Gerrit-PatchSet: 4 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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in pysim[master]: sysmocom_sja2: Prevent KeyError/None exception on encode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28735 ) Change subject: sysmocom_sja2: Prevent KeyError/None exception on encode ...................................................................... sysmocom_sja2: Prevent KeyError/None exception on encode Fix a bug in the pySim.sysmocom_sja2 module, where we defined unnamed bits in BitStruct without a default value causing exceptions like this: EXCEPTION of type 'KeyError' occurred with message: 'None' Change-Id: Ib2da5adda4fae374ab14bb8100f338691aef719a Closes: OS#5575 --- M pySim/sysmocom_sja2.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/28735/1 diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index d00a2cb..5d25993 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -137,7 +137,7 @@ class EF_SIM_AUTH_KEY(TransparentEF): def __init__(self, fid='6f20', name='EF.SIM_AUTH_KEY'): super().__init__(fid, name=name, desc='USIM authentication key') - CfgByte = BitStruct(Bit[2], + CfgByte = BitStruct(Default(BitsInteger(2), 0), 'use_sres_deriv_func_2'/Bit, 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) @@ -192,7 +192,7 @@ class EF_USIM_AUTH_KEY(TransparentEF): def __init__(self, fid='af20', name='EF.USIM_AUTH_KEY'): super().__init__(fid, name=name, desc='USIM authentication key') - CfgByte = BitStruct(Bit, 'only_4bytes_res_in_3g'/Bit, + CfgByte = BitStruct(Default(Bit, 0), 'only_4bytes_res_in_3g'/Bit, 'use_sres_deriv_func_2_in_3g'/Bit, 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, xor=15)) @@ -210,7 +210,7 @@ class EF_USIM_AUTH_KEY_2G(TransparentEF): def __init__(self, fid='af22', name='EF.USIM_AUTH_KEY_2G'): super().__init__(fid, name=name, desc='USIM authentication key in 2G context') - CfgByte = BitStruct(Bit, 'only_4bytes_res_in_3g'/Bit, + CfgByte = BitStruct(Default(Bit,0), 'only_4bytes_res_in_3g'/Bit, 'use_sres_deriv_func_2_in_3g'/Bit, 'use_opc_instead_of_op'/Bit, 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib2da5adda4fae374ab14bb8100f338691aef719a Gerrit-Change-Number: 28735 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: Introduce APDU/TPDU trace decoder

by fixeria

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28725 ) Change subject: Introduce APDU/TPDU trace decoder ...................................................................... Patch Set 5: (1 comment) File pySim/apdu/__init__.py: https://gerrit.osmocom.org/c/pysim/+/28725/comment/fcd14e9c_562bf0d2 PS5, Line 70: cmd rsp? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I862d93163d495a294364168f7818641e47b18c0a Gerrit-Change-Number: 28725 Gerrit-PatchSet: 5 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 15:03:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Move struct cbc bring up code to its own file and functions

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28734 ) Change subject: Move struct cbc bring up code to its own file and functions ...................................................................... Move struct cbc bring up code to its own file and functions This way it's clear and we have in one place all the related code that neds to be run at a given time.t Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/debug.h M src/Makefile.am A src/cbc_data.c M src/cbc_main.c M src/rest_api.c 7 files changed, 100 insertions(+), 34 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-cbc/osmo-cbc.cfg b/doc/examples/osmo-cbc/osmo-cbc.cfg index cc4272f..994da8c 100644 --- a/doc/examples/osmo-cbc/osmo-cbc.cfg +++ b/doc/examples/osmo-cbc/osmo-cbc.cfg @@ -1,4 +1,5 @@ log stderr + logging level main notice logging level rest notice logging level cbsp notice logging level sbcap notice diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index d96e5ca..d3a8319 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -79,6 +79,8 @@ }; extern struct cbc *g_cbc; +struct cbc *cbc_alloc(void *ctx); +int cbc_start(struct cbc *cbc); /* rest_api.c */ int rest_api_init(void *ctx, const char *bind_addr, uint16_t port); diff --git a/include/osmocom/cbc/debug.h b/include/osmocom/cbc/debug.h index 1ec0a8e..025419e 100644 --- a/include/osmocom/cbc/debug.h +++ b/include/osmocom/cbc/debug.h @@ -1,6 +1,7 @@ #pragma once enum { + DMAIN, DCBSP, DSBcAP, DREST, diff --git a/src/Makefile.am b/src/Makefile.am index 32cccd7..e72b20b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ bin_PROGRAMS = osmo-cbc osmo_cbc_SOURCES = \ + cbc_data.c \ cbc_main.c \ cbc_message.c \ cbc_peer.c \ diff --git a/src/cbc_data.c b/src/cbc_data.c new file mode 100644 index 0000000..5d5a64f --- /dev/null +++ b/src/cbc_data.c @@ -0,0 +1,83 @@ +/* Osmocom CBC (Cell Broacast Centre) */ + +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * 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. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +#include <string.h> +#include <errno.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> + +#include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbsp_link.h> +#include <osmocom/cbc/sbcap_link.h> +#include <osmocom/cbc/rest_it_op.h> +#include <osmocom/cbc/debug.h> + +struct cbc *cbc_alloc(void *ctx) +{ + struct cbc *cbc; + + cbc = talloc_zero(ctx, struct cbc); + INIT_LLIST_HEAD(&cbc->peers); + INIT_LLIST_HEAD(&cbc->messages); + INIT_LLIST_HEAD(&cbc->expired_messages); + cbc->config.cbsp.local_host = talloc_strdup(cbc, "127.0.0.1"); + cbc->config.cbsp.local_port = CBSP_TCP_PORT; + /* cbc->config.sbcap local_host set up during VTY (and vty_go_parent) */ + cbc->config.sbcap.local_port = SBcAP_SCTP_PORT; + cbc->config.ecbe.local_host = talloc_strdup(cbc, "127.0.0.1"); + cbc->config.ecbe.local_port = 12345; + + cbc->it_q.rest2main = osmo_it_q_alloc(cbc, "rest2main", 10, rest2main_read_cb, NULL); + OSMO_ASSERT(cbc->it_q.rest2main); + osmo_fd_register(&cbc->it_q.rest2main->event_ofd); + + return cbc; +} + +int cbc_start(struct cbc *cbc) +{ + void *tall_rest_ctx; + int rc; + + tall_rest_ctx = talloc_named_const(cbc, 0, "REST"); + + if (!(cbc->cbsp.mgr = cbc_cbsp_mgr_create(cbc))) { + LOGP(DMAIN, LOGL_ERROR, "Error binding CBSP port\n"); + return -EIO; + } + + if (!(cbc->sbcap.mgr = cbc_sbcap_mgr_create(cbc))) { + LOGP(DMAIN, LOGL_ERROR, "Error binding SBc-AP port\n"); + return -EIO; + } + + rc = rest_api_init(tall_rest_ctx, cbc->config.ecbe.local_host, cbc->config.ecbe.local_port); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Error binding ECBE port\n"); + return -EIO; + } + return 0; +} diff --git a/src/cbc_main.c b/src/cbc_main.c index cd80e31..4ad59b6 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -45,9 +45,6 @@ #include <osmocom/vty/misc.h> #include <osmocom/cbc/debug.h> -#include <osmocom/cbc/rest_it_op.h> -#include <osmocom/cbc/cbsp_link.h> -#include <osmocom/cbc/sbcap_link.h> #include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/cbc_vty.h> @@ -55,6 +52,13 @@ struct cbc *g_cbc; static const struct log_info_cat log_info_cat[] = { + [DMAIN] = { + .name = "DMAIN", + .description = "Main logging category", + .color = "\033[1;30m", + .enabled = 1, + .loglevel = LOGL_NOTICE, + }, [DCBSP] = { .name = "DCBSP", .description = "Cell Broadcast Service Protocol (CBC-BSC)", @@ -234,27 +238,16 @@ int main(int argc, char **argv) { - void *tall_rest_ctx; int rc; tall_cbc_ctx = talloc_named_const(NULL, 1, "osmo-cbc"); - tall_rest_ctx = talloc_named_const(tall_cbc_ctx, 0, "REST"); msgb_talloc_ctx_init(tall_cbc_ctx, 0); osmo_init_logging2(tall_cbc_ctx, &log_info); log_enable_multithread(); osmo_stats_init(tall_cbc_ctx); vty_init(&vty_info); - g_cbc = talloc_zero(tall_cbc_ctx, struct cbc); - INIT_LLIST_HEAD(&g_cbc->peers); - INIT_LLIST_HEAD(&g_cbc->messages); - INIT_LLIST_HEAD(&g_cbc->expired_messages); - g_cbc->config.cbsp.local_host = talloc_strdup(g_cbc, "127.0.0.1"); - g_cbc->config.cbsp.local_port = CBSP_TCP_PORT; - /* g_cbc->config.sbcap local_host set up during VTY (and vty_go_parent) */ - g_cbc->config.sbcap.local_port = SBcAP_SCTP_PORT; - g_cbc->config.ecbe.local_host = talloc_strdup(g_cbc, "127.0.0.1"); - g_cbc->config.ecbe.local_port = 12345; + g_cbc = cbc_alloc(tall_cbc_ctx); cbc_vty_init(); @@ -276,26 +269,9 @@ exit(1); } - if (!(g_cbc->cbsp.mgr = cbc_cbsp_mgr_create(tall_cbc_ctx))) { - perror("Error binding CBSP port"); + rc = cbc_start(g_cbc); + if (rc < 0) exit(1); - } - - if (!(g_cbc->sbcap.mgr = cbc_sbcap_mgr_create(tall_cbc_ctx))) { - perror("Error binding SBc-AP port\n"); - exit(1); - } - - rc = rest_api_init(tall_rest_ctx, g_cbc->config.ecbe.local_host, g_cbc->config.ecbe.local_port); - if (rc < 0) { - perror("Error binding ECBE port"); - exit(1); - } - - LOGP(DREST, LOGL_INFO, "Main thread tid: %lu\n", pthread_self()); - g_cbc->it_q.rest2main = osmo_it_q_alloc(g_cbc, "rest2main", 10, rest2main_read_cb, NULL); - OSMO_ASSERT(g_cbc->it_q.rest2main); - osmo_fd_register(&g_cbc->it_q.rest2main->event_ofd); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); diff --git a/src/rest_api.c b/src/rest_api.c index 4294485..3af50e6 100644 --- a/src/rest_api.c +++ b/src/rest_api.c @@ -686,6 +686,8 @@ struct osmo_sockaddr_str sastr; int i; + LOGP(DREST, LOGL_INFO, "Main thread tid: %lu\n", pthread_self()); + #ifdef ULFIUS_MALLOC_NOT_BROKEN /* See https://github.com/babelouest/ulfius/issues/63 */ g_tall_rest = ctx; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 Gerrit-Change-Number: 28734 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Move struct cbc bring up code to its own file and functions

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28734 ) Change subject: Move struct cbc bring up code to its own file and functions ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 Gerrit-Change-Number: 28734 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 14:13:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Move struct cbc bring up code to its own file and functions

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-cbc/+/28734 to look at the new patch set (#3). Change subject: Move struct cbc bring up code to its own file and functions ...................................................................... Move struct cbc bring up code to its own file and functions This way it's clear and we have in one place all the related code that neds to be run at a given time.t Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/debug.h M src/Makefile.am A src/cbc_data.c M src/cbc_main.c M src/rest_api.c 7 files changed, 100 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/34/28734/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 Gerrit-Change-Number: 28734 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Move struct cbc bring up code to its won file and functions

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-cbc/+/28734 to look at the new patch set (#2). Change subject: Move struct cbc bring up code to its won file and functions ...................................................................... Move struct cbc bring up code to its won file and functions This way it's clear and we have in one place all the related code that neds to be run at a given time.t Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/debug.h M src/Makefile.am A src/cbc_data.c M src/cbc_main.c M src/rest_api.c 7 files changed, 100 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/34/28734/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 Gerrit-Change-Number: 28734 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: vty: Define peer proto during 'peer' node cmd

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28718 ) Change subject: vty: Define peer proto during 'peer' node cmd ...................................................................... vty: Define peer proto during 'peer' node cmd This way we lock the type (proto) of each peer at creation time. Otherwise, having the possibility of changing the protocol of the peer makes all the code too complex and there's no good way to prevent the protocol from being changed at any time creating unexpected issues. If the user wants to change the protocol, she can do so by removing the peer and re-adding it through the VTY with the desired protocol. Change-Id: I47756dddd8f9b8450ba14c914614fd2391d5486e --- M doc/examples/osmo-cbc/osmo-cbc.cfg M src/cbc_vty.c 2 files changed, 40 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/doc/examples/osmo-cbc/osmo-cbc.cfg b/doc/examples/osmo-cbc/osmo-cbc.cfg index dc33b09..cc4272f 100644 --- a/doc/examples/osmo-cbc/osmo-cbc.cfg +++ b/doc/examples/osmo-cbc/osmo-cbc.cfg @@ -14,12 +14,10 @@ local-ip 127.0.0.1 local-ip ::1 local-port 29168 - peer example-bsc - protocol cbsp + peer cbsp example-bsc remote-ip 127.0.0.2 remote-port 48049 - peer example-mme - protocol sbcap + peer sbcap example-mme remote-ip 127.0.0.2 remote-ip ::2 remote-port 29168 diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 36d646d..7e5a9db 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -44,6 +44,10 @@ { 0, NULL } }; +#define CBC_PEER_PROTO_NAME_VTY_CMD "(cbsp|sbcap)" +#define CBC_PEER_PROTO_NAME_VTY_STR "Cell Broadcast Service Protocol (GSM)\n" \ + "SBc Application Part (LTE)\n" + static void dump_one_cbc_peer(struct vty *vty, const struct cbc_peer *peer) { const char *state = "<disconnected>"; @@ -519,13 +523,17 @@ /* PEER */ -DEFUN(cfg_cbc_peer, cfg_cbc_peer_cmd, +DEFUN_DEPRECATED(cfg_cbc_peer_old, cfg_cbc_peer_old_cmd, "peer NAME", "Remote Peer\n" "Name identifying the peer\n") { struct cbc_peer *peer; + vty_out(vty, "%% This function is deprecated, use " + "'peer " CBC_PEER_PROTO_NAME_VTY_CMD " NAME' instead. " + "Assuming 'cbsp' for peers being created%s", VTY_NEWLINE); + peer = cbc_peer_by_name(argv[0]); if (!peer) peer = cbc_peer_create(argv[0], CBC_PEER_PROTO_CBSP); @@ -537,6 +545,27 @@ return CMD_SUCCESS; } +DEFUN(cfg_cbc_peer, cfg_cbc_peer_cmd, + "peer " CBC_PEER_PROTO_NAME_VTY_CMD " NAME", + "Remote Peer\n" + CBC_PEER_PROTO_NAME_VTY_STR + "Name identifying the peer\n") +{ + struct cbc_peer *peer; + enum cbc_peer_protocol proto; + + proto = get_string_value(cbc_peer_proto_name_vty, argv[0]); + peer = cbc_peer_by_name(argv[1]); + if (!peer) + peer = cbc_peer_create(argv[1], proto); + if (!peer) + return CMD_WARNING; + + vty->node = PEER_NODE; + vty->index = peer; + return CMD_SUCCESS; +} + DEFUN(cfg_cbc_no_peer, cfg_cbc_no_peer_cmd, "no peer NAME", NO_STR "Remote Peer\n" @@ -554,13 +583,13 @@ } -DEFUN(cfg_peer_proto, cfg_peer_proto_cmd, - "protocol (cbsp|sbcap)", +DEFUN_DEPRECATED(cfg_peer_proto, cfg_peer_proto_cmd, + "protocol " CBC_PEER_PROTO_NAME_VTY_CMD, "Configure Protocol of Peer\n" - "Cell Broadcast Service Protocol (GSM)\n") + CBC_PEER_PROTO_NAME_VTY_STR) { - struct cbc_peer *peer = (struct cbc_peer *) vty->index; - peer->proto = get_string_value(cbc_peer_proto_name_vty, argv[0]); + vty_out(vty, "%% This function is deprecated and does nothing, use " + "'peer " CBC_PEER_PROTO_NAME_VTY_CMD " NAME' instead%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -646,9 +675,8 @@ static void write_one_peer(struct vty *vty, struct cbc_peer *peer) { unsigned int i; - vty_out(vty, " peer %s%s", peer->name, VTY_NEWLINE); - vty_out(vty, " protocol %s%s", - get_value_string(cbc_peer_proto_name_vty, peer->proto), VTY_NEWLINE); + vty_out(vty, " peer %s %s%s", get_value_string(cbc_peer_proto_name_vty, peer->proto), + peer->name, VTY_NEWLINE); if (peer->remote_port == -1) vty_out(vty, " no remote-port%s", VTY_NEWLINE); else @@ -696,6 +724,7 @@ install_element(SBcAP_NODE, &cfg_sbcap_no_local_ip_cmd); install_element(SBcAP_NODE, &cfg_sbcap_local_port_cmd); + install_element(CBC_NODE, &cfg_cbc_peer_old_cmd); install_element(CBC_NODE, &cfg_cbc_peer_cmd); install_element(CBC_NODE, &cfg_cbc_no_peer_cmd); install_node(&peer_node, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I47756dddd8f9b8450ba14c914614fd2391d5486e Gerrit-Change-Number: 28718 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in pysim[master]: Introduce APDU/TPDU trace decoder

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/28725 to look at the new patch set (#5). Change subject: Introduce APDU/TPDU trace decoder ...................................................................... Introduce APDU/TPDU trace decoder This introduces a new pySim.apdu module hierarchy, which contains classes that represent TPDU/APDUs as exchanged between SIM/UICC/USIM/ISIM card and UE. It contains instruction level decoders for SELECT, READ BINARY and friends, and then uses the pySim.filesystem.Runtime{Lchan,State} classes to keep track of the currently selected EF/DF/ADF for each logical channel, and uses the file-specific decoder classes of pySim to decode the actual file content that is being read or written. This provides a much more meaningful decode of protocol traces than wireshark will ever be able to give us. Furthermore, there's the new pySim.apdu_source set of classes which provides "input plugins" for obtaining APDU traces in a variety of formats. So far, GSMTAP UDP live capture and pyshark based RSPRO live and pcap file reading are imlpemented. Change-Id: I862d93163d495a294364168f7818641e47b18c0a Closes: OS#5126 --- M README.md M contrib/jenkins.sh A pySim-trace.py A pySim/apdu/__init__.py A pySim/apdu/global_platform.py A pySim/apdu/ts_102_221.py A pySim/apdu/ts_31_102.py A pySim/apdu_source/__init__.py A pySim/apdu_source/gsmtap.py A pySim/apdu_source/pyshark_rspro.py A pySim/gsmtap.py M pySim/ts_31_102.py M requirements.txt M setup.py A tests/test_apdu.py 15 files changed, 1,855 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/28725/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I862d93163d495a294364168f7818641e47b18c0a Gerrit-Change-Number: 28725 Gerrit-PatchSet: 5 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-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28733 ) Change subject: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > So that means the -latest will be failing for the next X months until we release a new version. […] Having the existing minimal set infrastructure to work at the same time for CBSP and SBc-AP was by far the easiest and quickest in time, so I went that way. We have a set of hours available for this, so when I'm done with implementing the system working, we can spend time on stuff like improving the tests, etc. It makes sense to make a new release once I'm done. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3654acdf4b68886133af7f418726903f3fee57eb Gerrit-Change-Number: 28733 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 13:38:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022