sync with OpenBSD -current

This commit is contained in:
purplerain 2024-02-22 09:09:55 +00:00
parent 5f8da13f08
commit 1b6040b16e
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
7 changed files with 36 additions and 23 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: util.c,v 1.81 2024/02/02 16:14:51 claudio Exp $ */
/* $OpenBSD: util.c,v 1.82 2024/02/22 06:45:22 miod Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@ -178,8 +178,13 @@ const char *
log_roa(struct roa *roa)
{
static char buf[256];
struct bgpd_addr addr = { .aid = roa->aid, .v6 = roa->prefix.inet6 };
char maxbuf[32];
#if defined(__GNUC__) && __GNUC__ < 4
struct bgpd_addr addr = { .aid = roa->aid };
addr.v6 = roa->prefix.inet6;
#else
struct bgpd_addr addr = { .aid = roa->aid, .v6 = roa->prefix.inet6 };
#endif
maxbuf[0] = '\0';
if (roa->prefixlen != roa->maxlen)