argus-3.0.0.rc.5 now available

[Peter Van Epp]

On Thu, Jun 08, 2006 at 10:09:17PM -0400, Carter Bullard wrote:
> Hey Peter,
>     I defined it this way:
> 
> #if !defined(IGMP_MEMBERSHIP_QUERY)
> #define IGMP_MEMBERSHIP_QUERY           0x11
> #endif
> #if !defined(IGMP_V1_MEMBERSHIP_REPORT)
> #define IGMP_V1_MEMBERSHIP_REPORT       0x12
> #endif
> #if !defined(IGMP_V2_MEMBERSHIP_REPORT)
> #define IGMP_V2_MEMBERSHIP_REPORT       0x16
> #endif
> #if !defined(IGMP_V2_LEAVE_GROUP)
> #define IGMP_V2_LEAVE_GROUP             0x17
> #endif
> 
> Carter
> 

	Thats a better bet for sure. Below are the clients patches for 
NetBSD (I haven't done it for OpenBSD yet so you may want to wait for
tomorrow when I can reboot the test machine back in to OpenBSD). With
this all the clients compile clean.


*** include/argus_os.h.orig	Thu Jun  8 12:17:09 2006
--- include/argus_os.h	Thu Jun  8 12:17:35 2006
***************
*** 100,106 ****
  #include <sys/types.h>
  #include <netinet/icmp6.h>
  
! #if defined(MLD_LISTENER_QUERY)
  #define ICMP6_MEMBERSHIP_QUERY 		MLD_LISTENER_QUERY
  #define ICMP6_MEMBERSHIP_REPORT		MLD_LISTENER_REPORT
  #define ICMP6_MEMBERSHIP_REDUCTION	MLD_LISTENER_REDUCTION
--- 100,106 ----
  #include <sys/types.h>
  #include <netinet/icmp6.h>
  
! #if defined(MLD_LISTENER_QUERY) && !defined(__NetBSD__)
  #define ICMP6_MEMBERSHIP_QUERY 		MLD_LISTENER_QUERY
  #define ICMP6_MEMBERSHIP_REPORT		MLD_LISTENER_REPORT
  #define ICMP6_MEMBERSHIP_REDUCTION	MLD_LISTENER_REDUCTION


*** common/argus_util.c.orig	Thu Jun  8 11:52:45 2006
--- common/argus_util.c	Thu Jun  8 11:55:26 2006
***************
*** 10796,10802 ****
  
  
  #if defined(_LITTLE_ENDIAN)
! #if defined(__FreeBSD__)
  #include <extract.h>
  #if !defined(ntohll)
  #define ntohll(x) EXTRACT_64BITS(&x)
--- 10796,10802 ----
  
  
  #if defined(_LITTLE_ENDIAN)
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
  #include <extract.h>
  #if !defined(ntohll)
  #define ntohll(x) EXTRACT_64BITS(&x)


*** include/compat.h.orig	Thu Jun  8 13:02:54 2006
--- include/compat.h	Thu Jun  8 13:03:48 2006
***************
*** 98,106 ****
  #endif
  #endif
  
- #if !defined(HAVE_STRTOF)
- float strtof (char *, char **);
- #endif
  #if !defined(HAVE_STRLCPY)
  size_t strlcpy(char *, const char *, size_t);
  #endif
--- 98,103 ----


*** include/net/nff.h.orig	Thu Jun  8 11:20:12 2006
--- include/net/nff.h	Thu Jun  8 12:25:08 2006
***************
*** 205,212 ****
--- 205,215 ----
   * 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 */