June 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add templates to receive CellID IE
by jolly 09 Jun '23

09 Jun '23

Attention is currently required from: jolly. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33144 to look at the new patch set (#4). Change subject: BSSMAP_Templates: Add templates to receive CellID IE ...................................................................... BSSMAP_Templates: Add templates to receive CellID IE Change-Id: I42d52d871c8011db7e0897dfe752afeefa6d9662 --- M library/BSSMAP_Templates.ttcn 1 file changed, 99 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/33144/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42d52d871c8011db7e0897dfe752afeefa6d9662 Gerrit-Change-Number: 33144 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[L] Change in osmo-ttcn3-hacks[master]: Added BSC tests for terminating voice group calls
by jolly 09 Jun '23

09 Jun '23

Attention is currently required from: jolly. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33150 to look at the new patch set (#5). Change subject: Added BSC tests for terminating voice group calls ...................................................................... Added BSC tests for terminating voice group calls Change-Id: I6762e8adfb7d5f77df837c698ff70cd7fd715ffe --- M bsc/BSC_Tests.ttcn A bsc/BSC_Tests_ASCI.ttcn M bsc/MSC_ConnectionHandler.ttcn 3 files changed, 543 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/33150/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6762e8adfb7d5f77df837c698ff70cd7fd715ffe Gerrit-Change-Number: 33150 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add template to receive ChannelType IE
by jolly 09 Jun '23

09 Jun '23

Attention is currently required from: jolly. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33145 to look at the new patch set (#4). Change subject: BSSMAP_Templates: Add template to receive ChannelType IE ...................................................................... BSSMAP_Templates: Add template to receive ChannelType IE Change-Id: Ia6f283c17a1687ee65f8997bbeba0b09d1a462cf --- M library/BSSMAP_Templates.ttcn 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/33145/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia6f283c17a1687ee65f8997bbeba0b09d1a462cf Gerrit-Change-Number: 33145 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmocore[master]: Added generation of include/osmocom/core/socket_compat.h
by jolly 09 Jun '23

09 Jun '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33256 ) Change subject: Added generation of include/osmocom/core/socket_compat.h ...................................................................... Added generation of include/osmocom/core/socket_compat.h This file is required to compile header files on machines that do not have sys/socket.h. Change-Id: Ia3eafc992221900bbbf1760f669725bf9da92105 --- M configure.ac M include/osmocom/core/Makefile.am A include/osmocom/core/socket_compat.h.tpl 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/33256/1 diff --git a/configure.ac b/configure.ac index 5e17c7a..ef15f22 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,7 @@ dnl checks for header files AC_HEADER_STDC AC_CHECK_HEADERS(execinfo.h poll.h sys/select.h sys/socket.h sys/signalfd.h sys/eventfd.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h netinet/in.h) +AC_CHECK_DECL(HAVE_SYS_SOCKET_H, AC_SUBST(HAVE_SYS_SOCKET_H, 1), AC_SUBST(HAVE_SYS_SOCKET_H, 0)) # for src/conv.c AC_FUNC_ALLOCA AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""]) diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am index 1d394cd..c7d2b32 100644 --- a/include/osmocom/core/Makefile.am +++ b/include/osmocom/core/Makefile.am @@ -62,6 +62,7 @@ sockaddr_str.h \ time_cc.h \ use_count.h \ + socket_compat.h \ $(NULL) if ENABLE_PLUGIN @@ -93,3 +94,7 @@ crc%gen.h: crcXXgen.h.tpl $(AM_V_GEN)$(MKDIR_P) $(dir $@) $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ + +socket_compat.h: socket_compat.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)sed -e's/XX/$(HAVE_SYS_SOCKET_H)/g' $< > $@ diff --git a/include/osmocom/core/socket_compat.h.tpl b/include/osmocom/core/socket_compat.h.tpl new file mode 100644 index 0000000..43bee9e --- /dev/null +++ b/include/osmocom/core/socket_compat.h.tpl @@ -0,0 +1,10 @@ +#define HAVE_STRUCT_SOCKADDR_STORAGE XX + +#if HAVE_STRUCT_SOCKADDR_STORAGE + #include <sys/socket.h> +#else +struct sockaddr_storage { + unsigned short ss_family; + char __data[128 - sizeof(unsigned short)]; +}; +#endif -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia3eafc992221900bbbf1760f669725bf9da92105 Gerrit-Change-Number: 33256 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[L] Change in libosmocore[master]: ASCI: Add message definition and encoding according to 3GPP TS 48.008
by jolly 09 Jun '23

09 Jun '23

Attention is currently required from: jolly, dexter. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/32932 to look at the new patch set (#16). Change subject: ASCI: Add message definition and encoding according to 3GPP TS 48.008 ...................................................................... ASCI: Add message definition and encoding according to 3GPP TS 48.008 Change-Id: Ib94c64136c31ce4af67c314a8550d93946cc844f --- M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 4 files changed, 926 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/32932/16 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib94c64136c31ce4af67c314a8550d93946cc844f Gerrit-Change-Number: 32932 Gerrit-PatchSet: 16 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: pySim-shell: fix reset command
by dexter 09 Jun '23

09 Jun '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33255 ) Change subject: pySim-shell: fix reset command ...................................................................... pySim-shell: fix reset command The API of the lchan object has changed. It no longer features the reset method used by the pySim-shell reset command. Let's fix this by using the reset method of the card object. Change-Id: I55511d1edb97e8fa014724598ec173dd47fe25c1 --- M pySim-shell.py 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/55/33255/1 diff --git a/pySim-shell.py b/pySim-shell.py index 3f0818a..2b22d25 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -50,7 +50,7 @@ from pySim.commands import SimCardCommands from pySim.transport import init_reader, ApduTracer, argparse_add_reader_args, ProactiveHandler from pySim.cards import card_detect, SimCard -from pySim.utils import h2b, swap_nibbles, rpad, b2h, JsonEncoder, bertlv_parse_one, sw_match +from pySim.utils import h2b, b2h, i2h, swap_nibbles, rpad, JsonEncoder, bertlv_parse_one, sw_match from pySim.utils import sanitize_pin_adm, tabulate_str_list, boxed_heading_str, Hexstr from pySim.card_handler import CardHandler, CardHandlerAuto @@ -736,8 +736,8 @@ def do_reset(self, opts): """Reset the Card.""" - atr = self._cmd.lchan.reset(self._cmd) - self._cmd.poutput('Card ATR: %s' % atr) + atr = self._cmd.card.reset() + self._cmd.poutput('Card ATR: %s' % i2h(atr)) self._cmd.update_prompt() def do_desc(self, opts): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I55511d1edb97e8fa014724598ec173dd47fe25c1 Gerrit-Change-Number: 33255 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-netif[master]: examples: Use new stream API in {ipa-,}stream-{client,server}
by Jenkins Builder 09 Jun '23

09 Jun '23

Attention is currently required from: arehbein, pespin, daniel. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33194 ) Change subject: examples: Use new stream API in {ipa-,}stream-{client,server} ...................................................................... Patch Set 7: (2 comments) File examples/stream-client.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8122): https://gerrit.osmocom.org/c/libosmo-netif/+/33194/comment/358cb215_19a49874 PS7, Line 53: static int read_cb(struct osmo_stream_cli *conn, struct msgb* msg) "foo* bar" should be "foo *bar" File examples/stream-server.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8122): https://gerrit.osmocom.org/c/libosmo-netif/+/33194/comment/44c337ae_70af6beb PS7, Line 45: int read_cb(struct osmo_stream_srv *conn, struct msgb* msg) "foo* bar" should be "foo *bar" -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I97a9979199c816686b32080534627f6f033e009e Gerrit-Change-Number: 33194 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Jun 2023 13:08:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Use cli->state to check if cli is already closed
by daniel 09 Jun '23

09 Jun '23

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33254 ) Change subject: stream: Use cli->state to check if cli is already closed ...................................................................... stream: Use cli->state to check if cli is already closed Change-Id: I92231528da08f8891e20c1226b61989a65e00ccd --- M src/stream.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/54/33254/1 diff --git a/src/stream.c b/src/stream.c index 5f74127..a0f349c 100644 --- a/src/stream.c +++ b/src/stream.c @@ -306,7 +306,7 @@ * abstraction and close the socket */ void osmo_stream_cli_close(struct osmo_stream_cli *cli) { - if (cli->ofd.fd == -1) + if (cli->state == STREAM_CLI_STATE_CLOSED) return; osmo_fd_unregister(&cli->ofd); close(cli->ofd.fd); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I92231528da08f8891e20c1226b61989a65e00ccd Gerrit-Change-Number: 33254 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-netif[master]: stream: Factor out reconnection handling
by daniel 09 Jun '23

09 Jun '23

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33253 ) Change subject: stream: Factor out reconnection handling ...................................................................... stream: Factor out reconnection handling Change-Id: I418377eabd465ee4ffce9b4440e96287c7734924 --- M src/stream.c 1 file changed, 48 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/53/33253/1 diff --git a/src/stream.c b/src/stream.c index 2e38916..5f74127 100644 --- a/src/stream.c +++ b/src/stream.c @@ -420,44 +420,56 @@ #endif } +static void stream_cli_handle_connecting(struct osmo_stream_cli *cli, int res) +{ + int error, ret = res; + socklen_t len = sizeof(error); + + int fd = osmo_stream_cli_fd(cli); + + if (ret < 0) { + osmo_stream_cli_reconnect(cli); + return; + } + ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len); + if (ret >= 0 && error > 0) { + osmo_stream_cli_reconnect(cli); + return; + } + + LOGSCLI(cli, LOGL_DEBUG, "connection established\n"); + cli->state = STREAM_CLI_STATE_CONNECTED; + switch (cli->sk_domain) { + case AF_UNIX: + _setsockopt_nosigpipe(cli); + break; + case AF_UNSPEC: + case AF_INET: + case AF_INET6: + if (cli->proto == IPPROTO_SCTP) { + _setsockopt_nosigpipe(cli); + sctp_sock_activate_events(fd); + } + break; + default: + break; + } + if (cli->connect_cb) + cli->connect_cb(cli); +} + static int osmo_stream_cli_fd_cb(struct osmo_fd *ofd, unsigned int what) { struct osmo_stream_cli *cli = ofd->data; - int error, ret; - socklen_t len = sizeof(error); switch(cli->state) { case STREAM_CLI_STATE_CONNECTING: - ret = getsockopt(ofd->fd, SOL_SOCKET, SO_ERROR, &error, &len); - if (ret >= 0 && error > 0) { - osmo_stream_cli_reconnect(cli); - return 0; - } + stream_cli_handle_connecting(cli, 0); /* If messages got enqueued while 'connecting', keep WRITE flag up to dispatch them upon next main loop step */ if (llist_empty(&cli->tx_queue)) osmo_fd_write_disable(&cli->ofd); - - LOGSCLI(cli, LOGL_DEBUG, "connection established\n"); - cli->state = STREAM_CLI_STATE_CONNECTED; - switch (cli->sk_domain) { - case AF_UNIX: - _setsockopt_nosigpipe(cli); - break; - case AF_UNSPEC: - case AF_INET: - case AF_INET6: - if (cli->proto == IPPROTO_SCTP) { - _setsockopt_nosigpipe(cli); - sctp_sock_activate_events(ofd->fd); - } - break; - default: - break; - } - if (cli->connect_cb) - cli->connect_cb(cli); break; case STREAM_CLI_STATE_CONNECTED: if (what & OSMO_FD_READ) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I418377eabd465ee4ffce9b4440e96287c7734924 Gerrit-Change-Number: 33253 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in libosmo-netif[master]: Add osmo_io support to osmo_stream_cli and osmo_stream_srv
by daniel 09 Jun '23

09 Jun '23

Attention is currently required from: arehbein, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33193 ) Change subject: Add osmo_io support to osmo_stream_cli and osmo_stream_srv ...................................................................... Patch Set 9: (1 comment) File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33193/comment/3fc1df81_827b3502 PS7, Line 554: static void handle_connecting(struct osmo_stream_cli *cli, int res) > this is for osmo_stream_cli, so adding a "stream_cli" prefix would help easily gastp that. Ack -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I2f52c7107c392b6f4b0bf2a84f8c873c084a200c Gerrit-Change-Number: 33193 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Jun 2023 13:07:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0