Re: pf: route-to least-states

[YASUOKA Masahiko]

Hi,

Let me add another fix of previous.

ok?

Fix previous commit which referred wrong address and returned wrong
value.

Index: sys/net/pf_lb.c
===================================================================
RCS file: /cvs/src/sys/net/pf_lb.c,v
retrieving revision 1.66
diff -u -p -r1.66 pf_lb.c
--- sys/net/pf_lb.c     28 Jul 2020 16:47:41 -0000      1.66
+++ sys/net/pf_lb.c     28 Jul 2020 16:52:24 -0000
@@ -323,7 +323,7 @@ pf_map_addr_sticky(sa_family_t af, struc
        }
 
        if ((rpool->opts & PF_POOL_TYPEMASK) == PF_POOL_LEASTSTATES) {
-               if (pf_map_addr_states_increase(af, rpool, naddr) == -1)
+               if (pf_map_addr_states_increase(af, rpool, cached) == -1)
                        return (-1);
        }
 
@@ -651,7 +651,7 @@ pf_map_addr_states_increase(sa_family_t 
                                pf_print_host(naddr, 0, af);
                                addlog(". Failed to increase count!\n");
                        }
-                       return (1);
+                       return (-1);
                }
        } else if (rpool->addr.type == PF_ADDR_DYNIFTL) {
                if (pfr_states_increase(rpool->addr.p.dyn->pfid_kt,
@@ -663,7 +663,7 @@ pf_map_addr_states_increase(sa_family_t 
                                pf_print_host(naddr, 0, af);
                                addlog(". Failed to increase count!\n");
                        }
-                       return (1);
+                       return (-1);
                }
        }
        return (0);