new clients patches against argus-clients-3.0.0.rc.6.tar.gz

[Peter Van Epp]

	Below are the complete set of client patches against 
argus-clients-3.0.0.rc.6.tar (with 2 changes for OpenBSD from last night's set).
With these clients compile on FreeBSD 5.4, FreeBSD 6.1, SUSE 9.1 OpenBSD 3.8
and NetBSD 1.8(?, the latest anyway). 


*** common/argus_util.c.orig	Tue Jun 13 17:55:27 2006
--- common/argus_util.c	Wed Jun 14 01:18:22 2006
***************
*** 8935,8941 ****
  #ifdef ETHER_SERVICE
  struct ether_addr;
  
! #if defined(HAVE_ETHER_HOSTTON)
  extern int ether_ntohost(char *, const struct ether_addr *);
  #endif
  #endif
--- 8935,8941 ----
  #ifdef ETHER_SERVICE
  struct ether_addr;
  
! #if defined(HAVE_ETHER_HOSTTON) && !defined(__OpenBSD__)
  extern int ether_ntohost(char *, const struct ether_addr *);
  #endif
  #endif
***************
*** 10535,10541 ****
  
  #if !defined(ntohll)
  #if defined(_LITTLE_ENDIAN)
! #if defined(__FreeBSD__) || if defined(__OpenBSD__) || if defined(__NetBSD__)
  #include <extract.h>
  #define ntohll(x) EXTRACT_64BITS(&x)
  #define htonll(x) EXTRACT_64BITS(&x)
--- 10535,10541 ----
  
  #if !defined(ntohll)
  #if defined(_LITTLE_ENDIAN)
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
  #include <extract.h>
  #define ntohll(x) EXTRACT_64BITS(&x)
  #define htonll(x) EXTRACT_64BITS(&x)


*** include/net/nff.h.orig	Tue Jun 13 13:09:10 2006
--- include/net/nff.h	Tue Jun 13 13:10:14 2006
***************
*** 205,212 ****
--- 205,214 ----
   * continue to compile - even though they won't correctly read
   * files of these types.
   */
+ #if !defined(__NetBSD__)
  #define DLT_SLIP_BSDOS	15	/* BSD/OS Serial Line IP */
  #define DLT_PPP_BSDOS	16	/* BSD/OS Point-to-point Protocol */
+ #endif
  
  #define DLT_ATM_CLIP	19	/* Linux Classical-IP over ATM */
  

*** ratop/ratop.h.orig	Tue Jun 13 12:28:45 2006
--- ratop/ratop.h	Tue Jun 13 12:34:26 2006
***************
*** 69,78 ****
  #if defined(ARGUS_CURSES)
  #include <curses.h>
  
! #if !defined(CYGWIN)
! #include <term.h>
! #else
  #include <termios.h>
  #endif /* CYGWIN */
  
  char *RaModifyCommandArray[] = {
--- 69,78 ----
  #if defined(ARGUS_CURSES)
  #include <curses.h>
  
! #if defined(CYGWIN) || defined(__NetBSD__)
  #include <termios.h>
+ #else
+ #include <term.h>
  #endif /* CYGWIN */
  
  char *RaModifyCommandArray[] = {

*** common/scanner.l.orig	Thu Jun  8 11:20:12 2006
--- common/scanner.l	Wed Jun 14 01:27:02 2006
***************
*** 65,71 ****
--- 65,73 ----
  #include <tokdefs.h>
  #include <syslog.h>
  
+ #if !defined(__NetBSD__) && !defined(__OpenBSD__)
  float strtof(const char *, char ** );
+ #endif
  extern void ArgusLog (int, char *, ...);
  
  #ifndef __GNUC__