new argus and argus-clients code available
Peter Van Epp
vanepp at sfu.ca
Tue Jun 13 23:40:28 EDT 2006
And now the client patches (not yet tested on OpenBSD so there may
yet be more changes though :-)):
*** common/argus_util.c.orig Tue Jun 13 18:36:03 2006
--- common/argus_util.c Tue Jun 13 18:36:58 2006
***************
*** 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 Tue Jun 13 12:19:55 2006
--- common/scanner.l Tue Jun 13 12:21:10 2006
***************
*** 65,71 ****
--- 65,73 ----
#include <tokdefs.h>
#include <syslog.h>
+ #if !defined(__NetBSD__)
float strtof(const char *, char ** );
+ #endif
extern void ArgusLog (int, char *, ...);
#ifndef __GNUC__
More information about the argus
mailing list