Author: glebius
Date: Mon Sep 1 08:34:39 2014
New Revision: 270925
URL: http://svnweb.freebsd.org/changeset/base/270925
Log:
Fix ABI broken in r270576. This is direct commit to stable/10.
Reported by: kib
Modified:
stable/10/sys/netpfil/pf/pf.c
stable/10/sys/netpfil/pf/pf.h
Modified: stable/10/sys/netpfil/pf/pf.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf.c Mon Sep 1 08:33:52 2014
(r270924)
+++ stable/10/sys/netpfil/pf/pf.c Mon Sep 1 08:34:39 2014
(r270925)
@@ -3522,7 +3522,7 @@ pf_create_state(struct pf_rule *r, struc
if (r->rt && r->rt != PF_FASTROUTE) {
if (pf_map_addr(pd->af, r, pd->src, &s->rt_addr, NULL, &sn)) {
- REASON_SET(&reason, PFRES_MAPFAILED);
+ REASON_SET(&reason, PFRES_BADSTATE);
pf_src_tree_remove_state(s);
STATE_DEC_COUNTERS(s);
uma_zfree(V_pf_state_z, s);
Modified: stable/10/sys/netpfil/pf/pf.h
==============================================================================
--- stable/10/sys/netpfil/pf/pf.h Mon Sep 1 08:33:52 2014
(r270924)
+++ stable/10/sys/netpfil/pf/pf.h Mon Sep 1 08:34:39 2014
(r270925)
@@ -125,8 +125,7 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE
#define PFRES_MAXSTATES 12 /* State limit */
#define PFRES_SRCLIMIT 13 /* Source node/conn limit */
#define PFRES_SYNPROXY 14 /* SYN proxy */
-#define PFRES_MAPFAILED 15 /* pf_map_addr() failed */
-#define PFRES_MAX 16 /* total+1 */
+#define PFRES_MAX 15 /* total+1 */
#define PFRES_NAMES { \
"match", \
@@ -144,7 +143,6 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE
"state-limit", \
"src-limit", \
"synproxy", \
- "map-failed", \
NULL \
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
