diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2006-05-06 18:31:01 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2006-05-06 18:31:01 +0000 |
| commit | 42e658f9ac7ba7c342888b872a69b98bedc9824c (patch) | |
| tree | 310ad0f13879dd2c102534d427e527c31f40eff4 /sys/net | |
| parent | 1b31e61641da8e617823a4d005e984a0d76e4594 (diff) | |
The SPI in a TDB is actually stored in network order. Make sa synchronisation
work between little-endian and big-endian machines, and compare the spi
against SPI_RESERVED_MAX correctly.
Fix from Nathanael <list-openbsd-tech at polymorpheus dot com>
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_pfsync.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 3c9e1107c73..96c51a8b908 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.62 2006/03/25 22:41:47 djm Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.63 2006/05/06 18:31:00 mcbride Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -1540,16 +1540,11 @@ pfsync_update_net_tdb(struct pfsync_tdb *pt) int s; /* check for invalid values */ - pt->spi = htonl(pt->spi); - if (pt->spi <= SPI_RESERVED_MAX || + if (ntohl(pt->spi) <= SPI_RESERVED_MAX || (pt->dst.sa.sa_family != AF_INET && pt->dst.sa.sa_family != AF_INET6)) goto bad; - if (pt->dst.sa.sa_family == AF_INET) - pt->dst.sin.sin_addr.s_addr = - htonl(pt->dst.sin.sin_addr.s_addr); - s = spltdb(); tdb = gettdb(pt->spi, &pt->dst, pt->sproto); if (tdb) { @@ -1649,18 +1644,11 @@ pfsync_update_tdb(struct tdb *tdb) tdb->tdb_sproto); for (i = 0; !pt && i < h->count; i++) { - /* XXX Ugly, u is network ordered. */ - if (u->dst.sa.sa_family == AF_INET) - u->dst.sin.sin_addr.s_addr = - ntohl(u->dst.sin.sin_addr.s_addr); - if (tdb_hash(ntohl(u->spi), &u->dst, + if (tdb_hash(u->spi, &u->dst, u->sproto) == hash) { pt = u; pt->updates++; } - if (u->dst.sa.sa_family == AF_INET) - u->dst.sin.sin_addr.s_addr = - htonl(u->dst.sin.sin_addr.s_addr); u++; } } @@ -1674,11 +1662,8 @@ pfsync_update_tdb(struct tdb *tdb) h->count++; bzero(pt, sizeof(*pt)); - pt->spi = htonl(tdb->tdb_spi); + pt->spi = tdb->tdb_spi; memcpy(&pt->dst, &tdb->tdb_dst, sizeof pt->dst); - if (pt->dst.sa.sa_family == AF_INET) - pt->dst.sin.sin_addr.s_addr = - htonl(pt->dst.sin.sin_addr.s_addr); pt->sproto = tdb->tdb_sproto; } |