diff options
| author | glebius <glebius@FreeBSD.org> | 2014-09-01 08:34:39 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-09-01 08:34:39 +0000 |
| commit | c13a1bd64376737cbf7022b2d44d996c858e9244 (patch) | |
| tree | 6bbf0ed8dc049b1f08ebc7d1bfa427672bdf8918 /sys/netpfil | |
| parent | 1f0f86c00bff27c3c1e056f3cb543ff1cd233c3c (diff) | |
| download | FreeBSD-src-c13a1bd64376737cbf7022b2d44d996c858e9244.zip FreeBSD-src-c13a1bd64376737cbf7022b2d44d996c858e9244.tar.gz | |
Fix ABI broken in r270576. This is direct commit to stable/10.
Reported by: kib
Diffstat (limited to 'sys/netpfil')
| -rw-r--r-- | sys/netpfil/pf/pf.c | 2 | ||||
| -rw-r--r-- | sys/netpfil/pf/pf.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index f5daacb..5ae383d 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3522,7 +3522,7 @@ pf_create_state(struct pf_rule *r, struct pf_rule *nr, struct pf_rule *a, 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); diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h index 630cd3f..3ea66d3 100644 --- a/sys/netpfil/pf/pf.h +++ b/sys/netpfil/pf/pf.h @@ -125,8 +125,7 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE, PF_ADDR_DYNIFTL, #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, PF_ADDR_DYNIFTL, "state-limit", \ "src-limit", \ "synproxy", \ - "map-failed", \ NULL \ } |
