October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-mgw[master]: osmux: cleanup misleading code calling rtp_bridge_cb

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29566 ) Change subject: osmux: cleanup misleading code calling rtp_bridge_cb ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29566 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I42d1f2e2919eae3b1555ca4929e571855960792e Gerrit-Change-Number: 29566 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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-Comment-Date: Tue, 04 Oct 2022 10:53:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Drop logging of osmux internal counters

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29531 ) Change subject: osmux: Drop logging of osmux internal counters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I853e118f843070ea29b19e1b0fe56b52f267437a Gerrit-Change-Number: 29531 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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-Comment-Date: Tue, 04 Oct 2022 10:53:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: Allocate struct osmux_in_handle through new libosmo-netif APIs

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29526 ) Change subject: Allocate struct osmux_in_handle through new libosmo-netif APIs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I013c99d1f915279684ce278648e9c69e39b94266 Gerrit-Change-Number: 29526 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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-Comment-Date: Tue, 04 Oct 2022 10:53:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: osmux: Drop logging of osmux internal counters

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29532 ) Change subject: osmux: Drop logging of osmux internal counters ...................................................................... osmux: Drop logging of osmux internal counters This way we have no more access to internal osmux structures. If those counters are needed in the future they can be counted by osmo-bts by means of adding rate counters to the caller of osmux_xfrm_input() and deliver_cb. Change-Id: Ib952437ea3aa2770c96bddb667491e7675a6a06e --- M src/common/osmux.c 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/osmux.c b/src/common/osmux.c index caea4ec..cacc3aa 100644 --- a/src/common/osmux.c +++ b/src/common/osmux.c @@ -130,13 +130,6 @@ LOGP(DOSMUX, LOGL_INFO, "Releasing unused osmux handle for %s\n", osmo_sockaddr_to_str(&h->rem_addr)); - LOGP(DOSMUX, LOGL_INFO, "Stats: " - "input RTP msgs: %u bytes: %" PRIu64 " " - "output osmux msgs: %u bytes: %" PRIu64 "\n", - in->stats.input_rtp_msgs, - in->stats.input_rtp_bytes, - in->stats.output_osmux_msgs, - in->stats.output_osmux_bytes); llist_del(&h->head); TALLOC_FREE(h->in); talloc_free(h); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib952437ea3aa2770c96bddb667491e7675a6a06e Gerrit-Change-Number: 29532 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: Allocate struct osmux_in_handle through new libosmo-netif APIs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29530 ) Change subject: Allocate struct osmux_in_handle through new libosmo-netif APIs ...................................................................... Allocate struct osmux_in_handle through new libosmo-netif APIs Depends: libosmo-netif.git I752ab031f935f04731bb1a354333f1682a1aa5bd Change-Id: I132a7c03213cb20dfe118616c8cfd7032b075507 --- M TODO-RELEASE M src/common/osmux.c 2 files changed, 8 insertions(+), 13 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index d0ab49f..84937cf 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,5 +8,5 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmocore >1.7.0 BTS_FEAT_OSMUX, RSL_IE_OSMO_OSMUX_CID -libosmo-netif >1.2.0 OSMUX_DEFAULT_PORT +libosmo-netif >1.2.0 OSMUX_DEFAULT_PORT, new osmux APIs libosmo-abis >1.3.0 e1inp_ipa_bts_rsl_close_n() diff --git a/src/common/osmux.c b/src/common/osmux.c index e443d1d..caea4ec 100644 --- a/src/common/osmux.c +++ b/src/common/osmux.c @@ -138,7 +138,7 @@ in->stats.output_osmux_msgs, in->stats.output_osmux_bytes); llist_del(&h->head); - osmux_xfrm_input_fini(h->in); + TALLOC_FREE(h->in); talloc_free(h); } return; @@ -159,22 +159,17 @@ h->rem_addr = *rem_addr; h->refcnt++; - h->in = talloc_zero(h, struct osmux_in_handle); + h->in = osmux_xfrm_input_alloc(h); if (!h->in) { talloc_free(h); return NULL; } - /* sequence number to start OSMUX message from */ - h->in->osmux_seq = 0; - - h->in->batch_factor = bts->osmux.batch_factor; - - /* If batch size is zero, the library defaults to 1470 bytes. */ - h->in->batch_size = bts->osmux.batch_size; - h->in->deliver = osmux_deliver_cb; - osmux_xfrm_input_init(h->in); - h->in->data = h; + osmux_xfrm_input_set_initial_seqnum(h->in, 0); + osmux_xfrm_input_set_batch_factor(h->in, bts->osmux.batch_factor); + /* If batch size is zero, the library defaults to 1472 bytes. */ + osmux_xfrm_input_set_batch_size(h->in, bts->osmux.batch_size); + osmux_xfrm_input_set_deliver_cb(h->in, osmux_deliver_cb, h); llist_add(&h->head, &bts->osmux.osmux_handle_list); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I132a7c03213cb20dfe118616c8cfd7032b075507 Gerrit-Change-Number: 29530 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: osmux: Drop logging of osmux internal counters

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29532 ) Change subject: osmux: Drop logging of osmux internal counters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib952437ea3aa2770c96bddb667491e7675a6a06e Gerrit-Change-Number: 29532 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 10:52:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: Allocate struct osmux_in_handle through new libosmo-netif APIs

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29530 ) Change subject: Allocate struct osmux_in_handle through new libosmo-netif APIs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I132a7c03213cb20dfe118616c8cfd7032b075507 Gerrit-Change-Number: 29530 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 10:52:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: Use new libosmocore API osmo_sockaddr_is_any()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29587 ) Change subject: Use new libosmocore API osmo_sockaddr_is_any() ...................................................................... Use new libosmocore API osmo_sockaddr_is_any() Depends: libosmocore.git Change-Id I2810a889fc14052d0e0be6a2b500ad4e5088ffa9 Change-Id: Ib2ba708bdc834359de8a7cce302e2dc1f8c64954 --- M TODO-RELEASE M src/libosmo-mgcp/mgcp_network.c 2 files changed, 5 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/87/29587/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 3e8b2ee..c480ba0 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -25,3 +25,4 @@ # #library what description / commit summary line libosmo-netif >1.2.0 OSMUX_DEFAULT_PORT, osmux_xfrm_output_*, osmux_xfrm_input_* +libosmocore >1.7.0 osmo_sockaddr_is_any() \ No newline at end of file diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 5246160..86a6330 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -72,20 +72,9 @@ static int rx_rtp(struct msgb *msg); -static bool addr_is_any(const struct osmo_sockaddr *osa) -{ - if (osa->u.sa.sa_family == AF_INET6) { - struct in6_addr ip6_any = IN6ADDR_ANY_INIT; - return memcmp(&osa->u.sin6.sin6_addr, - &ip6_any, sizeof(ip6_any)) == 0; - } else { - return osa->u.sin.sin_addr.s_addr == 0; - } -} - bool mgcp_rtp_end_remote_addr_available(const struct mgcp_rtp_end *rtp_end) { - return rtp_end->rtp_port && !addr_is_any(&rtp_end->addr); + return rtp_end->rtp_port && (osmo_sockaddr_is_any(&rtp_end->addr) == 0); } /*! Determine the local rtp bind IP-address. @@ -103,7 +92,7 @@ char ipbuf[INET6_ADDRSTRLEN]; int rc; endp = conn->conn->endp; - bool rem_addr_set = !addr_is_any(&conn->end.addr); + bool rem_addr_set = osmo_sockaddr_is_any(&conn->end.addr) == 0; char *bind_addr; /* Osmux: No smart IP addresses allocation is supported yet. Simply @@ -832,7 +821,7 @@ { char ipbuf[INET6_ADDRSTRLEN]; - if (addr_is_any(&conn->end.addr)) { + if (osmo_sockaddr_is_any(&conn->end.addr) != 0) { switch (conn->conn->mode) { case MGCP_CONN_LOOPBACK: /* HACK: for IuUP, we want to reply with an IuUP Initialization ACK upon the first RTP @@ -901,7 +890,7 @@ static int check_rtp_destin(struct mgcp_conn_rtp *conn) { char ipbuf[INET6_ADDRSTRLEN]; - bool ip_is_any = addr_is_any(&conn->end.addr); + bool ip_is_any = osmo_sockaddr_is_any(&conn->end.addr) != 0; /* Note: it is legal to create a connection but never setting a port * and IP-address for outgoing data. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29587 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib2ba708bdc834359de8a7cce302e2dc1f8c64954 Gerrit-Change-Number: 29587 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: Fix regression in detection of legacy dummy packets

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29584 ) Change subject: Fix regression in detection of legacy dummy packets ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29584 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iedf085932c45af5d13e04e56a4cd1082de81d869 Gerrit-Change-Number: 29584 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 10:40:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: socket: Introduce API osmo_sockaddr_is_any

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29586 ) Change subject: socket: Introduce API osmo_sockaddr_is_any ...................................................................... socket: Introduce API osmo_sockaddr_is_any Change-Id: I2810a889fc14052d0e0be6a2b500ad4e5088ffa9 --- M TODO-RELEASE M include/osmocom/core/socket.h M src/socket.c 3 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/29586/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 8ccfa49..436d417 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmocore new API osmo_sockaddr_is_any() \ No newline at end of file diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 79de6c5..a1c83f3 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -31,6 +31,7 @@ }; int osmo_sockaddr_is_local(struct sockaddr *addr, unsigned int addrlen); +int osmo_sockaddr_is_any(struct osmo_sockaddr *addr); unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, const struct sockaddr *sa); diff --git a/src/socket.c b/src/socket.c index 4605db4..9777d47 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1175,6 +1175,26 @@ return 0; } +/*! Determine if the given address is an ANY address ("0.0.0.0", "::"). Port is not checked. + * \param[in] addr Socket Address + * \param[in] addrlen Length of socket address in bytes + * \returns 1 if address is local, 0 otherwise. -1 is address family not supported/detected. + */ +int osmo_sockaddr_is_any(struct osmo_sockaddr *addr) +{ + switch (addr->u.sa.sa_family) { + case AF_INET6: { + struct in6_addr ip6_any = IN6ADDR_ANY_INIT; + return memcmp(&addr->u.sin6.sin6_addr, + &ip6_any, sizeof(ip6_any)) == 0; + } + case AF_INET: + return addr->u.sin.sin_addr.s_addr == 0; + default: + return -1; + } +} + /*! Convert sockaddr_in to IP address as char string and port as uint16_t. * \param[out] addr String buffer to write IP address to, or NULL. * \param[out] addr_len Size of \a addr. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2810a889fc14052d0e0be6a2b500ad4e5088ffa9 Gerrit-Change-Number: 29586 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022