argus-3.0.0.rc.4 now available

[Peter Van Epp]

	Hopefully the last on server. NetBSD decided that it is its turn to 
be difficult :-), so a new copy of ArgusIgmp.c.dif (because they copied the
OpenBSD includes) and  new ones from nff.h and argus_int.h. 
	As well the compiler flagged these two which are probably fine but 
presumably it thinks should be cast:

gcc -g  -Wall -Wmissing-prototypes -Wstrict-prototypes -I. -I/usr/include  -I./../include -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DARGUSDEBUG=1 -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 -DHAVE_SYS_SOCKIO_H=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 -DCONFIG_X86_BSWAP=1 -DSTDC_HEADERS=1 -c ArgusModeler.c
ArgusModeler.c: In function `setArgusFarReportInterval':
ArgusModeler.c:3382: warning: subscript has type `char'
ArgusModeler.c:3386: warning: subscript has type `char'

gcc -g  -Wall -Wmissing-prototypes -Wstrict-prototypes -I. -I/usr/include  -I./../include -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DARGUSDEBUG=1 -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 -DHAVE_SYS_SOCKIO_H=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 -DCONFIG_X86_BSWAP=1 -DSTDC_HEADERS=1 -c ArgusOutput.c
ArgusOutput.c: In function `setArgusMarReportInterval':
ArgusOutput.c:948: warning: subscript has type `char'
ArgusOutput.c:952: warning: subscript has type `char'



*** argus/ArgusIgmp.c.orig	Thu Jun  8 11:20:12 2006
--- argus/ArgusIgmp.c	Thu Jun  8 09:16:18 2006
***************
*** 35,40 ****
--- 35,46 ----
  #include <ArgusSource.h>
  #include <ArgusUtil.h>
  
+ #if defined(__OpenBSD__) || defined(__NetBSD__) && !defined(__APPLE_CC__) && !defined(__APPLE__)
+ #define IGMP_V1_MEMBERSHIP_REPORT IGMP_v1_HOST_MEMBERSHIP_REPORT
+ #define IGMP_V2_MEMBERSHIP_REPORT IGMP_v2_HOST_MEMBERSHIP_REPORT 
+ #define IGMP_V2_LEAVE_GROUP IGMP_HOST_LEAVE_MESSAGE
+ #endif
+ 
  struct ArgusFlow *ArgusCreateIGMPv6Flow (struct ArgusModelerStruct *, struct igmp *);
  struct ArgusFlow *ArgusCreateIGMPFlow (struct ArgusModelerStruct *, struct ip *);
  

*** include/net/nff.h.orig	Thu Jun  8 11:19:22 2006
--- include/net/nff.h	Thu Jun  8 11:21:07 2006
***************
*** 173,180 ****
--- 173,183 ----
   * 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 */
 
 
*** include/argus_int.h.orig	Thu Jun  8 09:19:29 2006
--- include/argus_int.h	Thu Jun  8 09:25:20 2006
***************
*** 73,82 ****
--- 73,87 ----
  { 10,"DLT_FDDI", "FDDI"},
  { 11, "DLT_ATM_RFC1483", "LLC/SNAP encapsulated atm"},
  { 12, "DLT_LOOP", "loopback"},
+ #if defined(__NetBSD__)
+ ( 14, "DLT_PPP_BSDOS", "BSD/OS Point-to-point Protocol"},
+ #endif
  {100, "DLT_ATM_RFC1483", "LLC/SNAP encapsulated atm"},
  {101, "DLT_RAW", "raw IP"},
  {102, "DLT_SLIP_BSDOS", "BSD/OS Serial Line IP"},
+ #if !defined(__NetBSD__)
  {103, "DLT_PPP_BSDOS", "BSD/OS Point-to-point Protocol"},
+ #endif
  {104, "DLT_CHDLC", "Cisco HDLC"},
  {-1, "Undefined", "Undefined"},
  };