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

[XS] Change in libosmocore[master]: gsm_04_08: Add IEs seen during 4G->2G RAU

by pespin

Attention is currently required from: daniel, fixeria, lynxis lazus. pespin has posted comments on this change by daniel. ( https://gerrit.osmocom.org/c/libosmocore/+/38825?usp=email ) Change subject: gsm_04_08: Add IEs seen during 4G->2G RAU ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38825?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: Id5c2f4b2ef4a78f694d8232b9c2f45b0fdc10617 Gerrit-Change-Number: 38825 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 19 Nov 2024 17:15:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[S] Change in ...pyosmocom[master]: Fixing 3-digit MNC PlmnAdapter encoding & decoding, and related tests.

by dexter

Attention is currently required from: JPM. dexter has posted comments on this change by JPM. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email ) Change subject: Fixing 3-digit MNC PlmnAdapter encoding & decoding, and related tests. ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: As it seems unittests/test_files.py needs to be updated. -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376 Gerrit-Change-Number: 38687 Gerrit-PatchSet: 5 Gerrit-Owner: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Comment-Date: Tue, 19 Nov 2024 16:39:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 1 week

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli: Allow setting nodelay sockopt after opening sock

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38826?usp=email ) Change subject: stream_cli: Allow setting nodelay sockopt after opening sock ...................................................................... stream_cli: Allow setting nodelay sockopt after opening sock This allows users who wish to first open the socket and set the nodelay option at a later point. This has also a use case according to man 7 tcp: """ setting this option forces an explicit flush of pending output, even if TCP_CORK is currently set. """ Change-Id: Ic178d924da03968de1f140bfc8805c972b849e7b --- M src/stream_cli.c 1 file changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/26/38826/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index d4067d6..5d8a2c2 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -148,6 +148,17 @@ return cli->state == STREAM_CLI_STATE_CONNECTED; } +/*! Check if Osmocom Stream Client is opened (has an FD available) according to + * its current state. + * \param[in] cli Osmocom Stream Client + * \return true if fd is available (osmo_stream_cli_get_fd()), false otherwise + */ +static bool stream_cli_is_opened(const struct osmo_stream_cli *cli) +{ + return cli->state == STREAM_CLI_STATE_CONNECTING || + cli->state == STREAM_CLI_STATE_CONNECTED; +} + static void osmo_stream_cli_close_iofd(struct osmo_stream_cli *cli) { if (!cli->iofd) @@ -911,17 +922,29 @@ /*! Set the NODELAY socket option to avoid Nagle-like behavior. * Setting this to nodelay=true will automatically set the NODELAY * socket option on any socket established via \ref osmo_stream_cli_open - * or any re-connect. You have to set this _before_ opening the + * or any re-connect. This can be set either before or after opening the * socket. * \param[in] cli Stream client whose sockets are to be configured * \param[in] nodelay whether to set (true) NODELAY before connect() */ void osmo_stream_cli_set_nodelay(struct osmo_stream_cli *cli, bool nodelay) { + int fd; if (nodelay) cli->flags |= OSMO_STREAM_CLI_F_NODELAY; else cli->flags &= ~OSMO_STREAM_CLI_F_NODELAY; + + if (!stream_cli_is_opened(cli)) + return; /* Config will be applied upon open() time */ + + if ((fd = osmo_stream_cli_get_fd(cli)) < 0) { + LOGSCLI(cli, LOGL_ERROR, "set_nodelay(%u): failed obtaining socket\n", nodelay); + return; + } + if (stream_setsockopt_nodelay(fd, cli->proto, nodelay ? 1 : 0) < 0) + LOGSCLI(cli, LOGL_ERROR, "set_nodelay(%u): failed setsockopt err=%d\n", + nodelay, errno); } /*! Open connection of an Osmocom stream client. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38826?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: Ic178d924da03968de1f140bfc8805c972b849e7b Gerrit-Change-Number: 38826 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[M] Change in libosmo-netif[master]: stream_cli: Add osmo_stream_cli_set_{ip_dscp,priority}() APIs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38827?usp=email ) Change subject: stream_cli: Add osmo_stream_cli_set_{ip_dscp,priority}() APIs ...................................................................... stream_cli: Add osmo_stream_cli_set_{ip_dscp,priority}() APIs Change-Id: Ie5954fcf7eb1276210a99baf1e445c7ad54e0bb4 --- M include/osmocom/netif/stream.h M src/stream_cli.c 2 files changed, 75 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/27/38827/1 diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 3c4ec7e..96d8bbf 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -192,6 +192,8 @@ void osmo_stream_cli_set_name(struct osmo_stream_cli *cli, const char *name); const char *osmo_stream_cli_get_name(const struct osmo_stream_cli *cli); void osmo_stream_cli_set_nodelay(struct osmo_stream_cli *cli, bool nodelay); +int osmo_stream_cli_set_priority(struct osmo_stream_cli *cli, int sk_prio); +int osmo_stream_cli_set_ip_dscp(struct osmo_stream_cli *cli, uint8_t ip_dscp); void osmo_stream_cli_set_addr(struct osmo_stream_cli *cli, const char *addr); int osmo_stream_cli_set_addrs(struct osmo_stream_cli *cli, const char **addr, size_t addrcnt); void osmo_stream_cli_set_port(struct osmo_stream_cli *cli, uint16_t port); diff --git a/src/stream_cli.c b/src/stream_cli.c index 5d8a2c2..19b3862 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -102,7 +102,9 @@ uint16_t local_port; int sk_domain; int sk_type; + int sk_prio; /* socket priority, SO_PRIORITY, default=0=unset */ uint16_t proto; + uint8_t ip_dscp; /* IP Differentiated services, 0..63, default=0=unset */ osmo_stream_cli_connect_cb_t connect_cb; osmo_stream_cli_disconnect_cb_t disconnect_cb; osmo_stream_cli_read_cb_t read_cb; @@ -883,7 +885,8 @@ ret = osmo_sock_init2_multiaddr2(AF_UNSPEC, SOCK_STREAM, cli->proto, (const char **)cli->local_addr, cli->local_addrcnt, cli->local_port, (const char **)cli->addr, cli->addrcnt, cli->port, - OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK, + OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK | + OSMO_SOCK_F_DSCP(cli->ip_dscp) | OSMO_SOCK_F_PRIO(cli->sk_prio), &cli->ma_pars); break; #endif @@ -891,7 +894,8 @@ ret = osmo_sock_init2(AF_UNSPEC, SOCK_STREAM, cli->proto, cli->local_addr[0], cli->local_port, cli->addr[0], cli->port, - OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK); + OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK | + OSMO_SOCK_F_DSCP(cli->ip_dscp) | OSMO_SOCK_F_PRIO(cli->sk_prio)); } if (ret < 0) { @@ -947,6 +951,69 @@ nodelay, errno); } +/*! Set the priority value of the stream socket. + * Setting this will automatically set the socket priority + * option on any socket established via \ref osmo_stream_cli_open + * or any re-connect. This can be set either before or after opening the + * socket. + * \param[in] cli Stream client whose sockets are to be configured + * \param[in] sk_prio priority value. Values outside 0..6 require CAP_NET_ADMIN. + * \return negative on error, 0 on success + */ +int osmo_stream_cli_set_priority(struct osmo_stream_cli *cli, int sk_prio) +{ + int rc; + int fd; + + if (cli->sk_prio == sk_prio) + return 0; /* No change needed */ + + cli->sk_prio = sk_prio; + + if (!stream_cli_is_opened(cli)) + return 0; /* Config will be applied upon open() time */ + + if ((fd = osmo_stream_cli_get_fd(cli)) < 0) { /* Shouldn't happen... */ + LOGSCLI(cli, LOGL_ERROR, "set_priority(%u): failed obtaining socket\n", cli->sk_prio); + return -EBADFD; + } + if ((rc = osmo_sock_set_priority(fd, cli->sk_prio)) < 0) + LOGSCLI(cli, LOGL_ERROR, "set_priority(%u): failed setsockopt err=%d\n", + cli->sk_prio, errno); + return rc; +} + +/*! Set the DSCP (differentiated services code point) of the stream socket. + * Setting this will automatically set the IP DSCP option on any socket established + * via \ref osmo_stream_cli_open or any re-connect. This can be set either before or + * after opening the socket. + * \param[in] cli Stream client whose sockets are to be configured + * \param[in] ip_dscp DSCP value. Value range 0..63. + * \return negative on error, 0 on success + */ +int osmo_stream_cli_set_ip_dscp(struct osmo_stream_cli *cli, uint8_t ip_dscp) +{ + int rc; + int fd; + + if (cli->ip_dscp == ip_dscp) + return 0; /* No change needed */ + + cli->ip_dscp = ip_dscp; + + if (!stream_cli_is_opened(cli)) + return 0; /* Config will be applied upon open() time */ + + if ((fd = osmo_stream_cli_get_fd(cli)) < 0) { /* Shouldn't happen... */ + LOGSCLI(cli, LOGL_ERROR, "set_ip_dscp(%u): failed obtaining socket\n", cli->ip_dscp); + return -EBADFD; + } + if ((rc = osmo_sock_set_dscp(fd, cli->ip_dscp)) < 0) + LOGSCLI(cli, LOGL_ERROR, "set_ip_dscp(%u): failed setsockopt err=%d\n", + cli->ip_dscp, errno); + return rc; +} + /*! Open connection of an Osmocom stream client. * This will initiate an non-blocking outbound connect to the configured destination (server) address. * By default the client will automatically attempt to reconnect after default timeout. @@ -976,7 +1043,8 @@ #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: local_addrcnt = cli->local_addrcnt; - flags = OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_NONBLOCK; + flags = OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK | + OSMO_SOCK_F_DSCP(cli->ip_dscp) | OSMO_SOCK_F_PRIO(cli->sk_prio); if (cli->local_addrcnt > 0 || cli->local_port > 0) { /* explicit bind required? */ flags |= OSMO_SOCK_F_BIND; /* If no local addr configured, use local_addr[0]=NULL by default when creating the socket. */ @@ -993,7 +1061,8 @@ ret = osmo_sock_init2(cli->sk_domain, cli->sk_type, cli->proto, cli->local_addr[0], cli->local_port, cli->addr[0], cli->port, - OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK); + OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK | + OSMO_SOCK_F_DSCP(cli->ip_dscp) | OSMO_SOCK_F_PRIO(cli->sk_prio)); } break; default: -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38827?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: Ie5954fcf7eb1276210a99baf1e445c7ad54e0bb4 Gerrit-Change-Number: 38827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in libosmocore[master]: gsm_04_08: Add IEs seen during 4G->2G RAU

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38825?usp=email ) Change subject: gsm_04_08: Add IEs seen during 4G->2G RAU ...................................................................... gsm_04_08: Add IEs seen during 4G->2G RAU Change-Id: Id5c2f4b2ef4a78f694d8232b9c2f45b0fdc10617 --- M include/osmocom/gsm/protocol/gsm_04_08_gprs.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/38825/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h index 4df4585..b9d8b74 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08_gprs.h +++ b/include/osmocom/gsm/protocol/gsm_04_08_gprs.h @@ -104,6 +104,8 @@ GSM48_IE_GMM_PS_LCS_CAPA = 0x33, /* 10.5.5.22 */ GSM48_IE_GMM_GMM_MBMS_CTX_ST = 0x35, /* 10.5.7.6 */ GSM48_IE_GMM_TIMER_T3346 = 0x3A, /* 10.5.7.4 */ + GSM48_IE_GMM_UE_NET_CAP = 0x58, /* 10.5.5.26 */ + GSM48_IE_GMM_VD_PREF_UE_USAGE = 0x5d, /* 10.5.5.28 */ GSM48_IE_GMM_NET_FEAT_SUPPORT = 0xB0, /* 10.5.5.23 */ }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5c2f4b2ef4a78f694d8232b9c2f45b0fdc10617 Gerrit-Change-Number: 38825 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in osmo-hlr[master]: gsup: Replace deprecated ipa_msg_push_header()

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/38823?usp=email to look at the new patch set (#2). Change subject: gsup: Replace deprecated ipa_msg_push_header() ...................................................................... gsup: Replace deprecated ipa_msg_push_header() Use the libosmocore API, which does the same except setting the l2h pointer, which we don't really need here. Change-Id: I7a4d05a0b09032d8133d8775fb4707a4da8f0cf3 --- M src/gsup_server.c M src/gsupclient/gsup_client.c 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/23/38823/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38823?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7a4d05a0b09032d8133d8775fb4707a4da8f0cf3 Gerrit-Change-Number: 38823 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

7 months, 1 week

1
0
0 0

[XS] Change in osmo-remsim[master]: Replace deprecated ipa_msg_push_header()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/38824?usp=email ) Change subject: Replace deprecated ipa_msg_push_header() ...................................................................... Replace deprecated ipa_msg_push_header() Use the libosmocore API, which does the same except setting the l2h pointer, which we don't really need here. Change-Id: I3769e1e4a4c0167fa077a1d9b09af81a1aaf5707 --- M src/rspro_client_fsm.c M src/server/rspro_server.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/24/38824/1 diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 72176ab..351c642 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -76,7 +76,7 @@ static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) { ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_client_conn_send(ipa, msg_tx); /* msg_tx is now queued and will be freed. */ } diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index da27a2d..5803c8a 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -59,7 +59,7 @@ return; } ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_server_conn_send(conn->peer, msg_tx); } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/38824?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I3769e1e4a4c0167fa077a1d9b09af81a1aaf5707 Gerrit-Change-Number: 38824 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[M] Change in libosmo-abis[master]: ipaccess: Replace ipa_bts_id_resp() with libosmocore ipa_ccm_make_id_...

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38813?usp=email ) Change subject: ipaccess: Replace ipa_bts_id_resp() with libosmocore ipa_ccm_make_id_resp_from_req() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38813?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7f32231bff792b01e33f604bbb8b68fe22876abb Gerrit-Change-Number: 38813 Gerrit-PatchSet: 3 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-Comment-Date: Tue, 19 Nov 2024 13:42:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

7 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: ipaccess: Use libosmocore API ipa_ccm_send_id_ack()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email ) Change subject: ipaccess: Use libosmocore API ipa_ccm_send_id_ack() ...................................................................... ipaccess: Use libosmocore API ipa_ccm_send_id_ack() This allows getting rid of the second use of rmsg variable, and simplify the return paths. Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a --- M src/input/ipaccess.c 1 file changed, 6 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 9e06857..fb9eaf6 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -825,20 +825,6 @@ return nmsg; } -static struct msgb *ipa_bts_id_ack(void) -{ - struct msgb *nmsg2; - - nmsg2 = ipa_msg_alloc(0); - if (!nmsg2) - return NULL; - - *msgb_put(nmsg2, 1) = IPAC_MSGT_ID_ACK; - ipa_msg_push_header(nmsg2, IPAC_PROTO_IPACCESS); - - return nmsg2; -} - static void ipaccess_bts_updown_cb(struct ipa_client_conn *link, int up) { struct e1inp_line *line = link->line; @@ -869,7 +855,6 @@ if (hh->proto != IPAC_PROTO_IPACCESS) return 0; - struct msgb *rmsg; int ret = 0; uint8_t *data = msgb_l2(msg); int len = msgb_l2len(msg); @@ -891,6 +876,7 @@ /* this is a request for identification from the BSC. */ if (msg_type == IPAC_MSGT_ID_GET) { + struct msgb *rmsg; int trx_nr = 0; if (link->ofd->priv_nr >= E1INP_SIGN_RSL) @@ -903,24 +889,21 @@ if (ret != rmsg->len) { LOGP(DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", strerror(errno)); - goto err_rmsg; + msgb_free(rmsg); + goto err; } msgb_free(rmsg); /* send ID_ACK. */ - rmsg = ipa_bts_id_ack(); - ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); - if (ret != rmsg->len) { + ret = ipa_ccm_send_id_ack(link->ofd->fd); + if (ret <= 0) { LOGP(DLINP, LOGL_ERROR, "cannot send ID_ACK message. Reason: %s\n", strerror(errno)); - goto err_rmsg; + goto err; } - msgb_free(rmsg); } return 1; -err_rmsg: - msgb_free(rmsg); err: ipa_client_conn_close(link); return -1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a Gerrit-Change-Number: 38812 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in osmo-hlr[master]: gsup: Replace deprecated ipa_msg_push_header()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38823?usp=email ) Change subject: gsup: Replace deprecated ipa_msg_push_header() ...................................................................... gsup: Replace deprecated ipa_msg_push_header() Change-Id: I7a4d05a0b09032d8133d8775fb4707a4da8f0cf3 --- M src/gsup_server.c M src/gsupclient/gsup_client.c 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/23/38823/1 diff --git a/src/gsup_server.c b/src/gsup_server.c index 20ea162..1510bd0 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -26,6 +26,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/abis/ipa.h> #include <osmocom/abis/ipaccess.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/gsm48_ie.h> #include <osmocom/gsm/apn.h> #include <osmocom/gsm/gsm23003.h> @@ -49,7 +50,7 @@ int proto_ext, struct msgb *msg_tx) { ipa_prepend_header_ext(msg_tx, proto_ext); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_server_conn_send(conn->conn, msg_tx); } diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index 3329361..e7d03f2 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -26,6 +26,7 @@ #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/abis/ipa.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/oap_client.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/core/msgb.h> @@ -44,7 +45,7 @@ msg->l2h = msgb_put(msg, 1); msg->l2h[0] = IPAC_MSGT_PING; - ipa_msg_push_header(msg, IPAC_PROTO_IPACCESS); + ipa_prepend_header(msg, IPAC_PROTO_IPACCESS); ipa_client_conn_send(gsupc->link, msg); } @@ -114,7 +115,7 @@ struct msgb *msg_tx) { ipa_prepend_header_ext(msg_tx, proto_ext); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_client_conn_send(gsupc->link, msg_tx); /* msg_tx is now queued and will be freed. */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38823?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7a4d05a0b09032d8133d8775fb4707a4da8f0cf3 Gerrit-Change-Number: 38823 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024