argus-clients-3.0.0.rc.4
Peter Van Epp
vanepp at sfu.ca
Fri Jun 9 23:39:15 EDT 2006
The almost final set of clients patches (this does everything except
Mac OS 10.3 which is really broken, against argus-clients-3.0.0.rc.4).
I think I'm probably missing something simple on Mac OS 10.3 but I
don't know what. I expect a single .h file will fix all this but I haven't
been able to figure out which one :-)
gcc -O3 -I. -I../include -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 -DARGUS_THREADS=1 -DHAVE_TCP_WRAPPER=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 -DHAVE_STRTOF=1 -DHAVE_DARWIN=1 -DSTDC_HEADERS=1 -DARGUS_SYSLOG -c ./argus_main.c
In file included from ../include/argus_os.h:99,
from argus_main.c:65:
/usr/include/netinet/in.h:255: error: parse error before "in_addr_t"
/usr/include/netinet/in.h:312: error: parse error before "u_char"
/usr/include/netinet/in.h:314: error: parse error before "sin_port"
/usr/include/netinet/in.h:317: error: parse error before '}' token
/usr/include/netinet/in.h:329: error: field `ip_dst' has incomplete type
/usr/include/netinet/in.h:398: error: field `imr_multiaddr' has incomplete type
/usr/include/netinet/in.h:399: error: field `imr_interface' has incomplete type
In file included from /usr/include/netinet/in.h:518,
from ../include/argus_os.h:99,
from argus_main.c:65:
/usr/include/netinet6/in6.h:123: error: parse error before "u_int8_t"
/usr/include/netinet6/in6.h:125: error: parse error before "__u6_addr32"
/usr/include/netinet6/in6.h:126: error: parse error before '}' token
/usr/include/netinet6/in6.h:127: error: parse error before '}' token
/usr/include/netinet6/in6.h:145: error: parse error before "u_int8_t"
/usr/include/netinet6/in6.h:147: error: parse error before "sin6_port"
/usr/include/netinet6/in6.h:148: error: parse error before "sin6_flowinfo"
/usr/include/netinet6/in6.h:150: error: parse error before "sin6_scope_id"
/usr/include/netinet6/in6.h:384: error: field `ro_dst' has incomplete type
/usr/include/netinet6/in6.h:455: error: field `ipv6mr_multiaddr' has incomplete type
/usr/include/netinet6/in6.h:463: error: field `ipi6_addr' has incomplete type
/usr/include/netinet6/in6.h:615: error: syntax error before "struct"
/usr/include/netinet6/in6.h:617: error: parse error before "__P"
/usr/include/netinet6/in6.h:618: error: parse error before "__P"
/usr/include/netinet6/in6.h:619: error: parse error before "__P"
/usr/include/netinet6/in6.h:621: error: parse error before '*' token
/usr/include/netinet6/in6.h:622: error: parse error before "__P"
/usr/include/netinet6/in6.h:623: error: parse error before "__P"
/usr/include/netinet6/in6.h:625: error: parse error before "inet6_rthdr_space"
/usr/include/netinet6/in6.h:626: error: parse error before "__P"
/usr/include/netinet6/in6.h:627: error: parse error before "__P"
/usr/include/netinet6/in6.h:629: error: parse error before "__P"
/usr/include/netinet6/in6.h:633: error: parse error before "__P"
/usr/include/netinet6/in6.h:634: error: parse error before "__P"
/usr/include/netinet6/in6.h:635: error: parse error before "__P"
/usr/include/netinet6/in6.h:637: error: parse error before "__P"
/usr/include/netinet6/in6.h:638: error: parse error before "__P"
/usr/include/netinet6/in6.h:640: error: parse error before "__P"
/usr/include/netinet6/in6.h:641: error: parse error before "__P"
/usr/include/netinet6/in6.h:643: error: parse error before "__P"
/usr/include/netinet6/in6.h:645: error: parse error before "__P"
/usr/include/netinet6/in6.h:647: error: parse error before "__P"
/usr/include/netinet6/in6.h:648: error: parse error before "inet6_rth_space"
/usr/include/netinet6/in6.h:649: error: parse error before "__P"
/usr/include/netinet6/in6.h:650: error: parse error before "__P"
/usr/include/netinet6/in6.h:651: error: parse error before "__P"
/usr/include/netinet6/in6.h:652: error: parse error before "__P"
/usr/include/netinet6/in6.h:653: error: parse error before "__P"
In file included from /usr/include/machine/types.h:30,
from /usr/include/sys/types.h:72,
from ../include/argus_os.h:100,
from argus_main.c:65:
/usr/include/ppc/types.h:69: error: syntax error before "typedef"
In file included from ../include/argus_os.h:101,
from argus_main.c:65:
/usr/include/netinet/icmp6.h:190: error: field `mld6_addr' has incomplete type
/usr/include/netinet/icmp6.h:244: error: field `nd_ns_target' has incomplete type
/usr/include/netinet/icmp6.h:255: error: field `nd_na_target' has incomplete type
/usr/include/netinet/icmp6.h:277: error: field `nd_rd_target' has incomplete type
/usr/include/netinet/icmp6.h:278: error: field `nd_rd_dst' has incomplete type
/usr/include/netinet/icmp6.h:309: error: field `nd_opt_pi_prefix' has incomplete type
/usr/include/netinet/icmp6.h:456: error: field `rpm_prefix' has incomplete type
/usr/include/netinet/icmp6.h:472: error: field `rpu_prefix' has incomplete type
/usr/include/netinet/icmp6.h:490: error: field `rrr_prefix' has incomplete type
In file included from ../include/argus_out.h:44,
from argus_main.c:69:
/usr/include/netinet/if_ether.h:171: error: field `sin_addr' has incomplete type
/usr/include/netinet/if_ether.h:172: error: field `sin_srcaddr' has incomplete type
In file included from ../include/argus_util.h:34,
from argus_main.c:73:
/usr/include/netinet/in_systm.h:75: error: parse error before "n_short"
/usr/include/netinet/in_systm.h:76: error: parse error before "n_long"
/usr/include/netinet/in_systm.h:78: error: parse error before "n_time"
In file included from ../include/argus_util.h:35,
from argus_main.c:73:
/usr/include/netinet/ip.h:95: error: field `ip_src' has incomplete type
/usr/include/netinet/ip.h:95: error: field `ip_dst' has incomplete type
/usr/include/netinet/ip.h:178: error: parse error before "n_long"
/usr/include/netinet/ip.h:180: error: field `ipt_addr' has incomplete type
/usr/include/netinet/ip.h:181: error: parse error before "n_long"
/usr/include/netinet/ip.h:183: error: parse error before '}' token
/usr/include/netinet/ip.h:184: error: parse error before '}' token
In file included from /usr/include/mach/mach_types.h:64,
from /usr/include/pthread.h:66,
from ../include/argus_util.h:37,
from argus_main.c:73:
/usr/include/gcc/darwin/3.3/stdint.h:34: error: parse error before "uint8_t"
/usr/include/gcc/darwin/3.3/stdint.h:35: error: parse error before "uint16_t"
/usr/include/gcc/darwin/3.3/stdint.h:36: error: parse error before "uint32_t"
/usr/include/gcc/darwin/3.3/stdint.h:45: error: parse error before "uint_least8_t"
/usr/include/gcc/darwin/3.3/stdint.h:46: error: parse error before "uint_least16_t"
/usr/include/gcc/darwin/3.3/stdint.h:47: error: parse error before "uint_least32_t"
/usr/include/gcc/darwin/3.3/stdint.h:56: error: parse error before "uint_fast8_t"
/usr/include/gcc/darwin/3.3/stdint.h:57: error: parse error before "uint_fast16_t"
/usr/include/gcc/darwin/3.3/stdint.h:58: error: parse error before "uint_fast32_t"
In file included from /usr/include/mach/memory_object_types.h:68,
from /usr/include/mach/mach_types.h:71,
from /usr/include/pthread.h:66,
from ../include/argus_util.h:37,
from argus_main.c:73:
/usr/include/mach/vm_types.h:57: error: parse error before "reg64_t"
/usr/include/mach/vm_types.h:64: error: parse error before "ppnum_t"
In file included from /usr/include/mach/mach_types.h:79,
from /usr/include/pthread.h:66,
from ../include/argus_util.h:37,
from argus_main.c:73:
/usr/include/mach/thread_policy.h:154: error: parse error before "uint32_t"
/usr/include/mach/thread_policy.h:156: error: parse error before "constraint"
/usr/include/mach/thread_policy.h:158: error: parse error before '}' token
In file included from ../include/argus_util.h:41,
from argus_main.c:73:
../include/cons_out.h:64: error: field `src' has incomplete type
../include/cons_out.h:65: error: field `dst' has incomplete type
../include/cons_out.h:71: error: field `src' has incomplete type
../include/cons_out.h:72: error: field `dst' has incomplete type
../include/cons_out.h:107: error: field `srcaddr' has incomplete type
../include/cons_out.h:107: error: field `dstaddr' has incomplete type
../include/cons_out.h:107: error: field `gwaddr' has incomplete type
../include/cons_out.h:129: error: field `src' has incomplete type
../include/cons_out.h:130: error: field `dst' has incomplete type
In file included from ../include/argus_util.h:68,
from argus_main.c:73:
/usr/include/netinet/ip_icmp.h:84: error: field `ih_gwaddr' has incomplete type
/usr/include/netinet/ip_icmp.h:86: error: parse error before "n_short"
/usr/include/netinet/ip_icmp.h:93: error: parse error before "n_short"
/usr/include/netinet/ip_icmp.h:102: error: parse error before '}' token
/usr/include/netinet/ip_icmp.h:115: error: parse error before "n_time"
/usr/include/netinet/ip_icmp.h:117: error: parse error before "its_ttime"
/usr/include/netinet/ip_icmp.h:126: error: parse error before '}' token
/usr/include/netinet/ip_icmp.h:134: error: parse error before '}' token
/usr/include/netinet/in.h:315: error: storage size of `sin_addr' isn't known
/usr/include/netinet6/in6.h:149: error: storage size of `sin6_addr' isn't known
make[1]: *** [argus_main.o] Error 1
*** include/argus_os.h.orig Fri Jun 9 08:26:56 2006
--- include/argus_os.h Fri Jun 9 04:11:17 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__)&& !defined(__OpenBSD__)
#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:20:12 2006
--- common/argus_util.c Fri Jun 9 04:35:18 2006
***************
*** 9210,9216 ****
#ifdef ETHER_SERVICE
struct ether_addr;
! #if defined(HAVE_ETHER_HOSTTON)
extern int ether_ntohost(char *, const struct ether_addr *);
#endif
#endif
--- 9210,9216 ----
#ifdef ETHER_SERVICE
struct ether_addr;
! #if defined(HAVE_ETHER_HOSTTON) && !defined(__OpenBSD__)
extern int ether_ntohost(char *, const struct ether_addr *);
#endif
#endif
***************
*** 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 */
More information about the argus
mailing list