Changeset 204

Timestamp:

07/28/04 15:12:04 (4 years ago)

Author:

morris

Message:

sync with wired

Files:

• trackerd/trunk/Makefile.in (modified) (5 diffs)
• trackerd/trunk/config.h.in (modified) (1 diff)
• trackerd/trunk/configure (modified) (16 diffs)
• trackerd/trunk/configure.in (modified) (13 diffs)
• trackerd/trunk/trackerd/banlist.c (modified) (5 diffs)
• trackerd/trunk/trackerd/banlist.h (modified) (2 diffs)
• trackerd/trunk/trackerd/commands.c (modified) (27 diffs)
• trackerd/trunk/trackerd/commands.h (modified) (3 diffs)
• trackerd/trunk/trackerd/main.c (modified) (9 diffs)
• trackerd/trunk/trackerd/settings.c (modified) (13 diffs)
• trackerd/trunk/trackerd/settings.h (modified) (3 diffs)
• trackerd/trunk/trackerd/tracker.c (modified) (23 diffs)
• trackerd/trunk/trackerd/tracker.h (modified) (9 diffs)
• trackerd/trunk/trackerd/utility.c (modified) (9 diffs)
• trackerd/trunk/trackerd/utility.h (modified) (3 diffs)

trackerd/trunk/Makefile.in

@@ -1 +1 @@
-SUBDIRS                                 = trackerd
-
+ Makefile
-
-WT_PACKAGE_VERSION              = @WT_PACKAGE_VERSION@
@@ -30 +30 @@
-SED                                             = @SED@
-CUT                                             = @CUT@
+FIND                                    = @FIND@
+XARGS                                   = @XARGS@
-OPENSSL                                 = @OPENSSL@
-
@@ -95 +97 @@
-        $(INSTALL) -m 644 -o root -g bin man/trackerd.8 $(mandir)/man8/
-
- distclean
+
-        @echo "Making $@ in ."
-
@@ -105 +107 @@
-                $(CP) -pr $$i wired-tracker-$(WT_PACKAGE_VERSION)/$$i; \
-        done
+        
+        $(MAKE) -C wired-tracker-$(WT_PACKAGE_VERSION) -f Makefile distclean
-
-        $(TAR) -czf wired-tracker-$(WT_PACKAGE_VERSION).tar.gz wired-tracker-$(WT_PACKAGE_VERSION)
-        $(RM) -rf wired-tracker-$(WT_PACKAGE_VERSION)
-
+
-clean: clean-recursive
-        @echo "Making $@ in ."
@@ -117 +121 @@
-        @echo "Making $@ in ."
-
+        $(FIND) . -name .DS_Store -print0 | $(XARGS) -0 $(RM) -f
+        $(FIND) . -name CVS -print0 | $(XARGS) -0 $(RM) -rf
-        $(RM) -f Makefile config.h config.log config.status
-        $(RM) -f wired-tracker-$(WT_PACKAGE_VERSION).tar.gz
+
+autoclean:
+        @echo "Making $@ in ."
+        
+        $(RM) -rf autom4te.cache
+        $(RM) -f autoscan.log configure.scan config.h.in~

trackerd/trunk/config.h.in

@@ -38 +38 @@
-#undef HAVE_LIMITS_H
-
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
-/* Define to 1 if `lstat' has the bug that it succeeds when given the
-   zero-length file name argument. */

trackerd/trunk/configure

@@ -311 +311 @@
-#endif"
-
-
+FIND XARGS 
-ac_subst_files=''
-
@@ -844 +844 @@
-   esac
-  cat <<\_ACEOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-warnings       enable warnings
+
-
-Optional Packages:
@@ -1391 +1397 @@
-
-
+# These are used in configure.in
+
+
-
-#######################################################################
@@ -2451 +2460 @@
-
-
+
-# Check for some other group to use than "daemon"
-echo "$as_me:$LINENO: checking for group" >&5
@@ -2526 +2536 @@
-WT_GROUP="$with_group"
-
+
+
+# Check for warnings
+echo "$as_me:$LINENO: checking whether to enable warnings" >&5
+echo $ECHO_N "checking whether to enable warnings... $ECHO_C" >&6
+# Check whether --enable-warnings or --disable-warnings was given.
+if test "${enable_warnings+set}" = set; then
+  enableval="$enable_warnings"
+
+fi;
+
+if test -n "$enable_warnings"; then
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+        CFLAGS="$CFLAGS -Wall"
+else
+        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-
-
@@ -2806 +2835 @@
-  echo "$as_me:$LINENO: result: $CUT" >&5
-echo "${ECHO_T}$CUT" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "find", so it can be a program name with args.
+set dummy find; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_FIND+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$FIND"; then
+  ac_cv_prog_FIND="$FIND" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_FIND="find"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+FIND=$ac_cv_prog_FIND
+if test -n "$FIND"; then
+  echo "$as_me:$LINENO: result: $FIND" >&5
+echo "${ECHO_T}$FIND" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "xargs", so it can be a program name with args.
+set dummy xargs; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_XARGS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$XARGS"; then
+  ac_cv_prog_XARGS="$XARGS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_XARGS="xargs"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+XARGS=$ac_cv_prog_XARGS
+if test -n "$XARGS"; then
+  echo "$as_me:$LINENO: result: $XARGS" >&5
+echo "${ECHO_T}$XARGS" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
@@ -2977 +3076 @@
-echo "${ECHO_T}$ac_cv_lib_m_main" >&6
-if test $ac_cv_lib_m_main = yes; then
-
+
+
+
-fi
-
@@ -3117 +3218 @@
-echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6
-if test $ac_cv_lib_socket_setsockopt = yes; then
-
+
+
+
-fi
-
@@ -3257 +3360 @@
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostent" >&6
-if test $ac_cv_lib_nsl_gethostent = yes; then
-
+
+
+
-fi
-
@@ -3931 +4036 @@
-else
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-   { (exit 1); exit 1; }; }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   { (exit 1); exit 1; }; }
+
-
-fi
@@ -4143 +4268 @@
-else
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-   { (exit 1); exit 1; }; }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   { (exit 1); exit 1; }; }
+
-
-fi
@@ -5461 +5606 @@
-
-for ac_header in  \
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -5915 +6072 @@
-fi
-
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
-
-int
-main ()
-{
-int i;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (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_type_signal=void
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
@@ -7100 +7197 @@
-rm -f conftest*
-
+echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+if test "${ac_cv_type_signal+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+# undef signal
+#endif
+#ifdef __cplusplus
+extern "C" void (*signal (int, void (*)(int)))(int);
+#else
+void (*signal ()) ();
+#endif
+
+int
+main ()
+{
+int i;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (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_type_signal=void
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_signal=int
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6
+
+cat >>confdefs.h <<_ACEOF
+#define RETSIGTYPE $ac_cv_type_signal
+_ACEOF
+
+
-echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
-echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6
@@ -7336 +7493 @@
-
-
+
-for ac_func in  \
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        uname
-do
@@ -8078 +8256 @@
-s,@SED@,$SED,;t t
-s,@CUT@,$CUT,;t t
+s,@FIND@,$FIND,;t t
+s,@XARGS@,$XARGS,;t t
-s,@OPENSSL@,$OPENSSL,;t t
-s,@CPP@,$CPP,;t t

trackerd/trunk/configure.in

@@ -1 +1 @@
-# Process this file with autoconf to produce a configure script
-trackerd, 1.0, axel@zankasoftware.com
-2.57
+[trackerd], [1.0], [axel@zankasoftware.com]
+[2.57]
-AC_CONFIG_SRCDIR([config.h.in])
-AC_CONFIG_HEADER([config.h])
@@ -9 +9 @@
-
-# These are used in the source code
-WT_PACKAGE_VERSION, "AC_PACKAGE_VERSION", Application version
-WT_PROTOCOL_VERSION, "1.0", Protocol version
-WT_BUGREPORT, "AC_PACKAGE_BUGREPORT", Maintainer's email address
-WT_CPU, "$host_cpu", Host CPU
+[WT_PACKAGE_VERSION], ["AC_PACKAGE_VERSION"], [Application version]
+[WT_PROTOCOL_VERSION], ["1.0"], [Protocol version]
+[WT_BUGREPORT], ["AC_PACKAGE_BUGREPORT"], [Maintainer's email address]
+[WT_CPU], ["$host_cpu"], [Host CPU]
-
-# These are used in the Makefile
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -31 +40 @@
-# Check for some other user to use than "wired"
-AC_MSG_CHECKING([for user])
-user
-
+[user]
+       
-)
-
@@ -53 +62 @@
-])
-
-
-
+
+
+
-
-# Check for some other group to use than "daemon"
-AC_MSG_CHECKING([for group])
-group
+[group]
-        [  --with-group=GROUP      use a group other than "daemon"]
-)
@@ -80 +90 @@
-])
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -87 +111 @@
-# Checks for programs.
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -102 +128 @@
-
-# Check if we need the math library
-
-
+
+
+
+
-])
-
@@ -109 +137 @@
-# Check if we need the socket library
-AC_CHECK_FUNC(setsockopt, [], [
-
+
+
+
-])
-
-
-# Check if we need the network services library
-
-
+
+
+
+
-])
-
@@ -121 +153 @@
-# Check for the OpenSSL crypto library
-AC_CHECK_HEADERS([openssl/sha.h], [
-crypto, main
+[crypto], [main]
-                LIBS="$LIBS -lcrypto"
-        ], [
-AC_MSG_ERROR([could not locate a usable SHA interface in 
+WT_MSG_LIB_ERROR([
-        ])
-], [
-AC_MSG_ERROR([could not locate 
+WT_MSG_LIB_ERROR([
-])
-
@@ -133 +165 @@
-# Check for the OpenSSL ssl library
-AC_CHECK_HEADERS([openssl/ssl.h], [
-ssl, main
+[ssl], [main]
-                LIBS="$LIBS -lssl"
-        ], [
-AC_MSG_ERROR([could not locate a usable OpenSSL implementation
+WT_MSG_LIB_ERROR([OpenSSL
-        ])
-], [
-AC_MSG_ERROR([could not locate 
+WT_MSG_LIB_ERROR([
-])
-
@@ -241 +273 @@
-AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([ \
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -255 +299 @@
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
@@ -268 +311 @@
-AC_FUNC_REALLOC
-AC_FUNC_SELECT_ARGTYPES
+AC_TYPE_SIGNAL
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([ \
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        uname])
-

trackerd/trunk/trackerd/banlist.c

@@ -1 @@
-1 2004/05/12 22:09:25
+2 2004/07/28 13:12:04
-
-/*
@@ -27 +27 @@
- */
-
+#include "config.h"
+
-#include <sys/param.h>
-#include <sys/types.h>
@@ -37 +39 @@
-#include <math.h>
-
-#include "config.h"
-#include "banlist.h"
-#include "settings.h"
@@ -43 +44 @@
-
-
-int wt_check_ban
-                       
-                       
-int                                            result = 1
+bool wt_ip_is_banned
+
+
+bool           banned = false
-
-        /* check the banlist if we're configured to do so */
-        if(strlen(wt_settings.banlist) > 0) {
+
-                /* open the banlist file */
-                fp = fopen(wt_settings.banlist, "r");
-                
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        wt_log(LOG_WARNING, "Could not open %s: %s",
-                                wt_settings.banlist, strerror(errno));
-                        
-                        return 0;
-                }
-        
-                while(fgets(buffer, sizeof(buffer), fp) != NULL) {
-                        /* remove the linebreak if any */
-                        if((p = strchr(buffer, '\n')) != NULL)
-                                *p = '\0';
-        
-                        /* ignore comments */
-                        if(buffer[0] == '#' || buffer[0] == '\0')
-                                continue;
-                        
-                        if(strchr(buffer, '*')) {
-                                /* test wildcard string */
-                                if(wt_ip_wildcard(buffer, ip)) {
-                                        result = -1;
-                                        
-                                        break;
-                                }
-                        }
-                        else if(strchr(buffer, '/')) {
-                                /* test netmask string */
-                                if(wt_ip_netmask(buffer, ip)) {
-                                        result = -1;
-                                        
-                                        break;
-                                }
-                        } else {
-                                /* test absolute string */
-                                if(strcmp(ip, buffer) == 0) {
-                                        result = -1;
-                                        
-                                        break;
-                                }
-                        }
-                }
-                
-                fclose(fp);
-        }
-
-result
+
+banned
-}
-
@@ -104 +104 @@
-#pragma mark -
-
-
-
-
+
+
+
+
-        
-
-
+
+
+
+
+
-        
-m = strsep(&match, ".")) && (t = strsep(&ip
-m, t) == 0 || strcmp(m
-result
+p1 = strsep(&ii, ".")) && (p2 = strsep(&mm
+p1, p2) == 0 || strcmp(p2
+matches
-        }
-        
-        free(o);
-
-result == 4 ? 1 : 0
+matches == 4 ? true : false
-}
-
-
-
-int wt_ip_netmask(char *match, char *test
-*p, *netmask
-unsigned int   ip_u = 0, netmask_u = 0, test_u = 0
-bits
+bool wt_ip_matches_netmask(char *ip, char *match
+m[32], netmask[16]
+char                   *p
+ip_u, match_u, netmask_u
-        
-
-
-
-
+
-        
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        }
-        
-
+
+
+
+
+
+
+
+
+
-}
-
-
-
-
-
-
+
+
-        
-/* we're going to modify the ip */
-o = p = strdup(ip)
+if(sscanf(ip, "%u.%u.%u.%u", &a, &b, &c, &d) == 4)
+       return (a << 24) + (b << 16) + (c << 8) + d
-        
-
-
-
-
-
-
+
-}