aboutsummaryrefslogtreecommitdiffstats
path: root/sys/netinet/ip_nat.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1998-06-20 18:18:05 +0000
committerPeter Wemm <peter@FreeBSD.org>1998-06-20 18:18:05 +0000
commitaeee047f956f7be068ff4001efed9ea24980058b (patch)
tree6cc40b6d411c8a74ad3c20972c62df03ae5a581e /sys/netinet/ip_nat.c
parent27064bb1595ba86624494176675c7c36450d121f (diff)
downloadsrc-aeee047f956f7be068ff4001efed9ea24980058b.tar.gz
src-aeee047f956f7be068ff4001efed9ea24980058b.zip
Import ipfilter 3.2.7 kernel components
Notes
Notes: svn path=/vendor-sys/ipfilter/dist-old/; revision=37071
Diffstat (limited to 'sys/netinet/ip_nat.c')
-rw-r--r--sys/netinet/ip_nat.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/netinet/ip_nat.c b/sys/netinet/ip_nat.c
index 0b6c07fc9b4f..102d57f32ab9 100644
--- a/sys/netinet/ip_nat.c
+++ b/sys/netinet/ip_nat.c
@@ -9,7 +9,7 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.0.2.44.2.7 1997/12/02 13:54:27 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.0.2.44.2.10 1998/05/23 19:05:29 darrenr Exp $";
#endif
#if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)
@@ -130,10 +130,10 @@ static int nat_ifpaddr __P((nat_t *, void *, struct in_addr *));
void fix_outcksum(sp, n)
u_short *sp;
-u_long n;
+u_32_t n;
{
register u_short sumshort;
- register u_long sum1;
+ register u_32_t sum1;
if (!n)
return;
@@ -149,10 +149,10 @@ u_long n;
void fix_incksum(sp, n)
u_short *sp;
-u_long n;
+u_32_t n;
{
register u_short sumshort;
- register u_long sum1;
+ register u_32_t sum1;
if (!n)
return;
@@ -456,7 +456,7 @@ struct in_addr *inp;
struct in_addr in;
#if SOLARIS
- in.s_addr = ill->ill_ipif->ipif_local_addr;
+ in.s_addr = ntohl(ill->ill_ipif->ipif_local_addr);
#else /* SOLARIS */
# if linux
;
@@ -521,7 +521,7 @@ fr_info_t *fin;
u_short flags;
int direction;
{
- register u_long sum1, sum2, sumd, l;
+ register u_32_t sum1, sum2, sumd, l;
u_short port = 0, sport = 0, dport = 0, nport = 0;
struct in_addr in;
tcphdr_t *tcp = NULL;
@@ -779,7 +779,7 @@ int *nflags;
*/
if (flags & IPN_TCPUDP) {
tcphdr_t *tcp = (tcphdr_t *)(oip + 1);
- u_long sum1, sum2, sumd;
+ u_32_t sum1, sum2, sumd;
struct in_addr in;
if (nat->nat_dir == NAT_OUTBOUND) {
@@ -964,7 +964,7 @@ int hlen;
fr_info_t *fin;
{
register ipnat_t *np;
- register u_long ipa;
+ register u_32_t ipa;
tcphdr_t *tcp = NULL;
u_short nflags = 0, sport = 0, dport = 0, *csump = NULL;
struct ifnet *ifp;
@@ -1281,7 +1281,7 @@ void *ifp;
#endif
{
register nat_t *nat;
- register u_long sum1, sum2, sumd;
+ register u_32_t sum1, sum2, sumd;
struct in_addr in;
ipnat_t *np;
#if defined(_KERNEL) && !SOLARIS