projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
localize header files
[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
441b87d
..
9efc277
100644
(file)
--- a/
usr/src/sys/netinet/in.c
+++ b/
usr/src/sys/netinet/in.c
@@
-1,12
+1,14
@@
-/* in.c 4.
1 82/06/13
*/
+/* in.c 4.
4 82/10/09
*/
#include "../h/param.h"
#include "../h/mbuf.h"
#include "../h/protosw.h"
#include "../h/socket.h"
#include "../h/socketvar.h"
#include "../h/param.h"
#include "../h/mbuf.h"
#include "../h/protosw.h"
#include "../h/socket.h"
#include "../h/socketvar.h"
-#include "../net/in.h"
-#include "../net/in_systm.h"
+#include "../netinet/in.h"
+#include "../netinet/in_systm.h"
+#include "../net/if.h"
+#include "../net/route.h"
#include "../net/af.h"
#ifdef INET
#include "../net/af.h"
#ifdef INET
@@
-14,7
+16,6
@@
inet_hash(sin, hp)
register struct sockaddr_in *sin;
struct afhash *hp;
{
register struct sockaddr_in *sin;
struct afhash *hp;
{
-COUNT(INET_HASH);
hp->afh_nethash = in_netof(sin->sin_addr);
hp->afh_hosthash = ntohl(sin->sin_addr.s_addr);
if (hp->afh_hosthash < 0)
hp->afh_nethash = in_netof(sin->sin_addr);
hp->afh_hosthash = ntohl(sin->sin_addr.s_addr);
if (hp->afh_hosthash < 0)
@@
-24,7
+25,6
@@
COUNT(INET_HASH);
inet_netmatch(sin1, sin2)
struct sockaddr_in *sin1, *sin2;
{
inet_netmatch(sin1, sin2)
struct sockaddr_in *sin1, *sin2;
{
-COUNT(INET_NETMATCH);
return (sin1->sin_addr.s_net == sin2->sin_addr.s_net);
}
return (sin1->sin_addr.s_net == sin2->sin_addr.s_net);
}
@@
-38,7
+38,6
@@
if_makeaddr(net, host)
{
u_long addr;
{
u_long addr;
-COUNT(IF_MAKEADDR);
if (net < 128)
addr = (net << 24) | host;
else if (net < 65536)
if (net < 128)
addr = (net << 24) | host;
else if (net < 65536)
@@
-85,7
+84,6
@@
if_rtinit(ifp, flags)
{
struct sockaddr_in sin;
{
struct sockaddr_in sin;
-COUNT(IF_RTINIT);
if (ifp->if_flags & IFF_ROUTE)
return;
bzero((caddr_t)&sin, sizeof (sin));
if (ifp->if_flags & IFF_ROUTE)
return;
bzero((caddr_t)&sin, sizeof (sin));