summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2000-10-25 10:56:41 +0000
committerru <ru@FreeBSD.org>2000-10-25 10:56:41 +0000
commit1c21cf3de38e95c872a9601ad271976c5050c43e (patch)
tree684e2c1fc5efcfcf1f5514d4443cb672bf9350e2 /sys
parentfd78b036689b66842fb4fdc879844147a382004b (diff)
downloadFreeBSD-src-1c21cf3de38e95c872a9601ad271976c5050c43e.zip
FreeBSD-src-1c21cf3de38e95c872a9601ad271976c5050c43e.tar.gz
We now keep the ip_id field in network byte order all the
time, so there is no need to make the distinction between ip_output() and ip_input() cases. Reviewed by: silence on freebsd-net
Diffstat (limited to 'sys')
-rw-r--r--sys/contrib/ipfilter/netinet/fil.c4
-rw-r--r--sys/netinet/fil.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c
index e28f855..1fb4b6c 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -825,12 +825,14 @@ int out;
# endif
#endif /* _KERNEL */
+#ifndef __FreeBSD__
/*
* Be careful here: ip_id is in network byte order when called
* from ip_output()
*/
if ((out) && (v == 4))
ip->ip_id = ntohs(ip->ip_id);
+#endif
changed = 0;
fin->fin_v = v;
@@ -1037,8 +1039,10 @@ logit:
}
#endif /* IPFILTER_LOG */
+#ifndef __FreeBSD__
if ((out) && (v == 4))
ip->ip_id = htons(ip->ip_id);
+#endif
#ifdef _KERNEL
/*
diff --git a/sys/netinet/fil.c b/sys/netinet/fil.c
index e28f855..1fb4b6c 100644
--- a/sys/netinet/fil.c
+++ b/sys/netinet/fil.c
@@ -825,12 +825,14 @@ int out;
# endif
#endif /* _KERNEL */
+#ifndef __FreeBSD__
/*
* Be careful here: ip_id is in network byte order when called
* from ip_output()
*/
if ((out) && (v == 4))
ip->ip_id = ntohs(ip->ip_id);
+#endif
changed = 0;
fin->fin_v = v;
@@ -1037,8 +1039,10 @@ logit:
}
#endif /* IPFILTER_LOG */
+#ifndef __FreeBSD__
if ((out) && (v == 4))
ip->ip_id = htons(ip->ip_id);
+#endif
#ifdef _KERNEL
/*
OpenPOWER on IntegriCloud