argus-clients-3.0.0.rc.7

[Peter Van Epp]

	And with this set against argus-clients-3.0.0.rc.7.tar.gz it also 
compiles on all machines (that I have anyway, Mac OS 10.4 may be a problem 
because I got around the extern int ether_hostton(const char *, struct 
ether_addr *); problem by defining __apple__ which  may break Mac OS 10.3.)
	As well there is this problem in Suse 9.1 that I'm not sure how to
fix (likely not doing either for linux since it seems to be defined there):

gcc -O3 -pthread  -I. -I../include -I../common  -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_FILE_OFFSET_BITS=64 -DARGUS_THREADS=1 -DHAVE_TCP_WRAPPER=1 -DHAVE_STRING_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_SYSLOG_H=1 -DHAVE_ETHER_HOSTTON=1 -DHAVE_STRERROR=1 -DHAVE_STRTOF=1 -DSTDC_HEADERS=1  -c ./radium.c
In file included from ../include/argus_client.h:56,
                 from radium.h:67,
                 from radium.c:41:
../include/argus_int.h:35:1: warning: "inline" redefined
In file included from /usr/include/asm/sigcontext.h:4,
                 from /usr/include/bits/sigcontext.h:28,
                 from /usr/include/signal.h:333,
                 from /usr/include/sys/wait.h:30,
                 from radium.h:54,
                 from radium.c:41:
/usr/include/linux/compiler.h:12:1: warning: this is the location of the previous definition
gcc -O3 -pthread  -o radium radium.o ../lib/argus_parse.a ../lib/argus_common.a ../lib/argus_client.a -lnsl -lwrap  -lm
make[1]: Leaving directory `/usr/local/src/argus-clients-3.0.0.rc.7/radium'

Peter Van Epp / Operations and Technical Support 
Simon Fraser University, Burnaby, B.C. Canada


*** common/argus_client.c.orig	Thu Jun 15 19:29:53 2006
--- common/argus_client.c	Thu Jun 15 19:34:33 2006
***************
*** 1668,1673 ****
--- 1668,1674 ----
     unsigned int *dsrptr = (unsigned int *)retn + 1;
     int i, x, len = 0, type = 0;
     struct ArgusDSRHeader *dsr;
+    struct ArgusFlow           *tflow = NULL;
  
     if (rec) {
        retn->hdr.type  = rec->hdr.type;
***************
*** 1676,1682 ****
        
        if (rec->hdr.type & ARGUS_FAR) {
           dsrindex = rec->dsrindex;
-          struct ArgusFlow           *tflow = NULL;
           for (i = 0, ind = 1; (dsrindex && (i < ARGUSMAXDSRTYPE)); i++, ind <<= 1) {
              if ((dsr = rec->dsrs[i]) != NULL) {
                 len = ((dsr->type & ARGUS_IMMEDIATE_DATA) ? 1 :
--- 1677,1682 ----


*** include/argus_os.h.orig	Thu Jun 15 21:12:18 2006
--- include/argus_os.h	Thu Jun 15 21:14:56 2006
***************
*** 39,45 ****
  
  #define HAVE_SYS_ERRLIST
  
! #if defined(__OpenBSD__)
  #include <sys/types.h>
  #endif
  
--- 39,45 ----
  
  #define HAVE_SYS_ERRLIST
  
! #if defined(__OpenBSD__) || defined (__FreeBSD__) || defined(__APPLE_CC__) || defined(__APPLE__)
  #include <sys/types.h>
  #endif
  

*** common/argus_util.c.orig	Thu Jun 15 20:59:09 2006
--- common/argus_util.c	Thu Jun 15 21:00:32 2006
***************
*** 9912,9918 ****
  }
  #else
  
! #if defined(HAVE_ETHER_HOSTTON)
  extern int ether_hostton(const char *, struct ether_addr *);
  #endif
  
--- 9912,9918 ----
  }
  #else
  
! #if defined(HAVE_ETHER_HOSTTON) && !defined(__APPLE_CC__) && !defined(__APPLE__)
  extern int ether_hostton(const char *, struct ether_addr *);
  #endif
  

*** include/compat.h.orig	Thu Jun 15 18:43:41 2006
--- include/compat.h	Thu Jun 15 19:32:00 2006
***************
*** 160,165 ****
--- 160,170 ----
  #define arg_int32   long
  #endif
  
+ #if defined (__FreeBSD__)
+ #include <sys/socket.h>
+ #include <netinet/if_ether.h>
+ #endif
+ 
  #ifndef ICMP_ROUTERADVERT
  #define	ICMP_ROUTERADVERT	9	/* router advertisement */
  #endif
***************
*** 210,216 ****
  #ifndef ETHERTYPE_ARP
  #define ETHERTYPE_ARP		0x0806
  #endif
! #ifndef ETHERTYPE_VINES
  #define ETHERTYPE_VINES		0x0bad
  #endif
  #ifndef ETHERTYPE_TRAIL
--- 215,221 ----
  #ifndef ETHERTYPE_ARP
  #define ETHERTYPE_ARP		0x0806
  #endif
! #if !defined(ETHERTYPE_VINES)
  #define ETHERTYPE_VINES		0x0bad
  #endif
  #ifndef ETHERTYPE_TRAIL


*** ratop/ratop.h.orig	Thu Jun 15 14:57:44 2006
--- ratop/ratop.h	Thu Jun 15 11:17:23 2006
***************
*** 69,78 ****
  #if defined(ARGUS_CURSES)
  #include <curses.h>
  
! #if defined(__NetBSD__) || !defined(CYGWIN)
! #include <term.h>
! #else
  #include <termios.h>
  #endif /* NetBSD || CYGWIN */
  
  char *RaModifyCommandArray[] = {
--- 69,78 ----
  #if defined(ARGUS_CURSES)
  #include <curses.h>
  
! #if defined(__NetBSD__) || defined(CYGWIN)
  #include <termios.h>
+ #else
+ #include <term.h>
  #endif /* NetBSD || CYGWIN */
  
  char *RaModifyCommandArray[] = {


*** common/scanner.l.orig	Thu Jun 15 18:59:40 2006
--- common/scanner.l	Thu Jun 15 19:39:26 2006
***************
*** 65,71 ****
  #include <tokdefs.h>
  #include <syslog.h>
  
! #if !defined(__NetBSD__) && !defined(__OpenBSD__)
  float strtof(const char *, char ** );
  #endif
  
--- 65,71 ----
  #include <tokdefs.h>
  #include <syslog.h>
  
! #if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
  float strtof(const char *, char ** );
  #endif