===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/cache.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/systat/cache.h	2008/06/12 22:26:01	1.1
--- src/usr.bin/systat/cache.h	2008/07/16 10:23:39	1.2
***************
*** 1,4 ****
! /* $Id: cache.h,v 1.1 2008/06/12 22:26:01 canacar Exp $ */
  /*
   * Copyright (c) 2001, 2007 Can Erkin Acar <canacar@openbsd.org>
   *
--- 1,4 ----
! /* $Id: cache.h,v 1.2 2008/07/16 10:23:39 canacar Exp $ */
  /*
   * Copyright (c) 2001, 2007 Can Erkin Acar <canacar@openbsd.org>
   *
***************
*** 18,56 ****
  #ifndef _CACHE_H_
  #define _CACHE_H_
  
- #include "config.h"
- 
  #include <sys/queue.h>
- #ifdef HAVE_TREE_H
  #include <sys/tree.h>
! #else
! #include "tree.h"
! #endif
  
- 
  struct sc_ent {
          RB_ENTRY(sc_ent)    tlink;
  	TAILQ_ENTRY(sc_ent) qlink;
- #ifdef HAVE_PFSYNC_STATE
  	u_int32_t	    id[2];
- #else
- 	struct pf_addr      addr[2];
- #endif
  	double		    peak;
  	double		    rate;
  	time_t		    t;
  	u_int32_t	    bytes;
- #ifndef HAVE_PFSYNC_STATE
-         u_int16_t           port[2];
-         u_int8_t            af;
-         u_int8_t            proto;
- #endif
  };
  
  int cache_init(int);
  void cache_endupdate(void);
! struct sc_ent *cache_state(pf_state_t *);
  extern int cache_max, cache_size;
  
  
  #endif
--- 18,43 ----
  #ifndef _CACHE_H_
  #define _CACHE_H_
  
  #include <sys/queue.h>
  #include <sys/tree.h>
! #include <net/pfvar.h>
  
  struct sc_ent {
          RB_ENTRY(sc_ent)    tlink;
  	TAILQ_ENTRY(sc_ent) qlink;
  	u_int32_t	    id[2];
  	double		    peak;
  	double		    rate;
  	time_t		    t;
  	u_int32_t	    bytes;
  };
  
  int cache_init(int);
  void cache_endupdate(void);
! struct sc_ent *cache_state(struct pfsync_state *);
  extern int cache_max, cache_size;
+ 
+ #define COUNTER(c) ((((u_int64_t) ntohl(c[0]))<<32) + ntohl(c[1]))
  
  
  #endif