From: Roy Marples <roy@marples.name>
Date: Sun, 5 May 2019 11:54:45 +0000 (+0000)
Subject: sun: Use sa_len rather than our variant.
X-Git-Tag: v8.0.0~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c90edf6b7745938251e57c69f7b4e09bbc041ec;p=thirdparty%2Fdhcpcd.git

sun: Use sa_len rather than our variant.
---

diff --git a/src/if-sun.c b/src/if-sun.c
index cf037657..fc8cfc85 100644
--- a/src/if-sun.c
+++ b/src/if-sun.c
@@ -76,7 +76,7 @@ extern int getallifaddrs(sa_family_t, struct ifaddrs **, int64_t);
 #ifndef RT_ROUNDUP
 #define RT_ROUNDUP(a)                                                        \
        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(int32_t) - 1))) : sizeof(int32_t))
-#define RT_ADVANCE(x, n) ((x) += RT_ROUNDUP(salen((n))))
+#define RT_ADVANCE(x, n) ((x) += RT_ROUNDUP(sa_len((n))))
 #endif
 
 #define COPYOUT(sin, sa) do {						      \
@@ -91,7 +91,7 @@ extern int getallifaddrs(sa_family_t, struct ifaddrs **, int64_t);
 		    (sa))->sin6_addr;					      \
 	} while (0)
 
-#define COPYSA(dst, src) memcpy((dst), (src), salen((src)))
+#define COPYSA(dst, src) memcpy((dst), (src), sa_len((src)))
 
 struct priv {
 #ifdef INET6
@@ -399,22 +399,6 @@ if_getifaddrs(struct ifaddrs **ifap)
 	return 0;
 }
 
-static int
-salen(const struct sockaddr *sa)
-{
-
-	switch (sa->sa_family) {
-	case AF_LINK:
-		return sizeof(struct sockaddr_dl);
-	case AF_INET:
-		return sizeof(struct sockaddr_in);
-	case AF_INET6:
-		return sizeof(struct sockaddr_in6);
-	default:
-		return sizeof(struct sockaddr);
-	}
-}
-
 static void
 if_linkaddr(struct sockaddr_dl *sdl, const struct interface *ifp)
 {
@@ -540,7 +524,7 @@ if_route0(struct dhcpcd_ctx *ctx, struct rtm *rtmsg,
 	 * This includes subnet/prefix routes. */
 
 #define ADDSA(sa) do {							\
-		sl = salen((sa));					\
+		sl = sa_len((sa));					\
 		memcpy(bp, (sa), sl);					\
 		bp += RT_ROUNDUP(sl);					\
 	} while (/* CONSTCOND */ 0)