Do the KAME embedded scope fixup in the two places where getifaddrs() is

used. With this there should be no more embedded scopes left and therefor
in6addr_to_text() can be removed. getnameinfo() will just do the right
thing now.
OK eric@

diff --git a/usr.sbin/smtpd/config.c b/usr.sbin/smtpd/config.c
index 1cd8eb4..094d418 100644 (file)
--- a/usr.sbin/smtpd/config.c
+++ b/usr.sbin/smtpd/config.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: config.c,v 1.52 2020/12/31 08:27:15 martijn Exp $     */
+/*     $OpenBSD: config.c,v 1.53 2021/01/19 09:16:20 claudio Exp $     */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -214,6 +214,17 @@ set_localaddrs(struct smtpd *conf, struct table *localnames)
                        sin6 = (struct sockaddr_in6 *)&ss;
                        *sin6 = *(struct sockaddr_in6 *)p->ifa_addr;
                        sin6->sin6_len = sizeof(struct sockaddr_in6);
+#ifdef __KAME__
+                       if ((IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) ||
+                           IN6_IS_ADDR_MC_LINKLOCAL(&sin6->sin6_addr) ||
+                           IN6_IS_ADDR_MC_INTFACELOCAL(&sin6->sin6_addr)) &&
+                           sin6->sin6_scope_id == 0) {
+                               sin6->sin6_scope_id = ntohs(
+                                   *(u_int16_t *)&sin6->sin6_addr.s6_addr[2]);
+                               sin6->sin6_addr.s6_addr[2] = 0;
+                               sin6->sin6_addr.s6_addr[3] = 0;
+                       }
+#endif
                        table_add(t, ss_to_text(&ss), NULL);
                        table_add(localnames, ss_to_text(&ss), NULL);
                        (void)snprintf(buf, sizeof buf, "[%s]", ss_to_text(&ss));

diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index 8dde420..b6783a2 100644 (file)
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.282 2020/12/31 08:27:15 martijn Exp $     */
+/*     $OpenBSD: parse.y,v 1.283 2021/01/19 09:16:20 claudio Exp $     */
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -3472,6 +3472,17 @@ interface(struct listen_opts *lo)
                        *sin6 = *(struct sockaddr_in6 *)p->ifa_addr;
                        sin6->sin6_len = sizeof(struct sockaddr_in6);
                        sin6->sin6_port = lo->port;
+#ifdef __KAME__
+                       if ((IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) ||
+                           IN6_IS_ADDR_MC_LINKLOCAL(&sin6->sin6_addr) ||
+                           IN6_IS_ADDR_MC_INTFACELOCAL(&sin6->sin6_addr)) &&
+                           sin6->sin6_scope_id == 0) {
+                               sin6->sin6_scope_id = ntohs(
+                                   *(u_int16_t *)&sin6->sin6_addr.s6_addr[2]);
+                               sin6->sin6_addr.s6_addr[2] = 0;
+                               sin6->sin6_addr.s6_addr[3] = 0;
+                       }
+#endif
                        if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
                                h->local = 1;
                        break;

diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index f39a5f1..487573d 100644 (file)
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: smtpd.h,v 1.660 2020/12/31 08:27:15 martijn Exp $     */
+/*     $OpenBSD: smtpd.h,v 1.661 2021/01/19 09:16:20 claudio Exp $     */
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1687,7 +1687,7 @@ const char *ss_to_text(const struct sockaddr_storage *);
 const char *time_to_text(time_t);
 const char *duration_to_text(time_t);
 const char *rule_to_text(struct rule *);
-const char *sockaddr_to_text(struct sockaddr *);
+const char *sockaddr_to_text(const struct sockaddr *);
 const char *mailaddr_to_text(const struct mailaddr *);
 const char *expandnode_to_text(struct expandnode *);
 

diff --git a/usr.sbin/smtpd/to.c b/usr.sbin/smtpd/to.c
index 052a235..11cdf59 100644 (file)
--- a/usr.sbin/smtpd/to.c
+++ b/usr.sbin/smtpd/to.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: to.c,v 1.44 2019/11/12 20:21:46 gilles Exp $  */
+/*     $OpenBSD: to.c,v 1.45 2021/01/19 09:16:20 claudio Exp $ */
 
 /*
  * Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -48,7 +48,6 @@
 #include "smtpd.h"
 #include "log.h"
 
-static const char *in6addr_to_text(const struct in6_addr *);
 static int alias_is_filter(struct expandnode *, const char *, size_t);
 static int alias_is_username(struct expandnode *, const char *, size_t);
 static int alias_is_address(struct expandnode *, const char *, size_t);
@@ -57,7 +56,7 @@ static int alias_is_include(struct expandnode *, const char *, size_t);
 static int alias_is_error(struct expandnode *, const char *, size_t);
 
 const char *
-sockaddr_to_text(struct sockaddr *sa)
+sockaddr_to_text(const struct sockaddr *sa)
 {
        static char     buf[NI_MAXHOST];
 
@@ -68,29 +67,6 @@ sockaddr_to_text(struct sockaddr *sa)
                return (buf);
 }
 
-static const char *
-in6addr_to_text(const struct in6_addr *addr)
-{
-       struct sockaddr_in6     sa_in6;
-       uint16_t                tmp16;
-
-       memset(&sa_in6, 0, sizeof(sa_in6));
-       sa_in6.sin6_len = sizeof(sa_in6);
-       sa_in6.sin6_family = AF_INET6;
-       memcpy(&sa_in6.sin6_addr, addr, sizeof(sa_in6.sin6_addr));
-
-       /* XXX thanks, KAME, for this ugliness... adopted from route/show.c */
-       if (IN6_IS_ADDR_LINKLOCAL(&sa_in6.sin6_addr) ||
-           IN6_IS_ADDR_MC_LINKLOCAL(&sa_in6.sin6_addr)) {
-               memcpy(&tmp16, &sa_in6.sin6_addr.s6_addr[2], sizeof(tmp16));
-               sa_in6.sin6_scope_id = ntohs(tmp16);
-               sa_in6.sin6_addr.s6_addr[2] = 0;
-               sa_in6.sin6_addr.s6_addr[3] = 0;
-       }
-
-       return (sockaddr_to_text((struct sockaddr *)&sa_in6));
-}
-
 int
 text_to_mailaddr(struct mailaddr *maddr, const char *email)
 {
@@ -165,13 +141,7 @@ sa_to_text(const struct sockaddr *sa)
                    (addr >> 8) & 0xff, addr & 0xff);
        }
        else if (sa->sa_family == AF_INET6) {
-               const struct sockaddr_in6 *in6;
-               const struct in6_addr   *in6_addr;
-
-               in6 = (const struct sockaddr_in6 *)sa;
-               p = buf;
-               in6_addr = &in6->sin6_addr;
-               (void)bsnprintf(p, NI_MAXHOST, "[%s]", in6addr_to_text(in6_addr));
+               (void)bsnprintf(p, NI_MAXHOST, "[%s]", sockaddr_to_text(sa));
        }
 
        return (buf);