argus-2.0.2 is available from the dev download area
Carter Bullard
carter at qosient.com
Mon Aug 27 12:55:28 EDT 2001
Hey Peter,
Could you try out ftp://qosient.com/dev/argus-2.0/argus-2.0.2.tar.gz
to see if it compiles under OpenBSD? This has your patches,
modified in places, incorporated.
Carter
Carter Bullard
QoSient, LLC
300 E. 56th Street, Suite 18K
New York, New York 10022
carter at qosient.com
Phone +1 212 588-9133
Fax +1 212 588-9134
http://qosient.com
> -----Original Message-----
> From: owner-argus-info at lists.andrew.cmu.edu
> [mailto:owner-argus-info at lists.andrew.cmu.edu] On Behalf Of
> Peter Van Epp
> Sent: Sunday, August 26, 2001 10:56 PM
> To: argus
> Subject: Re: argus-2.0.2 is available from the dev download area
>
>
> >
> > Hey Peter,
> > Well "better late than never"? 2.0.2 is now released,
> > so are these problems happening to /pub/argus/argus-2.0.2?
>
> Yep.
>
> >
> > It would probably be better if we modified the
> ./configure file so
> > that if its OpenBSD, we don't use the ../include/linux-include
> > directory. Could you check out how it behaves if you take the "-I
> > ../include/linux-include" out of the Makefiles?
> >
> >
> > Carter
> >
>
> Done. As well .devel is defined in the tar file which
> it probably
> shouldn't be. The following patch file compiles on OpenBSD
> 2.8 and FreeBSD 4.3 (and I would guess on NetBSD but I need
> to reboot the OpenBSD machine at work to bring up NetBSD to
> test it). Configure has been modified to remove the
> linux-include and all the .h file conflicts have been
> resolved either by
> manually only including the include once or commenting it out
> for OpenBSD
> (which likely means it could be removed because it is
> included somewhere else although I didn't do that). It is against the
>
> /pub/argus/argus-2.0.2/argus-2.0.2.tar.gz
>
> file.
> Its been somewhat over busy here so I'm just getting
> back to reading argus email ...
>
> Peter Van Epp / Operations and Technical Support
> Simon Fraser University, Burnaby, B.C. Canada
>
>
>
> *** server/ArgusModeler.c.orig Sun Aug 26 11:14:06 2001
> --- server/ArgusModeler.c Sun Aug 26 11:14:49 2001
> ***************
> *** 127,133 ****
> --- 127,136 ----
>
>
> #include <ethertype.h>
> +
> + #if !defined(__OpenBSD__)
> #include <netinet/if_ether.h>
> + #endif
>
> struct llc ArgusThisLLCBuffer;
> struct llc *ArgusThisLLC = &ArgusThisLLCBuffer;
> *** server/ArgusModeler.h.orig Sun Aug 26 10:49:59 2001
> --- server/ArgusModeler.h Sun Aug 26 11:10:01 2001
> ***************
> *** 106,116 ****
> --- 106,133 ----
>
> #if defined(HAVE_SOLARIS) || defined(__FreeBSD__) ||
> defined(__NetBSD__) || defined(__OpenBSD__)
> #include <sys/socket.h>
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NET_IF_H_
> + #define _NET_IF_H_
> + #include <net/if.h>
> + #endif
> + #else
> #include <net/if.h>
> #endif
>
> + #endif
> +
> #include <netinet/in.h>
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IF_SYSTM_H_
> + #define _NETINET_IF_SYSTM_H_
> + #include <netinet/in_systm.h>
> + #endif
> + #else
> #include <netinet/in_systm.h>
> + #endif
>
> #if !defined(__OpenBSD__)
> #include <netinet/if_ether.h>
> ***************
> *** 118,125 ****
> --- 135,158 ----
>
> #include <compat.h>
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_H_
> + #define _NETINET_IP_H_
> #include <netinet/ip.h>
> + #endif
> + #else
> + #include <netinet/ip.h>
> + #endif
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_UDP_H_
> + #define _NETINET_UDP_H_
> #include <netinet/udp.h>
> + #endif
> + #else
> + #include <netinet/udp.h>
> + #endif
> +
> #include <netinet/tcp.h>
> #include <netinet/ip_icmp.h>
> #include <netinet/igmp.h>
> *** server/ArgusSource.h.orig Sun Aug 26 11:02:00 2001
> --- server/ArgusSource.h Sun Aug 26 11:06:57 2001
> ***************
> *** 76,84 ****
> --- 76,109 ----
> #endif
>
> #include <netinet/in.h>
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IF_SYSTM_H_
> + #define _NETINET_IF_SYSTM_H_
> #include <netinet/in_systm.h>
> + #endif
> + #else
> + #include <netinet/in_systm.h>
> + #endif
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_H_
> + #define _NETINET_IP_H_
> + #include <netinet/ip.h>
> + #endif
> + #else
> #include <netinet/ip.h>
> + #endif
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_UDP_H_
> + #define _NETINET_UDP_H_
> + #include <netinet/udp.h>
> + #endif
> + #else
> #include <netinet/udp.h>
> + #endif
> +
> #include <netinet/tcp.h>
>
>
> *** server/Argus_app.c.orig Sun Aug 26 11:18:36 2001
> --- server/Argus_app.c Sun Aug 26 11:19:08 2001
> ***************
> *** 30,36 ****
> --- 30,38 ----
>
> #include <ArgusModeler.h>
>
> + #if !defined(__OpenBSD__)
> #include <netinet/udp.h>
> + #endif
> #include <netinet/rtp.h>
>
>
> *** server/Argus_arp.c.orig Sun Aug 26 11:19:39 2001
> --- server/Argus_arp.c Sun Aug 26 11:20:23 2001
> ***************
> *** 28,34 ****
> --- 28,37 ----
> #include <ArgusModeler.h>
> #include <os.h>
>
> + #if !defined(__OpenBSD__)
> #include <netinet/if_ether.h>
> + #endif
> +
>
> #if !defined(__OpenBSD__)
> #include <net/if_arp.h>
> *** server/Argus_icmp.c.orig Sun Aug 26 11:17:24 2001
> --- server/Argus_icmp.c Sun Aug 26 11:18:01 2001
> ***************
> *** 30,36 ****
> --- 30,38 ----
> #include <ArgusSource.h>
> #include <ArgusUtil.h>
>
> + #if !defined(__OpenBSD__)
> #include <netinet/ip_icmp.h>
> + #endif
>
>
> int
> *** server/Argus_udp.c.orig Sun Aug 26 11:15:44 2001
> --- server/Argus_udp.c Sun Aug 26 11:16:30 2001
> ***************
> *** 31,37 ****
> --- 31,39 ----
> #include <ArgusModeler.h>
> #include <bootp.h>
>
> + #if !defined(__OpenBSD__)
> #include <netinet/udp.h>
> + #endif
>
> struct bootp *bp;
>
> *** common/argus_filter.c.orig Sun Aug 26 07:18:35 2001
> --- common/argus_filter.c Sun Aug 26 10:36:29 2001
> ***************
> *** 80,94 ****
> --- 80,117 ----
> #endif
>
> #include <netinet/in.h>
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IF_SYSTM_H_
> + #define _NETINET_IF_SYSTM_H_
> + #include <netinet/in_systm.h>
> + #endif
> + #else
> #include <netinet/in_systm.h>
> + #endif
>
> #include <compat.h>
>
> #include <pcap.h>
> #include <interface.h>
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_H_
> + #define _NETINET_IP_H_
> + #include <netinet/ip.h>
> + #endif
> + #else
> #include <netinet/ip.h>
> + #endif
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_ICMP_H_
> + #define _NETINET_IP_ICMP_H_
> + #include <netinet/ip_icmp.h>
> + #endif
> + #else
> #include <netinet/ip_icmp.h>
> + #endif
>
> #include <argus_parse.h>
> #include <argus_out.h>
> ***************
> *** 701,707 ****
> #define ISLOOPBACK(p) (strcmp((p)->ifr_name, "lo0") == 0)
> #endif
>
> ! #if !defined(__OpenBSD__)
> #include <net/if.h>
> #endif
>
> --- 724,735 ----
> #define ISLOOPBACK(p) (strcmp((p)->ifr_name, "lo0") == 0)
> #endif
>
> ! #if defined(__OpenBSD__)
> ! #ifndef _NET_IF_H_
> ! #define _NET_IF_H_
> ! #include <net/if.h>
> ! #endif
> ! #else
> #include <net/if.h>
> #endif
>
> *** include/argus_out.h.orig Sun Aug 26 07:11:06 2001
> --- include/argus_out.h Sun Aug 26 07:31:41 2001
> ***************
> *** 49,58 ****
> --- 49,74 ----
> #if defined(HAVE_SOLARIS) || (__FreeBSD__) || (__NetBSD__)
> || (__OpenBSD__)
> #include <sys/types.h>
> #include <sys/socket.h>
> + #endif
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NET_IF_H_
> + #define _NET_IF_H_
> + #include <net/if.h>
> + #endif
> + #else
> #include <net/if.h>
> #endif
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IF_ETHER_H_
> + #define _NETINET_IF_ETHER_H_
> #include <netinet/if_ether.h>
> + #endif
> + #else
> + #include <netinet/if_ether.h>
> + #endif
> +
> #include <netinet/rtp.h>
> #include <llc.h>
>
> *** common/argus_util.c.orig Sun Aug 26 07:14:53 2001
> --- common/argus_util.c Sun Aug 26 07:17:21 2001
> ***************
> *** 222,228 ****
> --- 222,237 ----
> }
>
> #include <cons_def.h>
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_ICMP_H_
> + #define _NETINET_IP_ICMP_H_
> #include <netinet/ip_icmp.h>
> + #endif
> + #else
> + #include <netinet/ip_icmp.h>
> + #endif
> +
> extern int ArgusTotalBytes;
> extern int ArgusTotalCount;
>
> *** include/argus_util.h.orig Sun Aug 26 07:14:41 2001
> --- include/argus_util.h Sun Aug 26 10:37:10 2001
> ***************
> *** 46,53 ****
> --- 46,68 ----
> #ifndef ArgusUtil_h
> #define ArgusUtil_h
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IF_SYSTM_H_
> + #define _NETINET_IF_SYSTM_H_
> #include <netinet/in_systm.h>
> + #endif
> + #else
> + #include <netinet/in_systm.h>
> + #endif
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_H_
> + #define _NETINET_IP_H_
> + #include <netinet/ip.h>
> + #endif
> + #else
> #include <netinet/ip.h>
> + #endif
>
> #include <argus_out.h>
> #include <cons_out.h>
> ***************
> *** 161,167 ****
> --- 176,189 ----
> "sps", "pipe", "sctp", "fc",
> };
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_ICMP_H_
> + #define _NETINET_IP_ICMP_H_
> #include <netinet/ip_icmp.h>
> + #endif
> + #else
> + #include <netinet/ip_icmp.h>
> + #endif
>
> char *icmptypestr[ICMP_MAXTYPE + 1] = {
> "ECR", " ", " ", "UR", "SRC", "RED",
> *** configure.orig Sun Aug 26 07:04:31 2001
> --- configure Sun Aug 26 07:04:50 2001
> ***************
> *** 1641,1647 ****
> ;;
>
> openbsd*)
> ! V_INCLS="$V_INCLS -I../include/linux-include"
> echo "#define $host_cpu 1" >> confdefs.h
> ;;
>
> --- 1641,1647 ----
> ;;
>
> openbsd*)
> ! V_INCLS="$V_INCLS "
> echo "#define $host_cpu 1" >> confdefs.h
> ;;
>
> *** include/cons_out.h.orig Sun Aug 26 07:05:44 2001
> --- include/cons_out.h Sun Aug 26 10:23:50 2001
> ***************
> *** 42,53 ****
> *
> */
>
> ! #if !defined(__OpenBSD__)
> #include <net/if.h>
> #endif
>
> #include <netinet/in.h>
> #include <netinet/if_ether.h>
>
> struct THA_OBJECT {
> arg_int32 size;
> --- 42,66 ----
> *
> */
>
> ! #if defined(__OpenBSD__)
> ! #ifndef _NET_IF_H_
> ! #define _NET_IF_H_
> ! #include <net/if.h>
> ! #endif
> ! #else
> #include <net/if.h>
> #endif
>
> #include <netinet/in.h>
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IF_ETHER_H_
> + #define _NETINET_IF_ETHER_H_
> #include <netinet/if_ether.h>
> + #endif
> + #else
> + #include <netinet/if_ether.h>
> + #endif
>
> struct THA_OBJECT {
> arg_int32 size;
> *** common/gencode.c.orig Sun Aug 26 07:28:40 2001
> --- common/gencode.c Sun Aug 26 07:29:19 2001
> ***************
> *** 50,56 ****
> --- 50,64 ----
>
> #include <sys/time.h>
> #include <netinet/in.h>
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NET_IF_H_
> + #define _NET_IF_H_
> #include <net/if.h>
> + #endif
> + #else
> + #include <net/if.h>
> + #endif
>
> #include <setjmp.h>
> #include <stdarg.h>
> *** common/grammar.y.orig Sun Aug 26 07:29:40 2001
> --- common/grammar.y Sun Aug 26 07:30:10 2001
> ***************
> *** 52,58 ****
> --- 52,66 ----
>
> #include <stdlib.h>
> #include <sys/time.h>
> +
> + #if defined(__OpenBSD__)
> + #ifndef _NET_IF_H_
> + #define _NET_IF_H_
> #include <net/if.h>
> + #endif
> + #else
> + #include <net/if.h>
> + #endif
>
> #include <compat.h>
> #include <pcap.h>
> *** clients/ragator.c.orig Sun Aug 26 10:40:12 2001
> --- clients/ragator.c Sun Aug 26 10:46:35 2001
> ***************
> *** 903,909 ****
> --- 903,916 ----
> return (retn);
> }
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_ICMP_H_
> + #define _NETINET_IP_ICMP_H_
> #include <netinet/ip_icmp.h>
> + #endif
> + #else
> + #include <netinet/ip_icmp.h>
> + #endif
>
> void
> RaModifyDefaultFlow (struct ArgusRecord *argus)
> ***************
> *** 2049,2055 ****
> --- 2056,2069 ----
> }
>
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_ICMP_H_
> + #define _NETINET_IP_ICMP_H_
> #include <netinet/ip_icmp.h>
> + #endif
> + #else
> + #include <netinet/ip_icmp.h>
> + #endif
>
> struct RaPolicyStruct *
> RaParsePolicyEntry (char *str)
> *** clients/ramon.c.orig Sun Aug 26 10:40:29 2001
> --- clients/ramon.c Sun Aug 26 10:44:25 2001
> ***************
> *** 806,812 ****
> --- 806,819 ----
> return (retn);
> }
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_ICMP_H_
> + #define _NETINET_IP_ICMP_H_
> #include <netinet/ip_icmp.h>
> + #endif
> + #else
> + #include <netinet/ip_icmp.h>
> + #endif
>
> void
> RaModifyDefaultFlow (struct ArgusRecord *argus)
> ***************
> *** 1692,1699 ****
> return (retn);
> }
>
> !
> #include <netinet/ip_icmp.h>
>
> struct RaPolicyStruct *
> RaParsePolicyEntry (char *str)
> --- 1699,1712 ----
> return (retn);
> }
>
> ! #if defined(__OpenBSD__)
> ! #ifndef _NETINET_IP_ICMP_H_
> ! #define _NETINET_IP_ICMP_H_
> #include <netinet/ip_icmp.h>
> + #endif
> + #else
> + #include <netinet/ip_icmp.h>
> + #endif
>
> struct RaPolicyStruct *
> RaParsePolicyEntry (char *str)
> *** clients/raxml.c.orig Sun Aug 26 10:41:38 2001
> --- clients/raxml.c Sun Aug 26 10:45:22 2001
> ***************
> *** 376,382 ****
> --- 376,390 ----
> fflush(stdout);
> }
>
> + #if defined(__OpenBSD__)
> + #ifndef _NETINET_IP_ICMP_H_
> + #define _NETINET_IP_ICMP_H_
> #include <netinet/ip_icmp.h>
> + #endif
> + #else
> + #include <netinet/ip_icmp.h>
> + #endif
> +
> extern char *icmptypestr[];
>
> void
>
More information about the argus
mailing list