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

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29584 ) Change subject: Fix regression in detection of legacy dummy packets ...................................................................... Fix regression in detection of legacy dummy packets A commit refactored this code around one year ago, which broke osmux detection of dummy messages. This commit partially reverts the earlier commit and rearranges the existing code to make it more robust. Fixes: b3d14eb552cba1c58970acf90dae1bee291d5293 Change-Id: Iedf085932c45af5d13e04e56a4cd1082de81d869 --- M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_osmux.c 2 files changed, 9 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index 5668711..854c92d 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -9,7 +9,8 @@ /* The following constant defines an RTP dummy payload that is used for * "UDP Hole Punching" (NAT) */ -static const char rtp_dummy_payload[] = { 0x23 }; +#define MGCP_DUMMY_LOAD 0x23 +static const char rtp_dummy_payload[] = { MGCP_DUMMY_LOAD }; /* Check if the data in a given message buffer matches the rtp dummy payload * defined above */ diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index aae9579..23e4dad 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -363,30 +363,14 @@ } } -static int osmux_legacy_dummy_parse_cid(const struct osmo_sockaddr *rem_addr, struct msgb *msg, - uint8_t *osmux_cid) -{ - if (msg->len < 1 + sizeof(*osmux_cid)) { - LOGP(DOSMUX, LOGL_ERROR, - "Discarding truncated Osmux dummy load: %s\n", osmo_hexdump(msg->data, msg->len)); - return -1; - } - - /* extract the osmux CID from the dummy message */ - memcpy(osmux_cid, &msg->data[1], sizeof(*osmux_cid)); - return 0; -} - -/* This is called from the bsc-nat */ -static int osmux_handle_dummy(struct mgcp_trunk *trunk, const struct osmo_sockaddr *rem_addr, +/* Old versions of osmux used to send dummy packets [0x23 0x<CID>] to punch the + * hole in the NAT. Let's handle them speficially. */ +static int osmux_handle_legacy_dummy(struct mgcp_trunk *trunk, const struct osmo_sockaddr *rem_addr, struct msgb *msg) { - uint8_t osmux_cid; + uint8_t osmux_cid = msg->data[1]; struct mgcp_conn_rtp *conn; - if (osmux_legacy_dummy_parse_cid(rem_addr, msg, &osmux_cid) < 0) - goto out; - conn = osmux_conn_lookup(trunk, osmux_cid, rem_addr); if (!conn) { LOGP(DOSMUX, LOGL_DEBUG, @@ -426,9 +410,9 @@ goto out; } - /* not any further processing dummy messages */ - if (mgcp_is_rtp_dummy_payload(msg)) - return osmux_handle_dummy(trunk, &rem_addr, msg); + /* Catch legacy dummy message and process them separately: */ + if (msg->len == 2 && msg->data[0] == MGCP_DUMMY_LOAD) + return osmux_handle_legacy_dummy(trunk, &rem_addr, msg); rem = msg->len; while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) { -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

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

by pespin

pespin 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+2 -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 14:43:55 +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 submitted this change. ( 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(-) Approvals: fixeria: 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 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..06db5d0 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(const 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..3d945e7 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 ANY, 0 otherwise. -1 is address family not supported/detected. + */ +int osmo_sockaddr_is_any(const 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 == INADDR_ANY; + 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: 3 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> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: socket.h: Reorder sockaddr APIs to have them all together

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29585 ) Change subject: socket.h: Reorder sockaddr APIs to have them all together ...................................................................... socket.h: Reorder sockaddr APIs to have them all together Change-Id: Iab2ee2854be8027ee5978e06a83248b530a39bf7 --- M include/osmocom/core/socket.h 1 file changed, 25 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 183220d..79de6c5 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -30,6 +30,31 @@ } u; }; +int osmo_sockaddr_is_local(struct sockaddr *addr, unsigned int addrlen); + +unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, + const struct sockaddr *sa); +size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, + const struct sockaddr_in *sin); + +const char *osmo_sockaddr_ntop(const struct sockaddr *sa, char *dst); +uint16_t osmo_sockaddr_port(const struct sockaddr *sa); +void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port); + +int osmo_sockaddr_local_ip(struct osmo_sockaddr *local_ip, + const struct osmo_sockaddr *remote_ip); +int osmo_sockaddr_cmp(const struct osmo_sockaddr *a, + const struct osmo_sockaddr *b); + +int osmo_sockaddr_to_octets(uint8_t *dst, size_t dst_maxlen, const struct osmo_sockaddr *os); +int osmo_sockaddr_from_octets(struct osmo_sockaddr *os, const void *src, size_t src_len); + +const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *sockaddr); +char *osmo_sockaddr_to_str_buf(char *buf, size_t buf_len, + const struct osmo_sockaddr *sockaddr); +int osmo_sockaddr_to_str_buf2(char *buf, size_t buf_len, const struct osmo_sockaddr *sockaddr); +char *osmo_sockaddr_to_str_c(void *ctx, const struct osmo_sockaddr *sockaddr); + /* flags for osmo_sock_init. */ /*! connect the socket to a remote peer */ #define OSMO_SOCK_F_CONNECT (1 << 0) @@ -87,17 +112,6 @@ int osmo_sock_init_sa(struct sockaddr *ss, uint16_t type, uint8_t proto, unsigned int flags); -int osmo_sockaddr_is_local(struct sockaddr *addr, unsigned int addrlen); - -unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, - const struct sockaddr *sa); -size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port, - const struct sockaddr_in *sin); - -const char *osmo_sockaddr_ntop(const struct sockaddr *sa, char *dst); -uint16_t osmo_sockaddr_port(const struct sockaddr *sa); -void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port); - int osmo_sock_unix_init(uint16_t type, uint8_t proto, const char *socket_path, unsigned int flags); @@ -123,20 +137,6 @@ int osmo_sock_local_ip(char *local_ip, const char *remote_ip); -int osmo_sockaddr_local_ip(struct osmo_sockaddr *local_ip, - const struct osmo_sockaddr *remote_ip); -int osmo_sockaddr_cmp(const struct osmo_sockaddr *a, - const struct osmo_sockaddr *b); - -int osmo_sockaddr_to_octets(uint8_t *dst, size_t dst_maxlen, const struct osmo_sockaddr *os); -int osmo_sockaddr_from_octets(struct osmo_sockaddr *os, const void *src, size_t src_len); - -const char *osmo_sockaddr_to_str(const struct osmo_sockaddr *sockaddr); -char *osmo_sockaddr_to_str_buf(char *buf, size_t buf_len, - const struct osmo_sockaddr *sockaddr); -int osmo_sockaddr_to_str_buf2(char *buf, size_t buf_len, const struct osmo_sockaddr *sockaddr); -char *osmo_sockaddr_to_str_c(void *ctx, const struct osmo_sockaddr *sockaddr); - int osmo_sock_set_dscp(int fd, uint8_t dscp); int osmo_sock_set_priority(int fd, int prio); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab2ee2854be8027ee5978e06a83248b530a39bf7 Gerrit-Change-Number: 29585 Gerrit-PatchSet: 1 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> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

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

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29586 ) Change subject: socket: Introduce API osmo_sockaddr_is_any ...................................................................... Patch Set 3: Code-Review+2 -- 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: 3 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 14:42:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: vty: 'hopping arfcn add': succeed if adding arfcn already in set

by pespin

Attention is currently required from: neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29551 ) Change subject: vty: 'hopping arfcn add': succeed if adding arfcn already in set ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > > This is really an orthogonal discussion and it's up to the user/customer to decide how do they wan […] We don't end up having duplicated entries. The same info is stored irrespective of how many times you add the arfcn, and show running-config will only show one. Whether one wants to clear and re-apply all fields in the set is really another topic. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia4e70d20d48a28c46a21dd10358577e5c798744c Gerrit-Change-Number: 29551 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 14:33:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> 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 fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29587 ) Change subject: Use new libosmocore API osmo_sockaddr_is_any() ...................................................................... Patch Set 1: Code-Review+1 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 14:31:36 +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 fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29586 ) Change subject: socket: Introduce API osmo_sockaddr_is_any ...................................................................... Patch Set 3: Code-Review+1 -- 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: 3 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 14:31:23 +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

Attention is currently required from: osmith. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/29586 to look at the new patch set (#3). 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/3 -- 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: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: socket.h: Reorder sockaddr APIs to have them all together

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29585 ) Change subject: socket.h: Reorder sockaddr APIs to have them all together ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29585 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iab2ee2854be8027ee5978e06a83248b530a39bf7 Gerrit-Change-Number: 29585 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 14:29:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022