Changeset 1128

Timestamp:

02/18/07 11:53:30 (2 years ago)

Author:

honeytrap

Message:

compile bugs fixed

Files:

• honeytrap/trunk/configure (modified) (13 diffs)
• honeytrap/trunk/configure.in (modified) (4 diffs)
• honeytrap/trunk/src/ctrl.c (modified) (1 diff)
• honeytrap/trunk/src/honeytrap.h (modified) (2 diffs)
• honeytrap/trunk/src/ipqmon.h (modified) (1 diff)
• honeytrap/trunk/src/pcapmon.h (modified) (1 diff)

honeytrap/trunk/configure

@@ -1 +1 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-4
+3
-#
-# Report bugs to <tillmann.werner@gmx.de>.
@@ -424 +424 @@
-PACKAGE_NAME='honeytrap'
-PACKAGE_TARNAME='honeytrap'
-4
-4
+3
+3
-PACKAGE_BUGREPORT='tillmann.werner@gmx.de'
-
@@ -954 +954 @@
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-4
+3
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020 +1020 @@
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-4
+3
-   esac
-  cat <<\_ACEOF
@@ -1173 +1173 @@
-if $ac_init_version; then
-  cat <<\_ACEOF
-4
+3
-generated by GNU Autoconf 2.59
-
@@ -1187 +1187 @@
-running configure, to aid debugging if configure makes a mistake.
-
-4
+3
-generated by GNU Autoconf 2.59.  Invocation command line was
-
@@ -1832 +1832 @@
-# Define the identity of the package.
- PACKAGE=honeytrap
-4
+3
-
-
@@ -20424 +20424 @@
-_ACEOF
-
-
+
+
-esac
-
@@ -23003 +23004 @@
-
-if test "$DLLIB" != "no"; then
-
-
-
-
+
+
+
+
+
+
+
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-dl
+c
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
@@ -23054 +23058 @@
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlsym=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlsym=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
-if test $ac_cv_lib_dl_dlsym = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
-else
-  DLLIB="no"
-fi
-
-        if test "$DLLIB" != "no"; then
-                LIBS="$LIBS -ldl"
-        else
-
-echo "$as_me:$LINENO: checking for dlsym in -lc" >&5
-echo $ECHO_N "checking for dlsym in -lc... $ECHO_C" >&6
-if test "${ac_cv_lib_c_dlsym+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlsym ();
-int
-main ()
-{
-dlsym ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_c_dlsym=yes
-else
@@ -23156 +23082 @@
-fi
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        fi
-fi
@@ -24339 +24264 @@
-cat >&5 <<_CSEOF
-
-4
+3
-generated by GNU Autoconf 2.59.  Invocation command line was
-
@@ -24402 +24327 @@
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-4
+3
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

honeytrap/trunk/configure.in

@@ -1 +1 @@
-# $Id$ 
-AC_PREREQ(02.50)
-4
+3
-AM_CONFIG_HEADER(config.h)
-4
+3
-
-# Since we get -O2 from configure defaults, which doesn't work in 64bit
@@ -126 +126 @@
-    AC_DEFINE(MACOS,,[Define if MACOS])
-    AC_DEFINE(BROKEN_SIOCGIFMTU)
-
+
+
-esac
-
@@ -371 +372 @@
-AC_CHECK_LIB(dl, dlsym,, DLLIB="no")
-if test "$DLLIB" != "no"; then
-
-
-
+
+
-        else
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        fi
-fi
@@ -434 +433 @@
-                doc/Makefile
-                src/Makefile
-
+ 
-
-AC_OUTPUT

honeytrap/trunk/src/ctrl.c

@@ -21 +21 @@
-
-#include "honeytrap.h"
+#include "pcapmon.h"
-#include "logging.h"
-#include "ctrl.h"

honeytrap/trunk/src/honeytrap.h

@@ -19 +19 @@
-#include <grp.h>
-#include <dlfcn.h>
-
-
-
+
+
+
+
+
-
-#if HAVE_CONFIG_H
@@ -88 +90 @@
-char old_cwd[1024];
-
-#ifdef USE_PCAP_MON
-char *bpf_filter_string;
-bpf_u_int32 mask;
-bpf_u_int32 net;
-
-pcap_t *packet_sniffer;
-u_char pcap_offset;
-#endif
-
-
-#endif

honeytrap/trunk/src/ipqmon.h

@@ -11 +11 @@
- */
-
+#ifdef USE_IPQ_MON
-
-#ifndef __HONEYTRAP_IPQMON_H
-#define __HONEYTRAP_IPQMON_H 1
-
-#ifdef USE_IPQ_MON
-
-#include <libipq.h>

honeytrap/trunk/src/pcapmon.h

@@ -16 +16 @@
-#define __HONEYTRAP_PCAPMON_H 1
-
+#include <pcap.h>
-#include <netdb.h>
+
+char *bpf_filter_string;
+bpf_u_int32 mask;
+bpf_u_int32 net;
+
+pcap_t *packet_sniffer;
+u_char pcap_offset;
-
-int start_pcap_mon(void);