- gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: BSSMAP: make sure we don't try to reset non-existent entity
by fixeria 14 Aug '22

14 Aug '22

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28892 ) Change subject: BSSMAP: make sure we don't try to reset non-existent entity ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48 Gerrit-Change-Number: 28892 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 14 Aug 2022 09:11:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: Log more details in osmo_stream_srv_write()
by fixeria 14 Aug '22

14 Aug '22

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29082 ) Change subject: Log more details in osmo_stream_srv_write() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I580c00f3b5ade05ecb20a92ce4ece2854334a41f Gerrit-Change-Number: 29082 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Sun, 14 Aug 2022 08:58:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-netif[master]: Log more details in osmo_stream_srv_write()
by msuraev 14 Aug '22

14 Aug '22

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29082 ) Change subject: Log more details in osmo_stream_srv_write() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I580c00f3b5ade05ecb20a92ce4ece2854334a41f Gerrit-Change-Number: 29082 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 14 Aug 2022 07:29:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: BSSMAP: make sure we don't try to reset non-existent entity
by msuraev 14 Aug '22

14 Aug '22

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28892 ) Change subject: BSSMAP: make sure we don't try to reset non-existent entity ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > bssmap_reset_resend_reset() is only called by VTY cmd "DEFUN(msc_bssmap_reset, msc_bssmap_reset_cmd, […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48 Gerrit-Change-Number: 28892 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sun, 14 Aug 2022 06:10:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: BSSMAP: make sure we don't try to reset non-existent entity
by msuraev 14 Aug '22

14 Aug '22

Attention is currently required from: msuraev. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892 to look at the new patch set (#2). Change subject: BSSMAP: make sure we don't try to reset non-existent entity ...................................................................... BSSMAP: make sure we don't try to reset non-existent entity Fixes: OS#5551 Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bssmap_reset.c 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/28892/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I235bdd42ea82e7b5a1a40f437ca34c49ad239c48 Gerrit-Change-Number: 28892 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in libsmpp34[master]: binaries/Makefile: s/INCLUDES/AM_CPPFLAGS/
by fixeria 14 Aug '22

14 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/29081 ) Change subject: binaries/Makefile: s/INCLUDES/AM_CPPFLAGS/ ...................................................................... binaries/Makefile: s/INCLUDES/AM_CPPFLAGS/ binaries/Makefile.am:15: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') Change-Id: I9343f53c125be8e4c7590164a8541d9fe114deb5 --- M binaries/Makefile.am 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/81/29081/1 diff --git a/binaries/Makefile.am b/binaries/Makefile.am index 9fd565e..a919d59 100644 --- a/binaries/Makefile.am +++ b/binaries/Makefile.am @@ -10,8 +10,13 @@ include $(top_srcdir)/src/Makefile.am LDADD = libsmpp34.la -AM_CPPFLAGS = -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS +AM_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir) \ + -D_REENTRANT \ + -DBSD_COMP \ + -D_POSIX_PTHREAD_SEMANTICS \ + $(NULL) AM_CFLAGS = @CFLAGS@ -Wall -fPIC # -static -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir) AM_LDFLAGS = -lrt -lpthread OBJ_EXTRA_DIST = $(esme_EXTRA_DIST) -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/29081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: I9343f53c125be8e4c7590164a8541d9fe114deb5 Gerrit-Change-Number: 29081 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libsmpp34[master]: Makefile.am, configure.ac: fix autoreconf related warnings
by fixeria 14 Aug '22

14 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/29080 ) Change subject: Makefile.am, configure.ac: fix autoreconf related warnings ...................................................................... Makefile.am, configure.ac: fix autoreconf related warnings * aclocal: warning: couldn't open directory 'm4': No such file or directory * libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac * libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am * configure.ac:9: warning: 'AM_CONFIG_HEADER': this macro is obsolete configure.ac:9: You should use the 'AC_CONFIG_HEADERS' macro instead * configure.ac:22: warning: The macro `AC_PROG_LIBTOOL' is obsolete * configure.ac:86: warning: AC_OUTPUT should be used without arguments Change-Id: I3199e7de0a04b4df89d01277cdb305d33902fcc2 --- M .gitignore M Makefile.am M configure.ac A m4/.gitkeep 4 files changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/80/29080/1 diff --git a/.gitignore b/.gitignore index 474a5d6..c80e81c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,6 @@ debian/tmp debian/*.log debian/*.substvars +m4/*.m4 contrib/libsmpp34.spec diff --git a/Makefile.am b/Makefile.am index f888647..4b1006e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = binaries def_frame def_list if HAVE_LIBXML2 diff --git a/configure.ac b/configure.ac index b25602d..fce48b4 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,8 @@ AC_CONFIG_AUX_DIR(aux_config) AM_INIT_AUTOMAKE([foreign]) -AM_CONFIG_HEADER([aux_config/config.h]) +AC_CONFIG_HEADERS([aux_config/config.h]) +AC_CONFIG_MACRO_DIRS([m4]) dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -18,8 +19,8 @@ # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O -AC_PROG_LIBTOOL AC_PROG_INSTALL +LT_INIT dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], @@ -82,10 +83,11 @@ AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) -AC_OUTPUT([Makefile - def_frame/Makefile - def_list/Makefile - binaries/Makefile - test_apps/Makefile - libsmpp34.pc - contrib/libsmpp34.spec]) +AC_CONFIG_FILES([Makefile + def_frame/Makefile + def_list/Makefile + binaries/Makefile + test_apps/Makefile + libsmpp34.pc + contrib/libsmpp34.spec]) +AC_OUTPUT diff --git a/m4/.gitkeep b/m4/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/m4/.gitkeep -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/29080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: I3199e7de0a04b4df89d01277cdb305d33902fcc2 Gerrit-Change-Number: 29080 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libsmpp34[master]: update git URLs (git -> https; gitea)
by fixeria 14 Aug '22

14 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/29078 ) Change subject: update git URLs (git -> https; gitea) ...................................................................... update git URLs (git -> https; gitea) Change-Id: Ic7adcdb289dff952f9897813ea1243cd1945c1ca --- M README.md M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/78/29078/1 diff --git a/README.md b/README.md index d2db059..8b9a7d1 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,9 @@ You can clone from the Osmocom libsmpp34.git repository using - git clone git://git.osmocom.org/libsmpp34.git + git clone https://gitea.osmocom.org/cellular-infrastructure/libsmpp34 -There is a cgit interface at <http://git.osmocom.org/libsmpp34/> +There is a web interface at <https://gitea.osmocom.org/cellular-infrastructure/libsmpp34> Documentation ------------- diff --git a/debian/control b/debian/control index 875480d..3698922 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ pkg-config, libxml2-dev Standards-Version: 3.9.6 -Vcs-Browser: http://git.osmocom.org/libsmpp34/ -Vcs-Git: git://git.osmocom.org/libsmpp34.git +Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/libsmpp34 +Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/libsmpp34 Homepage: https://projects.osmocom.org/projects/libsmpp34 Package: libsmpp1 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/29078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ic7adcdb289dff952f9897813ea1243cd1945c1ca Gerrit-Change-Number: 29078 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libsmpp34[master]: README.md: fix copy-paste: s/libosmocore/libsmpp34/
by fixeria 14 Aug '22

14 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libsmpp34/+/29077 ) Change subject: README.md: fix copy-paste: s/libosmocore/libsmpp34/ ...................................................................... README.md: fix copy-paste: s/libosmocore/libsmpp34/ Change-Id: Ic0b804f5b3e4ddfc7b6e71195f3acf4dae2c4297 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/77/29077/1 diff --git a/README.md b/README.md index 2bca502..d2db059 100644 --- a/README.md +++ b/README.md @@ -58,5 +58,5 @@ <https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> for more details -The current patch queue for libosmocore can be seen at +The current patch queue for libsmpp34 can be seen at <https://gerrit.osmocom.org/#/q/project:libsmpp34+status:open> -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/29077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ic0b804f5b3e4ddfc7b6e71195f3acf4dae2c4297 Gerrit-Change-Number: 29077 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libosmocore[master]: Add osmo_sockaddr_strs_to_str()
by msuraev 14 Aug '22

14 Aug '22

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28992 ) Change subject: Add osmo_sockaddr_strs_to_str() ...................................................................... Add osmo_sockaddr_strs_to_str() This will come in handy for working with multihomes sockets like SCTP. Related: OS#5581 Change-Id: Ic0d7c08f669994e37a2314555ecac85d28c42c89 --- M include/osmocom/core/sockaddr_str.h M src/sockaddr_str.c M tests/sockaddr_str/sockaddr_str_test.c M tests/sockaddr_str/sockaddr_str_test.ok 4 files changed, 117 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index a46ad59..604f926 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -59,12 +59,14 @@ * struct osmo_sockaddr_str *my_sockaddr_str = ...; * printf("got " OSMO_SOCKADDR_STR_FMT "\n", OSMO_SOCKADDR_STR_FMT_ARGS(my_sockaddr_str)); */ -#define OSMO_SOCKADDR_STR_FMT "%s%s%s:%u" -#define OSMO_SOCKADDR_STR_FMT_ARGS(R) \ - ((R) && (R)->af == AF_INET6)? "[" : "", \ - (R)? (R)->ip : "NULL", \ - ((R) && (R)->af == AF_INET6)? "]" : "", \ - (R)? (R)->port : 0 +#define OSMO_SOCKADDR_STR_NO_PORT_FMT "%s%s%s" +#define OSMO_SOCKADDR_STR_NO_PORT_FMT_ARGS(R) \ + ((R) && (R)->af == AF_INET6) ? "[" : "", \ + (R) ? (R)->ip : "NULL", \ + ((R) && (R)->af == AF_INET6) ? "]" : "" + +#define OSMO_SOCKADDR_STR_FMT OSMO_SOCKADDR_STR_NO_PORT_FMT ":%u" +#define OSMO_SOCKADDR_STR_FMT_ARGS(R) OSMO_SOCKADDR_STR_NO_PORT_FMT_ARGS(R), (R) ? (R)->port : 0 bool osmo_sockaddr_str_is_set(const struct osmo_sockaddr_str *sockaddr_str); bool osmo_sockaddr_str_is_nonzero(const struct osmo_sockaddr_str *sockaddr_str); @@ -88,6 +90,7 @@ int osmo_sockaddr_str_to_sockaddr_in(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_in *dst); int osmo_sockaddr_str_to_sockaddr_in6(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_in6 *dst); int osmo_sockaddr_str_to_sockaddr(const struct osmo_sockaddr_str *sockaddr_str, struct sockaddr_storage *dst); +int osmo_sockaddr_strs_to_str(char *buf, size_t buf_len, const struct osmo_sockaddr_str **sa_str, size_t sa_str_count); int osmo_sockaddr_str_from_32n(struct osmo_sockaddr_str *sockaddr_str, uint32_t ip, uint16_t port) OSMO_DEPRECATED("osmo_sockaddr_str_from_32n() actually uses *host* byte order. Use osmo_sockaddr_str_from_32h() instead"); diff --git a/src/sockaddr_str.c b/src/sockaddr_str.c index 70927a7..b5007c3 100644 --- a/src/sockaddr_str.c +++ b/src/sockaddr_str.c @@ -541,5 +541,48 @@ } } +/*! Convert array of osmo_sockaddr_str address strings into a string representation of the address set, in the form: + * buf_len == 0: "()" + * buf_len == 1: "hostA" + * buf_len >= 2: (hostA|hostB|...|...) + * The port information is ignored. + * \param[out] buf The buffer to store address set representation in. + * \param[in] buf_len The size of buffer for address set representation. + * \param[in] sa_str The array of osmo_sockaddr_str structs. + * \param[in] sa_str_count Number of osmo_sockaddr_str structs to convert. + * \return 0 on success, negative on error. + */ +int osmo_sockaddr_strs_to_str(char *buf, size_t buf_len, const struct osmo_sockaddr_str **sa_str, size_t sa_str_count) +{ + size_t i; + struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + char *after; + + if (buf_len < 3) + return -ENOMEM; + + if (sa_str_count != 1) + OSMO_STRBUF_PRINTF(sb, "("); + + for (i = 0; i < sa_str_count; i++) { + if (sa_str_count == 1) + after = ""; + else + after = (i == (sa_str_count - 1)) ? ")" : "|"; + + if (sa_str[i]) + OSMO_STRBUF_PRINTF(sb, OSMO_SOCKADDR_STR_NO_PORT_FMT "%s", + OSMO_SOCKADDR_STR_NO_PORT_FMT_ARGS(sa_str[i]), after); + } + + if (sa_str_count == 0) + OSMO_STRBUF_PRINTF(sb, ")"); + + if (sb.chars_needed >= buf_len) + return -ENOSPC; + + return sb.chars_needed; +} + /*! @} */ #endif // HAVE_NETINET_IN_H diff --git a/tests/sockaddr_str/sockaddr_str_test.c b/tests/sockaddr_str/sockaddr_str_test.c index 0d0674b..8077b9a 100644 --- a/tests/sockaddr_str/sockaddr_str_test.c +++ b/tests/sockaddr_str/sockaddr_str_test.c @@ -24,7 +24,10 @@ #include <errno.h> #include <string.h> #include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/application.h> +#include <osmocom/core/logging.h> #include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> #include <netinet/in.h> struct osmo_sockaddr_str oip_data[] = { @@ -259,10 +262,62 @@ } } -int main(int argc, char **argv) +static int test_sockaddr_strs_dump(void *ctx, struct osmo_sockaddr_str *xdata, size_t count) { - sockaddr_str_test_conversions(); - test_osmo_sockaddr_str_cmp(); - return 0; + char buf[OSMO_SOCK_NAME_MAXLEN * OSMO_SOCK_MAX_ADDRS * 2]; + struct osmo_sockaddr_str *sa_strs[OSMO_SOCK_MAX_ADDRS]; + int i, j, rc; + + for (i = 0, j = 0; j < count && i < OSMO_SOCK_MAX_ADDRS; j++) {//ARRAY_SIZE(oip_data) + sa_strs[i] = talloc_zero(ctx, struct osmo_sockaddr_str); + struct sockaddr_storage tmp; + if (osmo_sockaddr_str_to_sockaddr(&xdata[j], &tmp) == 0) {//&oip_data[j] + rc = osmo_sockaddr_str_from_sockaddr(sa_strs[i], &tmp); + if (rc < 0) { + printf("osmo_sockaddr_str_from_sockaddr(%d) failed on ", i); + dump_oip(&xdata[j]);//&oip_data[j] + return rc; + } + i++; + } + } + rc = osmo_sockaddr_strs_to_str(buf, sizeof(buf), (const struct osmo_sockaddr_str **)sa_strs, i); + printf("\nTest data [%d == %ld]: %s\n", rc, strlen(buf), buf); + return rc; } +const struct log_info_cat default_categories[] = { +}; + +static struct log_info info = { + .cat = default_categories, + .num_cat = ARRAY_SIZE(default_categories), +}; + +int main(int argc, char **argv) +{ + int rc; + void *ctx = talloc_named_const(NULL, 0, "sockaddr_str__test"); + osmo_init_logging2(ctx, &info); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); + + sockaddr_str_test_conversions(); + test_osmo_sockaddr_str_cmp(); + + rc = test_sockaddr_strs_dump(ctx, oip_data, ARRAY_SIZE(oip_data)); + if (rc < 0) + return EXIT_FAILURE; + + rc = test_sockaddr_strs_dump(ctx, oip_data, 1); + if (rc < 0) + return EXIT_FAILURE; + + rc = test_sockaddr_strs_dump(ctx, oip_data, 0); + if (rc < 0) + return EXIT_FAILURE; + + return EXIT_SUCCESS; +} diff --git a/tests/sockaddr_str/sockaddr_str_test.ok b/tests/sockaddr_str/sockaddr_str_test.ok index 910e919..504231c 100644 --- a/tests/sockaddr_str/sockaddr_str_test.ok +++ b/tests/sockaddr_str/sockaddr_str_test.ok @@ -937,3 +937,9 @@ osmo_sockaddr_str_cmp(): [0::]:5(zero) > 0.0.0.0:5(zero) osmo_sockaddr_str_cmp(): [0::]:5(zero) == [::]:5(zero) osmo_sockaddr_str_cmp(): [0::]:5(zero) == [0::]:5(zero) + +Test data [179 == 179]: (1.2.3.4|0.0.0.0|255.255.255.255|[1:2:3::4]|[::]|[::1]|[ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]|[ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]|1.2.3.4|[::1:a09:807]|0.0.0.0|[::]|[::]) + +Test data [7 == 7]: 1.2.3.4 + +Test data [2 == 2]: () 7 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic0d7c08f669994e37a2314555ecac85d28c42c89 Gerrit-Change-Number: 28992 Gerrit-PatchSet: 8 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log