fix bgpd unittests

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

fix bgpd unittests

mbuhl-2
Hi,
the bgpd unittests are currently failing because the signature of sa2addr
changed.

> Wed Feb 27 04:31:56 2019 UTC (4 days, 1 hour ago) by claudio
> Convert the remote and local addresses in struct peer to be bgpd_addrs
> instead of sockaddr_storage. This again helps protability and simplifies
> some code. sa2addr now takes an optional pointer to return the port of
> the sockaddr.
> OK benno@

Index: regress/usr.sbin/bgpd/unittests/rde_trie_test.c
===================================================================
RCS file: /mount/openbsd/cvs/src/regress/usr.sbin/bgpd/unittests/rde_trie_test.c,v
retrieving revision 1.9
diff -u -p -r1.9 rde_trie_test.c
--- regress/usr.sbin/bgpd/unittests/rde_trie_test.c 1 Nov 2018 14:20:41 -0000 1.9
+++ regress/usr.sbin/bgpd/unittests/rde_trie_test.c 3 Mar 2019 05:54:08 -0000
@@ -48,7 +48,7 @@ host_ip(const char *s, struct bgpd_addr
  hints.ai_flags = AI_NUMERICHOST;
  if (getaddrinfo(s, NULL, &hints, &res) == 0) {
  *len = res->ai_family == AF_INET6 ? 128 : 32;
- sa2addr(res->ai_addr, h);
+ sa2addr(res->ai_addr, h, 0);
  freeaddrinfo(res);
  } else {        /* ie. for 10/8 parsing */
  if ((bits = inet_net_pton(AF_INET, s, &h->v4, sizeof(h->v4))) == -1)

Reply | Threaded
Open this post in threaded view
|

Re: fix bgpd unittests

Claudio Jeker
On Sun, Mar 03, 2019 at 07:12:19AM +0100, [hidden email] wrote:

> Hi,
> the bgpd unittests are currently failing because the signature of sa2addr
> changed.
>
> > Wed Feb 27 04:31:56 2019 UTC (4 days, 1 hour ago) by claudio
> > Convert the remote and local addresses in struct peer to be bgpd_addrs
> > instead of sockaddr_storage. This again helps protability and simplifies
> > some code. sa2addr now takes an optional pointer to return the port of
> > the sockaddr.
> > OK benno@
>
> Index: regress/usr.sbin/bgpd/unittests/rde_trie_test.c
> ===================================================================
> RCS file: /mount/openbsd/cvs/src/regress/usr.sbin/bgpd/unittests/rde_trie_test.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 rde_trie_test.c
> --- regress/usr.sbin/bgpd/unittests/rde_trie_test.c 1 Nov 2018 14:20:41 -0000 1.9
> +++ regress/usr.sbin/bgpd/unittests/rde_trie_test.c 3 Mar 2019 05:54:08 -0000
> @@ -48,7 +48,7 @@ host_ip(const char *s, struct bgpd_addr
>   hints.ai_flags = AI_NUMERICHOST;
>   if (getaddrinfo(s, NULL, &hints, &res) == 0) {
>   *len = res->ai_family == AF_INET6 ? 128 : 32;
> - sa2addr(res->ai_addr, h);
> + sa2addr(res->ai_addr, h, 0);
>   freeaddrinfo(res);
>   } else {        /* ie. for 10/8 parsing */
>   if ((bits = inet_net_pton(AF_INET, s, &h->v4, sizeof(h->v4))) == -1)
>

I committed this with NULL instead of 0. Since the third argument is a
pointer. Thanks for the report.

--
:wq Claudio