Constity and void

diff --git a/if-sun.c b/if-sun.c
index b709a0ad944c40210ceab9786b72cdea6303d1cc..e701a8e61bbd3d69bcca62cba35162211907cd88 100644 (file)
--- a/if-sun.c
+++ b/if-sun.c
@@ -63,12 +63,14 @@
 
 #define COPYOUT(sin, sa) do {                                                \
        if ((sa) && ((sa)->sa_family == AF_INET))                             \
-               (sin) = ((struct sockaddr_in *)(void *)(sa))->sin_addr;       \
+               (sin) = ((const struct sockaddr_in *)(const void *)           \
+                   (sa))->sin_addr;                                          \
        } while (0)
 
 #define COPYOUT6(sin, sa) do {                                               \
        if ((sa) && ((sa)->sa_family == AF_INET6))                            \
-               (sin) = ((struct sockaddr_in6 *)(void *)(sa))->sin6_addr;     \
+               (sin) = ((const struct sockaddr_in6 *)(const void *)          \
+                   (sa))->sin6_addr;                                         \
        } while (0)
 
 #ifndef CLLADDR
@@ -297,15 +299,15 @@ if_getifaddrs(struct ifaddrs **ifap)
 }
 
 static int
-get_addrs(int type, void *cp, struct sockaddr **sa)
+get_addrs(int type, const void *data, const struct sockaddr **sa)
 {
        int i;
-       char *p;
+       const char *p;
 
-       p = cp;
+       p = data;
        for (i = 0; i < RTAX_MAX; i++) {
                if (type & (1 << i)) {
-                       sa[i] = (struct sockaddr *)p;
+                       sa[i] = (const struct sockaddr *)p;
                        switch (sa[i]->sa_family) {
                        case AF_LINK:
                                p += sizeof(struct sockaddr_dl);
@@ -406,19 +408,17 @@ if_findsa(struct dhcpcd_ctx *ctx, const struct sockaddr *sa)
 
 #ifdef INET
 static int
-if_copyrt(struct dhcpcd_ctx *ctx, struct rt *rt, struct rt_msghdr *rtm)
+if_copyrt(struct dhcpcd_ctx *ctx, struct rt *rt, const struct rt_msghdr *rtm)
 {
-       char *ap;
-       struct sockaddr *sa, *rti_info[RTAX_MAX];
+       const struct sockaddr *sa, *rti_info[RTAX_MAX];
 
-       ap = (void *)(rtm + 1);
-       sa = (void *)ap;
+       sa = (const void *)(rtm + 1);
        if (sa->sa_family != AF_INET)
                return -1;
        if (~rtm->rtm_addrs & (RTA_DST | RTA_GATEWAY))
                return -1;
 
-       get_addrs(rtm->rtm_addrs, ap, rti_info);
+       get_addrs(rtm->rtm_addrs, sa, rti_info);
        memset(rt, 0, sizeof(*rt));
        rt->flags = (unsigned int)rtm->rtm_flags;
        COPYOUT(rt->dest, rti_info[RTAX_DST]);
@@ -458,19 +458,17 @@ if_copyrt(struct dhcpcd_ctx *ctx, struct rt *rt, struct rt_msghdr *rtm)
 
 #ifdef INET6
 static int
-if_copyrt6(struct dhcpcd_ctx *ctx, struct rt6 *rt, struct rt_msghdr *rtm)
+if_copyrt6(struct dhcpcd_ctx *ctx, struct rt6 *rt, const struct rt_msghdr *rtm)
 {
-       uint8_t *ap;
-       struct sockaddr *sa, *rti_info[RTAX_MAX];
+       const struct sockaddr *sa, *rti_info[RTAX_MAX];
 
-       ap = (void *)(rtm + 1);
-       sa = (void *)ap;
+       sa = (const void *)(rtm + 1);
        if (sa->sa_family != AF_INET6)
                return -1;
        if (~rtm->rtm_addrs & (RTA_DST | RTA_GATEWAY))
                return -1;
 
-       get_addrs(rtm->rtm_addrs, ap, rti_info);
+       get_addrs(rtm->rtm_addrs, sa, rti_info);
        memset(rt, 0, sizeof(*rt));
        rt->flags = (unsigned int)rtm->rtm_flags;
        COPYOUT6(rt->dest, rti_info[RTAX_DST]);
@@ -508,9 +506,9 @@ if_copyrt6(struct dhcpcd_ctx *ctx, struct rt6 *rt, struct rt_msghdr *rtm)
 #endif
 
 static void
-if_rtm(struct dhcpcd_ctx *ctx, struct rt_msghdr *rtm)
+if_rtm(struct dhcpcd_ctx *ctx, const struct rt_msghdr *rtm)
 {
-       struct sockaddr *sa;
+       const struct sockaddr *sa;
 
        /* Ignore messages generated by us */
        if (rtm->rtm_pid == getpid()) {
@@ -533,7 +531,7 @@ if_rtm(struct dhcpcd_ctx *ctx, struct rt_msghdr *rtm)
                return;
        }
 
-       sa = (void *)(rtm + 1);
+       sa = (const void *)(rtm + 1);
        switch (sa->sa_family) {
 #ifdef INET
        case AF_INET:
@@ -559,13 +557,11 @@ if_rtm(struct dhcpcd_ctx *ctx, struct rt_msghdr *rtm)
                 * existance with a hardware address.
                 */
                if (rtm->rtm_flags & (RTF_HOST)) {
-                       uint8_t *ap;
-                       struct sockaddr *rti_info[RTAX_MAX];
+                       const struct sockaddr *rti_info[RTAX_MAX];
                        struct in6_addr dst6;
                        struct sockaddr_dl sdl;
 
-                       ap = (void *)(rtm + 1);
-                       get_addrs(rtm->rtm_addrs, ap, rti_info);
+                       get_addrs(rtm->rtm_addrs, sa, rti_info);
                        COPYOUT6(dst6, rti_info[RTAX_DST]);
                        if (rti_info[RTAX_GATEWAY]->sa_family == AF_LINK)
                                memcpy(&sdl, rti_info[RTAX_GATEWAY],
@@ -587,19 +583,18 @@ if_rtm(struct dhcpcd_ctx *ctx, struct rt_msghdr *rtm)
 }
 
 static void
-if_ifa(struct dhcpcd_ctx *ctx, struct ifa_msghdr *ifam)
+if_ifa(struct dhcpcd_ctx *ctx, const struct ifa_msghdr *ifam)
 {
        struct interface *ifp;
-       uint8_t *cp;
-       struct sockaddr *rti_info[RTAX_MAX];
+       const struct sockaddr *sa, *rti_info[RTAX_MAX];
 
        /* XXX We have no way of knowing who generated these
         * messages wich truely sucks because we want to
         * avoid listening to our own delete messages. */
        if ((ifp = if_findindex(ctx->ifaces, ifam->ifam_index)) == NULL)
                return;
-       cp = (void *)(ifam + 1);
-       get_addrs(ifam->ifam_addrs, cp, rti_info);
+       sa = (const void *)(ifam + 1);
+       get_addrs(ifam->ifam_addrs, sa, rti_info);
        if (rti_info[RTAX_IFA] == NULL)
                return;
        switch (rti_info[RTAX_IFA]->sa_family) {
@@ -639,12 +634,12 @@ if_ifa(struct dhcpcd_ctx *ctx, struct ifa_msghdr *ifam)
        case AF_INET6:
        {
                struct in6_addr addr6, mask6;
-               struct sockaddr_in6 *sin6;
+               const struct sockaddr_in6 *sin6;
                int flags;
 
-               sin6 = (void *)rti_info[RTAX_IFA];
+               sin6 = (const void *)rti_info[RTAX_IFA];
                addr6 = sin6->sin6_addr;
-               sin6 = (void *)rti_info[RTAX_NETMASK];
+               sin6 = (const void *)rti_info[RTAX_NETMASK];
                mask6 = sin6->sin6_addr;
                if (ifam->ifam_type == RTM_NEWADDR) {
                        if ((flags = if_addrflags6(&addr6, ifp)) == -1)
@@ -662,7 +657,7 @@ if_ifa(struct dhcpcd_ctx *ctx, struct ifa_msghdr *ifam)
 }
 
 static void
-if_ifinfo(struct dhcpcd_ctx *ctx, struct if_msghdr *ifm)
+if_ifinfo(struct dhcpcd_ctx *ctx, const struct if_msghdr *ifm)
 {
        struct interface *ifp;
        int state;
@@ -678,22 +673,22 @@ if_ifinfo(struct dhcpcd_ctx *ctx, struct if_msghdr *ifm)
 }
 
 static void
-if_dispatch(struct dhcpcd_ctx *ctx, struct rt_msghdr *rtm)
+if_dispatch(struct dhcpcd_ctx *ctx, const struct rt_msghdr *rtm)
 {
 
        switch(rtm->rtm_type) {
        case RTM_IFINFO:
-               if_ifinfo(ctx, (void *)rtm);
+               if_ifinfo(ctx, (const void *)rtm);
                break;
        case RTM_ADD:           /* FALLTHROUGH */
        case RTM_CHANGE:        /* FALLTHROUGH */
        case RTM_DELETE:
-               if_rtm(ctx, (void *)rtm);
+               if_rtm(ctx, (const void *)rtm);
                break;
        case RTM_CHGADDR:       /* FALLTHROUGH */
        case RTM_DELADDR:       /* FALLTHROUGH */
        case RTM_NEWADDR:
-               if_ifa(ctx, (void *)rtm);
+               if_ifa(ctx, (const void *)rtm);
                break;
        }
 }
@@ -701,16 +696,19 @@ if_dispatch(struct dhcpcd_ctx *ctx, struct rt_msghdr *rtm)
 int
 if_handlelink(struct dhcpcd_ctx *ctx)
 {
-       uint8_t buf[2048], *p, *e;
+       char buf[2048];
+       const char *p, *e;
        size_t msglen;
        ssize_t bytes;
+       const struct rt_msghdr *rtm;
 
        if ((bytes = read(ctx->link_fd, buf, sizeof(buf))) == -1)
                return -1;
        e = buf + bytes;
        for (p = buf; p < e; p += msglen) {
-               msglen = ((struct rt_msghdr *)p)->rtm_msglen;
-               if_dispatch(ctx, (struct rt_msghdr *)p);
+               rtm = (const  void *)p;
+               msglen = rtm->rtm_msglen;
+               if_dispatch(ctx, rtm);
        }
        return 0;
 }