[src/trunk]: src/sys/dist/pf/net Apply a patch from OPENBSD_3_6 branch (ok ya...

[peter <peter%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/456ae37ee3bf
branches:  trunk
changeset: 572140:456ae37ee3bf
user:      peter <peter%NetBSD.org@localhost>
date:      Tue Dec 21 12:05:34 2004 +0000

description:
Apply a patch from OPENBSD_3_6 branch (ok yamt).

MFC:
Fix by mcbride@

Initialise init_addr in pf_map_addr() in the PF_POOL_ROUNDROBIN,
prevents a possible endless loop in pf_get_sport() with 'static-port'

Reported by adm at celeritystorm dot com in FreeBSD PR74930, debugging
by dhartmei@

ok mcbride@ dhartmei@ deraadt@ henning@

diffstat:

 sys/dist/pf/net/pf.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 67a7e841e0d2 -r 456ae37ee3bf sys/dist/pf/net/pf.c
--- a/sys/dist/pf/net/pf.c      Tue Dec 21 11:40:12 2004 +0000
+++ b/sys/dist/pf/net/pf.c      Tue Dec 21 12:05:34 2004 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: pf.c,v 1.9 2004/12/21 05:55:23 yamt Exp $      */
-/*     $OpenBSD: pf.c,v 1.457.2.4 2004/11/28 06:21:44 brad Exp $ */
+/*     $NetBSD: pf.c,v 1.10 2004/12/21 12:05:34 peter Exp $    */
+/*     $OpenBSD: pf.c,v 1.457.2.5 2004/12/16 02:04:55 brad Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -2012,6 +2012,8 @@
 
        get_addr:
                PF_ACPY(naddr, &rpool->counter, af);
+               if (init_addr != NULL && PF_AZERO(init_addr, af))
+                       PF_ACPY(init_addr, naddr, af);
                PF_AINC(&rpool->counter, af);
                break;
        }