a1cde0a2c4
PR: ports/155938 Submitted by: Fabian Keil <fk@fabiankeil.de> Approved by: maintainer timeout (46 weeks)
69 lines
1.5 KiB
C
69 lines
1.5 KiB
C
$OpenBSD: patch-cache_c,v 1.1 2008/06/13 00:38:12 canacar Exp $
|
|
--- cache.c.orig Tue Nov 6 23:34:18 2007
|
|
+++ cache.c Wed Jun 11 19:50:07 2008
|
|
@@ -118,12 +118,17 @@ add_state(pf_state_t *st)
|
|
|
|
cache_size--;
|
|
|
|
+#ifdef HAVE_PFSYNC_STATE
|
|
+ ent->id[0] = st->id[0];
|
|
+ ent->id[1] = st->id[1];
|
|
+#else
|
|
ent->addr[0] = st->lan.addr;
|
|
ent->port[0] = st->lan.port;
|
|
ent->addr[1] = st->ext.addr;
|
|
ent->port[1] = st->ext.port;
|
|
ent->af = st->af;
|
|
ent->proto = st->proto;
|
|
+#endif
|
|
#ifdef HAVE_INOUT_COUNT
|
|
ent->bytes = COUNTER(st->bytes[0]) + COUNTER(st->bytes[1]);
|
|
#else
|
|
@@ -147,13 +152,17 @@ cache_state(pf_state_t *st)
|
|
if (cache_max == 0)
|
|
return (NULL);
|
|
|
|
+#ifdef HAVE_PFSYNC_STATE
|
|
+ ent.id[0] = st->id[0];
|
|
+ ent.id[1] = st->id[1];
|
|
+#else
|
|
ent.addr[0] = st->lan.addr;
|
|
ent.port[0] = st->lan.port;
|
|
ent.addr[1] = st->ext.addr;
|
|
ent.port[1] = st->ext.port;
|
|
ent.af = st->af;
|
|
ent.proto = st->proto;
|
|
-
|
|
+#endif
|
|
old = RB_FIND(sc_tree, &sctree, &ent);
|
|
|
|
if (old == NULL) {
|
|
@@ -210,8 +219,18 @@ cache_endupdate(void)
|
|
static __inline int
|
|
sc_cmp(struct sc_ent *a, struct sc_ent *b)
|
|
{
|
|
+#ifdef HAVE_PFSYNC_STATE
|
|
+ if (a->id[0] > b->id[0])
|
|
+ return (1);
|
|
+ if (a->id[0] < b->id[0])
|
|
+ return (-1);
|
|
+ if (a->id[1] > b->id[1])
|
|
+ return (1);
|
|
+ if (a->id[1] < b->id[1])
|
|
+ return (-1);
|
|
+#else
|
|
int diff;
|
|
-
|
|
+
|
|
if ((diff = a->proto - b->proto) != 0)
|
|
return (diff);
|
|
if ((diff = a->af - b->af) != 0)
|
|
@@ -269,6 +288,6 @@ sc_cmp(struct sc_ent *a, struct sc_ent *b)
|
|
return (diff);
|
|
if ((diff = a->port[1] - b->port[1]) != 0)
|
|
return (diff);
|
|
-
|
|
+#endif
|
|
return (0);
|
|
}
|