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

Change in osmo-bsc[master]: split lchan specific defines and code to its own file

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28979 ) Change subject: split lchan specific defines and code to its own file ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > The point of `git grep ... […] Without prior knowledge of the exact file indeed, but still need to figure out which API exactly to look at, which is not triviil if they are not in one place. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idd855d126c43ac6576c5f3ba7e0b8014127a65e1 Gerrit-Change-Number: 28979 Gerrit-PatchSet: 3 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, 09 Aug 2022 09:43:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: split lchan specific defines and code to its own file

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28979 ) Change subject: split lchan specific defines and code to its own file ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > You need to first know exactly what you want to find before start using grep, so first step is openi […] The point of `git grep ...` is exactly to allow finding stuff without prior knowledge of the exact file ;) Personally I would not say "really difficult". It used to be quite simple: open gsm_data.h and you'll find everything in there. With ctags you also don't need to care that much. But from the hierarchical point of view it indeed makes more sense to have a separate header per a logical component. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idd855d126c43ac6576c5f3ba7e0b8014127a65e1 Gerrit-Change-Number: 28979 Gerrit-PatchSet: 3 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, 09 Aug 2022 09:04:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: Add function to guess AF_UNSPEC address

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28994 ) Change subject: Add function to guess AF_UNSPEC address ...................................................................... Add function to guess AF_UNSPEC address Sometimes we receive generic "struct sockaddr" with unspecified (AF_UNSPEC) address family. It's handy to try to guess the proper address (there're just 2 variants ATM in most practical applications). Use the added function to relax input checks in osmo_sockaddr_str_from_in*() Related: OS#5581 Change-Id: I1c90c56ce832f53b65e0d18d3cea94621c02a69a --- M include/osmocom/core/sockaddr_str.h M src/sockaddr_str.c 2 files changed, 35 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve msuraev: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index f474fa0..a46ad59 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -41,6 +41,7 @@ */ int osmo_ip_str_type(const char *ip); +unsigned osmo_sockaddr_guess_unspec(const struct sockaddr *src); struct osmo_sockaddr_str { /*! AF_INET for IPv4 address, or AF_INET6 for IPv6 address. */ diff --git a/src/sockaddr_str.c b/src/sockaddr_str.c index 9f1e897..70927a7 100644 --- a/src/sockaddr_str.c +++ b/src/sockaddr_str.c @@ -184,6 +184,38 @@ return AF_UNSPEC; } +/*! Guess whether struct sockaddr with AF_UNSPEC family has valid IPv4 or IPv6 address. + * The IPv6 is tried first to take into account "IPv4 mapped addresses". + * \param[in] src Generic struct sockaddr pointer. + * \return AF_INET or AF_INET6, AF_UNSPEC or original sa_family which are unsigned type according to <sys/socket.h>. + */ +unsigned osmo_sockaddr_guess_unspec(const struct sockaddr *src) +{ + int rc; + struct osmo_sockaddr_str sa; + struct osmo_sockaddr_str *tmp = &sa; + const struct sockaddr_in6 *src6 = (const struct sockaddr_in6 *)src; + const struct sockaddr_in *src4 = (const struct sockaddr_in *)src; + + if (!src) + return AF_UNSPEC; + + if (src->sa_family != AF_UNSPEC) + return src->sa_family; + + /* IPv6? */ + rc = osmo_sockaddr_str_from_in6_addr(tmp, &src6->sin6_addr, osmo_ntohs(src6->sin6_port)); + if (rc == 0 && osmo_ip_str_type(tmp->ip) == AF_INET6) + return AF_INET6; + + /* IPv4? */ + rc = osmo_sockaddr_str_from_in_addr(tmp, &src4->sin_addr, osmo_ntohs(src4->sin_port)); + if (rc == 0 && osmo_ip_str_type(tmp->ip) == AF_INET) + return AF_INET; + + return AF_UNSPEC; +} + /*! Safely copy the given ip string to sockaddr_str, classify to AF_INET or AF_INET6. * Data will be written to sockaddr_str even if an error is returned. * \param[out] sockaddr_str The instance to copy to. @@ -317,7 +349,7 @@ return -ENOSPC; if (!src) return -EINVAL; - if (src->sin_family != AF_INET) + if (src->sin_family != AF_INET && osmo_sockaddr_guess_unspec((const struct sockaddr *)src) != AF_INET) return -EINVAL; return osmo_sockaddr_str_from_in_addr(sockaddr_str, &src->sin_addr, osmo_ntohs(src->sin_port)); } @@ -333,7 +365,7 @@ return -ENOSPC; if (!src) return -EINVAL; - if (src->sin6_family != AF_INET6) + if (src->sin6_family != AF_INET6 && osmo_sockaddr_guess_unspec((const struct sockaddr *)src) != AF_INET6) return -EINVAL; return osmo_sockaddr_str_from_in6_addr(sockaddr_str, &src->sin6_addr, osmo_ntohs(src->sin6_port)); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1c90c56ce832f53b65e0d18d3cea94621c02a69a Gerrit-Change-Number: 28994 Gerrit-PatchSet: 5 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: Add function to guess AF_UNSPEC address

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28994 ) Change subject: Add function to guess AF_UNSPEC address ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1c90c56ce832f53b65e0d18d3cea94621c02a69a Gerrit-Change-Number: 28994 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 08:58:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: Ignore osmo-ns-dummy

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28991 ) Change subject: Ignore osmo-ns-dummy ...................................................................... Patch Set 2: (1 comment) File .gitignore: https://gerrit.osmocom.org/c/libosmocore/+/28991/comment/8f7ef52c_62cae5ca PS1, Line 73: utils/osmo-aka-verify > I would expect 'osmo-ns-dummy' to be added here for consistency, but fine either way. I also don't think it matters that much: I use external tool (magit) to add it there instead of manual file editing. Feel free to re-arrange if you feel like it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id562988942be13b83c552bdaa1ad93e275b3d0ae Gerrit-Change-Number: 28991 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 08:57:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: Ignore osmo-ns-dummy

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28991 ) Change subject: Ignore osmo-ns-dummy ...................................................................... Ignore osmo-ns-dummy Change-Id: Id562988942be13b83c552bdaa1ad93e275b3d0ae --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 269ce8a..936773e 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ coverage-cobertura.xml contrib/libosmocore.spec +/utils/osmo-ns-dummy -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id562988942be13b83c552bdaa1ad93e275b3d0ae Gerrit-Change-Number: 28991 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-msc[master]: Make esme struct shared

by msuraev

Attention is currently required from: pespin, dexter. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 to look at the new patch set (#17). Change subject: Make esme struct shared ...................................................................... Make esme struct shared This helps to merge similar code from smpp_mirror and smpp_* in follow-up patches. Related: OS#5568 Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 --- M include/osmocom/smpp/smpp.h M include/osmocom/smpp/smpp_smsc.h M src/libsmpputil/smpp_msc.c M src/libsmpputil/smpp_smsc.c M src/libsmpputil/smpp_vty.c M src/utils/Makefile.am M src/utils/smpp_mirror.c 7 files changed, 117 insertions(+), 101 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/28846/17 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 Gerrit-Change-Number: 28846 Gerrit-PatchSet: 17 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-msc[master]: SMPP: move read/write callbacks to libsmpputil

by msuraev

Attention is currently required from: msuraev. Hello Jenkins Builder, laforge, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 to look at the new patch set (#24). Change subject: SMPP: move read/write callbacks to libsmpputil ...................................................................... SMPP: move read/write callbacks to libsmpputil Related: OS#5568 Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 --- M include/osmocom/smpp/smpp.h M src/libsmpputil/smpp_smsc.c M src/libsmpputil/smpp_utils.c M src/utils/smpp_mirror.c 4 files changed, 150 insertions(+), 168 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/48/28848/24 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 Gerrit-Change-Number: 28848 Gerrit-PatchSet: 24 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-msc[master]: Make esme struct shared

by msuraev

Attention is currently required from: pespin, dexter. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28846 ) Change subject: Make esme struct shared ...................................................................... Patch Set 16: (2 comments) File src/libsmpputil/smpp_smsc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28846/comment/b2c936b1_c3f9a69d PS16, Line 878: { > Ack It's allocated with talloc_zero() already. File src/utils/Makefile.am: https://gerrit.osmocom.org/c/osmo-msc/+/28846/comment/7761728f_d5153f56 PS16, Line 44: $(LIBOSMOCORE_LIBS) \ > I guess there is some conflict with LIBOSMOCRE_LIBS so it had to be replaced? It's not replaced, merely shifted together with other libosmo* - I'll re-arrange to make diff look nicer. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 Gerrit-Change-Number: 28846 Gerrit-PatchSet: 16 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 08:52:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: cosmetic: Clean initiating whitespace

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28981 ) Change subject: cosmetic: Clean initiating whitespace ...................................................................... cosmetic: Clean initiating whitespace Change-Id: Ide2c13cc80dfabbacfbaee97122b000d708cd07a --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index f5da930..504bb34 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -861,8 +861,8 @@ custom_pt = chan_mode_to_mgcp_bss_pt(codec); if (bss_side && custom_pt > 0) { verb_info->ptmap[0].codec = codec; - verb_info->ptmap[0].pt = custom_pt; - verb_info->ptmap_len = 1; + verb_info->ptmap[0].pt = custom_pt; + verb_info->ptmap_len = 1; } /* AMR requires additional parameters to be set up (framing mode) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide2c13cc80dfabbacfbaee97122b000d708cd07a Gerrit-Change-Number: 28981 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

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022