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

Change in pysim[master]: ts_102_221: Fix decoding the 'num_of_rec' field

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27329 ) Change subject: ts_102_221: Fix decoding the 'num_of_rec' field ...................................................................... ts_102_221: Fix decoding the 'num_of_rec' field It is a 8bit integer, not a 16bit integer. See TS 102 221 11.1.1.4.3 Change-Id: I3e258547dad21a248650cfbc02e0576268d3b3fd --- M pySim/ts_102_221.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 708b50b..713d169 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -103,7 +103,7 @@ 'structure'/Enum(BitsInteger(3), no_info_given=0, transparent=1, linear_fixed=2, cyclic=6)) ) _construct = Struct('file_descriptor_byte'/FDB, Const(b'\x21'), - 'record_len'/COptional(Int16ub), 'num_of_rec'/COptional(Int16ub)) + 'record_len'/COptional(Int16ub), 'num_of_rec'/COptional(Int8ub)) # ETSI TS 102 221 11.1.1.4.4 class FileIdentifier(BER_TLV_IE, tag=0x83): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e258547dad21a248650cfbc02e0576268d3b3fd Gerrit-Change-Number: 27329 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Fix decoding the 'num_of_rec' field

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27329 ) Change subject: ts_102_221: Fix decoding the 'num_of_rec' field ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e258547dad21a248650cfbc02e0576268d3b3fd Gerrit-Change-Number: 27329 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 12:41:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: properly decode short file identifier

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27328 ) Change subject: ts_102_221: properly decode short file identifier ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibc69b99010d2a25cbb69b6a3d1585d0cb63f1345 Gerrit-Change-Number: 27328 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 25 Feb 2022 12:41:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: sccp_demo_user: make sure the command-line specified point codes are ...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27325 ) Change subject: sccp_demo_user: make sure the command-line specified point codes are used ...................................................................... sccp_demo_user: make sure the command-line specified point codes are used Change-Id: I983066199e5d8f056895fdad370e3b4439b4dba4 --- M examples/internal.h M examples/sccp_demo_user.c M examples/sccp_test_vty.c 3 files changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/examples/internal.h b/examples/internal.h index ef560ed..5dd439c 100644 --- a/examples/internal.h +++ b/examples/internal.h @@ -12,6 +12,9 @@ struct osmo_sccp_user; +extern struct osmo_sccp_addr g_calling_addr; +extern struct osmo_sccp_addr g_called_addr; + int sccp_test_user_vty_install(struct osmo_sccp_instance *inst, int ssn); int sccp_test_server_init(struct osmo_sccp_instance *sccp); diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 5f443e2..bcb95f4 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -300,6 +300,8 @@ } sccp_test_server_init(g_sccp); } + g_calling_addr.pc = local_pc; + g_called_addr.pc = remote_pc; while (1) { osmo_select_main(0); diff --git a/examples/sccp_test_vty.c b/examples/sccp_test_vty.c index c477c8b..044ecf2 100644 --- a/examples/sccp_test_vty.c +++ b/examples/sccp_test_vty.c @@ -13,13 +13,13 @@ static struct osmo_sccp_user *g_scu; -static struct osmo_sccp_addr g_calling_addr = { +struct osmo_sccp_addr g_calling_addr = { .presence = OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC, .ri = OSMO_SCCP_RI_SSN_PC, .pc = 23, }; -static struct osmo_sccp_addr g_called_addr = { +struct osmo_sccp_addr g_called_addr = { .presence = OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC, .ssn = 1, .ri = OSMO_SCCP_RI_SSN_PC, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I983066199e5d8f056895fdad370e3b4439b4dba4 Gerrit-Change-Number: 27325 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: sccp_demo_user: Allow user to specify logmask on command line

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27326 ) Change subject: sccp_demo_user: Allow user to specify logmask on command line ...................................................................... sccp_demo_user: Allow user to specify logmask on command line Change-Id: Ie1cf37b3501e26330b038b7ee17a5273d81c92d8 --- M examples/sccp_demo_user.c 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index bcb95f4..84ad84b 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -120,6 +120,7 @@ " %s:%d in client mode)\n" " -L: local point code (default is %d in server mode, %d in client mode)\n" " -R: remote point code (default is %d in server mode, %d in client mode)\n", + " -d: LOGMASK (libosmocore log mask string, e.g. -d DLINP,1:DLSS7,2)\n" DEFAULT_LOCAL_ADDRESS_SERVER, DEFAULT_LOCAL_PORT_SERVER, DEFAULT_LOCAL_ADDRESS_CLIENT, DEFAULT_LOCAL_PORT_CLIENT, DEFAULT_REMOTE_ADDRESS_SERVER, DEFAULT_REMOTE_PORT_SERVER, @@ -184,7 +185,10 @@ bool lflag = false, rflag = false, Lflag = false, Rflag = false; enum osmo_ss7_asp_protocol protocol = OSMO_SS7_ASP_PROT_M3UA; - while ((ch = getopt(argc, argv, "p:cl:r:L:R:C:")) != -1) { + void *tall_ctx = talloc_named_const(NULL, 1, "sccp_demo_user"); + init_logging(tall_ctx); + + while ((ch = getopt(argc, argv, "p:cl:r:L:R:C:d:")) != -1) { switch (ch) { case 'p': rc = get_string_value(osmo_ss7_asp_protocol_vals, optarg); @@ -238,6 +242,9 @@ case 'C': config_file = optarg; break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; default: usage(); } @@ -253,8 +260,6 @@ signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); - void *tall_ctx = talloc_named_const(NULL, 1, "sccp_demo_user"); - init_logging(tall_ctx); OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); vty_info.tall_ctx = tall_ctx; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ie1cf37b3501e26330b038b7ee17a5273d81c92d8 Gerrit-Change-Number: 27326 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: sccp_demo_user: enable stats / rate_counter timers

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27327 ) Change subject: sccp_demo_user: enable stats / rate_counter timers ...................................................................... sccp_demo_user: enable stats / rate_counter timers Change-Id: I135704d401de2cf439e51882e22323b31db14a2a --- M examples/sccp_demo_user.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 84ad84b..1a4ebac 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -11,6 +11,8 @@ #include <osmocom/core/logging.h> #include <osmocom/core/application.h> #include <osmocom/core/fsm.h> +#include <osmocom/core/stats.h> +#include <osmocom/core/rate_ctr.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> @@ -260,6 +262,8 @@ signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); + osmo_stats_init(tall_ctx); + rate_ctr_init(tall_ctx); OSMO_ASSERT(osmo_ss7_init() == 0); osmo_fsm_log_addr(false); vty_info.tall_ctx = tall_ctx; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I135704d401de2cf439e51882e22323b31db14a2a Gerrit-Change-Number: 27327 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: sccp_demo_user: Add 'show stats' to VTY

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27324 ) Change subject: sccp_demo_user: Add 'show stats' to VTY ...................................................................... sccp_demo_user: Add 'show stats' to VTY this allows us to inspect statistics of the demo user via VTY Change-Id: Ica48d4e0c9cedb9adb94ae08c5201207b8836e1c --- M examples/sccp_demo_user.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 82309ea..5f443e2 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -14,6 +14,7 @@ #include <osmocom/vty/vty.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> +#include <osmocom/vty/stats.h> #include <osmocom/vty/misc.h> #include <osmocom/sigtran/osmo_ss7.h> @@ -260,6 +261,7 @@ vty_init(&vty_info); logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); + osmo_stats_vty_add_cmds(); osmo_fsm_vty_add_cmds(); osmo_ss7_vty_init_asp(NULL); osmo_sccp_vty_init(); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ica48d4e0c9cedb9adb94ae08c5201207b8836e1c Gerrit-Change-Number: 27324 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: sccp_demo_user: Add command line argument to specify protocol (m3ua/ipa)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/27279 ) Change subject: sccp_demo_user: Add command line argument to specify protocol (m3ua/ipa) ...................................................................... sccp_demo_user: Add command line argument to specify protocol (m3ua/ipa) Change-Id: Iecb03df43709903b1cfe248e68d6624b995c563d --- M examples/sccp_demo_user.c 1 file changed, 15 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/examples/sccp_demo_user.c b/examples/sccp_demo_user.c index 88aead3..82309ea 100644 --- a/examples/sccp_demo_user.c +++ b/examples/sccp_demo_user.c @@ -28,16 +28,17 @@ static struct osmo_sccp_instance *g_sccp; -static struct osmo_sccp_instance *sua_server_helper(int local_port, const char *local_address, int local_pc, +static struct osmo_sccp_instance *sua_server_helper(enum osmo_ss7_asp_protocol protocol, + int local_port, const char *local_address, int local_pc, int remote_port, const char *remote_address, int remote_pc) { struct osmo_sccp_instance *sccp; - sccp = osmo_sccp_simple_server(NULL, local_pc, OSMO_SS7_ASP_PROT_M3UA, local_port, local_address); + sccp = osmo_sccp_simple_server(NULL, local_pc, protocol, local_port, local_address); if (sccp == NULL) return NULL; - osmo_sccp_simple_server_add_clnt(sccp, OSMO_SS7_ASP_PROT_M3UA, "client", remote_pc, local_port, + osmo_sccp_simple_server_add_clnt(sccp, protocol, "client", remote_pc, local_port, remote_port, remote_address); return sccp; @@ -110,6 +111,7 @@ " [-r REMOTE_ADDRESS[:REMOTE_PORT]]\n" " [-L LOCAL_POINT_CODE] [-R REMOTE_POINT_CODE]\n" "Options:\n" + " -p: protocol to use (m3ua, sua, ipa; default is ipa)\n" " -c: Run in client mode (default is server mode)\n" " -l: local IP address and SCTP port (default is %s:%d in server mode,\n" " %s:%d in client mode)\n" @@ -179,9 +181,16 @@ int remote_port = DEFAULT_REMOTE_PORT_SERVER; int remote_pc = DEFAULT_PC_CLIENT; bool lflag = false, rflag = false, Lflag = false, Rflag = false; + enum osmo_ss7_asp_protocol protocol = OSMO_SS7_ASP_PROT_M3UA; - while ((ch = getopt(argc, argv, "cl:r:L:R:C:")) != -1) { + while ((ch = getopt(argc, argv, "p:cl:r:L:R:C:")) != -1) { switch (ch) { + case 'p': + rc = get_string_value(osmo_ss7_asp_protocol_vals, optarg); + if (rc < 0) + exit(1); + protocol = rc; + break; case 'c': client = true; @@ -273,7 +282,7 @@ } if (client) { - g_sccp = osmo_sccp_simple_client(NULL, "client", local_pc, OSMO_SS7_ASP_PROT_M3UA, + g_sccp = osmo_sccp_simple_client(NULL, "client", local_pc, protocol, local_port, local_address, remote_port, remote_address); if (g_sccp == NULL) { perror("Could not create SCCP client"); @@ -281,7 +290,7 @@ } sccp_test_user_vty_install(g_sccp, OSMO_SCCP_SSN_BSSAP); } else { - g_sccp = sua_server_helper(local_port, local_address, local_pc, + g_sccp = sua_server_helper(protocol, local_port, local_address, local_pc, remote_port, remote_address, remote_pc); if (g_sccp == NULL) { perror("Could not create SCCP server"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/27279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iecb03df43709903b1cfe248e68d6624b995c563d Gerrit-Change-Number: 27279 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in meta-telephony[laforge/nightly]: osmo-hnbgw: depend on osmo-mgw

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27330 ) Change subject: osmo-hnbgw: depend on osmo-mgw ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I79b0525cff5030d72235640eddeabd7540f1bcf9 Gerrit-Change-Number: 27330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 12:40:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in meta-telephony[laforge/nightly]: osmo-hnbgw: depend on osmo-mgw

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/27330 ) Change subject: osmo-hnbgw: depend on osmo-mgw ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: It's usually useful to state here the osmo-hnbgw commit from which it starts to be needed. -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/27330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-Change-Id: I79b0525cff5030d72235640eddeabd7540f1bcf9 Gerrit-Change-Number: 27330 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Feb 2022 09:54:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022