- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: pySim-shell: rework startup procedure and introduce headless mode
by dexter 27 Aug '24

27 Aug '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37932?usp=email ) Change subject: pySim-shell: rework startup procedure and introduce headless mode ...................................................................... pySim-shell: rework startup procedure and introduce headless mode When pySim-shell is used in a scripted environment, we may easily get trapped in the pySim-shell prompt. This may happen in particular in case the script file is not executed due to problem with the reader initialization. In such a case pySim-shell will not exit automatically and the shellscript that was calling pySim-shell will stall indefinetly. To make the use of pySim-shell more reliable in scripted environments, let's add a --headless option that ensures the interactive mode is never entered. Let's also exit with an appropriate return code in case of initialization errors, so that the calling script can know that something went wrong. Related: OS#6531 Change-Id: I07ecb27b37e2573629981a0d032cc95cd156be7e --- M pySim-shell.py 1 file changed, 36 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/37932/1 diff --git a/pySim-shell.py b/pySim-shell.py index 0ba8a25..565d569 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -1026,6 +1026,8 @@ help='per-CSV-column AES transport key') global_group.add_argument("--card_handler", dest="card_handler_config", metavar="FILE", help="Use automatic card handling machine") +global_group.add_argument("--headless", help="Run in non interactive mode", + action='store_true', default=False) adm_group = global_group.add_mutually_exclusive_group() adm_group.add_argument('-a', '--pin-adm', metavar='PIN_ADM1', dest='pin_adm', default=None, @@ -1041,22 +1043,15 @@ if __name__ == '__main__': - # Parse options + startup_errors = False opts = option_parser.parse_args() - # If a script file is specified, be sure that it actually exists - if opts.script: - if not os.access(opts.script, os.R_OK): - print("Invalid script file!") - sys.exit(2) - + # Register csv-file as card data provider, either from specified CSV + # or from CSV file in home directory csv_column_keys = {} for par in opts.csv_column_key: name, key = par.split(':') csv_column_keys[name] = key - - # Register csv-file as card data provider, either from specified CSV - # or from CSV file in home directory csv_default = str(Path.home()) + "/.osmocom/pysim/card_data.csv" if opts.csv: card_key_provider_register(CardKeyProviderCsv(opts.csv, csv_column_keys)) @@ -1077,18 +1072,18 @@ # able to tolerate and recover from that. try: rs, card = init_card(sl) - app = PysimApp(card, rs, sl, ch, opts.script) + app = PysimApp(card, rs, sl, ch) except: + startup_errors = True print("Card initialization (%s) failed with an exception:" % str(sl)) print("---------------------8<---------------------") traceback.print_exc() print("---------------------8<---------------------") - print("(you may still try to recover from this manually by using the 'equip' command.)") - print(" it should also be noted that some readers may behave strangely when no card") - print(" is inserted.)") - print("") - if opts.script: - print("will not execute startup script due to card initialization errors!") + if not opts.headless: + print("(you may still try to recover from this manually by using the 'equip' command.)") + print(" it should also be noted that some readers may behave strangely when no card") + print(" is inserted.)") + print("") app = PysimApp(None, None, sl, ch) # If the user supplies an ADM PIN at via commandline args authenticate @@ -1100,9 +1095,31 @@ try: card._scc.verify_chv(card._adm_chv_num, h2b(pin_adm)) except Exception as e: + startup_errors = True + print("ADM verification (%s) failed with an exception:" % str(pin_adm)) + print("---------------------8<---------------------") print(e) + print("---------------------8<---------------------") + # Run optional command if opts.command: - app.onecmd_plus_hooks('{} {}'.format(opts.command, ' '.join(opts.command_args))) - else: + if not startup_errors: + app.onecmd_plus_hooks('{} {}'.format(opts.command, ' '.join(opts.command_args))) + else: + print("Errors during startup, refusing to execute command (%s)" % opts.command) + + # Run optional script file + if opts.script: + if not startup_errors: + if not os.access(opts.script, os.R_OK): + print("Error: script file (%s) not readable!" % opts.script) + startup_errors = True + else: + app.onecmd_plus_hooks('{} {}'.format('run_script', opts.script), add_to_history = False) + else: + print("Errors during startup, refusing to execute script (%s)" % opts.script) + + if not opts.headless: app.cmdloop() + elif startup_errors: + sys.exit(2) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37932?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I07ecb27b37e2573629981a0d032cc95cd156be7e Gerrit-Change-Number: 37932 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim-shell: fix sourcecode formatting
by dexter 27 Aug '24

27 Aug '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37930?usp=email ) Change subject: pySim-shell: fix sourcecode formatting ...................................................................... pySim-shell: fix sourcecode formatting Change-Id: I7133e93366eaacca5ace301172a08ae84e211c0e --- M pySim-shell.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/30/37930/1 diff --git a/pySim-shell.py b/pySim-shell.py index 78d20e6..d166008 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -1084,8 +1084,7 @@ traceback.print_exc() print("---------------------8<---------------------") print("(you may still try to recover from this manually by using the 'equip' command.)") - print( - " it should also be noted that some readers may behave strangely when no card") + print(" it should also be noted that some readers may behave strangely when no card") print(" is inserted.)") print("") if opts.script: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37930?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7133e93366eaacca5ace301172a08ae84e211c0e Gerrit-Change-Number: 37930 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in libgtpnl[master]: fix clang build
by pespin 27 Aug '24

27 Aug '24

Attention is currently required from: Hoernchen. pespin has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/libgtpnl/+/37929?usp=email ) Change subject: fix clang build ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/37929?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I345579a8ea989c5a21797a17f34629472fbd3525 Gerrit-Change-Number: 37929 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: Tue, 27 Aug 2024 09:54:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libgtpnl[master]: fix clang build
by Hoernchen 27 Aug '24

27 Aug '24

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/37929?usp=email ) Change subject: fix clang build ...................................................................... fix clang build Clang needs the configure patch that exists in most of our repos + visibility, because clang says warning: attribute declaration must precede definition [-Wignored-attributes] and the .so has no exports. Change-Id: I345579a8ea989c5a21797a17f34629472fbd3525 --- M configure.ac M src/genl.c M src/gtp-genl.c M src/gtp-rtnl.c M src/gtp.c 5 files changed, 41 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/29/37929/1 diff --git a/configure.ac b/configure.ac index 1628bc8..90e4dce 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,12 @@ AC_EXEEXT AC_DISABLE_STATIC LT_INIT + +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +AS_CASE(["$LD"],[*clang*], + [AS_CASE(["${host_os}"], + [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) + CHECK_GCC_FVISIBILITY case "$host" in *-*-linux* | *-*-uclinux*) ;; diff --git a/src/genl.c b/src/genl.c index 5d8b9af..572bed9 100644 --- a/src/genl.c +++ b/src/genl.c @@ -32,6 +32,7 @@ #include "internal.h" +EXPORT_SYMBOL(genl_nlmsg_build_hdr); struct nlmsghdr * genl_nlmsg_build_hdr(char *buf, uint16_t type, uint16_t flags, uint32_t seq, uint8_t cmd) @@ -50,7 +51,6 @@ return nlh; } -EXPORT_SYMBOL(genl_nlmsg_build_hdr); static int genl_ctrl_validate_cb(const struct nlattr *attr, void *data) { @@ -87,6 +87,7 @@ return MNL_CB_OK; } +EXPORT_SYMBOL(genl_socket_open); struct mnl_socket *genl_socket_open(void) { struct mnl_socket *nl; @@ -104,14 +105,14 @@ return nl; } -EXPORT_SYMBOL(genl_socket_open); +EXPORT_SYMBOL(genl_socket_close); void genl_socket_close(struct mnl_socket *nl) { mnl_socket_close(nl); } -EXPORT_SYMBOL(genl_socket_close); +EXPORT_SYMBOL(genl_socket_talk); int genl_socket_talk(struct mnl_socket *nl, struct nlmsghdr *nlh, uint32_t seq, int (*cb)(const struct nlmsghdr *nlh, void *data), void *data) @@ -135,7 +136,6 @@ return ret; } -EXPORT_SYMBOL(genl_socket_talk); static struct nlmsghdr * genl_nlmsg_build_lookup(char *buf, const char *subsys_name) @@ -158,6 +158,7 @@ return nlh; } +EXPORT_SYMBOL(genl_lookup_family); int genl_lookup_family(struct mnl_socket *nl, const char *family) { int32_t genl_id; @@ -171,4 +172,3 @@ return genl_id; } -EXPORT_SYMBOL(genl_lookup_family); diff --git a/src/gtp-genl.c b/src/gtp-genl.c index 33a78d8..ef8dfc0 100644 --- a/src/gtp-genl.c +++ b/src/gtp-genl.c @@ -96,6 +96,7 @@ } } +EXPORT_SYMBOL(gtp_add_tunnel); int gtp_add_tunnel(int genl_id, struct mnl_socket *nl, struct gtp_tunnel *t) { struct nlmsghdr *nlh; @@ -119,8 +120,8 @@ return 0; } -EXPORT_SYMBOL(gtp_add_tunnel); +EXPORT_SYMBOL(gtp_del_tunnel); int gtp_del_tunnel(int genl_id, struct mnl_socket *nl, struct gtp_tunnel *t) { char buf[MNL_SOCKET_BUFFER_SIZE]; @@ -138,7 +139,6 @@ return 0; } -EXPORT_SYMBOL(gtp_del_tunnel); struct gtp_pdp { uint32_t ifidx; @@ -270,6 +270,7 @@ return MNL_CB_OK; } +EXPORT_SYMBOL(gtp_list_tunnel); int gtp_list_tunnel(int genl_id, struct mnl_socket *nl) { char buf[MNL_SOCKET_BUFFER_SIZE]; @@ -286,4 +287,3 @@ return 0; } -EXPORT_SYMBOL(gtp_list_tunnel); diff --git a/src/gtp-rtnl.c b/src/gtp-rtnl.c index 1dfd125..6baa5a6 100644 --- a/src/gtp-rtnl.c +++ b/src/gtp-rtnl.c @@ -138,18 +138,19 @@ return gtp_dev_talk(nlh, seq); } +EXPORT_SYMBOL(gtp_dev_create); int gtp_dev_create(int dest_ns, const char *gtp_ifname, int fd0, int fd1) { return _gtp_dev_create(dest_ns, gtp_ifname, fd0, fd1, GTP_ROLE_GGSN); } -EXPORT_SYMBOL(gtp_dev_create); +EXPORT_SYMBOL(gtp_dev_create_sgsn); int gtp_dev_create_sgsn(int dest_ns, const char *gtp_ifname, int fd0, int fd1) { return _gtp_dev_create(dest_ns, gtp_ifname, fd0, fd1, GTP_ROLE_SGSN); } -EXPORT_SYMBOL(gtp_dev_create_sgsn); +EXPORT_SYMBOL(gtp_dev_destroy); int gtp_dev_destroy(const char *gtp_ifname) { char buf[MNL_SOCKET_BUFFER_SIZE]; @@ -166,8 +167,8 @@ return gtp_dev_talk(nlh, seq); } -EXPORT_SYMBOL(gtp_dev_destroy); +EXPORT_SYMBOL(gtp_dev_config); int gtp_dev_config(const char *ifname, struct in_addr *dst, uint32_t prefix) { struct mnl_socket *nl; @@ -211,4 +212,3 @@ return ret; } -EXPORT_SYMBOL(gtp_dev_config); diff --git a/src/gtp.c b/src/gtp.c index af216f7..8f12b5d 100644 --- a/src/gtp.c +++ b/src/gtp.c @@ -27,6 +27,7 @@ #include "internal.h" +EXPORT_SYMBOL(gtp_tunnel_alloc); struct gtp_tunnel *gtp_tunnel_alloc(void) { struct gtp_tunnel *t; @@ -38,152 +39,151 @@ t->ifns = -1; return t; } -EXPORT_SYMBOL(gtp_tunnel_alloc); +EXPORT_SYMBOL(gtp_tunnel_free); void gtp_tunnel_free(struct gtp_tunnel *t) { free(t); } -EXPORT_SYMBOL(gtp_tunnel_free); +EXPORT_SYMBOL(gtp_tunnel_set_ifns); void gtp_tunnel_set_ifns(struct gtp_tunnel *t, int ifns) { t->ifns = ifns; t->flags |= GTP_TUN_IFNS; } -EXPORT_SYMBOL(gtp_tunnel_set_ifns); +EXPORT_SYMBOL(gtp_tunnel_set_ifidx); void gtp_tunnel_set_ifidx(struct gtp_tunnel *t, uint32_t ifidx) { t->ifidx = ifidx; t->flags |= GTP_TUN_IFIDX; } -EXPORT_SYMBOL(gtp_tunnel_set_ifidx); +EXPORT_SYMBOL(gtp_tunnel_set_family); void gtp_tunnel_set_family(struct gtp_tunnel *t, uint16_t family) { t->ms_addr.family = family; t->flags |= GTP_TUN_FAMILY; } -EXPORT_SYMBOL(gtp_tunnel_set_family); +EXPORT_SYMBOL(gtp_tunnel_set_ms_ip4); void gtp_tunnel_set_ms_ip4(struct gtp_tunnel *t, struct in_addr *ms_addr) { t->ms_addr.family = AF_INET; t->ms_addr.ip4 = *ms_addr; t->flags |= GTP_TUN_FAMILY | GTP_TUN_MS_ADDR; } -EXPORT_SYMBOL(gtp_tunnel_set_ms_ip4); +EXPORT_SYMBOL(gtp_tunnel_set_sgsn_ip4); void gtp_tunnel_set_sgsn_ip4(struct gtp_tunnel *t, struct in_addr *sgsn_addr) { t->sgsn_addr.family = AF_INET; t->sgsn_addr.ip4 = *sgsn_addr; t->flags |= GTP_TUN_SGSN_ADDR; } -EXPORT_SYMBOL(gtp_tunnel_set_sgsn_ip4); +EXPORT_SYMBOL(gtp_tunnel_set_ms_ip6); void gtp_tunnel_set_ms_ip6(struct gtp_tunnel *t, const struct in6_addr *ms_addr) { t->ms_addr.family = AF_INET6; t->ms_addr.ip6 = *ms_addr; t->flags |= GTP_TUN_FAMILY | GTP_TUN_MS_ADDR; } -EXPORT_SYMBOL(gtp_tunnel_set_ms_ip6); +EXPORT_SYMBOL(gtp_tunnel_set_sgsn_ip6); void gtp_tunnel_set_sgsn_ip6(struct gtp_tunnel *t, const struct in6_addr *sgsn_addr) { t->sgsn_addr.family = AF_INET6; t->sgsn_addr.ip6 = *sgsn_addr; t->flags |= GTP_TUN_SGSN_ADDR; } -EXPORT_SYMBOL(gtp_tunnel_set_sgsn_ip6); +EXPORT_SYMBOL(gtp_tunnel_set_version); void gtp_tunnel_set_version(struct gtp_tunnel *t, uint32_t version) { t->gtp_version = version; t->flags |= GTP_TUN_VERSION; } -EXPORT_SYMBOL(gtp_tunnel_set_version); +EXPORT_SYMBOL(gtp_tunnel_set_tid); void gtp_tunnel_set_tid(struct gtp_tunnel *t, uint64_t tid) { t->u.v0.tid = tid; t->flags |= GTP_TUN_V0_TID; } -EXPORT_SYMBOL(gtp_tunnel_set_tid); +EXPORT_SYMBOL(gtp_tunnel_set_flowid); void gtp_tunnel_set_flowid(struct gtp_tunnel *t, uint16_t flowid) { t->u.v0.flowid = flowid; t->flags |= GTP_TUN_V0_FLOWID; } -EXPORT_SYMBOL(gtp_tunnel_set_flowid); +EXPORT_SYMBOL(gtp_tunnel_set_i_tei); void gtp_tunnel_set_i_tei(struct gtp_tunnel *t, uint32_t i_tei) { t->u.v1.i_tei = i_tei; t->flags |= GTP_TUN_V1_I_TEI; } -EXPORT_SYMBOL(gtp_tunnel_set_i_tei); +EXPORT_SYMBOL(gtp_tunnel_set_o_tei); void gtp_tunnel_set_o_tei(struct gtp_tunnel *t, uint32_t o_tei) { t->u.v1.o_tei = o_tei; t->flags |= GTP_TUN_V1_O_TEI; } -EXPORT_SYMBOL(gtp_tunnel_set_o_tei); +EXPORT_SYMBOL(gtp_tunnel_get_ifns); const int gtp_tunnel_get_ifns(struct gtp_tunnel *t) { return t->ifns; } -EXPORT_SYMBOL(gtp_tunnel_get_ifns); +EXPORT_SYMBOL(gtp_tunnel_get_ifidx); const uint32_t gtp_tunnel_get_ifidx(struct gtp_tunnel *t) { return t->ifidx; } -EXPORT_SYMBOL(gtp_tunnel_get_ifidx); +EXPORT_SYMBOL(gtp_tunnel_get_ms_ip4); const struct in_addr *gtp_tunnel_get_ms_ip4(struct gtp_tunnel *t) { return &t->ms_addr.ip4; } -EXPORT_SYMBOL(gtp_tunnel_get_ms_ip4); +EXPORT_SYMBOL(gtp_tunnel_get_sgsn_ip4); const struct in_addr *gtp_tunnel_get_sgsn_ip4(struct gtp_tunnel *t) { return &t->sgsn_addr.ip4; } -EXPORT_SYMBOL(gtp_tunnel_get_sgsn_ip4); +EXPORT_SYMBOL(gtp_tunnel_get_version); int gtp_tunnel_get_version(struct gtp_tunnel *t) { return t->gtp_version; } -EXPORT_SYMBOL(gtp_tunnel_get_version); +EXPORT_SYMBOL(gtp_tunnel_get_tid); uint64_t gtp_tunnel_get_tid(struct gtp_tunnel *t) { return t->u.v0.tid; } -EXPORT_SYMBOL(gtp_tunnel_get_tid); +EXPORT_SYMBOL(gtp_tunnel_get_flowid); uint16_t gtp_tunnel_get_flowid(struct gtp_tunnel *t) { return t->u.v0.flowid; } -EXPORT_SYMBOL(gtp_tunnel_get_flowid); +EXPORT_SYMBOL(gtp_tunnel_get_i_tei); uint32_t gtp_tunnel_get_i_tei(struct gtp_tunnel *t) { return t->u.v1.i_tei; } -EXPORT_SYMBOL(gtp_tunnel_get_i_tei); +EXPORT_SYMBOL(gtp_tunnel_get_o_tei); uint32_t gtp_tunnel_get_o_tei(struct gtp_tunnel *t) { return t->u.v1.o_tei; } -EXPORT_SYMBOL(gtp_tunnel_get_o_tei); -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/37929?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I345579a8ea989c5a21797a17f34629472fbd3525 Gerrit-Change-Number: 37929 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: src/core/socket.c: Fix close of negative fd in system_supports_inet6()
by lynxis lazus 26 Aug '24

26 Aug '24

Attention is currently required from: laforge. lynxis lazus has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/libosmocore/+/37894?usp=email ) Change subject: src/core/socket.c: Fix close of negative fd in system_supports_inet6() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37894?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iedd0f74688cacd8dbe4b46b2c7e03a6c2f56fbbf Gerrit-Change-Number: 37894 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 26 Aug 2024 16:41:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: filesystem: fix double space in docstring
by dexter 26 Aug '24

26 Aug '24

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37916?usp=email ) Change subject: filesystem: fix double space in docstring ...................................................................... filesystem: fix double space in docstring Change-Id: I69ef171ac2dd2e2717404b1f3b10f986af419f6e --- M pySim/filesystem.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 805983b..35af140 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1333,7 +1333,7 @@ @cmd2.with_argparser(del_data_parser) def do_delete_data(self, opts): - """Delete data for a given tag in a BER-TLV EF""" + """Delete data for a given tag in a BER-TLV EF""" (data, _sw) = self._cmd.lchan.set_data(opts.tag, None) if data: self._cmd.poutput(data) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37916?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I69ef171ac2dd2e2717404b1f3b10f986af419f6e Gerrit-Change-Number: 37916 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: filesystem: fix double space in docstring
by dexter 26 Aug '24

26 Aug '24

dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37916?usp=email ) Change subject: filesystem: fix double space in docstring ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37916?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I69ef171ac2dd2e2717404b1f3b10f986af419f6e Gerrit-Change-Number: 37916 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Aug 2024 12:03:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: Abort and reply call with error if unable to establish PFCP...
by pespin 26 Aug '24

26 Aug '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37923?usp=email ) Change subject: erab_fsm: Abort and reply call with error if unable to establish PFCP sess ...................................................................... erab_fsm: Abort and reply call with error if unable to establish PFCP sess Change-Id: If23881205b995e76647289d5e6c1c85d02f93b47 --- M src/erab_fsm.erl 1 file changed, 10 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 544f5ab..ae17a6e 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -170,11 +170,17 @@ %% state SESSION_ESTABLISH :: PFCP session establishment -session_establish(enter, OldState, S) -> +session_establish(enter, OldState, #erab_state{from = From} = S) -> ?LOG_DEBUG("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), - ok = session_establish_req(S), - {next_state, ?FUNCTION_NAME, S, %% loop transition to enable state_timeout - [{state_timeout, ?ERAB_T_SESSION_ESTABLISH, ?FUNCTION_NAME}]}; + case session_establish_req(S) of + ok -> + {next_state, ?FUNCTION_NAME, S, %% loop transition to enable state_timeout + [{state_timeout, ?ERAB_T_SESSION_ESTABLISH, ?FUNCTION_NAME}]}; + {error, Reason} -> + {stop_and_reply, + {shutdown, Reason}, + {reply, From, {error, Reason}}} + end; session_establish(state_timeout, _Timeout, #erab_state{from = From}) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37923?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If23881205b995e76647289d5e6c1c85d02f93b47 Gerrit-Change-Number: 37923 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: Add initial PFCP support emulating UPF
by pespin 26 Aug '24

26 Aug '24

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37920?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: s1gw: Add initial PFCP support emulating UPF ...................................................................... s1gw: Add initial PFCP support emulating UPF Change-Id: If2b135e113d2568092e90ac9b6c5f651ab30f5d0 --- M library/PFCP_Emulation.ttcn M s1gw/ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn M s1gw/gen_links.sh M s1gw/osmo-s1gw.config M s1gw/regen_makefile.sh 6 files changed, 144 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/37920/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37920?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If2b135e113d2568092e90ac9b6c5f651ab30f5d0 Gerrit-Change-Number: 37920 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: Abort and reply call with error if unable to establish PFCP...
by fixeria 26 Aug '24

26 Aug '24

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37923?usp=email ) Change subject: erab_fsm: Abort and reply call with error if unable to establish PFCP sess ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/erab_fsm.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37923/comment/5cf30d3c_c0d8… : PS1, Line 181: timeout > well, in hear clearly the error is not a timeout, but some error with reason=Reason. […] Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37923?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If23881205b995e76647289d5e6c1c85d02f93b47 Gerrit-Change-Number: 37923 Gerrit-PatchSet: 2 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: Mon, 26 Aug 2024 10:54:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log