Changeset 231

Timestamp:

09/09/04 11:37:56 (4 years ago)

Author:

morris

Message:

sync with wired

Files:

• trackerd/trunk/config.h.in (modified) (4 diffs)
• trackerd/trunk/configure (modified) (2 diffs)
• trackerd/trunk/configure.in (modified) (2 diffs)
• trackerd/trunk/trackerd/banlist.c (modified) (5 diffs)
• trackerd/trunk/trackerd/banlist.h (modified) (2 diffs)
• trackerd/trunk/trackerd/commands.c (modified) (23 diffs)
• trackerd/trunk/trackerd/main.c (modified) (14 diffs)
• trackerd/trunk/trackerd/settings.c (modified) (8 diffs)
• trackerd/trunk/trackerd/tracker.c (modified) (32 diffs)
• trackerd/trunk/trackerd/tracker.h (modified) (2 diffs)
• trackerd/trunk/trackerd/utility.c (modified) (4 diffs)
• trackerd/trunk/trackerd/utility.h (modified) (4 diffs)

trackerd/trunk/config.h.in

@@ -11 +11 @@
-#undef HAVE_DIRENT_H
-
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
+
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
@@ -16 +19 @@
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#undef HAVE_FSEEKO
-
-/* Define to 1 if you have the `gethostbyaddr' function. */
@@ -209 +215 @@
-#undef HAVE_UNISTD_H
-
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
@@ -270 +279 @@
-#undef WT_USER
-
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const

trackerd/trunk/configure

@@ -6414 +6414 @@
-fi
-
+echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
+if test "${ac_cv_sys_largefile_source+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  ac_cv_sys_largefile_source=no
+  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 <stdio.h>
+int
+main ()
+{
+return !fseeko;
+  ;
+  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
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  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.  */
+#define _LARGEFILE_SOURCE 1
+#include <stdio.h>
+int
+main ()
+{
+return !fseeko;
+  ;
+  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_sys_largefile_source=1; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+if test "$ac_cv_sys_largefile_source" != no; then
+
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+
+fi
+rm -f conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+echo "$as_me:$LINENO: checking for fseeko" >&5
+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+if test "${ac_cv_func_fseeko+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 <stdio.h>
+int
+main ()
+{
+return fseeko && fseeko (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 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_func_fseeko=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_fseeko=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+if test $ac_cv_func_fseeko = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FSEEKO 1
+_ACEOF
+
+fi
+
-
-for ac_header in stdlib.h
@@ -7473 +7620 @@
-fi
-done
+
+
+for ac_func in vprintf
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+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.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 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
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+echo "$as_me:$LINENO: checking for _doprnt" >&5
+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
+if test "${ac_cv_func__doprnt+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.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _doprnt (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* 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 _doprnt ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub__doprnt) || defined (__stub____doprnt)
+choke me
+#else
+char (*f) () = _doprnt;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != _doprnt;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 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_func__doprnt=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func__doprnt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
+echo "${ECHO_T}$ac_cv_func__doprnt" >&6
+if test $ac_cv_func__doprnt = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DOPRNT 1
+_ACEOF
+
+fi
+
+fi
+done
+
-
-

trackerd/trunk/configure.in

@@ -317 +317 @@
-
-AC_FUNC_CHOWN
+AC_FUNC_FSEEKO
-AC_FUNC_MALLOC
-AC_FUNC_LSTAT
@@ -324 +325 @@
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
+AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([ \
-        gethostbyaddr \

trackerd/trunk/trackerd/banlist.c

@@ -1 @@
-3 2004/07/29 20:33:4
+4 2004/09/09 09:37:5
-
-/*
@@ -54 +54 @@
-                /* open the banlist file */
-                fp = fopen(wt_settings.banlist, "r");
+
+                if(!fp) {
+                        wt_log_err("Could not open %s: %s",
+                                wt_settings.banlist, strerror(errno));
+
+                        goto end;
+                }
-                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                        }
+                        else if(strchr(buffer, '/')) {
+                                /* test netmask string */
+                                if(wt_ip_matches_netmask(ip, buffer)) {
+                                        banned = true;
+                                                
+                                        break;
+                                }
+                        } else {
+                                /* test absolute string */
+                                if(strcmp(ip, buffer) == 0) {
+                                        banned = true;
+                                        
+                                        break;
+                                }
+                        }
+                }
-                        
-
-
-
-
-
+
-        }
-
+end:
-        return banned;
-}
@@ -105 +108 @@
-
-bool wt_ip_matches_wildcard(char *ip, char *match) {
-
-
+
-        int             matches = 0;
-        
-
-
-
-
-
+
+
-        
-        while((p1 = strsep(&ii, ".")) && (p2 = strsep(&mm, "."))) {
@@ -119 +118 @@
-                        matches++;
-        }
+
+        free(i);
+        free(m);
-
-        return matches == 4 ? true : false;
@@ -126 +128 @@
-
-bool wt_ip_matches_netmask(char *ip, char *match) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                netmask_u = wt_iptou(netmask);
-
-       netmask_u = pow(2.0, 32.0) - pow(2.0, (float) 32 - strtoul(netmask, NULL, 10)
-
-match
+
+free(m
+
+block
-}
-
-
-
-unsigned int wt_iptou(char *ip) {
-        unsigned int    a, b, c, d;
-        
-        if(sscanf(ip, "%u.%u.%u.%u", &a, &b, &c, &d) == 4)
-                return (a << 24) + (b << 16) + (c << 8) + d;
-        
-        return 0;
-}

trackerd/trunk/trackerd/banlist.h

@@ -1 @@
-3 2004/07/29 20:33:4
+4 2004/09/09 09:37:5
-
-/*
@@ -39 +39 @@
-bool                                                    wt_ip_matches_wildcard(char *, char *);
-bool                                                    wt_ip_matches_netmask(char *, char *);
-unsigned int                                    wt_iptou(char *);
-
-#endif /* WT_BANLIST_H */

trackerd/trunk/trackerd/commands.c

@@ -1 @@
-3 2004/08/30 19:28:3
+4 2004/09/09 09:37:5
-
-/*
@@ -68 +68 @@
-
-void * wt_ctl_thread(void *arg) {
-
-
-
-
-
+
+
+
+
+
+
-
-        /* associate the struct with this thread */
@@ -83 +84 @@
-                                FD_ZERO(&rfds);
-                                FD_SET(client->sd, &rfds);
-
-
+
-                                state = select(client->sd + 1, &rfds, NULL, NULL, &tv);
-                        } while(state == 0 && client->state <= WT_CLIENT_STATE_SAID_HELLO);
@@ -99 +99 @@
-                                } else {
-                                        /* error in TCP communication */
-(LOG_WARNING, 
+_err(
-                                                client->ip, strerror(errno));
-        
@@ -109 +109 @@
-                
-                /* read from SSL */
-
-
-
+
-
-                if(bytes == 0) {
@@ -119 +117 @@
-                else if(bytes < 0) {
-                        /* error in SSL communication */
-
-
-
-
+
+
-
-                        error = true;
-                        break;
-                }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        client->buffer = realloc(client->buffer, client->buffer_size);
-
-
+
+
+
+
+
+
+
+
+
-                        /* chomp separator */
-                        client->buffer[client->buffer_offset + bytes - 1] = '\0';
@@ -147 +144 @@
-                        wt_parse_command(client->buffer);
-                        
-
+
+
-                        client->buffer_offset = 0;
-                }
@@ -167 +165 @@
-        /* delete client */
-        if(client) {
-(LOG_INFO, 
+_info(
-
-                free(client->buffer);
@@ -193 +191 @@
-        
-        /* get command */
-buffer - start + 1
-buffer - start
+(size_t) (buffer - start + 1)
+(size_t) (buffer - start)
-        command[buffer - start] = '\0';
-
@@ -287 +285 @@
-        
-        if(!fp) {
-
+
+
-                        wt_settings.categories, strerror(errno));
-                wt_reply(500, "Command Failed");
-                
-                goto end;
@@ -346 +344 @@
-        if(wt_ip_is_banned(client->ip)) {
-                wt_reply(511, "Banned");
-(LOG_INFO, 
+_err(
-                        client->ip);
-                
@@ -367 +365 @@
-                
-        /* reply a 200 */
-s%s%s%s%s%s%s
+c%s%c%s%c%s%c
-                         wt_version_string,
-                         WT_FIELD_SEPARATOR,
@@ -406 +404 @@
-                if(wt_settings.strictlookup) {
-                        wt_reply(503, "Syntax Error");
-l(LOG_WARNING, 
+warn(
-                                client->ip, argv[1], "URL parse failed");
-                        
@@ -427 +425 @@
-                                if(wt_settings.strictlookup) {
-                                        wt_reply(516, "Permission Denied");
-l(LOG_WARNING, 
+warn(
-                                                client->ip, url, "IP mismatch");
-                                        
@@ -445 +443 @@
-                                        if(wt_settings.strictlookup) {
-                                                wt_reply(516, "Permission Denied");
-l(LOG_WARNING, 
+warn(
-                                                        client->ip, url, "Lookup failed");
-                                                
@@ -463 +461 @@
-                                        if(wt_settings.strictlookup) {
-                                                wt_reply(516, "Permission Denied");
-l(LOG_WARNING, 
+warn(
-                                                        client->ip, url, "IP mismatch");
-                                                
@@ -482 +480 @@
-                                        if(wt_settings.strictlookup) {
-                                                wt_reply(516, "Permission Denied");
-l(LOG_WARNING, 
+warn(
-                                                        client->ip, url, "Lookup failed");
-                                                
@@ -497 +495 @@
-                                        if(wt_settings.strictlookup) {
-                                                wt_reply(516, "Permission Denied");
-l(LOG_WARNING, 
+warn(
-                                                        client->ip, url, "Hostname mismatch");
-                                                
@@ -516 +514 @@
-
-        /* test bandwidth */
-
+
+
+
+
+
-        
-        if(wt_settings.minbandwidth > 0 && bandwidth < wt_settings.minbandwidth) {
-                wt_reply(516, "Permission Denied");
-l(LOG_WARNING, 
+warn(
-                        client->ip, url);
-                
@@ -528 +530 @@
-        if(wt_settings.maxbandwidth > 0 && bandwidth > wt_settings.maxbandwidth) {
-                wt_reply(516, "Permission Denied");
-l(LOG_WARNING, 
+warn(
-                        client->ip, url);
-                
@@ -561 +563 @@
-                else if(!wt_settings.allowmultiple) {
-                        wt_reply(516, "Permission Denied");
-l(LOG_WARNING, 
+warn(
-                                client->ip, url);
-                                
@@ -610 +612 @@
-        
-        /* log */
-(LOG_INFO, 
+_info(
-
-        /* update status */
@@ -638 +640 @@
-        WT_LIST_FOREACH(wt_servers, node, server) {
-                /* reply 720 */
-s%s%s%s%s%u%s%u%s%u%s%u%s%u%s%llu%s
+c%s%c%s%c%u%c%u%c%u%c%u%c%u%c%llu%c
-                        server->category,
-                        WT_FIELD_SEPARATOR,

trackerd/trunk/trackerd/main.c

@@ -1 @@
-1 2004/09/06 08:38:2
+2 2004/09/09 09:37:5
-
-/*
@@ -107 +107 @@
-                        
-                        case 'i':
-
+
+
-                                break;
-                        
@@ -157 +158 @@
-        argv += optind;
-        
-debug || wt_
+
-                /* test facility */
-                if(syslog_flag) {
-                        wt_syslog = false;
-
+
+
-                }
-
@@ -183 +185 @@
-                /* change root directory */
-                if(chroot(wt_root) < 0) {
-(LOG_ERR, 
+_err(
-                                wt_root, strerror(errno));
-                }
@@ -225 +227 @@
-        if(!wt_debug) {
-                if(daemon(1, 1) < 0) {
-(LOG_ERR, 
+_err(
-                                strerror(errno));
-                }
@@ -235 +237 @@
-        /* init server */
-        wt_start_time = time(NULL);
-(LOG_INFO, 
+_info(
-        wt_init_tracker();
-(LOG_INFO, 
+_info(
-                strlen(wt_settings.address) > 0
-                        ? inet_ntoa(wt_addr.sin_addr)
-                        : "all available addresses",
-wt_settings.port
+ntohs(wt_addr.sin_port)
-
-        /* switch user/group on log file */
@@ -247 +249 @@
-                if(chown(wt_log_path, wt_frozen_settings.user->pw_uid,
-                         wt_frozen_settings.group->gr_gid) < 0) {
-(LOG_ERR, 
+_err(
-                                wt_log_path, strerror(errno));
-                }
@@ -256 +258 @@
-                if(initgroups(wt_frozen_settings.user->pw_name,
-                                          wt_frozen_settings.group->gr_gid) < 0) {
-(LOG_ERR, 
+_err(
-                                strerror(errno));
-                }
-
-                if(setgid(wt_frozen_settings.group->gr_gid) < 0) {
-