[src/trunk]: src/usr.sbin/rarpd We need to close and open the socket to preve...

[abs <abs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74e9fe119943
branches:  trunk
changeset: 481989:74e9fe119943
user:      abs <abs%NetBSD.org@localhost>
date:      Fri Feb 11 11:27:20 2000 +0000

description:
We need to close and open the socket to prevent routing updates building
up such that when we send our message we never see our reply (and hang)
Fix taken (modified) from PR 7508

diffstat:

 usr.sbin/rarpd/mkarp.c |  35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diffs (109 lines):

diff -r fae79467d17c -r 74e9fe119943 usr.sbin/rarpd/mkarp.c
--- a/usr.sbin/rarpd/mkarp.c    Fri Feb 11 11:25:23 2000 +0000
+++ b/usr.sbin/rarpd/mkarp.c    Fri Feb 11 11:27:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkarp.c,v 1.2 1998/01/17 11:38:36 christos Exp $ */
+/*     $NetBSD: mkarp.c,v 1.3 2000/02/11 11:27:20 abs Exp $ */
 
 /*
  * Copyright (c) 1984, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)arp.c      8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: mkarp.c,v 1.2 1998/01/17 11:38:36 christos Exp $");
+__RCSID("$NetBSD: mkarp.c,v 1.3 2000/02/11 11:27:20 abs Exp $");
 #endif
 #endif /* not lint */
 
@@ -80,7 +80,7 @@
 
 #include "mkarp.h"
 
-int    rtmsg __P((int, struct rt_msghdr *, struct sockaddr_inarp *, 
+int    rtmsg __P((int, int, struct rt_msghdr *, struct sockaddr_inarp *, 
                   struct sockaddr_dl *));
 struct {
        struct  rt_msghdr m_rtm;
@@ -102,6 +102,8 @@
        struct sockaddr_dl *sdl;
        struct rt_msghdr *rtm;
        u_int8_t *p, *endp;
+       int result;
+       int s;
 
        struct sockaddr_inarp sin_m;
        struct sockaddr_dl sdl_m;
@@ -124,12 +126,22 @@
        }
        sdl_m.sdl_alen = ETHER_ADDR_LEN;
 
+       /*
+        * We need to close and open the socket to prevent routing updates
+        * building up such that when we send our message we never see our
+        * reply (and hang)
+        */
+       s = socket(PF_ROUTE, SOCK_RAW, 0);
+       if (s < 0)
+               err(1, "socket");
+
        rtm->rtm_flags = 0;
 
-       if (rtmsg(RTM_GET, rtm, &sin_m, &sdl_m) < 0) {
+       if (rtmsg(RTM_GET, s, rtm, &sin_m, &sdl_m) < 0) {
 #if 0
                warn("%s", host);
 #endif
+               close(s);
                return (1);
        }
        sin = (struct sockaddr_inarp *)(rtm + 1);
@@ -145,6 +157,7 @@
 #if 0
                (void)printf("set: can only proxy for %s\n", host);
 #endif
+               close(s);
                return (1);
        }
 overwrite:
@@ -153,22 +166,25 @@
                (void)printf("cannot intuit interface index and type for %s\n",
                    host);
 #endif
+               close(s);
                return (1);
        }
        sdl_m.sdl_type = sdl->sdl_type;
        sdl_m.sdl_index = sdl->sdl_index;
-       return (rtmsg(RTM_ADD, rtm, &sin_m, &sdl_m));
+       result = rtmsg(RTM_ADD, s, rtm, &sin_m, &sdl_m);
+       close(s);
+       return (result);
 }
 
 int
-rtmsg(cmd, rtm, sin_m, sdl_m)
+rtmsg(cmd, s, rtm, sin_m, sdl_m)
        int cmd;
+       int s;
        struct rt_msghdr *rtm;
        struct sockaddr_inarp *sin_m;
        struct sockaddr_dl *sdl_m;
 {
        static int seq;
-       static int s = -1;
        int rlen;
        char *cp;
        int l;
@@ -179,11 +195,6 @@
        cp = m_rtmsg.m_space;
        errno = 0;
 
-       if (s < 0) {
-               s = socket(PF_ROUTE, SOCK_RAW, 0);
-               if (s < 0)
-                       err(1, "socket");
-       }
        pid = getpid();
 
        (void)memset(&m_rtmsg, 0, sizeof(m_rtmsg));