386BSD 0.1 development

[unix-history] / usr / src / sbin / routed / if.c

diff --git a/usr/src/sbin/routed/if.c b/usr/src/sbin/routed/if.c
index 07aa434..4871c9d 100644 (file)
--- a/usr/src/sbin/routed/if.c
+++ b/usr/src/sbin/routed/if.c
@@ -1,6 +1,39 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)if.c       4.4 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)if.c       5.6 (Berkeley) 6/1/90";
+#endif /* not lint */

 
 /*
  * Routing Table Management Daemon
 
 /*
  * Routing Table Management Daemon


@@ -64,7 +97,7 @@ if_ifwithnet(addr)
        register int af = addr->sa_family;
        register int (*netmatch)();
 
        register int af = addr->sa_family;
        register int (*netmatch)();
 

-       if (af >= AF_MAX)
+       if (af >= af_max)

                return (0);
        netmatch = afswitch[af].af_netmatch;
        for (ifp = ifnet; ifp; ifp = ifp->int_next) {
                return (0);
        netmatch = afswitch[af].af_netmatch;
        for (ifp = ifnet; ifp; ifp = ifp->int_next) {


@@ -91,7 +124,7 @@ if_iflookup(addr)
        register int af = addr->sa_family;
        register int (*netmatch)();
 
        register int af = addr->sa_family;
        register int (*netmatch)();
 

-       if (af >= AF_MAX)
+       if (af >= af_max)

                return (0);
        maybe = 0;
        netmatch = afswitch[af].af_netmatch;
                return (0);
        maybe = 0;
        netmatch = afswitch[af].af_netmatch;


@@ -103,6 +136,9 @@ if_iflookup(addr)
                if ((ifp->int_flags & IFF_BROADCAST) &&
                    same(&ifp->int_broadaddr, addr))
                        break;
                if ((ifp->int_flags & IFF_BROADCAST) &&
                    same(&ifp->int_broadaddr, addr))
                        break;

+               if ((ifp->int_flags & IFF_POINTOPOINT) &&
+                   same(&ifp->int_dstaddr, addr))
+                       break;

                if (maybe == 0 && (*netmatch)(addr, &ifp->int_addr))
                        maybe = ifp;
        }
                if (maybe == 0 && (*netmatch)(addr, &ifp->int_addr))
                        maybe = ifp;
        }