arp expire time

[Alexander Bluhm]

Hi,

I found more int expire_time that should be time_t in arp and rarpd.

ok?

bluhm

Index: usr.sbin/arp/arp.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/arp/arp.c,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 arp.c
--- usr.sbin/arp/arp.c  21 Mar 2013 04:43:17 -0000      1.52
+++ usr.sbin/arp/arp.c  19 Jul 2013 20:42:38 -0000
@@ -248,8 +248,8 @@ getsocket(void)
 struct sockaddr_in     so_mask = { 8, 0, 0, { 0xffffffff } };
 struct sockaddr_inarp  blank_sin = { sizeof(blank_sin), AF_INET }, sin_m;
 struct sockaddr_dl     blank_sdl = { sizeof(blank_sdl), AF_LINK }, sdl_m;
-int                    expire_time, flags, export_only, doing_proxy,
-                           found_entry;
+time_t                 expire_time;
+int                    flags, export_only, doing_proxy, found_entry;
 struct {
        struct rt_msghdr        m_rtm;
        char                    m_space[512];
@@ -282,7 +282,8 @@ set(int argc, char *argv[])
                errx(1, "invalid ethernet address: %s", eaddr);
        memcpy(LLADDR(&sdl_m), ea, sizeof(*ea));
        sdl_m.sdl_alen = 6;
-       doing_proxy = flags = export_only = expire_time = 0;
+       expire_time = 0;
+       doing_proxy = flags = export_only = 0;
        while (argc-- > 0) {
                if (strncmp(argv[0], "temp", 4) == 0) {
                        struct timeval time;
Index: usr.sbin/rarpd/arptab.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/rarpd/arptab.c,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 arptab.c
--- usr.sbin/rarpd/arptab.c     27 Oct 2009 23:59:54 -0000      1.18
+++ usr.sbin/rarpd/arptab.c     19 Jul 2013 20:39:42 -0000
@@ -74,7 +74,8 @@ getsocket(void)
 struct sockaddr_in so_mask = {8, 0, 0, { 0xffffffff}};
 struct sockaddr_inarp blank_sin = {sizeof(blank_sin), AF_INET }, sin_m;
 struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK }, sdl_m;
-int    expire_time, flags, export_only, doing_proxy;
+time_t expire_time;
+int    flags, export_only, doing_proxy;
 
 struct {
        struct  rt_msghdr m_rtm;
@@ -104,7 +105,8 @@ arptab_set(u_char *eaddr, u_int32_t host
        sin->sin_addr.s_addr = host;
        memcpy((u_char *)LLADDR(&sdl_m), (char *)eaddr, 6);
        sdl_m.sdl_alen = 6;
-       doing_proxy = flags = export_only = expire_time = 0;
+       expire_time = 0;
+       doing_proxy = flags = export_only = 0;
        gettimeofday(&time, 0);
        expire_time = time.tv_sec + 20 * 60;