November 2024 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pySim.esim.saip: Treat "Readable and Updateable when deactivated" flag

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38896?usp=email ) Change subject: pySim.esim.saip: Treat "Readable and Updateable when deactivated" flag ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38896?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: I7644d265f746c662b64f7156b3be08a01e3a97aa Gerrit-Change-Number: 38896 Gerrit-PatchSet: 1 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 Nov 2024 21:06:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip: Fix parsing/generating fillPattern + repeatPattern

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/38895?usp=email ) Change subject: esim.saip: Fix parsing/generating fillPattern + repeatPattern ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38895?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: Iff339cbe841112a01c9c617f43b0e69df2521b51 Gerrit-Change-Number: 38895 Gerrit-PatchSet: 1 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 Nov 2024 21:04:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in libosmo-netif[master]: stream_cli: Log destroy code path

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38910?usp=email ) Change subject: stream_cli: Log destroy code path ...................................................................... stream_cli: Log destroy code path Change-Id: Ia371cd2d913f1d434b851809c6305301897108d9 --- M src/stream_cli.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/10/38910/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 807f062..2dc6513 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -860,6 +860,7 @@ * \param[in] cli Stream Client to destroy */ void osmo_stream_cli_destroy(struct osmo_stream_cli *cli) { + LOGSCLI(cli, LOGL_DEBUG, "destroy()\n"); osmo_stream_cli_close(cli); osmo_timer_del(&cli->timer); msgb_queue_free(&cli->tx_queue); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38910?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia371cd2d913f1d434b851809c6305301897108d9 Gerrit-Change-Number: 38910 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[L] Change in libosmo-netif[master]: stream_cli: Support destroy object within user callback

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38911?usp=email ) Change subject: stream_cli: Support destroy object within user callback ...................................................................... stream_cli: Support destroy object within user callback read_cb(len=0) -> osmo_stream_cli_reconnect() -> osmo_stream_cli_close() -> disconnect_cb -> [user calls osmo_stream_cli_destroy()] -> [popped stack does read_cb()] -> [user uses freed msg] Change-Id: I952938474fa2780bf3c906cbdffb2d024b03c1b7 --- M src/stream_cli.c 1 file changed, 174 insertions(+), 88 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/11/38911/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index e70bc35..79d0e8d 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -83,6 +83,11 @@ #define OSMO_STREAM_CLI_F_RECONF (1 << 0) #define OSMO_STREAM_CLI_F_NODELAY (1 << 1) +/* Mark whether the object is currently in user a callback. */ +#define IN_CB_MASK_CONNECT_CB (1 << 0) +#define IN_CB_MASK_DISCONNECT_CB (1 << 1) +#define IN_CB_MASK_READ_CB (1 << 2) + struct osmo_stream_cli { char *name; char sockname[OSMO_SOCK_NAME_MAXLEN]; @@ -114,31 +119,128 @@ int flags; int reconnect_timeout; struct osmo_sock_init2_multiaddr_pars ma_pars; + uint8_t in_cb_mask; /* IN_CB_MASK_* */ + bool delay_free; }; -void osmo_stream_cli_close(struct osmo_stream_cli *cli); /*! \addtogroup stream_cli * @{ */ +/* return true if freed */ +static inline bool free_delayed_if_needed(struct osmo_stream_cli *cli) +{ + /* Nobody requested delayed free, skip */ + if (!cli->delay_free) + return false; + /* Check for other callbacks active in case we were e.g. in: + * read_cb() -> [user] -> osmo_steam_client_close() -> disconnect_cb() --> [user] --> osmo_stream_client_destroy() + * or: + * connect_cb() -> [user] -> osmo_steam_client_close() -> disconnect_cb() --> [user] --> osmo_stream_client_destroy() + */ + if (cli->in_cb_mask != 0) + return false; + + LOGSCLI(cli, LOGL_DEBUG, "free(delayed)\n"); + talloc_free(cli); + return true; +} + +static void stream_cli_close_iofd(struct osmo_stream_cli *cli) +{ + if (!cli->iofd) + return; + + osmo_iofd_free(cli->iofd); + cli->iofd = NULL; +} + +static void stream_cli_close_ofd(struct osmo_stream_cli *cli) +{ + if (cli->ofd.fd == -1) + return; + osmo_fd_unregister(&cli->ofd); + close(cli->ofd.fd); + cli->ofd.fd = -1; +} + +/*! Close an Osmocom Stream Client. + * \param[in] cli Osmocom Stream Client to be closed + * \return true if stream was freed due to disconnect_cb, false otherwise + * We unregister the socket fd from the osmocom select() loop + * abstraction and close the socket */ +static bool stream_cli_close(struct osmo_stream_cli *cli) +{ + int old_state = cli->state; + + /* This guards against reentrant close through disconnect_cb(): */ + if (cli->state == STREAM_CLI_STATE_CLOSED) + return false; + if (cli->state == STREAM_CLI_STATE_WAIT_RECONNECT) { + osmo_timer_del(&cli->timer); + cli->state = STREAM_CLI_STATE_CLOSED; + return false; + } + + + switch (cli->mode) { + case OSMO_STREAM_MODE_OSMO_FD: + stream_cli_close_ofd(cli); + break; + case OSMO_STREAM_MODE_OSMO_IO: + stream_cli_close_iofd(cli); + break; + default: + OSMO_ASSERT(false); + } + + cli->state = STREAM_CLI_STATE_CLOSED; + + /* If conn was established, notify the disconnection to the user: + * Also, if reconnect is disabled by user, notify the user that connect() failed: */ + if (old_state == STREAM_CLI_STATE_CONNECTED || + (old_state == STREAM_CLI_STATE_CONNECTING && cli->reconnect_timeout < 0)) { + LOGSCLI(cli, LOGL_DEBUG, "connection closed\n"); + cli->in_cb_mask |= IN_CB_MASK_DISCONNECT_CB; + if (cli->disconnect_cb) + cli->disconnect_cb(cli); + cli->in_cb_mask &= ~IN_CB_MASK_DISCONNECT_CB; + return free_delayed_if_needed(cli); + } + return false; +} + +/*! Re-connect an Osmocom Stream Client. + * If re-connection is enabled for this client + * (which is the case unless negative timeout was explicitly set via osmo_stream_cli_set_reconnect_timeout() call), + * we close any existing connection (if any) and schedule a re-connect timer */ +static bool stream_cli_reconnect(struct osmo_stream_cli *cli) +{ + bool freed = stream_cli_close(cli); + + if (freed) + return true; + + if (cli->reconnect_timeout < 0) { + LOGSCLI(cli, LOGL_INFO, "not reconnecting, disabled\n"); + return false; + } + + cli->state = STREAM_CLI_STATE_WAIT_RECONNECT; + LOGSCLI(cli, LOGL_INFO, "retrying reconnect in %d seconds...\n", + cli->reconnect_timeout); + osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0); + return false; +} + /*! Re-connect an Osmocom Stream Client. * If re-connection is enabled for this client * (which is the case unless negative timeout was explicitly set via osmo_stream_cli_set_reconnect_timeout() call), * we close any existing connection (if any) and schedule a re-connect timer */ void osmo_stream_cli_reconnect(struct osmo_stream_cli *cli) { - osmo_stream_cli_close(cli); - - if (cli->reconnect_timeout < 0) { - LOGSCLI(cli, LOGL_INFO, "not reconnecting, disabled\n"); - return; - } - - cli->state = STREAM_CLI_STATE_WAIT_RECONNECT; - LOGSCLI(cli, LOGL_INFO, "retrying reconnect in %d seconds...\n", - cli->reconnect_timeout); - osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0); + stream_cli_reconnect(cli); } /*! Check if Osmocom Stream Client is in connected state. @@ -161,62 +263,13 @@ cli->state == STREAM_CLI_STATE_CONNECTED; } -static void osmo_stream_cli_close_iofd(struct osmo_stream_cli *cli) -{ - if (!cli->iofd) - return; - - osmo_iofd_free(cli->iofd); - cli->iofd = NULL; -} - -static void osmo_stream_cli_close_ofd(struct osmo_stream_cli *cli) -{ - if (cli->ofd.fd == -1) - return; - osmo_fd_unregister(&cli->ofd); - close(cli->ofd.fd); - cli->ofd.fd = -1; -} - /*! Close an Osmocom Stream Client. * \param[in] cli Osmocom Stream Client to be closed * We unregister the socket fd from the osmocom select() loop * abstraction and close the socket */ void osmo_stream_cli_close(struct osmo_stream_cli *cli) { - int old_state = cli->state; - - if (cli->state == STREAM_CLI_STATE_CLOSED) - return; - if (cli->state == STREAM_CLI_STATE_WAIT_RECONNECT) { - osmo_timer_del(&cli->timer); - cli->state = STREAM_CLI_STATE_CLOSED; - return; - } - - - switch (cli->mode) { - case OSMO_STREAM_MODE_OSMO_FD: - osmo_stream_cli_close_ofd(cli); - break; - case OSMO_STREAM_MODE_OSMO_IO: - osmo_stream_cli_close_iofd(cli); - break; - default: - OSMO_ASSERT(false); - } - - cli->state = STREAM_CLI_STATE_CLOSED; - - /* If conn was established, notify the disconnection to the user: - * Also, if reconnect is disabled by user, notify the user that connect() failed: */ - if (old_state == STREAM_CLI_STATE_CONNECTED || - (old_state == STREAM_CLI_STATE_CONNECTING && cli->reconnect_timeout < 0)) { - LOGSCLI(cli, LOGL_DEBUG, "connection closed\n"); - if (cli->disconnect_cb) - cli->disconnect_cb(cli); - } + stream_cli_close(cli); } /*! Retrieve file descriptor of the stream client socket. @@ -249,15 +302,19 @@ return cli->iofd; } -static void osmo_stream_cli_read(struct osmo_stream_cli *cli) +/* Return true if read_cb caused a delayed_free, hence cli not available anymore. */ +static bool stream_cli_read(struct osmo_stream_cli *cli) { LOGSCLI(cli, LOGL_DEBUG, "message received\n"); + cli->in_cb_mask |= IN_CB_MASK_READ_CB; if (cli->read_cb) cli->read_cb(cli); + cli->in_cb_mask &= ~IN_CB_MASK_READ_CB; + return free_delayed_if_needed(cli); } -static int osmo_stream_cli_write(struct osmo_stream_cli *cli) +static int stream_cli_write(struct osmo_stream_cli *cli) { #ifdef HAVE_LIBSCTP struct sctp_sndrcvinfo sinfo; @@ -323,7 +380,7 @@ return 0; } msgb_free(msg); - osmo_stream_cli_reconnect(cli); + stream_cli_reconnect(cli); return 0; } @@ -359,13 +416,13 @@ if (ret < 0) { LOGSCLI(cli, LOGL_ERROR, "connect failed (%d)\n", res); - osmo_stream_cli_reconnect(cli); + stream_cli_reconnect(cli); return; } ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len); if (ret >= 0 && error > 0) { LOGSCLI(cli, LOGL_ERROR, "connect so_error (%d)\n", error); - osmo_stream_cli_reconnect(cli); + stream_cli_reconnect(cli); return; } @@ -394,8 +451,11 @@ default: break; } + cli->in_cb_mask |= IN_CB_MASK_CONNECT_CB; if (cli->connect_cb) cli->connect_cb(cli); + cli->in_cb_mask &= ~IN_CB_MASK_CONNECT_CB; + free_delayed_if_needed(cli); } static int osmo_stream_cli_fd_cb(struct osmo_fd *ofd, unsigned int what) @@ -409,11 +469,12 @@ case STREAM_CLI_STATE_CONNECTED: if (what & OSMO_FD_READ) { LOGSCLI(cli, LOGL_DEBUG, "connected read\n"); - osmo_stream_cli_read(cli); + if (stream_cli_read(cli) == true) + break; /* cli (and hence ofd) freed, done. */ } if (what & OSMO_FD_WRITE) { LOGSCLI(cli, LOGL_DEBUG, "connected write\n"); - osmo_stream_cli_write(cli); + stream_cli_write(cli); } break; default: @@ -459,6 +520,7 @@ static void stream_cli_iofd_read_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg) { struct osmo_stream_cli *cli = osmo_iofd_get_data(iofd); + bool freed; switch (cli->state) { case STREAM_CLI_STATE_CONNECTING: @@ -470,21 +532,29 @@ case -EPIPE: case -ECONNRESET: LOGSCLI(cli, LOGL_ERROR, "lost connection with srv (%d)\n", res); - osmo_stream_cli_reconnect(cli); + freed = stream_cli_reconnect(cli); break; case 0: LOGSCLI(cli, LOGL_NOTICE, "connection closed with srv\n"); - osmo_stream_cli_reconnect(cli); + freed = stream_cli_reconnect(cli); break; default: LOGSCLI(cli, LOGL_DEBUG, "received %d bytes from srv\n", res); + freed = false; break; } + if (freed) + return; /* msg was also freed as part of the talloc tree. */ /* Notify user of new data or error: */ - if (cli->iofd_read_cb) - cli->iofd_read_cb(cli, res, msg); - else + if (!cli->iofd_read_cb) { msgb_free(msg); + return; + } + cli->in_cb_mask |= IN_CB_MASK_READ_CB; + cli->iofd_read_cb(cli, res, msg); + cli->in_cb_mask &= ~IN_CB_MASK_READ_CB; + OSMO_ASSERT(cli->in_cb_mask == 0); + free_delayed_if_needed(cli); break; default: osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state); @@ -501,8 +571,8 @@ break; case STREAM_CLI_STATE_CONNECTED: if (msg && res <= 0) { - osmo_stream_cli_reconnect(cli); LOGSCLI(cli, LOGL_ERROR, "received error %d in response to send\n", res); + stream_cli_reconnect(cli); } break; default: @@ -521,6 +591,7 @@ static void stream_cli_iofd_recvmsg_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg, const struct msghdr *msgh) { struct osmo_stream_cli *cli = osmo_iofd_get_data(iofd); + bool freed; res = stream_iofd_sctp_recvmsg_trailer(iofd, msg, res, msgh); @@ -534,20 +605,28 @@ case -EPIPE: case -ECONNRESET: LOGSCLI(cli, LOGL_ERROR, "lost connection with srv (%d)\n", res); - osmo_stream_cli_reconnect(cli); + freed = stream_cli_reconnect(cli); break; case 0: LOGSCLI(cli, LOGL_NOTICE, "connection closed with srv\n"); - osmo_stream_cli_reconnect(cli); + freed = stream_cli_reconnect(cli); break; default: + freed = 0; break; } + if (freed) + return; /* msg was also freed as part of the talloc tree. */ /* Notify user of new data or error: */ - if (cli->iofd_read_cb) - cli->iofd_read_cb(cli, res, msg); - else + if (!cli->iofd_read_cb) { msgb_free(msg); + return; + } + cli->in_cb_mask |= IN_CB_MASK_READ_CB; + cli->iofd_read_cb(cli, res, msg); + cli->in_cb_mask &= ~IN_CB_MASK_READ_CB; + OSMO_ASSERT(cli->in_cb_mask == 0); + free_delayed_if_needed(cli); break; default: osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state); @@ -863,10 +942,17 @@ void osmo_stream_cli_destroy(struct osmo_stream_cli *cli) { LOGSCLI(cli, LOGL_DEBUG, "destroy()\n"); - osmo_stream_cli_close(cli); + OSMO_ASSERT(!stream_cli_close(cli)); /* BUG IN APP, TRYING TO DESTROY() WHILE ALREADY IN DESTROY()*/ osmo_timer_del(&cli->timer); msgb_queue_free(&cli->tx_queue); - talloc_free(cli); + /* if we are in a user callback, delay freeing. */ + if (cli->in_cb_mask != 0) { + LOGSCLI(cli, LOGL_DEBUG, "delay free() in_cb_mask=0x%02x\n", cli->in_cb_mask); + cli->delay_free = true; + } else { + LOGSCLI(cli, LOGL_DEBUG, "free(destroy)\n"); + talloc_free(cli); + } } /*! DEPRECATED: use osmo_stream_cli_set_reconnect_timeout() or osmo_stream_cli_reconnect() instead! @@ -881,7 +967,7 @@ /* we are reconfiguring this socket, close existing first. */ if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && cli->ofd.fd >= 0) - osmo_stream_cli_close(cli); + stream_cli_close(cli); cli->flags &= ~OSMO_STREAM_CLI_F_RECONF; @@ -907,7 +993,7 @@ if (ret < 0) { LOGSCLI(cli, LOGL_ERROR, "connect: socket creation error (%d)\n", ret); if (reconnect) - osmo_stream_cli_reconnect(cli); + stream_cli_reconnect(cli); return ret; } osmo_fd_setup(&cli->ofd, ret, OSMO_FD_READ | OSMO_FD_WRITE, osmo_stream_cli_fd_cb, cli, 0); @@ -1035,7 +1121,7 @@ /* we are reconfiguring this socket, close existing first. */ if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_get_fd(cli) >= 0) - osmo_stream_cli_close(cli); + stream_cli_close(cli); cli->flags &= ~OSMO_STREAM_CLI_F_RECONF; @@ -1078,7 +1164,7 @@ if (ret < 0) { LOGSCLI(cli, LOGL_ERROR, "connect: socket creation error (%d)\n", ret); - osmo_stream_cli_reconnect(cli); + stream_cli_reconnect(cli); return ret; } @@ -1098,7 +1184,7 @@ break; case OSMO_STREAM_MODE_OSMO_IO: /* Be sure that previous osmo_io instance is freed before creating a new one. */ - osmo_stream_cli_close_iofd(cli); + stream_cli_close_iofd(cli); #ifdef HAVE_LIBSCTP if (cli->proto == IPPROTO_SCTP) { cli->iofd = osmo_iofd_setup(cli, fd, cli->name, OSMO_IO_FD_MODE_RECVMSG_SENDMSG, @@ -1242,7 +1328,7 @@ LOGSCLI(cli, LOGL_ERROR, "lost connection with srv (%d)\n", errno); else LOGSCLI(cli, LOGL_ERROR, "recv failed (%d)\n", errno); - osmo_stream_cli_reconnect(cli); + stream_cli_reconnect(cli); return ret; } else if (ret == 0) { LOGSCLI(cli, LOGL_ERROR, "connection closed with srv\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38911?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I952938474fa2780bf3c906cbdffb2d024b03c1b7 Gerrit-Change-Number: 38911 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[S] Change in libosmocore[master]: ctrl: logging improvements

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/38885?usp=email ) Change subject: ctrl: logging improvements ...................................................................... ctrl: logging improvements Change-Id: Id555fe0dc27e49af3c931ffb33124a15784ccfb3 --- M src/ctrl/control_cmd.c M src/ctrl/control_if.c 2 files changed, 8 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c index db20551..b630620 100644 --- a/src/ctrl/control_cmd.c +++ b/src/ctrl/control_cmd.c @@ -425,7 +425,7 @@ osmo_escape_str(var, -1)); goto err; } - LOGP(DLCTRL, LOGL_DEBUG, "Command: GET %s\n", cmd->variable); + LOGP(DLCTRL, LOGL_DEBUG, "Command: GET %s %s\n", cmd->id, cmd->variable); break; case CTRL_TYPE_SET: var = strtok_r(NULL, " ", &saveptr); @@ -457,7 +457,7 @@ goto err; } - LOGP(DLCTRL, LOGL_DEBUG, "Command: SET %s = \"%s\"\n", cmd->variable, + LOGP(DLCTRL, LOGL_DEBUG, "Command: SET %s %s = \"%s\"\n", cmd->id, cmd->variable, osmo_escape_str(cmd->value, -1)); break; #define REPLY_CASE(TYPE, NAME) \ @@ -481,11 +481,11 @@ cmd->reply = talloc_strdup(cmd, val); \ if (!cmd->variable || !cmd->reply) \ goto oom; \ - LOGP(DLCTRL, LOGL_DEBUG, "Command: " NAME " %s: %s\n", cmd->variable, \ + LOGP(DLCTRL, LOGL_DEBUG, "Command: " NAME " %s %s: %s\n", cmd->id, cmd->variable, \ osmo_escape_str(cmd->reply, -1)); \ break - REPLY_CASE(CTRL_TYPE_GET_REPLY, "GET REPLY"); - REPLY_CASE(CTRL_TYPE_SET_REPLY, "SET REPLY"); + REPLY_CASE(CTRL_TYPE_GET_REPLY, "GET_REPLY"); + REPLY_CASE(CTRL_TYPE_SET_REPLY, "SET_REPLY"); REPLY_CASE(CTRL_TYPE_TRAP, "TRAP"); #undef REPLY_CASE case CTRL_TYPE_ERROR: diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index c265c3a..83148c3 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -445,10 +445,10 @@ if (!cmd) { /* should never happen */ + LOGP(DLCTRL, LOGL_ERROR, "Command parser error: %s\n", msgb_hexdump(msg)); cmd = talloc_zero(ccon, struct ctrl_cmd); if (!cmd) return -ENOMEM; - LOGP(DLCTRL, LOGL_ERROR, "Command parser error.\n"); cmd->type = CTRL_TYPE_ERROR; cmd->id = "err"; cmd->reply = "Command parser error."; @@ -474,6 +474,8 @@ send_reply: /* There is a reply or error that should be reported back to the sender. */ + LOGP(DLCTRL, LOGL_DEBUG, "Tx Command reply: %s %s %s %s\n", + get_value_string(ctrl_type_vals, cmd->type), cmd->id, cmd->variable, cmd->reply); ctrl_cmd_send2(ccon, cmd); just_free: talloc_free(cmd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id555fe0dc27e49af3c931ffb33124a15784ccfb3 Gerrit-Change-Number: 38885 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-Reviewer: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip: New methods for inserting ProfileElement into sequence

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38905?usp=email ) Change subject: esim.saip: New methods for inserting ProfileElement into sequence ...................................................................... esim.saip: New methods for inserting ProfileElement into sequence ProfileElements.insert_after_pe() is a convenience method to insert a new PE after an existing one in the sequence. This is a frequent task as there are strict ordering requirements in the SAIP format. Change-Id: I4424926127b4867931c2157e9340bacd2682ff0c --- M pySim/esim/saip/__init__.py 1 file changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/05/38905/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 1fcf61f..b83367e 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -1500,6 +1500,27 @@ pe.header['identification'] = i i += 1 + def get_index_by_pe(self, pe: ProfileElement) -> int: + """Return a list with the indicies of all instances of PEs of petype.""" + ret = [] + i = 0 + for cur in self.pe_list: + if cur == pe: + return i + i += 1 + raise ValueError('PE %s is not part of PE Sequence' % (pe)) + + def insert_at_index(self, idx: int, pe: ProfileElement) -> None: + """Insert a given [new] ProfileElement at given index into the PE Sequence.""" + self.pe_list.insert(idx, pe) + self._process_pelist() + self.renumber_identification() + + def insert_after_pe(self, pe_before: ProfileElement, pe_new: ProfileElement) -> None: + """Insert a given [new] ProfileElement after a given [existing] PE in the PE Sequence.""" + idx = self.get_index_by_pe(pe_before) + self.insert_at_index(idx+1, pe_new) + def get_index_by_type(self, petype: str) -> List[int]: """Return a list with the indicies of all instances of PEs of petype.""" ret = [] @@ -1515,9 +1536,7 @@ # find MNO-SD index idx = self.get_index_by_type('securityDomain')[0] # insert _after_ MNO-SD - self.pe_list.insert(idx+1, ssd) - self._process_pelist() - self.renumber_identification() + self.insert_at_index(idx+1, ssd) def remove_naas_of_type(self, naa: Naa) -> None: """Remove all instances of NAAs of given type. This can be used, for example, -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38905?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: I4424926127b4867931c2157e9340bacd2682ff0c Gerrit-Change-Number: 38905 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[S] Change in pysim[master]: esim.saip.File: Re-compute file_size when changing body

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38906?usp=email ) Change subject: esim.saip.File: Re-compute file_size when changing body ...................................................................... esim.saip.File: Re-compute file_size when changing body If the API user modifies the size of the body, we need to check if we need to re-compute the file_size attribute which is later encoded into the fileDescriptor. The size obviously must be large enough to fit the body. Let's do this implicitly by introducing a setter for File.body Change-Id: I1a908504b845b7c90f31294faf2a6e988bdd8049 --- M pySim/esim/saip/__init__.py 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/06/38906/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index b83367e..163c91b 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -106,7 +106,7 @@ self.pe_name = pename self._name = name self.template = template - self.body: Optional[bytes] = None + self._body: Optional[bytes] = None self.node: Optional['FsNode'] = None self.file_type = None self.fid: Optional[int] = None @@ -191,6 +191,24 @@ # All the files defined in the templates shall have, by default, shareable/not-shareable bit in the file descriptor set to "shareable". self.shareable = True self._template_derived = True + if hasattr(template, 'file_size'): + self._file_size = template.file_size + + def _recompute_size(self): + """recompute the file size, if needed (body larger than current size)""" + body_size = len(self.body) + if self.file_size == None or self.file_size < body_size: + self._file_size = body_size + + @property + def body(self): + return self._body + + @body.setter + def body(self, value: bytes): + self._body = value + # we need to potentially update the file size after changing the body [size] + self._recompute_size() def to_fileDescriptor(self) -> dict: """Convert from internal representation to 'fileDescriptor' as used by asn1tools for SAIP""" @@ -332,7 +350,7 @@ if fd: self.from_fileDescriptor(dict(fd)) # BODY - self.body = self.file_content_from_tuples(l) + self._body = self.file_content_from_tuples(l) @staticmethod def path_from_gfm(bin_path: bytes): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38906?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: I1a908504b845b7c90f31294faf2a6e988bdd8049 Gerrit-Change-Number: 38906 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[XS] Change in pysim[master]: esim.saip.File: Proper ARR conversion of template (into) to file (bytes)

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38907?usp=email ) Change subject: esim.saip.File: Proper ARR conversion of template (into) to file (bytes) ...................................................................... esim.saip.File: Proper ARR conversion of template (into) to file (bytes) The encoding of the access rule reference is different in FileTemplate vs File, let's make sure we properly convert it when instantiating a File from a FileTemplate. Change-Id: Ibb8afb85cc0006bc5c59230ebf28b2c0c1a8a8ed --- M pySim/esim/saip/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/07/38907/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 163c91b..40ef4ce 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -178,7 +178,7 @@ self.file_type = template.file_type self.fid = template.fid self.sfi = template.sfi - self.arr = template.arr + self.arr = template.arr.to_bytes(1) if hasattr(template, 'rec_len'): self.rec_len = template.rec_len else: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38907?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: Ibb8afb85cc0006bc5c59230ebf28b2c0c1a8a8ed Gerrit-Change-Number: 38907 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[XS] Change in pysim[master]: esim.saip.File: Suppress encoding attributes that are like template

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38908?usp=email ) Change subject: esim.saip.File: Suppress encoding attributes that are like template ...................................................................... esim.saip.File: Suppress encoding attributes that are like template The point of the SAIP template mechanism is to reduce the size of the encoded profile. Therefore, our encoder in the to_fileDescriptor() method should suppress generating attributes if their value is identical to that of the template (if any). Change-Id: I337ee6c7e882ec711bece17b7a0def9da36b0ad7 --- M pySim/esim/saip/__init__.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/08/38908/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 40ef4ce..94df453 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -216,13 +216,13 @@ fdb_dec = {} pefi = {} spfi = 0 - if self.fid: + if self.fid and self.fid != self.template.fid: fileDescriptor['fileID'] = self.fid.to_bytes(2, 'big') - if self.sfi: + if self.sfi and self.sfi != self.template.sfi: fileDescriptor['shortEFID'] = bytes([self.sfi]) if self.df_name: fileDescriptor['dfName'] = self.df_name - if self.arr: + if self.arr and self.arr != self.template.arr.to_bytes(1): fileDescriptor['securityAttributesReferenced'] = self.arr if self.file_type in ['LF', 'CY']: fdb_dec['file_type'] = 'working_ef' -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38908?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: I337ee6c7e882ec711bece17b7a0def9da36b0ad7 Gerrit-Change-Number: 38908 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

[XS] Change in pysim[master]: esim.saip.FsProfileElement: Add create_file() method

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38909?usp=email ) Change subject: esim.saip.FsProfileElement: Add create_file() method ...................................................................... esim.saip.FsProfileElement: Add create_file() method So far we mainly created File() instances when parsing existing profiles. However, sometimes we want to programmatically create Files and we should offer a convenience helper to do so, rather than asking API users to worry about low-level details. Change-Id: I0817819af40f3d0dc0c3d2b91039c5748dd31ee2 --- M pySim/esim/saip/__init__.py 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/09/38909/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 94df453..2552c8e 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -643,6 +643,14 @@ file = File(k, v, template.files_by_pename.get(k, None)) self.add_file(file) + def create_file(self, pename: str) -> File: + """Programatically create a file by its PE-Name.""" + template = templates.ProfileTemplateRegistry.get_by_oid(self.templateID) + file = File(pename, None, template.files_by_pename.get(pename, None)) + self.add_file(file) + self.decoded[pename] = [] + return file + def _post_decode(self): # not entirely sure about doing this this automatism self.pe2files() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38909?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: I0817819af40f3d0dc0c3d2b91039c5748dd31ee2 Gerrit-Change-Number: 38909 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024