Mercurial > hg > dhcpcd

changeset 4520:9c9d2b0827eb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sun: Use sa_len rather than our variant.
author Roy Marples <roy@marples.name>
date Sun, 05 May 2019 11:54:45 +0000
parents ff4eb295ed3c
children 9a0884e8ab97
files src/if-sun.c
diffstat 1 files changed, 3 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/if-sun.c	Sun May 05 11:54:30 2019 +0000
+++ b/src/if-sun.c	Sun May 05 11:54:45 2019 +0000
@@ -76,7 +76,7 @@
 #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 @@
 		    (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 @@
 	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 @@
 	 * 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)