diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-06-29 15:12:22 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-06-29 15:12:22 +0000 |
| commit | c15eeb5d6d49a86f24b2782e5e2fc463782297a9 (patch) | |
| tree | 62e8b4f813b2ea61249d168ff18e519ddc33e97d /sys/net | |
| parent | 63bedb40764baf2de207e1e9c746d542088dd89c (diff) | |
add ESN-related bits missed in the previous commit
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_pfsync.c | 10 | ||||
| -rw-r--r-- | sys/net/if_pfsync.h | 12 |
2 files changed, 13 insertions, 9 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 994aa184846..1de226decfd 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.185 2012/06/28 13:59:21 mikeb Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.186 2012/06/29 15:12:21 mikeb Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -140,14 +140,16 @@ struct { { pfsync_in_error, 0 }, /* PFSYNC_ACT_BUS */ { pfsync_in_bus, sizeof(struct pfsync_bus) }, - /* PFSYNC_ACT_TDB */ - { pfsync_in_tdb, sizeof(struct pfsync_tdb) }, + /* PFSYNC_ACT_OTDB */ + { pfsync_in_error, 0 }, /* PFSYNC_ACT_EOF */ { pfsync_in_error, 0 }, /* PFSYNC_ACT_INS */ { pfsync_in_ins, sizeof(struct pfsync_state) }, /* PFSYNC_ACT_UPD */ - { pfsync_in_upd, sizeof(struct pfsync_state) } + { pfsync_in_upd, sizeof(struct pfsync_state) }, + /* PFSYNC_ACT_TDB */ + { pfsync_in_tdb, sizeof(struct pfsync_tdb) }, }; struct pfsync_q { diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h index 8e9e84b5f0c..4fcc8006b6b 100644 --- a/sys/net/if_pfsync.h +++ b/sys/net/if_pfsync.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.h,v 1.45 2012/06/29 14:48:04 mikeb Exp $ */ +/* $OpenBSD: if_pfsync.h,v 1.46 2012/06/29 15:12:21 mikeb Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -59,11 +59,12 @@ #define PFSYNC_ACT_INS_F 8 /* insert fragment */ #define PFSYNC_ACT_DEL_F 9 /* delete fragments */ #define PFSYNC_ACT_BUS 10 /* bulk update status */ -#define PFSYNC_ACT_TDB 11 /* TDB replay counter update */ +#define PFSYNC_ACT_OTDB 11 /* old TDB replay counter update */ #define PFSYNC_ACT_EOF 12 /* end of frame - DEPRECATED */ #define PFSYNC_ACT_INS 13 /* insert state */ #define PFSYNC_ACT_UPD 14 /* update state */ -#define PFSYNC_ACT_MAX 15 +#define PFSYNC_ACT_TDB 15 /* TDB replay counter update */ +#define PFSYNC_ACT_MAX 16 #define PFSYNC_ACTIONS "CLR ST", \ "INS ST OLD", \ @@ -76,10 +77,11 @@ "INS FR", \ "DEL FR", \ "BULK UPD STAT", \ - "TDB UPD", \ + "UPD TDB OLD", \ "EOF", \ "INS ST", \ - "UPD ST" + "UPD ST", \ + "UPD TDB" /* * A pfsync frame is built from a header followed by several sections which |