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

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

diff --git a/usr/src/sys/netinet/in_pcb.c b/usr/src/sys/netinet/in_pcb.c
index 2c3dc3d..93dd3ba 100644 (file)
--- a/usr/src/sys/netinet/in_pcb.c
+++ b/usr/src/sys/netinet/in_pcb.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)in_pcb.c    7.23 (Berkeley) %G%
+ *     @(#)in_pcb.c    7.24 (Berkeley) %G%

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


@@ -26,9 +26,7 @@
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
 
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
 

-#ifdef MULTICAST

 #include <netinet/ip_var.h>
 #include <netinet/ip_var.h>

-#endif

 
 struct in_addr zeroin_addr;
 
 
 struct in_addr zeroin_addr;
 


@@ -198,7 +196,6 @@ in_pcbconnect(inp, nam)
                        if (ia == 0)
                                return (EADDRNOTAVAIL);
                }
                        if (ia == 0)
                                return (EADDRNOTAVAIL);
                }

-#ifdef MULTICAST

                /*
                 * If the destination address is multicast and an outgoing
                 * interface has been set as a multicast option, use the
                /*
                 * If the destination address is multicast and an outgoing
                 * interface has been set as a multicast option, use the


@@ -218,7 +215,6 @@ in_pcbconnect(inp, nam)
                                        return (EADDRNOTAVAIL);
                        }
                }
                                        return (EADDRNOTAVAIL);
                        }
                }

-#endif

                ifaddr = (struct sockaddr_in *)&ia->ia_addr;
        }
        if (in_pcblookup(inp->inp_head,
                ifaddr = (struct sockaddr_in *)&ia->ia_addr;
        }
        if (in_pcblookup(inp->inp_head,


@@ -259,9 +255,7 @@ in_pcbdetach(inp)
                (void)m_free(inp->inp_options);
        if (inp->inp_route.ro_rt)
                rtfree(inp->inp_route.ro_rt);
                (void)m_free(inp->inp_options);
        if (inp->inp_route.ro_rt)
                rtfree(inp->inp_route.ro_rt);

-#ifdef MULTICAST

        ip_freemoptions(inp->inp_moptions);
        ip_freemoptions(inp->inp_moptions);

-#endif

        remque(inp);
        FREE(inp, M_PCB);
 }
        remque(inp);
        FREE(inp, M_PCB);
 }