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

[S] Change in libosmo-netif[master]: prim: Introduce osmo_prim_srv{_link}_set_name APIs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36238?usp=email ) Change subject: prim: Introduce osmo_prim_srv{_link}_set_name APIs ...................................................................... prim: Introduce osmo_prim_srv{_link}_set_name APIs This allows a user setting a name on the underlaying stream which in turns allows easily identifying the socket. Change-Id: Iba683e4d65e0aba81e13bdf1b9d5a9065b1fc89c --- M TODO-RELEASE M include/osmocom/netif/prim.h M src/prim.c 3 files changed, 26 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 111f0c5..83bc188 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -13,4 +13,5 @@ libosmocore >1.9.0 use osmo_iofd_get_ioops() libosmo-netif added osmo_stream_srv_get_sockname() libosmo-netif update-dependency libosmocore > 1.9.0 required for I89eb519b22d21011d61a7855b2364bc3c295df82 -libosmo-netif ADD osmo_stream_srv_link_get_name(), osmo_stream_srv_get_name(), osmo_stream_cli_get_name() \ No newline at end of file +libosmo-netif ADD osmo_stream_srv_link_get_name(), osmo_stream_srv_get_name(), osmo_stream_cli_get_name() +libosmo-netif ADD osmo_prim_srv_link_set_name(), osmo_prim_srv_set_name() \ No newline at end of file diff --git a/include/osmocom/netif/prim.h b/include/osmocom/netif/prim.h index 78406dd..d26e220 100644 --- a/include/osmocom/netif/prim.h +++ b/include/osmocom/netif/prim.h @@ -45,6 +45,7 @@ struct osmo_prim_srv_link *osmo_prim_srv_link_alloc(void *ctx); void osmo_prim_srv_link_free(struct osmo_prim_srv_link *prim_link); +void osmo_prim_srv_link_set_name(struct osmo_prim_srv_link *prim_link, const char *name); int osmo_prim_srv_link_set_addr(struct osmo_prim_srv_link *prim_link, const char *path); const char *osmo_prim_srv_link_get_addr(struct osmo_prim_srv_link *prim_link); void osmo_prim_srv_link_set_priv(struct osmo_prim_srv_link *prim_link, void *priv); @@ -59,6 +60,7 @@ int osmo_prim_srv_send(struct osmo_prim_srv *prim_srv, struct msgb *msg); struct osmo_prim_srv_link *osmo_prim_srv_get_link(struct osmo_prim_srv *prims_srv); +void osmo_prim_srv_set_name(struct osmo_prim_srv *prim_srv, const char *name); void osmo_prim_srv_set_priv(struct osmo_prim_srv *prim_srv, void *priv); void *osmo_prim_srv_get_priv(const struct osmo_prim_srv *prim_srv); void osmo_prim_srv_close(struct osmo_prim_srv *prim_srv); diff --git a/src/prim.c b/src/prim.c index 5c0233c..eae1064 100644 --- a/src/prim.c +++ b/src/prim.c @@ -320,6 +320,11 @@ talloc_free(prim_srv); } +void osmo_prim_srv_set_name(struct osmo_prim_srv *prim_srv, const char *name) +{ + osmo_stream_srv_set_name(prim_srv->stream, name); +} + struct osmo_prim_srv_link *osmo_prim_srv_get_link(struct osmo_prim_srv *prim_srv) { return prim_srv->link; @@ -395,6 +400,11 @@ talloc_free(prim_link); } +void osmo_prim_srv_link_set_name(struct osmo_prim_srv_link *prim_link, const char *name) +{ + osmo_stream_srv_link_set_name(prim_link->stream, name); +} + int osmo_prim_srv_link_set_addr(struct osmo_prim_srv_link *prim_link, const char *path) { osmo_talloc_replace_string(prim_link, &prim_link->addr, path); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36238?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iba683e4d65e0aba81e13bdf1b9d5a9065b1fc89c Gerrit-Change-Number: 36238 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream: Add osmo_stream_*_get_name() APIs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36237?usp=email ) Change subject: stream: Add osmo_stream_*_get_name() APIs ...................................................................... stream: Add osmo_stream_*_get_name() APIs This allows users to retrieve a previously set name. Change-Id: If5054d3c207f8f5d58a448f1e58266ad9c4386dd --- M TODO-RELEASE M include/osmocom/netif/stream.h M src/stream_cli.c M src/stream_srv.c 4 files changed, 42 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 6642459..111f0c5 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -13,3 +13,4 @@ libosmocore >1.9.0 use osmo_iofd_get_ioops() libosmo-netif added osmo_stream_srv_get_sockname() libosmo-netif update-dependency libosmocore > 1.9.0 required for I89eb519b22d21011d61a7855b2364bc3c295df82 +libosmo-netif ADD osmo_stream_srv_link_get_name(), osmo_stream_srv_get_name(), osmo_stream_cli_get_name() \ No newline at end of file diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 2e6aa97..fe4dd77 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -26,6 +26,7 @@ void osmo_stream_srv_link_destroy(struct osmo_stream_srv_link *link); void osmo_stream_srv_link_set_name(struct osmo_stream_srv_link *link, const char *name); +const char *osmo_stream_srv_link_get_name(const struct osmo_stream_srv_link *link); void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay); void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link, const char *addr); int osmo_stream_srv_link_set_addrs(struct osmo_stream_srv_link *link, const char **addr, size_t addrcnt); @@ -60,6 +61,7 @@ struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, int fd, int (*read_cb)(struct osmo_stream_srv *conn), int (*closed_cb)(struct osmo_stream_srv *conn), void *data); struct osmo_stream_srv *osmo_stream_srv_create2(void *ctx, struct osmo_stream_srv_link *link, int fd, void *data); void osmo_stream_srv_set_name(struct osmo_stream_srv *conn, const char *name); +const char *osmo_stream_srv_get_name(const struct osmo_stream_srv *conn); void osmo_stream_srv_set_read_cb(struct osmo_stream_srv *conn, int (*read_cb)(struct osmo_stream_srv *conn, struct msgb *msg)); void osmo_stream_srv_set_closed_cb(struct osmo_stream_srv *conn, int (*closed_cb)(struct osmo_stream_srv *conn)); void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn); @@ -84,6 +86,7 @@ struct osmo_stream_cli; 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); 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); diff --git a/src/stream_cli.c b/src/stream_cli.c index 2f5339c..46ddc89 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -528,6 +528,15 @@ osmo_iofd_set_name(cli->iofd, name); } +/*! \brief Retrieve name previously set on the cli object (see osmo_stream_cli_set_name()) + * \param[in] cli stream_cli whose name is to be retrieved + * \returns The name to be set on cli; NULL if never set + */ +const char *osmo_stream_cli_get_name(const struct osmo_stream_cli *cli) +{ + return cli->name; +} + /*! \brief Set the remote address to which we connect * \param[in] cli Stream Client to modify * \param[in] addr Remote IP address diff --git a/src/stream_srv.c b/src/stream_srv.c index 95a2cbb..72c5a81 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -206,6 +206,15 @@ osmo_talloc_replace_string(link, &link->name, name); } +/*! \brief Retrieve name previously set on the srv_link object (see osmo_stream_srv_link_set_name()) + * \param[in] link server link whose name is to be retrieved + * \returns The name to be set on link; NULL if never set + */ +const char *osmo_stream_srv_link_get_name(const struct osmo_stream_srv_link *link) +{ + return link->name; +} + /*! \brief 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 this server link, before @@ -837,6 +846,15 @@ osmo_iofd_set_name(conn->iofd, name); } +/*! \brief Retrieve name previously set on the srv object (see osmo_stream_srv_set_name()) + * \param[in] conn server whose name is to be retrieved + * \returns The name to be set on conn; NULL if never set + */ +const char *osmo_stream_srv_get_name(const struct osmo_stream_srv *conn) +{ + return conn->name; +} + /*! \brief Set the call-back function when data was read from the stream server socket * Only for osmo_stream_srv created with osmo_stream_srv_create2() * \param[in] conn Stream Server to modify -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36237?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If5054d3c207f8f5d58a448f1e58266ad9c4386dd Gerrit-Change-Number: 36237 Gerrit-PatchSet: 2 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> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream_srv: Fix retrieve of srv_link sockname for AF_UNIX sockets

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36240?usp=email ) Change subject: stream_srv: Fix retrieve of srv_link sockname for AF_UNIX sockets ...................................................................... stream_srv: Fix retrieve of srv_link sockname for AF_UNIX sockets Change-Id: Idd76ee3b5c9ad503eabd29d676a5d84e34d92071 --- M src/stream_srv.c 1 file changed, 58 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/stream_srv.c b/src/stream_srv.c index 72c5a81..da49bad 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -28,6 +28,7 @@ #include <time.h> #include <sys/fcntl.h> #include <sys/socket.h> +#include <sys/un.h> #include <sys/ioctl.h> #include <arpa/inet.h> #include <netinet/in.h> @@ -348,30 +349,57 @@ } /* Similar to osmo_sock_multiaddr_get_name_buf(), but aimed at listening sockets (only local part): */ -static char *get_local_sockname_buf(char *buf, size_t buf_len, int fd, int proto) +static char *get_local_sockname_buf(char *buf, size_t buf_len, const struct osmo_stream_srv_link *link) { - char hostbuf[OSMO_STREAM_MAX_ADDRS][INET6_ADDRSTRLEN]; - size_t num_hostbuf = ARRAY_SIZE(hostbuf); - char portbuf[6]; struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; - bool need_more_bufs; int rc; - rc = osmo_sock_multiaddr_get_ip_and_port(fd, proto, &hostbuf[0][0], - &num_hostbuf, sizeof(hostbuf[0]), - portbuf, sizeof(portbuf), true); - if (rc < 0) + if (buf_len > 0) + buf[0] = '\0'; + + switch (link->sk_domain) { + case AF_UNSPEC: + /* we assume INET(6) by default upon link creation: */ + case AF_INET: + case AF_INET6: + { + char hostbuf[OSMO_STREAM_MAX_ADDRS][INET6_ADDRSTRLEN]; + size_t num_hostbuf = ARRAY_SIZE(hostbuf); + char portbuf[6]; + bool need_more_bufs; + rc = osmo_sock_multiaddr_get_ip_and_port(link->ofd.fd, link->proto, &hostbuf[0][0], + &num_hostbuf, sizeof(hostbuf[0]), + portbuf, sizeof(portbuf), true); + if (rc < 0) + return NULL; + need_more_bufs = num_hostbuf > ARRAY_SIZE(hostbuf); + if (need_more_bufs) + num_hostbuf = ARRAY_SIZE(hostbuf); + OSMO_STRBUF_APPEND(sb, osmo_multiaddr_ip_and_port_snprintf, + &hostbuf[0][0], num_hostbuf, sizeof(hostbuf[0]), portbuf); + if (need_more_bufs) + OSMO_STRBUF_PRINTF(sb, "<need-more-bufs!>"); + return buf; + } + case AF_UNIX: + { + struct osmo_sockaddr osa; + struct sockaddr_un *sun; + socklen_t len = sizeof(osa.u.sas); + rc = getsockname(link->ofd.fd, &osa.u.sa, &len); + if (rc < 0) { + OSMO_STRBUF_PRINTF(sb, "<error-in-getsockname>"); + return buf; + } + /* Make sure sun_path is NULL terminated: */ + sun = (struct sockaddr_un *)&osa.u.sa; + sun->sun_path[sizeof(sun->sun_path) - 1] = '\0'; + OSMO_STRBUF_PRINTF(sb, "%s", sun->sun_path); + return buf; + } + default: return NULL; - - need_more_bufs = num_hostbuf > ARRAY_SIZE(hostbuf); - if (need_more_bufs) - num_hostbuf = ARRAY_SIZE(hostbuf); - OSMO_STRBUF_APPEND(sb, osmo_multiaddr_ip_and_port_snprintf, - &hostbuf[0][0], num_hostbuf, sizeof(hostbuf[0]), portbuf); - if (need_more_bufs) - OSMO_STRBUF_PRINTF(sb, "<need-more-bufs!>"); - - return buf; + } } /*! \brief Get description of the stream server link e. g. 127.0.0.1:1234 @@ -381,7 +409,7 @@ { static char buf[sizeof(link->sockname)]; - if (!get_local_sockname_buf(buf, sizeof(buf), link->ofd.fd, link->proto)) + if (!get_local_sockname_buf(buf, sizeof(buf), link)) return NULL; return buf; } @@ -472,7 +500,7 @@ return -EIO; } - get_local_sockname_buf(link->sockname, sizeof(link->sockname), link->ofd.fd, link->proto); + get_local_sockname_buf(link->sockname, sizeof(link->sockname), link); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36240?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Idd76ee3b5c9ad503eabd29d676a5d84e34d92071 Gerrit-Change-Number: 36240 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[L] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36259?usp=email ) Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... xua + ipa: Add support for I/O in OSMO_IO mode This switches osmo_stream_{cli,srv} over to using the OSMO_IO mode instead of the classic OSMO_FD mode. The difference is that we no longer read/write directly to a file descriptor, but we pass message buffers to/from the library. This in turn allows the library to use more efficient I/O mechanisms as osmo_io backend, for example the Linux kernel io_uring. This re-introduces Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 which was previously reverted due to regressions caused by a missing change in libosmo-netif. Depends: libosmo-netif.git I6cf5bad5f618e71c80017960c38009b089dbd6a1 Depends: libosmocore.git I89eb519b22d21011d61a7855b2364bc3c295df82 Closes: OS#5752 Change-Id: Ia1910f3b99d918ec2a34d5304c3f40ba015c25c9 --- M TODO-RELEASE M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 4 files changed, 98 insertions(+), 226 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/59/36259/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 7785711..0c3e87e 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -17,3 +17,4 @@ libosmo-sigtran API added osmo_ss7_asp_get_trans_proto() libosmo-sigtran API added osmo_ss7_asp_{find2,find_or_create2}() libosmo-sigtran API added osmo_ss7_xua_server_{find2,create2}() +libosmo-netif >1.4.0 osmo_io SCTP support diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 5bab5ff..e023880 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -601,9 +601,9 @@ talloc_free(asp); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn); -static int ipa_cli_read_cb(struct osmo_stream_cli *conn); -static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn); +static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); +static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); +static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); static int xua_cli_connect_cb(struct osmo_stream_cli *cli); int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp) @@ -645,19 +645,22 @@ switch (asp->cfg.proto) { case OSMO_SS7_ASP_PROT_IPA: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_TCP); - osmo_stream_cli_set_read_cb(asp->client, ipa_cli_read_cb); + osmo_stream_cli_set_read_cb2(asp->client, ipa_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, osmo_ipa_segmentation_cb); break; case OSMO_SS7_ASP_PROT_M3UA: - if (asp->cfg.trans_proto == IPPROTO_SCTP) - osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); - else if (asp->cfg.trans_proto == IPPROTO_TCP) - osmo_stream_cli_set_read_cb(asp->client, m3ua_tcp_cli_read_cb); - else + if (asp->cfg.trans_proto == IPPROTO_SCTP) { + osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, NULL); + } else if (asp->cfg.trans_proto == IPPROTO_TCP) { + osmo_stream_cli_set_read_cb2(asp->client, m3ua_tcp_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, xua_segmentation_cb); + } else OSMO_ASSERT(0); break; default: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_SCTP); - osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); break; } osmo_stream_cli_set_data(asp->client, asp); @@ -789,33 +792,11 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn) +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) { int fd = osmo_stream_srv_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - struct msgb *msg = NULL; - int rc; - OSMO_ASSERT(fd >= 0); - - /* read IPA message from socket and process it */ - rc = ipa_msg_recv_buffered(fd, &msg, &asp->pending_msg); - LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", - __func__, rc); - if (rc <= 0) { - if (rc == -EAGAIN) { - /* more data needed */ - return 0; - } - osmo_stream_srv_destroy(conn); - return rc; - } - if (osmo_ipa_process_msg(msg) < 0) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); - osmo_stream_srv_destroy(conn); - msgb_free(msg); - return -1; - } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do @@ -824,19 +805,14 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn) +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - struct msgb *msg = m3ua_msgb_alloc("xUA Server Rx"); unsigned int ppid; int flags; - int rc; + int rc = 0; - if (!msg) - return -ENOMEM; - - /* read xUA message from socket and process it */ - rc = osmo_stream_srv_recv(conn, msg); + /* process the received xUA message */ flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", @@ -855,22 +831,6 @@ default: break; } - - if (rc == 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; - } else { - rc = 0; - } - goto out; - } - if (rc < 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - } else if (rc == 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; goto out; } @@ -890,73 +850,38 @@ return rc; } -/* netif code tells us we can read something from the socket */ -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn) +int xua_segmentation_cb(struct msgb *msg) { - struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - int fd = osmo_stream_srv_get_fd(conn); - struct msgb *msg = asp->pending_msg; const struct xua_common_hdr *hdr; size_t msg_length; - int rc; - OSMO_ASSERT(fd >= 0); + if (msgb_length(msg) < sizeof(*hdr)) + return -EAGAIN; - if (msg == NULL) { - msg = m3ua_msgb_alloc(__func__); - asp->pending_msg = msg; - } - - /* read message header first */ - if (msg->len < sizeof(*hdr)) { - errno = 0; - rc = recv(fd, msg->tail, sizeof(*hdr) - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - osmo_stream_srv_destroy(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < sizeof(*hdr)) - return 0; /* need more data */ - } - - hdr = (const struct xua_common_hdr *)msg->data; + hdr = (const struct xua_common_hdr *) msg->data; msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ - /* read the rest of the message */ - if (msg->len < msg_length) { - errno = 0; - rc = recv(fd, msg->tail, msg_length - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - osmo_stream_srv_destroy(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } + return msg_length; +} - msgb_put(msg, rc); - if (msg->len < msg_length) - return 0; /* need more data */ - } +/* netif code tells us we can read something from the socket */ +int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +{ + struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + const struct xua_common_hdr *hdr; + int rc; msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* spoof SCTP Stream ID */ + hdr = (const struct xua_common_hdr *)msg->data; if (hdr->msg_class == M3UA_MSGC_XFER) msgb_sctp_stream(msg) = 1; else msgb_sctp_stream(msg) = 0; rc = m3ua_rx_msg(asp, msg); - asp->pending_msg = NULL; msgb_free(msg); return rc; @@ -1016,33 +941,17 @@ } /* read call-back for IPA/SCCPlite socket */ -static int ipa_cli_read_cb(struct osmo_stream_cli *conn) +static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { int fd = osmo_stream_cli_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - struct msgb *msg = NULL; - int rc; - OSMO_ASSERT(fd >= 0); - - /* read IPA message from socket and process it */ - rc = ipa_msg_recv_buffered(fd, &msg, &asp->pending_msg); - LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", - __func__, rc); - if (rc <= 0) { - if (rc == -EAGAIN) { - /* more data needed */ - return 0; - } - xua_cli_close_and_reconnect(conn); - return rc; - } - if (osmo_ipa_process_msg(msg) < 0) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); - xua_cli_close_and_reconnect(conn); + if (msgb_length(msg) == 0) { + xua_cli_close_and_reconnect(asp->client); msgb_free(msg); - return -1; + return 0; } + msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do @@ -1051,94 +960,34 @@ } /* read call-back for M3UA-over-TCP socket */ -static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn) +static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { - struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - int fd = osmo_stream_cli_get_fd(conn); - struct msgb *msg = asp->pending_msg; const struct xua_common_hdr *hdr; - size_t msg_length; - int rc; - OSMO_ASSERT(fd >= 0); - - if (msg == NULL) { - msg = m3ua_msgb_alloc(__func__); - asp->pending_msg = msg; - } - - /* read message header first */ - if (msg->len < sizeof(*hdr)) { - errno = 0; - rc = recv(fd, msg->tail, sizeof(*hdr) - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - xua_cli_close_and_reconnect(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < sizeof(*hdr)) - return 0; /* need more data */ - } - - hdr = (const struct xua_common_hdr *)msg->data; - msg_length = ntohl(hdr->msg_length); /* includes sizeof(*hdr) */ - - /* read the rest of the message */ - if (msg->len < msg_length) { - errno = 0; - rc = recv(fd, msg->tail, msg_length - msg->len, 0); - if (rc <= 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; /* need more data */ - xua_cli_close_and_reconnect(conn); - asp->pending_msg = NULL; - msgb_free(msg); - return rc; - } - - msgb_put(msg, rc); - if (msg->len < msg_length) - return 0; /* need more data */ - } - - msg->dst = asp; - rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); + /* spoof SCTP PPID */ + msgb_sctp_ppid(msg) = M3UA_PPID; /* spoof SCTP Stream ID */ + hdr = (const struct xua_common_hdr *) msg->data; if (hdr->msg_class == M3UA_MSGC_XFER) msgb_sctp_stream(msg) = 1; else msgb_sctp_stream(msg) = 0; - rc = m3ua_rx_msg(asp, msg); - asp->pending_msg = NULL; - msgb_free(msg); - - return rc; + return xua_cli_read_cb(conn, msg); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn) +static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - struct msgb *msg = m3ua_msgb_alloc("xUA Client Rx"); unsigned int ppid; int flags; int rc; - if (!msg) - return -ENOMEM; - - /* read xUA message from socket and process it */ - rc = osmo_stream_cli_recv(conn, msg); flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", - __func__, rc, flags); + __func__, msgb_length(msg), flags); if (flags & OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION) { union sctp_notification *notif = (union sctp_notification *) msgb_data(msg); @@ -1153,17 +1002,12 @@ default: break; } - - if (rc == 0) - xua_cli_close_and_reconnect(conn); - rc = 0; goto out; } - if (rc < 0) { + + if (msgb_length(msg) == 0) { xua_cli_close_and_reconnect(conn); - goto out; - } else if (rc == 0) { - xua_cli_close_and_reconnect(conn); + rc = 0; goto out; } diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 6da7b7a..ce10448 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -67,32 +67,11 @@ struct osmo_ss7_asp *asp; char *sock_name = osmo_sock_get_name(link, fd); const char *proto_name = get_value_string(osmo_ss7_asp_protocol_vals, oxs->cfg.proto); - int (*read_cb)(struct osmo_stream_srv *conn) = NULL; int rc = 0; LOGP(DLSS7, LOGL_INFO, "%s: New %s connection accepted\n", sock_name, proto_name); - switch (oxs->cfg.proto) { - case OSMO_SS7_ASP_PROT_IPA: - OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_TCP); - read_cb = &ss7_asp_ipa_srv_conn_cb; - break; - case OSMO_SS7_ASP_PROT_M3UA: - if (oxs->cfg.trans_proto == IPPROTO_SCTP) - read_cb = &ss7_asp_xua_srv_conn_cb; - else if (oxs->cfg.trans_proto == IPPROTO_TCP) - read_cb = &ss7_asp_m3ua_tcp_srv_conn_cb; - else - OSMO_ASSERT(0); - break; - default: - OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); - read_cb = &ss7_asp_xua_srv_conn_cb; - break; - } - - srv = osmo_stream_srv_create(oxs, link, fd, read_cb, - &ss7_asp_xua_srv_conn_closed_cb, NULL); + srv = osmo_stream_srv_create2(oxs, link, fd, NULL); if (!srv) { LOGP(DLSS7, LOGL_ERROR, "%s: Unable to create stream server " "for connection\n", sock_name); @@ -101,6 +80,28 @@ return -1; } + switch (oxs->cfg.proto) { + case OSMO_SS7_ASP_PROT_IPA: + osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, osmo_ipa_segmentation_cb); + break; + case OSMO_SS7_ASP_PROT_M3UA: + if (oxs->cfg.trans_proto == IPPROTO_SCTP) + osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb); + else if (oxs->cfg.trans_proto == IPPROTO_TCP) { + osmo_stream_srv_set_read_cb(srv, &ss7_asp_m3ua_tcp_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, xua_segmentation_cb); + } else + OSMO_ASSERT(0); + break; + default: + OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); + osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, NULL); + break; + } + osmo_stream_srv_set_closed_cb(srv, ss7_asp_xua_srv_conn_closed_cb); + asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto); if (asp) { LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n", diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 758da90..b737fa2 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -24,9 +24,9 @@ bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); int ss7_default_trans_proto_for_asp_proto(enum osmo_ss7_asp_protocol proto); -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn); -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn); -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn); +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv); int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp); @@ -38,6 +38,8 @@ bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); +int xua_segmentation_cb(struct msgb *msg); + enum ss7_as_ctr { SS7_AS_CTR_RX_MSU_TOTAL, SS7_AS_CTR_TX_MSU_TOTAL, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia1910f3b99d918ec2a34d5304c3f40ba015c25c9 Gerrit-Change-Number: 36259 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: stats: Add per-hnb paging:{cs,ps}:attempted counter

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36209?usp=email ) Change subject: stats: Add per-hnb paging:{cs,ps}:attempted counter ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36209?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7648caa410dba8474d57121a8128579ba200b18f Gerrit-Change-Number: 36209 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 11:12:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: stats: Add per-hnb paging:{cs,ps}:attempted counter

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36209?usp=email ) Change subject: stats: Add per-hnb paging:{cs,ps}:attempted counter ...................................................................... Patch Set 5: (1 comment) Patchset: PS4: > we actually might want to differentiate this based on CS and PS domain. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36209?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7648caa410dba8474d57121a8128579ba200b18f Gerrit-Change-Number: 36209 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 11:11:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: mgw_fsm: Add some OSMO_ASSERT() to ensure only CS maps passed

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36250?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mgw_fsm: Add some OSMO_ASSERT() to ensure only CS maps passed ...................................................................... mgw_fsm: Add some OSMO_ASSERT() to ensure only CS maps passed The mgw_fsm only supports CS RABs in the CS domain; let's add some ASSERTs to make sure the impossible doesn't happen. Change-Id: I264c4b3da17b6f59ebcdd02031318402a483041a --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/50/36250/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I264c4b3da17b6f59ebcdd02031318402a483041a Gerrit-Change-Number: 36250 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: stats: Add per-hnb paging:{cs,ps}:attempted counter

by laforge

Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36209?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: stats: Add per-hnb paging:{cs,ps}:attempted counter ...................................................................... stats: Add per-hnb paging:{cs,ps}:attempted counter Adding counters for number of paging succeeded is much harder, as we currently don't parse connection-oriented DL RANAP and/or any L3 NAS in it. Change-Id: I7648caa410dba8474d57121a8128579ba200b18f --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/09/36209/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36209?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7648caa410dba8474d57121a8128579ba200b18f Gerrit-Change-Number: 36209 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: cosmetic: align downlink RANAP unitdata function names with uplink

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36210?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: cosmetic: align downlink RANAP unitdata function names with uplink ...................................................................... cosmetic: align downlink RANAP unitdata function names with uplink In uplink we use *ranap_rx_udt_ul*, so let's use the same naming pattern for processing dowlink unit-data messages to make things more consistent. Also, make sure udt is always part of functions that only handle unitdata - not to be confused with connection-oriented messages. Change-Id: I1792e4c2cdce145ae906c181898163bcda36328d --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/10/36210/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36210?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1792e4c2cdce145ae906c181898163bcda36328d Gerrit-Change-Number: 36210 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: mgw_fsm: Add some OSMO_ASSERT() to ensure only CS maps passed

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36250?usp=email ) Change subject: mgw_fsm: Add some OSMO_ASSERT() to ensure only CS maps passed ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I264c4b3da17b6f59ebcdd02031318402a483041a Gerrit-Change-Number: 36250 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 13 Mar 2024 11:10:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024