(By Sklower) checkpoint the current state of Cherenson's work.

[unix-history] / usr / src / sys / netinet / in.c

diff --git a/usr/src/sys/netinet/in.c b/usr/src/sys/netinet/in.c
index dc99505..746c05c 100644 (file)
--- a/usr/src/sys/netinet/in.c
+++ b/usr/src/sys/netinet/in.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)in.c        7.26 (Berkeley) %G%
+ *     @(#)in.c        7.27 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -66,10 +66,8 @@ in_netof(in)
                net = i & IN_CLASSB_NET;
        else if (IN_CLASSC(i))
                net = i & IN_CLASSC_NET;
                net = i & IN_CLASSB_NET;
        else if (IN_CLASSC(i))
                net = i & IN_CLASSC_NET;

-#ifdef MULTICAST

        else if (IN_CLASSD(i))
                net = i & IN_CLASSD_NET;
        else if (IN_CLASSD(i))
                net = i & IN_CLASSD_NET;

-#endif

        else
                return (0);
 
        else
                return (0);
 


@@ -150,11 +148,9 @@ in_lnaof(in)
        } else if (IN_CLASSC(i)) {
                net = i & IN_CLASSC_NET;
                host = i & IN_CLASSC_HOST;
        } else if (IN_CLASSC(i)) {
                net = i & IN_CLASSC_NET;
                host = i & IN_CLASSC_HOST;

-#ifdef MULTICAST

        } else if (IN_CLASSD(i)) {
                net = i & IN_CLASSD_NET;
                host = i & IN_CLASSD_HOST;
        } else if (IN_CLASSD(i)) {
                net = i & IN_CLASSD_NET;
                host = i & IN_CLASSD_HOST;

-#endif

        } else
                return (i);
 
        } else
                return (i);
 


@@ -540,7 +536,6 @@ in_ifinit(ifp, ia, sin, scrub)
        }
        if ((error = rtinit(&(ia->ia_ifa), (int)RTM_ADD, flags)) == 0)
                ia->ia_flags |= IFA_ROUTE;
        }
        if ((error = rtinit(&(ia->ia_ifa), (int)RTM_ADD, flags)) == 0)
                ia->ia_flags |= IFA_ROUTE;

-#ifdef MULTICAST

        /*
         * If the interface supports multicast, join the "all hosts"
         * multicast group on that interface.
        /*
         * If the interface supports multicast, join the "all hosts"
         * multicast group on that interface.


@@ -551,7 +546,6 @@ in_ifinit(ifp, ia, sin, scrub)
                addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP);
                in_addmulti(&addr, ifp);
        }
                addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP);
                in_addmulti(&addr, ifp);
        }

-#endif

        return (error);
 }
 
        return (error);
 }
 


@@ -598,7 +592,6 @@ in_broadcast(in)
        return (0);
 }
 
        return (0);
 }
 

-#ifdef MULTICAST

 /*
  * Add an address to the list of IP multicast addresses for a given interface.
  */
 /*
  * Add an address to the list of IP multicast addresses for a given interface.
  */


@@ -711,4 +704,3 @@ in_delmulti(inm)
        splx(s);
 }
 #endif
        splx(s);
 }
 #endif

-#endif