2007-12-12 22:09:01 +01:00
|
|
|
/* Copyright (c) 2003, Roger Dingledine
|
|
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
|
|
|
* Copyright (c) 2007, The Tor Project, Inc. */
|
2003-04-16 19:04:58 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2004-11-29 23:25:31 +01:00
|
|
|
const char util_c_id[] = "$Id$";
|
2003-04-16 19:04:58 +02:00
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/**
|
|
|
|
* \file util.c
|
|
|
|
* \brief Common functions for strings, IO, network, data structures,
|
2004-11-01 21:41:47 +01:00
|
|
|
* process control.
|
2004-05-07 19:04:12 +02:00
|
|
|
**/
|
2004-05-01 22:46:28 +02:00
|
|
|
|
2004-08-07 04:46:16 +02:00
|
|
|
/* This is required on rh7 to make strptime not complain.
|
|
|
|
*/
|
|
|
|
#define _GNU_SOURCE
|
|
|
|
|
2004-04-03 06:05:12 +02:00
|
|
|
#include "orconfig.h"
|
2004-11-04 05:01:19 +01:00
|
|
|
#include "util.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "crypto.h"
|
2004-12-02 05:33:01 +01:00
|
|
|
#include "torint.h"
|
2005-09-03 06:40:05 +02:00
|
|
|
#include "container.h"
|
2004-04-28 22:13:21 +02:00
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
#include <io.h>
|
|
|
|
#include <direct.h>
|
2006-12-15 06:12:52 +01:00
|
|
|
#include <process.h>
|
2005-09-03 06:40:05 +02:00
|
|
|
#else
|
|
|
|
#include <dirent.h>
|
2005-12-05 02:28:10 +01:00
|
|
|
#include <pwd.h>
|
2004-04-28 22:13:21 +02:00
|
|
|
#endif
|
|
|
|
|
2004-11-01 22:54:12 +01:00
|
|
|
#ifdef HAVE_CTYPE_H
|
|
|
|
#include <ctype.h>
|
|
|
|
#endif
|
2004-04-03 06:05:12 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
2004-08-04 01:31:22 +02:00
|
|
|
|
2004-04-03 06:05:12 +02:00
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ARPA_INET_H
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ERRNO_H
|
|
|
|
#include <errno.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif
|
2004-11-01 09:24:34 +01:00
|
|
|
#ifdef HAVE_SYS_TIME_H
|
|
|
|
#include <sys/time.h>
|
|
|
|
#endif
|
2004-04-03 06:05:12 +02:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_STAT_H
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_FCNTL_H
|
|
|
|
#include <sys/fcntl.h>
|
|
|
|
#endif
|
2004-04-28 22:13:21 +02:00
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
2004-04-28 21:35:12 +02:00
|
|
|
#endif
|
2005-08-12 19:24:53 +02:00
|
|
|
#ifdef HAVE_TIME_H
|
|
|
|
#include <time.h>
|
|
|
|
#endif
|
2007-12-26 01:12:01 +01:00
|
|
|
#ifdef HAVE_MALLOC_MALLOC_H
|
|
|
|
#include <malloc/malloc.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_MALLOC_H
|
2007-08-08 07:14:03 +02:00
|
|
|
#include <malloc.h>
|
|
|
|
#endif
|
2004-04-28 21:35:12 +02:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/* =====
|
|
|
|
* Memory management
|
|
|
|
* ===== */
|
2005-02-03 08:25:10 +01:00
|
|
|
#ifdef USE_DMALLOC
|
2007-11-30 19:11:26 +01:00
|
|
|
#undef strndup
|
2005-02-03 08:25:10 +01:00
|
|
|
#include <dmalloc.h>
|
2005-10-03 22:20:38 +02:00
|
|
|
#define DMALLOC_FN_ARGS , file, line
|
2007-11-30 20:02:56 +01:00
|
|
|
|
|
|
|
#if defined(HAVE_DMALLOC_STRDUP)
|
|
|
|
/* the dmalloc_strdup should be fine as defined */
|
|
|
|
#elif defined(HAVE_DMALLOC_STRNDUP)
|
|
|
|
#define dmalloc_strdup(file, line, string, xalloc_b) \
|
|
|
|
dmalloc_strndup(file, line, (string), -1, xalloc_b)
|
|
|
|
#else
|
|
|
|
#error "No dmalloc_strdup or equivalent"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#else /* not using dmalloc */
|
2005-02-03 08:25:10 +01:00
|
|
|
#define dmalloc_strdup(file, line, string, xalloc_b) strdup(string)
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
#define dmalloc_malloc(file, line, size, func_id, alignment, xalloc_b) \
|
|
|
|
malloc(size)
|
2005-02-03 08:25:10 +01:00
|
|
|
#define DMALLOC_FUNC_MALLOC 0
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
#define dmalloc_realloc(file, line, old_pnt, new_size, func_id, xalloc_b) \
|
|
|
|
realloc((old_pnt), (new_size))
|
2005-02-03 08:25:10 +01:00
|
|
|
#define DMALLOC_FUNC_REALLOC 0
|
2005-09-30 00:59:17 +02:00
|
|
|
#define DMALLOC_FN_ARGS
|
2005-02-03 08:25:10 +01:00
|
|
|
#endif
|
2004-11-01 21:41:47 +01:00
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Allocate a chunk of <b>size</b> bytes of memory, and return a pointer to
|
2004-05-01 22:46:28 +02:00
|
|
|
* result. On error, log and terminate the process. (Same as malloc(size),
|
|
|
|
* but never returns NULL.)
|
2005-02-03 08:35:24 +01:00
|
|
|
*
|
|
|
|
* <b>file</b> and <b>line</b> are used if dmalloc is enabled, and
|
|
|
|
* ignored otherwise.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:39:24 +02:00
|
|
|
void *
|
2005-10-03 22:20:38 +02:00
|
|
|
_tor_malloc(size_t size DMALLOC_PARAMS)
|
2005-09-30 00:59:17 +02:00
|
|
|
{
|
2003-05-20 08:37:34 +02:00
|
|
|
void *result;
|
|
|
|
|
2006-09-20 00:36:48 +02:00
|
|
|
#ifndef MALLOC_ZERO_WORKS
|
2004-04-08 05:05:08 +02:00
|
|
|
/* Some libcs don't do the right thing on size==0. Override them. */
|
|
|
|
if (size==0) {
|
|
|
|
size=1;
|
|
|
|
}
|
2006-09-20 00:36:48 +02:00
|
|
|
#endif
|
2005-02-03 08:25:10 +01:00
|
|
|
result = dmalloc_malloc(file, line, size, DMALLOC_FUNC_MALLOC, 0, 0);
|
2003-05-20 08:37:34 +02:00
|
|
|
|
2007-03-06 21:25:44 +01:00
|
|
|
if (PREDICT_UNLIKELY(result == NULL)) {
|
2006-09-30 00:33:34 +02:00
|
|
|
log_err(LD_MM,"Out of memory on malloc(). Dying.");
|
2006-04-18 05:58:42 +02:00
|
|
|
/* If these functions die within a worker process, they won't call
|
|
|
|
* spawn_exit, but that's ok, since the parent will run out of memory soon
|
|
|
|
* anyway. */
|
2003-05-20 08:37:34 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** Allocate a chunk of <b>size</b> bytes of memory, fill the memory with
|
2004-05-01 22:46:28 +02:00
|
|
|
* zero bytes, and return a pointer to the result. Log and terminate
|
|
|
|
* the process on error. (Same as calloc(size,1), but never returns NULL.)
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void *
|
2005-10-03 22:20:38 +02:00
|
|
|
_tor_malloc_zero(size_t size DMALLOC_PARAMS)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2005-10-03 22:20:38 +02:00
|
|
|
void *result = _tor_malloc(size DMALLOC_FN_ARGS);
|
2003-11-18 09:20:09 +01:00
|
|
|
memset(result, 0, size);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Change the size of the memory block pointed to by <b>ptr</b> to <b>size</b>
|
2004-05-01 22:46:28 +02:00
|
|
|
* bytes long; return the new memory block. On error, log and
|
|
|
|
* terminate. (Like realloc(ptr,size), but never returns NULL.)
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void *
|
2005-10-03 22:20:38 +02:00
|
|
|
_tor_realloc(void *ptr, size_t size DMALLOC_PARAMS)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2003-10-14 03:11:42 +02:00
|
|
|
void *result;
|
2003-12-13 02:42:44 +01:00
|
|
|
|
2005-02-03 08:25:10 +01:00
|
|
|
result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0);
|
2007-03-06 21:25:44 +01:00
|
|
|
if (PREDICT_UNLIKELY(result == NULL)) {
|
2006-09-30 00:33:34 +02:00
|
|
|
log_err(LD_MM,"Out of memory on realloc(). Dying.");
|
2003-10-14 03:11:42 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Return a newly allocated copy of the NUL-terminated string s. On
|
2004-05-01 22:46:28 +02:00
|
|
|
* error, log and terminate. (Like strdup(s), but never returns
|
|
|
|
* NULL.)
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
char *
|
2005-10-03 22:20:38 +02:00
|
|
|
_tor_strdup(const char *s DMALLOC_PARAMS)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2003-10-04 05:29:09 +02:00
|
|
|
char *dup;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(s);
|
2003-10-04 05:29:09 +02:00
|
|
|
|
2005-02-03 08:25:10 +01:00
|
|
|
dup = dmalloc_strdup(file, line, s, 0);
|
2007-03-06 21:25:44 +01:00
|
|
|
if (PREDICT_UNLIKELY(dup == NULL)) {
|
2006-09-30 00:33:34 +02:00
|
|
|
log_err(LD_MM,"Out of memory on strdup(). Dying.");
|
2003-10-04 05:29:09 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
return dup;
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Allocate and return a new string containing the first <b>n</b>
|
|
|
|
* characters of <b>s</b>. If <b>s</b> is longer than <b>n</b>
|
|
|
|
* characters, only the first <b>n</b> are copied. The result is
|
|
|
|
* always NUL-terminated. (Like strndup(s,n), but never returns
|
|
|
|
* NULL.)
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
char *
|
2005-10-03 22:20:38 +02:00
|
|
|
_tor_strndup(const char *s, size_t n DMALLOC_PARAMS)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2003-12-09 00:45:37 +01:00
|
|
|
char *dup;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(s);
|
2005-10-03 22:20:38 +02:00
|
|
|
dup = _tor_malloc((n+1) DMALLOC_FN_ARGS);
|
2004-12-01 04:48:14 +01:00
|
|
|
/* Performance note: Ordinarily we prefer strlcpy to strncpy. But
|
2004-11-12 21:41:03 +01:00
|
|
|
* this function gets called a whole lot, and platform strncpy is
|
|
|
|
* much faster than strlcpy when strlen(s) is much longer than n.
|
|
|
|
*/
|
2004-11-12 22:14:51 +01:00
|
|
|
strncpy(dup, s, n);
|
2004-11-12 21:41:03 +01:00
|
|
|
dup[n]='\0';
|
2003-12-09 00:45:37 +01:00
|
|
|
return dup;
|
2006-06-18 09:22:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Allocate a chunk of <b>len</b> bytes, with the same contents starting at
|
|
|
|
* <b>mem</b>. */
|
|
|
|
void *
|
|
|
|
_tor_memdup(const void *mem, size_t len DMALLOC_PARAMS)
|
|
|
|
{
|
|
|
|
char *dup;
|
|
|
|
tor_assert(mem);
|
|
|
|
dup = _tor_malloc(len DMALLOC_FN_ARGS);
|
|
|
|
memcpy(dup, mem, len);
|
|
|
|
return dup;
|
2003-12-09 00:45:37 +01:00
|
|
|
}
|
|
|
|
|
2006-09-20 01:48:14 +02:00
|
|
|
/** Helper for places that need to take a function pointer to the right
|
|
|
|
* spelling of "free()". */
|
|
|
|
void
|
2006-09-21 23:48:55 +02:00
|
|
|
_tor_free(void *mem)
|
|
|
|
{
|
2006-09-20 01:48:14 +02:00
|
|
|
tor_free(mem);
|
|
|
|
}
|
|
|
|
|
2007-12-26 01:12:01 +01:00
|
|
|
/** Allocate and return a chunk of memory of size at least *<b>size</p>, using
|
|
|
|
* the same resources we would use to malloc *<b>sizep</b>. Set *<b>sizep</b>
|
|
|
|
* to the number of usable bytes in the chunk of memory. */
|
|
|
|
void *
|
|
|
|
_tor_malloc_roundup(size_t *sizep DMALLOC_PARAMS)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_MALLOC_GOOD_SIZE
|
|
|
|
*sizep = malloc_good_size(*sizep);
|
|
|
|
return _tor_malloc(*sizep DMALLOC_FN_ARGS);
|
|
|
|
#else
|
|
|
|
#if defined(HAVE_MALLOC_USABLE_SIZE) && !defined(USE_DMALLOC)
|
|
|
|
void *result = _tor_malloc(*sizep DMALLOC_FN_ARGS);
|
|
|
|
*sizep = malloc_usable_size(result);
|
|
|
|
return result;
|
|
|
|
#else
|
|
|
|
return _tor_malloc(*sizep);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-08-15 21:56:01 +02:00
|
|
|
/** Call the platform malloc info function, and dump the results to the log at
|
|
|
|
* level <b>severity</b>. If no such function exists, do nothing. */
|
2007-07-30 20:14:14 +02:00
|
|
|
void
|
|
|
|
tor_log_mallinfo(int severity)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_MALLINFO
|
|
|
|
struct mallinfo mi;
|
|
|
|
memset(&mi, 0, sizeof(mi));
|
|
|
|
mi = mallinfo();
|
|
|
|
log(severity, LD_MM,
|
|
|
|
"mallinfo() said: arena=%d, ordblks=%d, smblks=%d, hblks=%d, "
|
|
|
|
"hblkhd=%d, usmblks=%d, fsmblks=%d, uordblks=%d, fordblks=%d, "
|
|
|
|
"keepcost=%d",
|
|
|
|
mi.arena, mi.ordblks, mi.smblks, mi.hblks,
|
|
|
|
mi.hblkhd, mi.usmblks, mi.fsmblks, mi.uordblks, mi.fordblks,
|
|
|
|
mi.keepcost);
|
2007-08-01 17:57:07 +02:00
|
|
|
#else
|
|
|
|
(void)severity;
|
2007-07-30 20:14:14 +02:00
|
|
|
#endif
|
2007-11-30 19:11:26 +01:00
|
|
|
#ifdef USE_DMALLOC
|
2007-11-30 20:07:11 +01:00
|
|
|
dmalloc_log_changed(0, /* Since the program started. */
|
|
|
|
1, /* Log info about non-freed pointers. */
|
|
|
|
0, /* Do not log info about freed pointers. */
|
|
|
|
0 /* Do not log individual pointers. */
|
|
|
|
);
|
2007-11-30 19:11:26 +01:00
|
|
|
#endif
|
2007-07-30 20:14:14 +02:00
|
|
|
}
|
|
|
|
|
2007-05-24 19:12:57 +02:00
|
|
|
/* =====
|
|
|
|
* Math
|
|
|
|
* ===== */
|
|
|
|
|
|
|
|
/** Returns floor(log2(u64)). If u64 is 0, (incorrectly) returns 0. */
|
|
|
|
int
|
|
|
|
tor_log2(uint64_t u64)
|
|
|
|
{
|
|
|
|
int r = 0;
|
|
|
|
if (u64 >= (U64_LITERAL(1)<<32)) {
|
|
|
|
u64 >>= 32;
|
|
|
|
r = 32;
|
|
|
|
}
|
|
|
|
if (u64 >= (U64_LITERAL(1)<<16)) {
|
|
|
|
u64 >>= 16;
|
|
|
|
r += 16;
|
|
|
|
}
|
|
|
|
if (u64 >= (U64_LITERAL(1)<<8)) {
|
|
|
|
u64 >>= 8;
|
|
|
|
r += 8;
|
|
|
|
}
|
|
|
|
if (u64 >= (U64_LITERAL(1)<<4)) {
|
|
|
|
u64 >>= 4;
|
|
|
|
r += 4;
|
|
|
|
}
|
|
|
|
if (u64 >= (U64_LITERAL(1)<<2)) {
|
|
|
|
u64 >>= 2;
|
|
|
|
r += 2;
|
|
|
|
}
|
|
|
|
if (u64 >= (U64_LITERAL(1)<<1)) {
|
|
|
|
u64 >>= 1;
|
|
|
|
r += 1;
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return the power of 2 closest to <b>u64</b>. */
|
|
|
|
uint64_t
|
|
|
|
round_to_power_of_2(uint64_t u64)
|
|
|
|
{
|
|
|
|
int lg2 = tor_log2(u64);
|
|
|
|
uint64_t low = U64_LITERAL(1) << lg2, high = U64_LITERAL(1) << (lg2+1);
|
|
|
|
if (high - u64 < u64 - low)
|
|
|
|
return high;
|
|
|
|
else
|
|
|
|
return low;
|
|
|
|
}
|
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/* =====
|
|
|
|
* String manipulation
|
|
|
|
* ===== */
|
|
|
|
|
2004-10-06 15:26:37 +02:00
|
|
|
/** Remove from the string <b>s</b> every character which appears in
|
|
|
|
* <b>strip</b>. Return the number of characters removed. */
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
tor_strstrip(char *s, const char *strip)
|
2004-10-06 15:26:37 +02:00
|
|
|
{
|
|
|
|
char *read = s;
|
|
|
|
while (*read) {
|
|
|
|
if (strchr(strip, *read)) {
|
|
|
|
++read;
|
|
|
|
} else {
|
|
|
|
*s++ = *read++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*s = '\0';
|
|
|
|
return read-s;
|
|
|
|
}
|
2004-03-20 02:21:19 +01:00
|
|
|
|
2004-10-07 22:58:53 +02:00
|
|
|
/** Set the <b>dest_len</b>-byte buffer <b>buf</b> to contain the
|
|
|
|
* string <b>s</b>, with the string <b>insert</b> inserted after every
|
|
|
|
* <b>n</b> characters. Return 0 on success, -1 on failure.
|
2004-10-07 23:37:06 +02:00
|
|
|
*
|
2007-02-05 19:33:52 +01:00
|
|
|
* Never end the string with <b>insert</b>, even if its length <i>is</i> a
|
|
|
|
* multiple of <b>n</b>.
|
2004-10-07 22:58:53 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
tor_strpartition(char *dest, size_t dest_len,
|
2007-02-05 19:33:52 +01:00
|
|
|
const char *s, const char *insert, size_t n)
|
2004-10-07 22:58:53 +02:00
|
|
|
{
|
2004-10-07 23:37:06 +02:00
|
|
|
char *destp;
|
2004-10-12 22:20:19 +02:00
|
|
|
size_t len_in, len_out, len_ins;
|
|
|
|
int is_even, remaining;
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(s);
|
|
|
|
tor_assert(insert);
|
|
|
|
tor_assert(n > 0);
|
2004-12-02 05:33:01 +01:00
|
|
|
tor_assert(n < SIZE_T_CEILING);
|
|
|
|
tor_assert(dest_len < SIZE_T_CEILING);
|
2004-10-07 22:58:53 +02:00
|
|
|
len_in = strlen(s);
|
|
|
|
len_ins = strlen(insert);
|
2005-01-10 17:30:51 +01:00
|
|
|
tor_assert(len_in < SIZE_T_CEILING);
|
|
|
|
tor_assert(len_in/n < SIZE_T_CEILING/len_ins); /* avoid overflow */
|
2004-10-07 22:58:53 +02:00
|
|
|
len_out = len_in + (len_in/n)*len_ins;
|
2004-10-07 23:37:06 +02:00
|
|
|
is_even = (len_in%n) == 0;
|
2007-02-05 19:33:52 +01:00
|
|
|
if (is_even && len_in)
|
|
|
|
len_out -= len_ins;
|
2004-10-07 22:58:53 +02:00
|
|
|
if (dest_len < len_out+1)
|
|
|
|
return -1;
|
2004-10-07 23:37:06 +02:00
|
|
|
destp = dest;
|
2004-10-12 22:20:19 +02:00
|
|
|
remaining = len_in;
|
2004-11-28 10:05:49 +01:00
|
|
|
while (remaining) {
|
2004-10-07 23:37:06 +02:00
|
|
|
strncpy(destp, s, n);
|
2004-10-12 22:20:19 +02:00
|
|
|
remaining -= n;
|
|
|
|
if (remaining < 0) {
|
2004-10-07 23:37:06 +02:00
|
|
|
break;
|
2007-02-05 19:33:52 +01:00
|
|
|
} else if (remaining == 0) {
|
2004-10-07 23:37:06 +02:00
|
|
|
*(destp+n) = '\0';
|
|
|
|
break;
|
|
|
|
}
|
2007-01-18 20:37:23 +01:00
|
|
|
strncpy(destp+n, insert, len_ins+1);
|
2004-10-07 22:58:53 +02:00
|
|
|
s += n;
|
2004-10-07 23:37:06 +02:00
|
|
|
destp += n+len_ins;
|
2004-10-07 22:58:53 +02:00
|
|
|
}
|
2004-10-07 23:37:06 +02:00
|
|
|
tor_assert(len_out == strlen(dest));
|
2004-10-07 22:58:53 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-12-01 04:48:14 +01:00
|
|
|
/** Return a pointer to a NUL-terminated hexadecimal string encoding
|
2004-05-07 19:04:12 +02:00
|
|
|
* the first <b>fromlen</b> bytes of <b>from</b>. (fromlen must be \<= 32.) The
|
2004-05-01 22:46:28 +02:00
|
|
|
* result does not need to be deallocated, but repeated calls to
|
|
|
|
* hex_str will trash old results.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
const char *
|
|
|
|
hex_str(const char *from, size_t fromlen)
|
2004-04-06 22:16:12 +02:00
|
|
|
{
|
|
|
|
static char buf[65];
|
|
|
|
if (fromlen>(sizeof(buf)-1)/2)
|
|
|
|
fromlen = (sizeof(buf)-1)/2;
|
2004-08-07 03:18:02 +02:00
|
|
|
base16_encode(buf,sizeof(buf),from,fromlen);
|
2004-04-06 22:16:12 +02:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Convert all alphabetic characters in the nul-terminated string <b>s</b> to
|
|
|
|
* lowercase. */
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
tor_strlower(char *s)
|
2004-05-07 19:04:12 +02:00
|
|
|
{
|
|
|
|
while (*s) {
|
2006-08-31 19:39:51 +02:00
|
|
|
*s = TOR_TOLOWER(*s);
|
2004-05-07 19:04:12 +02:00
|
|
|
++s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-09-08 20:33:51 +02:00
|
|
|
/** Convert all alphabetic characters in the nul-terminated string <b>s</b> to
|
|
|
|
* lowercase. */
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
tor_strupper(char *s)
|
2005-09-08 20:33:51 +02:00
|
|
|
{
|
|
|
|
while (*s) {
|
2006-08-31 19:39:51 +02:00
|
|
|
*s = TOR_TOUPPER(*s);
|
2005-09-08 20:33:51 +02:00
|
|
|
++s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-16 00:35:55 +01:00
|
|
|
/** Return 1 if every character in <b>s</b> is printable, else return 0.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
tor_strisprint(const char *s)
|
|
|
|
{
|
|
|
|
while (*s) {
|
|
|
|
if (!TOR_ISPRINT(*s))
|
|
|
|
return 0;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-07-31 20:01:37 +02:00
|
|
|
/** Return 1 if no character in <b>s</b> is uppercase, else return 0.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
tor_strisnonupper(const char *s)
|
|
|
|
{
|
|
|
|
while (*s) {
|
2006-07-31 22:19:58 +02:00
|
|
|
if (TOR_ISUPPER(*s))
|
2006-07-31 20:01:37 +02:00
|
|
|
return 0;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** Compares the first strlen(s2) characters of s1 with s2. Returns as for
|
2004-09-02 20:25:50 +02:00
|
|
|
* strcmp.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
strcmpstart(const char *s1, const char *s2)
|
2004-09-02 20:25:50 +02:00
|
|
|
{
|
|
|
|
size_t n = strlen(s2);
|
|
|
|
return strncmp(s1, s2, n);
|
|
|
|
}
|
|
|
|
|
2007-07-16 20:26:31 +02:00
|
|
|
/** Compare the s1_len-byte string <b>s1</b> with <b>s2</b>,
|
|
|
|
* without depending on a terminating nul in s1. Sorting order is first by
|
|
|
|
* length, then lexically; return values are as for strcmp.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
strcmp_len(const char *s1, const char *s2, size_t s1_len)
|
|
|
|
{
|
|
|
|
size_t s2_len = strlen(s2);
|
|
|
|
if (s1_len < s2_len)
|
|
|
|
return -1;
|
|
|
|
if (s1_len > s2_len)
|
|
|
|
return 1;
|
|
|
|
return memcmp(s1, s2, s2_len);
|
|
|
|
}
|
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** Compares the first strlen(s2) characters of s1 with s2. Returns as for
|
2004-11-30 04:10:56 +01:00
|
|
|
* strcasecmp.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
strcasecmpstart(const char *s1, const char *s2)
|
2004-11-30 04:10:56 +01:00
|
|
|
{
|
|
|
|
size_t n = strlen(s2);
|
|
|
|
return strncasecmp(s1, s2, n);
|
|
|
|
}
|
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** Compares the last strlen(s2) characters of s1 with s2. Returns as for
|
2004-11-09 19:22:17 +01:00
|
|
|
* strcmp.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
strcmpend(const char *s1, const char *s2)
|
2004-11-09 19:22:17 +01:00
|
|
|
{
|
|
|
|
size_t n1 = strlen(s1), n2 = strlen(s2);
|
|
|
|
if (n2>n1)
|
|
|
|
return strcmp(s1,s2);
|
|
|
|
else
|
|
|
|
return strncmp(s1+(n1-n2), s2, n2);
|
|
|
|
}
|
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** Compares the last strlen(s2) characters of s1 with s2. Returns as for
|
2004-11-30 04:10:56 +01:00
|
|
|
* strcasecmp.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
strcasecmpend(const char *s1, const char *s2)
|
2004-11-30 04:10:56 +01:00
|
|
|
{
|
|
|
|
size_t n1 = strlen(s1), n2 = strlen(s2);
|
2004-11-30 09:54:08 +01:00
|
|
|
if (n2>n1) /* then they can't be the same; figure out which is bigger */
|
2004-11-30 04:10:56 +01:00
|
|
|
return strcasecmp(s1,s2);
|
|
|
|
else
|
|
|
|
return strncasecmp(s1+(n1-n2), s2, n2);
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Return a pointer to the first char of s that is not whitespace and
|
2004-05-01 23:41:23 +02:00
|
|
|
* not a comment, or to the terminating NUL if no such character exists.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
const char *
|
|
|
|
eat_whitespace(const char *s)
|
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(s);
|
2003-11-12 20:34:19 +01:00
|
|
|
|
2006-09-20 01:55:35 +02:00
|
|
|
while (1) {
|
|
|
|
switch (*s) {
|
|
|
|
case '\0':
|
|
|
|
default:
|
|
|
|
return s;
|
|
|
|
case ' ':
|
|
|
|
case '\t':
|
|
|
|
case '\n':
|
|
|
|
case '\r':
|
|
|
|
++s;
|
|
|
|
break;
|
|
|
|
case '#':
|
|
|
|
++s;
|
2004-11-28 10:05:49 +01:00
|
|
|
while (*s && *s != '\n')
|
2006-09-20 01:55:35 +02:00
|
|
|
++s;
|
2003-11-12 20:34:19 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-05-22 04:20:52 +02:00
|
|
|
/** Return a pointer to the first char of s that is not whitespace and
|
|
|
|
* not a comment, or to the terminating NUL if no such character exists.
|
|
|
|
*/
|
|
|
|
const char *
|
|
|
|
eat_whitespace_eos(const char *s, const char *eos)
|
|
|
|
{
|
|
|
|
tor_assert(s);
|
|
|
|
tor_assert(eos && s <= eos);
|
|
|
|
|
|
|
|
while (s < eos) {
|
|
|
|
switch (*s) {
|
|
|
|
case '\0':
|
|
|
|
default:
|
|
|
|
return s;
|
|
|
|
case ' ':
|
|
|
|
case '\t':
|
|
|
|
case '\n':
|
|
|
|
case '\r':
|
|
|
|
++s;
|
|
|
|
break;
|
|
|
|
case '#':
|
|
|
|
++s;
|
|
|
|
while (s < eos && *s && *s != '\n')
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2007-08-20 22:05:56 +02:00
|
|
|
/** Return a pointer to the first char of s that is not a space or a tab
|
|
|
|
* or a \\r, or to the terminating NUL if no such character exists. */
|
2005-09-30 03:09:52 +02:00
|
|
|
const char *
|
|
|
|
eat_whitespace_no_nl(const char *s)
|
|
|
|
{
|
2007-08-20 22:05:56 +02:00
|
|
|
while (*s == ' ' || *s == '\t' || *s == '\r')
|
2003-11-12 20:34:19 +01:00
|
|
|
++s;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2007-07-16 20:26:31 +02:00
|
|
|
/** As eat_whitespace_no_nl, but stop at <b>eos</b> whether we have
|
|
|
|
* found a non-whitespace character or not. */
|
2007-07-10 22:08:18 +02:00
|
|
|
const char *
|
|
|
|
eat_whitespace_eos_no_nl(const char *s, const char *eos)
|
|
|
|
{
|
2007-08-20 22:05:56 +02:00
|
|
|
while (s < eos && (*s == ' ' || *s == '\t' || *s == '\r'))
|
2007-07-10 22:08:18 +02:00
|
|
|
++s;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Return a pointer to the first char of s that is whitespace or <b>#</b>,
|
2004-05-01 23:50:53 +02:00
|
|
|
* or to the terminating NUL if no such character exists.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
const char *
|
|
|
|
find_whitespace(const char *s)
|
|
|
|
{
|
2005-10-18 07:06:36 +02:00
|
|
|
/* tor_assert(s); */
|
2006-09-20 00:20:09 +02:00
|
|
|
while (1) {
|
|
|
|
switch (*s)
|
|
|
|
{
|
|
|
|
case '\0':
|
|
|
|
case '#':
|
|
|
|
case ' ':
|
|
|
|
case '\r':
|
|
|
|
case '\n':
|
|
|
|
case '\t':
|
|
|
|
return s;
|
|
|
|
default:
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
}
|
2003-11-12 20:34:19 +01:00
|
|
|
}
|
|
|
|
|
2007-07-16 20:26:31 +02:00
|
|
|
/** As find_whitespace, but stop at <b>eos</b> whether we have found a
|
|
|
|
* whitespace or not. */
|
2007-07-10 22:08:18 +02:00
|
|
|
const char *
|
|
|
|
find_whitespace_eos(const char *s, const char *eos)
|
|
|
|
{
|
|
|
|
/* tor_assert(s); */
|
|
|
|
while (s < eos) {
|
|
|
|
switch (*s)
|
|
|
|
{
|
|
|
|
case '\0':
|
|
|
|
case '#':
|
|
|
|
case ' ':
|
|
|
|
case '\r':
|
|
|
|
case '\n':
|
|
|
|
case '\t':
|
|
|
|
return s;
|
|
|
|
default:
|
|
|
|
++s;
|
|
|
|
}
|
|
|
|
}
|
2007-07-16 20:26:31 +02:00
|
|
|
return s;
|
2007-07-10 22:08:18 +02:00
|
|
|
}
|
|
|
|
|
2006-07-23 07:32:35 +02:00
|
|
|
/** Return true iff the 'len' bytes at 'mem' are all zero. */
|
2006-07-23 09:19:49 +02:00
|
|
|
int
|
|
|
|
tor_mem_is_zero(const char *mem, size_t len)
|
2006-07-23 07:32:35 +02:00
|
|
|
{
|
|
|
|
static const char ZERO[] = {
|
|
|
|
0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
|
|
|
|
};
|
|
|
|
while (len >= sizeof(ZERO)) {
|
|
|
|
if (memcmp(mem, ZERO, sizeof(ZERO)))
|
|
|
|
return 0;
|
|
|
|
len -= sizeof(ZERO);
|
|
|
|
mem += sizeof(ZERO);
|
|
|
|
}
|
|
|
|
/* Deal with leftover bytes. */
|
|
|
|
if (len)
|
|
|
|
return ! memcmp(mem, ZERO, len);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-11-30 03:47:59 +01:00
|
|
|
/** Return true iff the DIGEST_LEN bytes in digest are all zero. */
|
|
|
|
int
|
|
|
|
tor_digest_is_zero(const char *digest)
|
|
|
|
{
|
2006-07-23 07:32:35 +02:00
|
|
|
return tor_mem_is_zero(digest, DIGEST_LEN);
|
2005-11-30 03:47:59 +01:00
|
|
|
}
|
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/* Helper: common code to check whether the result of a strtol or strtoul or
|
|
|
|
* strtoll is correct. */
|
2004-11-05 18:54:50 +01:00
|
|
|
#define CHECK_STRTOX_RESULT() \
|
|
|
|
/* Was at least one character converted? */ \
|
|
|
|
if (endptr == s) \
|
|
|
|
goto err; \
|
|
|
|
/* Were there unexpected unconverted characters? */ \
|
|
|
|
if (!next && *endptr) \
|
|
|
|
goto err; \
|
|
|
|
/* Is r within limits? */ \
|
|
|
|
if (r < min || r > max) \
|
|
|
|
goto err; \
|
|
|
|
if (ok) *ok = 1; \
|
|
|
|
if (next) *next = endptr; \
|
|
|
|
return r; \
|
|
|
|
err: \
|
|
|
|
if (ok) *ok = 0; \
|
|
|
|
if (next) *next = endptr; \
|
2005-11-15 04:05:23 +01:00
|
|
|
return 0
|
2004-11-05 18:54:50 +01:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/** Extract a long from the start of s, in the given numeric base. If
|
|
|
|
* there is unconverted data and next is provided, set *next to the
|
|
|
|
* first unconverted character. An error has occurred if no characters
|
|
|
|
* are converted; or if there are unconverted characters and next is NULL; or
|
|
|
|
* if the parsed value is not between min and max. When no error occurs,
|
|
|
|
* return the parsed value and set *ok (if provided) to 1. When an error
|
2004-12-01 04:48:14 +01:00
|
|
|
* occurs, return 0 and set *ok (if provided) to 0.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2003-04-16 19:04:58 +02:00
|
|
|
long
|
2004-11-01 21:41:47 +01:00
|
|
|
tor_parse_long(const char *s, int base, long min, long max,
|
|
|
|
int *ok, char **next)
|
2003-04-16 19:04:58 +02:00
|
|
|
{
|
2004-11-01 21:41:47 +01:00
|
|
|
char *endptr;
|
|
|
|
long r;
|
2003-04-17 04:03:55 +02:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
r = strtol(s, &endptr, base);
|
2004-11-05 18:54:50 +01:00
|
|
|
CHECK_STRTOX_RESULT();
|
2004-11-01 21:41:47 +01:00
|
|
|
}
|
|
|
|
|
2007-03-06 21:25:44 +01:00
|
|
|
/** As tor_parse_long, but return an unsigned long. */
|
2004-11-01 21:41:47 +01:00
|
|
|
unsigned long
|
|
|
|
tor_parse_ulong(const char *s, int base, unsigned long min,
|
|
|
|
unsigned long max, int *ok, char **next)
|
|
|
|
{
|
|
|
|
char *endptr;
|
|
|
|
unsigned long r;
|
|
|
|
|
2004-11-05 18:54:50 +01:00
|
|
|
r = strtoul(s, &endptr, base);
|
|
|
|
CHECK_STRTOX_RESULT();
|
2004-11-01 21:41:47 +01:00
|
|
|
}
|
2004-11-05 18:54:50 +01:00
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** As tor_parse_log, but return a unit64_t. Only base 10 is guaranteed to
|
|
|
|
* work for now. */
|
2004-11-05 18:54:50 +01:00
|
|
|
uint64_t
|
|
|
|
tor_parse_uint64(const char *s, int base, uint64_t min,
|
|
|
|
uint64_t max, int *ok, char **next)
|
|
|
|
{
|
|
|
|
char *endptr;
|
|
|
|
uint64_t r;
|
|
|
|
|
|
|
|
#ifdef HAVE_STRTOULL
|
|
|
|
r = (uint64_t)strtoull(s, &endptr, base);
|
|
|
|
#elif defined(MS_WINDOWS)
|
2007-02-28 18:46:36 +01:00
|
|
|
#if defined(_MSC_VER) && _MSC_VER < 1300
|
2004-11-09 20:13:08 +01:00
|
|
|
tor_assert(base <= 10);
|
|
|
|
r = (uint64_t)_atoi64(s);
|
|
|
|
endptr = (char*)s;
|
2004-12-08 01:42:50 +01:00
|
|
|
while (TOR_ISSPACE(*endptr)) endptr++;
|
|
|
|
while (TOR_ISDIGIT(*endptr)) endptr++;
|
2004-11-09 20:13:08 +01:00
|
|
|
#else
|
2004-11-05 18:54:50 +01:00
|
|
|
r = (uint64_t)_strtoui64(s, &endptr, base);
|
2004-11-09 20:13:08 +01:00
|
|
|
#endif
|
2004-11-05 18:54:50 +01:00
|
|
|
#elif SIZEOF_LONG == 8
|
|
|
|
r = (uint64_t)strtoul(s, &endptr, base);
|
|
|
|
#else
|
|
|
|
#error "I don't know how to parse 64-bit numbers."
|
2004-11-02 03:28:51 +01:00
|
|
|
#endif
|
2004-11-01 21:41:47 +01:00
|
|
|
|
2004-11-05 18:54:50 +01:00
|
|
|
CHECK_STRTOX_RESULT();
|
|
|
|
}
|
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Encode the <b>srclen</b> bytes at <b>src</b> in a NUL-terminated,
|
|
|
|
* uppercase hexadecimal string; store it in the <b>destlen</b>-byte buffer
|
|
|
|
* <b>dest</b>.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
base16_encode(char *dest, size_t destlen, const char *src, size_t srclen)
|
2004-11-01 21:41:47 +01:00
|
|
|
{
|
|
|
|
const char *end;
|
|
|
|
char *cp;
|
|
|
|
|
|
|
|
tor_assert(destlen >= srclen*2+1);
|
2004-12-02 05:33:01 +01:00
|
|
|
tor_assert(destlen < SIZE_T_CEILING);
|
2004-11-01 21:41:47 +01:00
|
|
|
|
|
|
|
cp = dest;
|
|
|
|
end = src+srclen;
|
|
|
|
while (src<end) {
|
2007-01-16 00:56:38 +01:00
|
|
|
*cp++ = "0123456789ABCDEF"[ (*(const uint8_t*)src) >> 4 ];
|
|
|
|
*cp++ = "0123456789ABCDEF"[ (*(const uint8_t*)src) & 0xf ];
|
2004-11-01 21:41:47 +01:00
|
|
|
++src;
|
|
|
|
}
|
|
|
|
*cp = '\0';
|
|
|
|
}
|
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Helper: given a hex digit, return its value, or -1 if it isn't hex. */
|
2005-09-30 03:09:52 +02:00
|
|
|
static INLINE int
|
|
|
|
hex_decode_digit(char c)
|
2004-11-01 21:41:47 +01:00
|
|
|
{
|
2006-09-29 20:13:37 +02:00
|
|
|
switch (c) {
|
|
|
|
case '0': return 0;
|
|
|
|
case '1': return 1;
|
|
|
|
case '2': return 2;
|
|
|
|
case '3': return 3;
|
|
|
|
case '4': return 4;
|
|
|
|
case '5': return 5;
|
|
|
|
case '6': return 6;
|
|
|
|
case '7': return 7;
|
|
|
|
case '8': return 8;
|
|
|
|
case '9': return 9;
|
|
|
|
case 'A': case 'a': return 10;
|
|
|
|
case 'B': case 'b': return 11;
|
|
|
|
case 'C': case 'c': return 12;
|
|
|
|
case 'D': case 'd': return 13;
|
|
|
|
case 'E': case 'e': return 14;
|
|
|
|
case 'F': case 'f': return 15;
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
}
|
2004-11-01 21:41:47 +01:00
|
|
|
}
|
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** Given a hexadecimal string of <b>srclen</b> bytes in <b>src</b>, decode it
|
2006-09-29 20:13:37 +02:00
|
|
|
* and store the result in the <b>destlen</b>-byte buffer at <b>dest</b>.
|
|
|
|
* Return 0 on success, -1 on failure. */
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
base16_decode(char *dest, size_t destlen, const char *src, size_t srclen)
|
2004-11-01 21:41:47 +01:00
|
|
|
{
|
|
|
|
const char *end;
|
2007-03-06 21:25:44 +01:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
int v1,v2;
|
|
|
|
if ((srclen % 2) != 0)
|
|
|
|
return -1;
|
2004-12-02 05:33:01 +01:00
|
|
|
if (destlen < srclen/2 || destlen > SIZE_T_CEILING)
|
2004-11-01 21:41:47 +01:00
|
|
|
return -1;
|
|
|
|
end = src+srclen;
|
|
|
|
while (src<end) {
|
|
|
|
v1 = hex_decode_digit(*src);
|
|
|
|
v2 = hex_decode_digit(*(src+1));
|
2004-11-28 10:05:49 +01:00
|
|
|
if (v1<0||v2<0)
|
2004-11-01 21:41:47 +01:00
|
|
|
return -1;
|
|
|
|
*(uint8_t*)dest = (v1<<4)|v2;
|
|
|
|
++dest;
|
|
|
|
src+=2;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-05 10:50:26 +01:00
|
|
|
/** Allocate and return a new string representing the contents of <b>s</b>,
|
|
|
|
* surrounded by quotes and using standard C escapes.
|
|
|
|
*
|
2007-01-19 22:25:32 +01:00
|
|
|
* Generally, we use this for logging values that come in over the network to
|
|
|
|
* keep them from tricking users, and for sending certain values to the
|
|
|
|
* controller.
|
2006-03-05 10:50:26 +01:00
|
|
|
*
|
|
|
|
* We trust values from the resolver, OS, configuration file, and command line
|
|
|
|
* to not be maliciously ill-formed. We validate incoming routerdescs and
|
|
|
|
* SOCKS requests and addresses from BEGIN cells as they're parsed;
|
|
|
|
* afterwards, we trust them as non-malicious.
|
|
|
|
*/
|
|
|
|
char *
|
|
|
|
esc_for_log(const char *s)
|
|
|
|
{
|
|
|
|
const char *cp;
|
|
|
|
char *result, *outp;
|
|
|
|
size_t len = 3;
|
2006-03-11 03:21:30 +01:00
|
|
|
if (!s) {
|
|
|
|
return tor_strdup("");
|
|
|
|
}
|
|
|
|
|
2006-03-05 10:50:26 +01:00
|
|
|
for (cp = s; *cp; ++cp) {
|
|
|
|
switch (*cp) {
|
|
|
|
case '\\':
|
|
|
|
case '\"':
|
|
|
|
case '\'':
|
|
|
|
len += 2;
|
|
|
|
break;
|
|
|
|
default:
|
2006-06-09 17:57:58 +02:00
|
|
|
if (TOR_ISPRINT(*cp) && ((uint8_t)*cp)<127)
|
2006-03-05 10:50:26 +01:00
|
|
|
++len;
|
|
|
|
else
|
|
|
|
len += 4;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
result = outp = tor_malloc(len);
|
|
|
|
*outp++ = '\"';
|
|
|
|
for (cp = s; *cp; ++cp) {
|
|
|
|
switch (*cp) {
|
|
|
|
case '\\':
|
|
|
|
case '\"':
|
|
|
|
case '\'':
|
|
|
|
*outp++ = '\\';
|
|
|
|
*outp++ = *cp;
|
|
|
|
break;
|
|
|
|
case '\n':
|
|
|
|
*outp++ = '\\';
|
|
|
|
*outp++ = 'n';
|
|
|
|
break;
|
|
|
|
case '\t':
|
|
|
|
*outp++ = '\\';
|
|
|
|
*outp++ = 't';
|
|
|
|
break;
|
|
|
|
case '\r':
|
|
|
|
*outp++ = '\\';
|
|
|
|
*outp++ = 'r';
|
|
|
|
break;
|
|
|
|
default:
|
2006-06-09 17:57:58 +02:00
|
|
|
if (TOR_ISPRINT(*cp) && ((uint8_t)*cp)<127) {
|
2006-03-05 10:50:26 +01:00
|
|
|
*outp++ = *cp;
|
|
|
|
} else {
|
2006-06-09 19:07:22 +02:00
|
|
|
tor_snprintf(outp, 5, "\\%03o", (int)(uint8_t) *cp);
|
2006-03-05 10:50:26 +01:00
|
|
|
outp += 4;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*outp++ = '\"';
|
|
|
|
*outp++ = 0;
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Allocate and return a new string representing the contents of <b>s</b>,
|
|
|
|
* surrounded by quotes and using standard C escapes.
|
|
|
|
*
|
|
|
|
* THIS FUNCTION IS NOT REENTRANT. Don't call it from outside the main
|
|
|
|
* thread. Also, each call invalidates the last-returned value, so don't
|
|
|
|
* try log_warn(LD_GENERAL, "%s %s", escaped(a), escaped(b));
|
|
|
|
*/
|
|
|
|
const char *
|
|
|
|
escaped(const char *s)
|
|
|
|
{
|
|
|
|
static char *_escaped_val = NULL;
|
|
|
|
if (_escaped_val)
|
|
|
|
tor_free(_escaped_val);
|
|
|
|
|
|
|
|
if (s)
|
|
|
|
_escaped_val = esc_for_log(s);
|
|
|
|
else
|
|
|
|
_escaped_val = NULL;
|
|
|
|
|
|
|
|
return _escaped_val;
|
|
|
|
}
|
|
|
|
|
2006-12-15 22:26:23 +01:00
|
|
|
/** Rudimentary string wrapping code: given a un-wrapped <b>string</b> (no
|
|
|
|
* newlines!), break the string into newline-terminated lines of no more than
|
|
|
|
* <b>width</b> characters long (not counting newline) and insert them into
|
|
|
|
* <b>out</b> in order. Precede the first line with prefix0, and subsequent
|
|
|
|
* lines with prefixRest.
|
|
|
|
*/
|
|
|
|
/* This uses a stupid greedy wrapping algorithm right now:
|
|
|
|
* - For each line:
|
|
|
|
* - Try to fit as much stuff as possible, but break on a space.
|
|
|
|
* - If the first "word" of the line will extend beyond the allowable
|
|
|
|
* width, break the word at the end of the width.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
wrap_string(smartlist_t *out, const char *string, size_t width,
|
|
|
|
const char *prefix0, const char *prefixRest)
|
|
|
|
{
|
|
|
|
size_t p0Len, pRestLen, pCurLen;
|
|
|
|
const char *eos, *prefixCur;
|
|
|
|
tor_assert(out);
|
|
|
|
tor_assert(string);
|
|
|
|
tor_assert(width);
|
|
|
|
if (!prefix0)
|
|
|
|
prefix0 = "";
|
|
|
|
if (!prefixRest)
|
|
|
|
prefixRest = "";
|
|
|
|
|
|
|
|
p0Len = strlen(prefix0);
|
|
|
|
pRestLen = strlen(prefixRest);
|
|
|
|
tor_assert(width > p0Len && width > pRestLen);
|
|
|
|
eos = strchr(string, '\0');
|
|
|
|
tor_assert(eos);
|
|
|
|
pCurLen = p0Len;
|
|
|
|
prefixCur = prefix0;
|
|
|
|
|
|
|
|
while ((eos-string)+pCurLen > width) {
|
|
|
|
const char *eol = string + width - pCurLen;
|
|
|
|
while (eol > string && *eol != ' ')
|
|
|
|
--eol;
|
|
|
|
/* eol is now the last space that can fit, or the start of the string. */
|
|
|
|
if (eol > string) {
|
|
|
|
size_t line_len = (eol-string) + pCurLen + 2;
|
|
|
|
char *line = tor_malloc(line_len);
|
|
|
|
memcpy(line, prefixCur, pCurLen);
|
|
|
|
memcpy(line+pCurLen, string, eol-string);
|
|
|
|
line[line_len-2] = '\n';
|
|
|
|
line[line_len-1] = '\0';
|
|
|
|
smartlist_add(out, line);
|
|
|
|
string = eol + 1;
|
|
|
|
} else {
|
|
|
|
size_t line_len = width + 2;
|
|
|
|
char *line = tor_malloc(line_len);
|
|
|
|
memcpy(line, prefixCur, pCurLen);
|
|
|
|
memcpy(line+pCurLen, string, width - pCurLen);
|
|
|
|
line[line_len-2] = '\n';
|
|
|
|
line[line_len-1] = '\0';
|
|
|
|
smartlist_add(out, line);
|
|
|
|
string += width-pCurLen;
|
|
|
|
}
|
|
|
|
prefixCur = prefixRest;
|
|
|
|
pCurLen = pRestLen;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (string < eos) {
|
|
|
|
size_t line_len = (eos-string) + pCurLen + 2;
|
|
|
|
char *line = tor_malloc(line_len);
|
|
|
|
memcpy(line, prefixCur, pCurLen);
|
|
|
|
memcpy(line+pCurLen, string, eos-string);
|
|
|
|
line[line_len-2] = '\n';
|
|
|
|
line[line_len-1] = '\0';
|
|
|
|
smartlist_add(out, line);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/* =====
|
|
|
|
* Time
|
|
|
|
* ===== */
|
|
|
|
|
|
|
|
/** Return the number of microseconds elapsed between *start and *end.
|
|
|
|
*/
|
|
|
|
long
|
2007-03-06 21:25:44 +01:00
|
|
|
tv_udiff(const struct timeval *start, const struct timeval *end)
|
2004-11-01 21:41:47 +01:00
|
|
|
{
|
|
|
|
long udiff;
|
|
|
|
long secdiff = end->tv_sec - start->tv_sec;
|
|
|
|
|
2004-11-23 01:08:26 +01:00
|
|
|
if (labs(secdiff+1) > LONG_MAX/1000000) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_GENERAL, "comparing times too far apart.");
|
2004-11-01 21:41:47 +01:00
|
|
|
return LONG_MAX;
|
|
|
|
}
|
|
|
|
|
|
|
|
udiff = secdiff*1000000L + (end->tv_usec - start->tv_usec);
|
2003-04-17 01:22:05 +02:00
|
|
|
return udiff;
|
2003-04-16 19:04:58 +02:00
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Return -1 if *a \< *b, 0 if *a==*b, and 1 if *a \> *b.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
2007-03-06 21:25:44 +01:00
|
|
|
tv_cmp(const struct timeval *a, const struct timeval *b)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2003-04-16 19:04:58 +02:00
|
|
|
if (a->tv_sec > b->tv_sec)
|
|
|
|
return 1;
|
|
|
|
if (a->tv_sec < b->tv_sec)
|
|
|
|
return -1;
|
|
|
|
if (a->tv_usec > b->tv_usec)
|
|
|
|
return 1;
|
|
|
|
if (a->tv_usec < b->tv_usec)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Increment *a by the number of seconds and microseconds in *b.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
2007-03-06 21:25:44 +01:00
|
|
|
tv_add(struct timeval *a, const struct timeval *b)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2003-04-16 19:04:58 +02:00
|
|
|
a->tv_usec += b->tv_usec;
|
|
|
|
a->tv_sec += b->tv_sec + (a->tv_usec / 1000000);
|
|
|
|
a->tv_usec %= 1000000;
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Increment *a by <b>ms</b> milliseconds.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
tv_addms(struct timeval *a, long ms)
|
|
|
|
{
|
2007-05-15 23:17:48 +02:00
|
|
|
uint64_t us = ms * 1000;
|
|
|
|
a->tv_usec += us % 1000000;
|
|
|
|
a->tv_sec += (us / 1000000) + (a->tv_usec / 1000000);
|
2003-04-16 19:04:58 +02:00
|
|
|
a->tv_usec %= 1000000;
|
|
|
|
}
|
2003-08-12 05:08:41 +02:00
|
|
|
|
2007-02-24 08:50:38 +01:00
|
|
|
/** Yield true iff <b>y</b> is a leap-year. */
|
2003-11-10 07:28:53 +01:00
|
|
|
#define IS_LEAPYEAR(y) (!(y % 4) && ((y % 100) || !(y % 400)))
|
2007-02-16 21:39:37 +01:00
|
|
|
/** Helper: Return the number of leap-days between Jan 1, y1 and Jan 1, y2. */
|
2005-09-30 03:09:52 +02:00
|
|
|
static int
|
|
|
|
n_leapdays(int y1, int y2)
|
|
|
|
{
|
2003-11-10 07:28:53 +01:00
|
|
|
--y1;
|
|
|
|
--y2;
|
|
|
|
return (y2/4 - y1/4) - (y2/100 - y1/100) + (y2/400 - y1/400);
|
|
|
|
}
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Number of days per month in non-leap year; used by tor_timegm. */
|
2003-12-17 22:14:13 +01:00
|
|
|
static const int days_per_month[] =
|
2003-11-10 07:28:53 +01:00
|
|
|
{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Return a time_t given a struct tm. The result is given in GMT, and
|
2004-05-01 22:46:28 +02:00
|
|
|
* does not account for leap seconds.
|
|
|
|
*/
|
2004-11-23 00:28:26 +01:00
|
|
|
time_t
|
2005-09-30 03:09:52 +02:00
|
|
|
tor_timegm(struct tm *tm)
|
|
|
|
{
|
2003-12-17 22:14:13 +01:00
|
|
|
/* This is a pretty ironclad timegm implementation, snarfed from Python2.2.
|
2003-11-10 07:28:53 +01:00
|
|
|
* It's way more brute-force than fiddling with tzset().
|
|
|
|
*/
|
2003-10-20 22:19:59 +02:00
|
|
|
time_t ret;
|
2003-11-10 07:28:53 +01:00
|
|
|
unsigned long year, days, hours, minutes;
|
|
|
|
int i;
|
|
|
|
year = tm->tm_year + 1900;
|
2006-01-02 00:09:19 +01:00
|
|
|
if (year < 1970 || tm->tm_mon < 0 || tm->tm_mon > 11) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_BUG, "Out-of-range argument to tor_timegm");
|
2006-01-02 00:13:19 +01:00
|
|
|
return -1;
|
2006-01-02 00:09:19 +01:00
|
|
|
}
|
2003-11-10 07:28:53 +01:00
|
|
|
days = 365 * (year-1970) + n_leapdays(1970,year);
|
|
|
|
for (i = 0; i < tm->tm_mon; ++i)
|
|
|
|
days += days_per_month[i];
|
|
|
|
if (tm->tm_mon > 1 && IS_LEAPYEAR(year))
|
|
|
|
++days;
|
|
|
|
days += tm->tm_mday - 1;
|
|
|
|
hours = days*24 + tm->tm_hour;
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2003-11-10 07:28:53 +01:00
|
|
|
minutes = hours*60 + tm->tm_min;
|
|
|
|
ret = minutes*60 + tm->tm_sec;
|
2003-10-20 22:19:59 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2004-08-04 03:11:15 +02:00
|
|
|
/* strftime is locale-specific, so we need to replace those parts */
|
|
|
|
static const char *WEEKDAY_NAMES[] =
|
|
|
|
{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
|
|
|
|
static const char *MONTH_NAMES[] =
|
|
|
|
{ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
|
|
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
|
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Set <b>buf</b> to the RFC1123 encoding of the GMT value of <b>t</b>.
|
|
|
|
* The buffer must be at least RFC1123_TIME_LEN+1 bytes long.
|
|
|
|
*
|
|
|
|
* (RFC1123 format is Fri, 29 Sep 2006 15:54:20 GMT)
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
format_rfc1123_time(char *buf, time_t t)
|
|
|
|
{
|
2005-02-22 08:03:03 +01:00
|
|
|
struct tm tm;
|
2004-08-04 03:11:15 +02:00
|
|
|
|
2005-02-22 08:03:03 +01:00
|
|
|
tor_gmtime_r(&t, &tm);
|
|
|
|
|
|
|
|
strftime(buf, RFC1123_TIME_LEN+1, "___, %d ___ %Y %H:%M:%S GMT", &tm);
|
|
|
|
tor_assert(tm.tm_wday >= 0);
|
|
|
|
tor_assert(tm.tm_wday <= 6);
|
|
|
|
memcpy(buf, WEEKDAY_NAMES[tm.tm_wday], 3);
|
|
|
|
tor_assert(tm.tm_wday >= 0);
|
|
|
|
tor_assert(tm.tm_mon <= 11);
|
|
|
|
memcpy(buf+8, MONTH_NAMES[tm.tm_mon], 3);
|
2004-08-04 03:11:15 +02:00
|
|
|
}
|
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Parse the the RFC1123 encoding of some time (in GMT) from <b>buf</b>,
|
|
|
|
* and store the result in *<b>t</b>.
|
|
|
|
*
|
|
|
|
* Return 0 on succcess, -1 on failure.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
parse_rfc1123_time(const char *buf, time_t *t)
|
|
|
|
{
|
2004-08-04 03:11:15 +02:00
|
|
|
struct tm tm;
|
|
|
|
char month[4];
|
|
|
|
char weekday[4];
|
|
|
|
int i, m;
|
|
|
|
|
|
|
|
if (strlen(buf) != RFC1123_TIME_LEN)
|
|
|
|
return -1;
|
|
|
|
memset(&tm, 0, sizeof(tm));
|
|
|
|
if (sscanf(buf, "%3s, %d %3s %d %d:%d:%d GMT", weekday,
|
|
|
|
&tm.tm_mday, month, &tm.tm_year, &tm.tm_hour,
|
|
|
|
&tm.tm_min, &tm.tm_sec) < 7) {
|
2006-03-05 10:50:26 +01:00
|
|
|
char *esc = esc_for_log(buf);
|
|
|
|
log_warn(LD_GENERAL, "Got invalid RFC1123 time %s", esc);
|
|
|
|
tor_free(esc);
|
2004-08-04 03:11:15 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
m = -1;
|
|
|
|
for (i = 0; i < 12; ++i) {
|
|
|
|
if (!strcmp(month, MONTH_NAMES[i])) {
|
|
|
|
m = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (m<0) {
|
2006-03-05 10:50:26 +01:00
|
|
|
char *esc = esc_for_log(buf);
|
2006-09-30 00:33:40 +02:00
|
|
|
log_warn(LD_GENERAL, "Got invalid RFC1123 time %s: No such month", esc);
|
2006-03-05 10:50:26 +01:00
|
|
|
tor_free(esc);
|
2004-08-04 03:11:15 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
tm.tm_mon = m;
|
2006-01-02 00:09:19 +01:00
|
|
|
|
|
|
|
if (tm.tm_year < 1970) {
|
2006-03-05 10:50:26 +01:00
|
|
|
char *esc = esc_for_log(buf);
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_GENERAL,
|
2006-03-05 10:50:26 +01:00
|
|
|
"Got invalid RFC1123 time %s. (Before 1970)", esc);
|
|
|
|
tor_free(esc);
|
2006-01-02 00:09:19 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-08-04 03:11:15 +02:00
|
|
|
tm.tm_year -= 1900;
|
2006-01-02 00:09:19 +01:00
|
|
|
|
2004-08-04 03:11:15 +02:00
|
|
|
*t = tor_timegm(&tm);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-07 18:25:28 +02:00
|
|
|
/** Set <b>buf</b> to the ISO8601 encoding of the local value of <b>t</b>.
|
2006-09-29 20:13:37 +02:00
|
|
|
* The buffer must be at least ISO_TIME_LEN+1 bytes long.
|
|
|
|
*
|
2006-10-07 18:25:28 +02:00
|
|
|
* (ISO8601 format is 2006-10-29 10:57:20)
|
2006-09-29 20:13:37 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
format_local_iso_time(char *buf, time_t t)
|
|
|
|
{
|
2005-02-22 08:03:03 +01:00
|
|
|
struct tm tm;
|
|
|
|
strftime(buf, ISO_TIME_LEN+1, "%Y-%m-%d %H:%M:%S", tor_localtime_r(&t, &tm));
|
2004-11-22 22:38:44 +01:00
|
|
|
}
|
|
|
|
|
2006-10-07 18:25:28 +02:00
|
|
|
/** Set <b>buf</b> to the ISO8601 encoding of the GMT value of <b>t</b>.
|
2006-09-29 20:13:37 +02:00
|
|
|
* The buffer must be at least ISO_TIME_LEN+1 bytes long.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
format_iso_time(char *buf, time_t t)
|
|
|
|
{
|
2005-02-22 08:03:03 +01:00
|
|
|
struct tm tm;
|
|
|
|
strftime(buf, ISO_TIME_LEN+1, "%Y-%m-%d %H:%M:%S", tor_gmtime_r(&t, &tm));
|
2004-08-07 04:46:16 +02:00
|
|
|
}
|
|
|
|
|
2006-09-29 01:57:49 +02:00
|
|
|
/** Given an ISO-formatted UTC time value (after the epoch) in <b>cp</b>,
|
|
|
|
* parse it and store its value in *<b>t</b>. Return 0 on success, -1 on
|
|
|
|
* failure. Ignore extraneous stuff in <b>cp</b> separated by whitespace from
|
|
|
|
* the end of the time string. */
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
parse_iso_time(const char *cp, time_t *t)
|
|
|
|
{
|
2004-08-07 04:46:16 +02:00
|
|
|
struct tm st_tm;
|
|
|
|
#ifdef HAVE_STRPTIME
|
|
|
|
if (!strptime(cp, "%Y-%m-%d %H:%M:%S", &st_tm)) {
|
2006-09-30 00:33:40 +02:00
|
|
|
log_warn(LD_GENERAL, "ISO time was unparseable by strptime"); return -1;
|
2004-08-07 04:46:16 +02:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
unsigned int year=0, month=0, day=0, hour=100, minute=100, second=100;
|
|
|
|
if (sscanf(cp, "%u-%u-%u %u:%u:%u", &year, &month,
|
|
|
|
&day, &hour, &minute, &second) < 6) {
|
2006-10-07 08:28:50 +02:00
|
|
|
log_warn(LD_GENERAL, "ISO time was unparseable"); return -1;
|
2004-08-07 04:46:16 +02:00
|
|
|
}
|
|
|
|
if (year < 1970 || month < 1 || month > 12 || day < 1 || day > 31 ||
|
|
|
|
hour > 23 || minute > 59 || second > 61) {
|
2006-09-30 00:33:40 +02:00
|
|
|
log_warn(LD_GENERAL, "ISO time was nonsensical"); return -1;
|
2004-08-07 04:46:16 +02:00
|
|
|
}
|
2004-12-06 23:39:10 +01:00
|
|
|
st_tm.tm_year = year-1900;
|
2004-08-07 04:46:16 +02:00
|
|
|
st_tm.tm_mon = month-1;
|
|
|
|
st_tm.tm_mday = day;
|
|
|
|
st_tm.tm_hour = hour;
|
|
|
|
st_tm.tm_min = minute;
|
|
|
|
st_tm.tm_sec = second;
|
|
|
|
#endif
|
2006-01-02 00:09:19 +01:00
|
|
|
if (st_tm.tm_year < 70) {
|
2006-03-05 10:50:26 +01:00
|
|
|
char *esc = esc_for_log(cp);
|
|
|
|
log_warn(LD_GENERAL, "Got invalid ISO time %s. (Before 1970)", esc);
|
|
|
|
tor_free(esc);
|
2006-01-02 00:09:19 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-08-07 04:46:16 +02:00
|
|
|
*t = tor_timegm(&st_tm);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-02 17:26:57 +02:00
|
|
|
/** Given a <b>date</b> in one of the three formats allowed by HTTP (ugh),
|
|
|
|
* parse it into <b>tm</b>. Return 0 on success, negative on failure. */
|
|
|
|
int
|
|
|
|
parse_http_time(const char *date, struct tm *tm)
|
|
|
|
{
|
|
|
|
const char *cp;
|
|
|
|
char month[4];
|
|
|
|
char wkday[4];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
tor_assert(tm);
|
|
|
|
memset(tm, 0, sizeof(*tm));
|
|
|
|
|
|
|
|
/* First, try RFC1123 or RFC850 format: skip the weekday. */
|
|
|
|
if ((cp = strchr(date, ','))) {
|
|
|
|
++cp;
|
|
|
|
if (sscanf(date, "%2d %3s %4d %2d:%2d:%2d GMT",
|
|
|
|
&tm->tm_mday, month, &tm->tm_year,
|
|
|
|
&tm->tm_hour, &tm->tm_min, &tm->tm_sec) == 6) {
|
|
|
|
/* rfc1123-date */
|
|
|
|
tm->tm_year -= 1900;
|
|
|
|
} else if (sscanf(date, "%2d-%3s-%2d %2d:%2d:%2d GMT",
|
|
|
|
&tm->tm_mday, month, &tm->tm_year,
|
|
|
|
&tm->tm_hour, &tm->tm_min, &tm->tm_sec) == 6) {
|
|
|
|
/* rfc850-date */
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* No comma; possibly asctime() format. */
|
|
|
|
if (sscanf(date, "%3s %3s %2d %2d:%2d:%2d %4d",
|
|
|
|
wkday, month, &tm->tm_mday,
|
|
|
|
&tm->tm_hour, &tm->tm_min, &tm->tm_sec, &tm->tm_year) == 7) {
|
|
|
|
tm->tm_year -= 1900;
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
month[4] = '\0';
|
|
|
|
/* Okay, now decode the month. */
|
|
|
|
for (i = 0; i < 12; ++i) {
|
|
|
|
if (!strcasecmp(MONTH_NAMES[i], month)) {
|
|
|
|
tm->tm_mon = i+1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tm->tm_year < 0 ||
|
|
|
|
tm->tm_mon < 1 || tm->tm_mon > 12 ||
|
|
|
|
tm->tm_mday < 0 || tm->tm_mday > 31 ||
|
|
|
|
tm->tm_hour < 0 || tm->tm_hour > 23 ||
|
|
|
|
tm->tm_min < 0 || tm->tm_min > 59 ||
|
|
|
|
tm->tm_sec < 0 || tm->tm_sec > 61)
|
|
|
|
return -1; /* Out of range, or bad month. */
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-10-30 16:17:07 +01:00
|
|
|
/** DOCDOC */
|
|
|
|
int
|
|
|
|
format_time_interval(char *out, size_t out_len, long interval)
|
|
|
|
{
|
|
|
|
/* We only report seconds if there's no hours. */
|
|
|
|
long sec = 0, min = 0, hour = 0, day = 0;
|
|
|
|
if (interval < 0)
|
|
|
|
interval = -interval;
|
|
|
|
|
|
|
|
if (interval >= 86400) {
|
|
|
|
day = interval / 86400;
|
|
|
|
interval %= 86400;
|
|
|
|
}
|
|
|
|
if (interval >= 3600) {
|
|
|
|
hour = interval / 3600;
|
|
|
|
interval %= 3600;
|
|
|
|
}
|
|
|
|
if (interval >= 60) {
|
|
|
|
min = interval / 60;
|
|
|
|
interval %= 60;
|
|
|
|
}
|
|
|
|
sec = interval;
|
|
|
|
|
|
|
|
if (day) {
|
|
|
|
return tor_snprintf(out, out_len, "%ld days, %ld hours, %ld minutes",
|
|
|
|
day, hour, min);
|
|
|
|
} else if (hour) {
|
|
|
|
return tor_snprintf(out, out_len, "%ld hours, %ld minutes", hour, min);
|
|
|
|
} else if (min) {
|
|
|
|
return tor_snprintf(out, out_len, "%ld minutes, %ld seconds", min, sec);
|
|
|
|
} else {
|
|
|
|
return tor_snprintf(out, out_len, "%ld seconds", sec);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-08 21:08:46 +02:00
|
|
|
/* =====
|
|
|
|
* Fuzzy time
|
|
|
|
* ===== */
|
|
|
|
|
|
|
|
/* In a perfect world, everybody would run ntp, and ntp would be perfect, so
|
|
|
|
* if we wanted to know "Is the current time before time X?" we could just say
|
|
|
|
* "time(NULL) < X".
|
|
|
|
*
|
|
|
|
* But unfortunately, many users are running Tor in an imperfect world, on
|
|
|
|
* even more imperfect computers. Hence, we need to track time oddly. We
|
|
|
|
* model the user's computer as being "skewed" from accurate time by
|
|
|
|
* -<b>ftime_skew</b> seconds, such that our best guess of the current time is
|
|
|
|
* time(NULL)+ftime_skew. We also assume that our measurements of time may
|
2007-09-08 22:25:57 +02:00
|
|
|
* have up to <b>ftime_slop</b> seconds of inaccuracy; IOW, our window of
|
|
|
|
* estimate for the current time is now + ftime_skew +/- ftime_slop.
|
2007-09-08 21:08:46 +02:00
|
|
|
*/
|
|
|
|
static int ftime_skew = 0;
|
|
|
|
static int ftime_slop = 60;
|
|
|
|
void
|
|
|
|
ftime_set_maximum_sloppiness(int seconds)
|
|
|
|
{
|
|
|
|
tor_assert(seconds >= 0);
|
|
|
|
ftime_slop = seconds;
|
|
|
|
}
|
|
|
|
void
|
|
|
|
ftime_set_estimated_skew(int seconds)
|
|
|
|
{
|
|
|
|
ftime_skew = seconds;
|
|
|
|
}
|
|
|
|
#if 0
|
|
|
|
void
|
|
|
|
ftime_get_window(time_t now, ftime_t *ft_out)
|
|
|
|
{
|
|
|
|
ft_out->earliest = now + ftime_skew - ftime_slop;
|
|
|
|
ft_out->latest = now + ftime_skew + ftime_slop;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
int
|
|
|
|
ftime_maybe_after(time_t now, time_t when)
|
|
|
|
{
|
2007-09-08 22:25:57 +02:00
|
|
|
/* It may be after when iff the latest possible current time is after when */
|
2007-09-08 21:08:46 +02:00
|
|
|
return (now + ftime_skew + ftime_slop) >= when;
|
|
|
|
}
|
|
|
|
int
|
|
|
|
ftime_maybe_before(time_t now, time_t when)
|
|
|
|
{
|
2007-09-08 22:25:57 +02:00
|
|
|
/* It may be before when iff the earliest possible current time is before */
|
2007-09-08 21:08:46 +02:00
|
|
|
return (now + ftime_skew - ftime_slop) < when;
|
|
|
|
}
|
|
|
|
int
|
|
|
|
ftime_definitely_after(time_t now, time_t when)
|
|
|
|
{
|
|
|
|
/* It is definitely after when if the earliest time it could be is still
|
|
|
|
* after when. */
|
|
|
|
return (now + ftime_skew - ftime_slop) >= when;
|
|
|
|
}
|
|
|
|
int
|
|
|
|
ftime_definitely_before(time_t now, time_t when)
|
|
|
|
{
|
|
|
|
/* It is definitely before when if the latest time it could be is still
|
|
|
|
* before when. */
|
|
|
|
return (now + ftime_skew + ftime_slop) < when;
|
|
|
|
}
|
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/* =====
|
|
|
|
* File helpers
|
|
|
|
* ===== */
|
2003-09-26 20:27:35 +02:00
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Write <b>count</b> bytes from <b>buf</b> to <b>fd</b>. <b>isSocket</b>
|
|
|
|
* must be 1 if fd was returned by socket() or accept(), and 0 if fd
|
|
|
|
* was returned by open(). Return the number of bytes written, or -1
|
|
|
|
* on error. Only use if fd is a blocking fd. */
|
2005-08-03 22:42:17 +02:00
|
|
|
int
|
2005-09-30 03:09:52 +02:00
|
|
|
write_all(int fd, const char *buf, size_t count, int isSocket)
|
|
|
|
{
|
2004-03-09 23:01:17 +01:00
|
|
|
size_t written = 0;
|
2003-08-21 01:05:22 +02:00
|
|
|
int result;
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
while (written != count) {
|
2004-03-11 07:35:03 +01:00
|
|
|
if (isSocket)
|
2006-09-19 22:41:31 +02:00
|
|
|
result = tor_socket_send(fd, buf+written, count-written, 0);
|
2004-03-11 07:35:03 +01:00
|
|
|
else
|
|
|
|
result = write(fd, buf+written, count-written);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (result<0)
|
2003-08-21 01:05:22 +02:00
|
|
|
return -1;
|
|
|
|
written += result;
|
2003-09-14 04:58:50 +02:00
|
|
|
}
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2004-09-26 18:51:31 +02:00
|
|
|
/** Read from <b>fd</b> to <b>buf</b>, until we get <b>count</b> bytes
|
2004-12-22 06:29:06 +01:00
|
|
|
* or reach the end of the file. <b>isSocket</b> must be 1 if fd
|
2004-05-01 22:46:28 +02:00
|
|
|
* was returned by socket() or accept(), and 0 if fd was returned by
|
|
|
|
* open(). Return the number of bytes read, or -1 on error. Only use
|
|
|
|
* if fd is a blocking fd. */
|
2005-08-03 22:42:17 +02:00
|
|
|
int
|
2005-09-30 03:09:52 +02:00
|
|
|
read_all(int fd, char *buf, size_t count, int isSocket)
|
|
|
|
{
|
2004-03-09 23:01:17 +01:00
|
|
|
size_t numread = 0;
|
2003-09-14 04:58:50 +02:00
|
|
|
int result;
|
|
|
|
|
2004-12-02 05:33:01 +01:00
|
|
|
if (count > SIZE_T_CEILING)
|
|
|
|
return -1;
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
while (numread != count) {
|
2004-04-07 21:57:40 +02:00
|
|
|
if (isSocket)
|
2006-09-19 22:41:31 +02:00
|
|
|
result = tor_socket_recv(fd, buf+numread, count-numread, 0);
|
2004-03-11 07:35:03 +01:00
|
|
|
else
|
|
|
|
result = read(fd, buf+numread, count-numread);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (result<0)
|
2003-09-14 04:58:50 +02:00
|
|
|
return -1;
|
2004-09-26 18:51:31 +02:00
|
|
|
else if (result == 0)
|
|
|
|
break;
|
2003-09-14 04:58:50 +02:00
|
|
|
numread += result;
|
2003-08-21 01:05:22 +02:00
|
|
|
}
|
2004-11-16 01:08:56 +01:00
|
|
|
return numread;
|
2003-08-21 01:05:22 +02:00
|
|
|
}
|
|
|
|
|
2003-09-26 20:27:35 +02:00
|
|
|
/*
|
|
|
|
* Filesystem operations.
|
|
|
|
*/
|
2003-10-04 05:29:09 +02:00
|
|
|
|
2005-03-16 01:04:59 +01:00
|
|
|
/** Clean up <b>name</b> so that we can use it in a call to "stat". On Unix,
|
|
|
|
* we do nothing. On Windows, we remove a trailing slash, unless the path is
|
|
|
|
* the root of a disk. */
|
|
|
|
static void
|
|
|
|
clean_name_for_stat(char *name)
|
|
|
|
{
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
size_t len = strlen(name);
|
|
|
|
if (!len)
|
|
|
|
return;
|
|
|
|
if (name[len-1]=='\\' || name[len-1]=='/') {
|
|
|
|
if (len == 1 || (len==3 && name[1]==':'))
|
|
|
|
return;
|
|
|
|
name[len-1]='\0';
|
|
|
|
}
|
2006-06-05 00:42:13 +02:00
|
|
|
#else
|
|
|
|
(void)name;
|
2005-03-16 01:04:59 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Return FN_ERROR if filename can't be read, FN_NOENT if it doesn't
|
2003-10-04 05:29:09 +02:00
|
|
|
* exist, FN_FILE if it is a regular file, or FN_DIR if it's a
|
|
|
|
* directory. */
|
2005-09-30 03:09:52 +02:00
|
|
|
file_status_t
|
|
|
|
file_status(const char *fname)
|
2003-09-26 20:27:35 +02:00
|
|
|
{
|
|
|
|
struct stat st;
|
2005-03-16 01:04:59 +01:00
|
|
|
char *f;
|
|
|
|
int r;
|
|
|
|
f = tor_strdup(fname);
|
|
|
|
clean_name_for_stat(f);
|
|
|
|
r = stat(f, &st);
|
|
|
|
tor_free(f);
|
|
|
|
if (r) {
|
2003-09-26 20:27:35 +02:00
|
|
|
if (errno == ENOENT) {
|
|
|
|
return FN_NOENT;
|
|
|
|
}
|
|
|
|
return FN_ERROR;
|
|
|
|
}
|
2003-12-17 22:14:13 +01:00
|
|
|
if (st.st_mode & S_IFDIR)
|
2003-09-26 20:27:35 +02:00
|
|
|
return FN_DIR;
|
|
|
|
else if (st.st_mode & S_IFREG)
|
|
|
|
return FN_FILE;
|
|
|
|
else
|
|
|
|
return FN_ERROR;
|
|
|
|
}
|
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Check whether dirname exists and is private. If yes return 0. If
|
2004-11-09 08:12:31 +01:00
|
|
|
* it does not exist, and check==CPD_CREATE is set, try to create it
|
|
|
|
* and return 0 on success. If it does not exist, and
|
|
|
|
* check==CPD_CHECK, and we think we can create it, return 0. Else
|
|
|
|
* return -1. */
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
check_private_dir(const char *dirname, cpd_check_t check)
|
2003-09-26 20:27:35 +02:00
|
|
|
{
|
2004-03-09 23:01:17 +01:00
|
|
|
int r;
|
2003-09-26 20:27:35 +02:00
|
|
|
struct stat st;
|
2005-03-16 01:04:59 +01:00
|
|
|
char *f;
|
2004-07-22 10:30:06 +02:00
|
|
|
tor_assert(dirname);
|
2005-03-16 01:04:59 +01:00
|
|
|
f = tor_strdup(dirname);
|
|
|
|
clean_name_for_stat(f);
|
|
|
|
r = stat(f, &st);
|
|
|
|
tor_free(f);
|
|
|
|
if (r) {
|
2003-09-26 20:27:35 +02:00
|
|
|
if (errno != ENOENT) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_WARN, LD_FS, "Directory %s cannot be read: %s", dirname,
|
2003-09-26 20:27:35 +02:00
|
|
|
strerror(errno));
|
|
|
|
return -1;
|
2003-12-17 22:14:13 +01:00
|
|
|
}
|
2004-11-09 08:12:31 +01:00
|
|
|
if (check == CPD_NONE) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_WARN, LD_FS, "Directory %s does not exist.", dirname);
|
2003-09-26 20:27:35 +02:00
|
|
|
return -1;
|
2004-11-09 08:12:31 +01:00
|
|
|
} else if (check == CPD_CREATE) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_info(LD_GENERAL, "Creating directory %s", dirname);
|
2004-03-09 23:01:17 +01:00
|
|
|
#ifdef MS_WINDOWS
|
2004-11-09 08:12:31 +01:00
|
|
|
r = mkdir(dirname);
|
2004-03-09 23:01:17 +01:00
|
|
|
#else
|
2004-11-09 08:12:31 +01:00
|
|
|
r = mkdir(dirname, 0700);
|
2004-03-09 23:01:17 +01:00
|
|
|
#endif
|
2004-11-09 08:12:31 +01:00
|
|
|
if (r) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_WARN, LD_FS, "Error creating directory %s: %s", dirname,
|
2004-11-09 08:12:31 +01:00
|
|
|
strerror(errno));
|
|
|
|
return -1;
|
|
|
|
}
|
2003-09-26 20:27:35 +02:00
|
|
|
}
|
2004-11-09 08:12:31 +01:00
|
|
|
/* XXXX In the case where check==CPD_CHECK, we should look at the
|
|
|
|
* parent directory a little harder. */
|
|
|
|
return 0;
|
2003-09-26 20:27:35 +02:00
|
|
|
}
|
|
|
|
if (!(st.st_mode & S_IFDIR)) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_WARN, LD_FS, "%s is not a directory", dirname);
|
2003-09-26 20:27:35 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-03-09 23:01:17 +01:00
|
|
|
#ifndef MS_WINDOWS
|
2003-09-26 20:27:35 +02:00
|
|
|
if (st.st_uid != getuid()) {
|
2005-12-05 02:28:10 +01:00
|
|
|
struct passwd *pw = NULL;
|
|
|
|
char *process_ownername = NULL;
|
|
|
|
|
|
|
|
pw = getpwuid(getuid());
|
2005-12-08 05:01:37 +01:00
|
|
|
process_ownername = pw ? tor_strdup(pw->pw_name) : tor_strdup("<unknown>");
|
2005-12-05 02:28:10 +01:00
|
|
|
|
|
|
|
pw = getpwuid(st.st_uid);
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_FS, "%s is not owned by this user (%s, %d) but by "
|
|
|
|
"%s (%d). Perhaps you are running Tor as the wrong user?",
|
2005-12-05 02:28:10 +01:00
|
|
|
dirname, process_ownername, (int)getuid(),
|
2005-12-05 02:30:11 +01:00
|
|
|
pw ? pw->pw_name : "<unknown>", (int)st.st_uid);
|
2005-12-05 02:28:10 +01:00
|
|
|
|
|
|
|
tor_free(process_ownername);
|
2003-09-26 20:27:35 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (st.st_mode & 0077) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_WARN, LD_FS, "Fixing permissions on directory %s", dirname);
|
2003-09-26 20:27:35 +02:00
|
|
|
if (chmod(dirname, 0700)) {
|
2005-10-24 20:37:09 +02:00
|
|
|
log(LOG_WARN, LD_FS, "Could not chmod directory %s: %s", dirname,
|
2003-09-26 20:27:35 +02:00
|
|
|
strerror(errno));
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2004-03-09 23:01:17 +01:00
|
|
|
#endif
|
2003-09-26 20:27:35 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
/** Create a file named <b>fname</b> with the contents <b>str</b>. Overwrite
|
|
|
|
* the previous <b>fname</b> if possible. Return 0 on success, -1 on failure.
|
2004-05-01 22:46:28 +02:00
|
|
|
*
|
2007-06-04 17:30:40 +02:00
|
|
|
* This function replaces the old file atomically, if possible. This
|
|
|
|
* function, and all other functions in util.c that create files, create them
|
|
|
|
* with mode 0600.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2003-09-26 20:27:35 +02:00
|
|
|
int
|
2004-09-08 09:16:34 +02:00
|
|
|
write_str_to_file(const char *fname, const char *str, int bin)
|
2004-11-03 20:02:48 +01:00
|
|
|
{
|
2004-11-09 20:13:08 +01:00
|
|
|
#ifdef MS_WINDOWS
|
2004-11-09 21:04:00 +01:00
|
|
|
if (!bin && strchr(str, '\r')) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_BUG,
|
2007-03-04 21:11:46 +01:00
|
|
|
"We're writing a text string that already contains a CR.");
|
2004-11-09 20:13:08 +01:00
|
|
|
}
|
|
|
|
#endif
|
2004-11-03 20:02:48 +01:00
|
|
|
return write_bytes_to_file(fname, str, strlen(str), bin);
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Represents a file that we're writing to, with support for atomic commit:
|
|
|
|
* we can write into a a temporary file, and either remove the file on
|
|
|
|
* failure, or replace the original file on success. */
|
2007-08-29 21:02:37 +02:00
|
|
|
struct open_file_t {
|
2007-10-04 18:21:58 +02:00
|
|
|
char *tempname; /**< Name of the temporary file. */
|
|
|
|
char *filename; /**< Name of the original file. */
|
|
|
|
int rename_on_close; /**< Are we using the temporary file or not? */
|
|
|
|
int fd; /**< fd for the open file. */
|
|
|
|
FILE *stdio_file; /**< stdio wrapper for <b>fd</b>. */
|
2007-08-29 21:02:37 +02:00
|
|
|
};
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Try to start writing to the file in <b>fname</b>, passing the flags
|
|
|
|
* <b>open_flags</b> to the open() syscall, creating the file (if needed) with
|
|
|
|
* access value <b>mode</b>. If the O_APPEND flag is set, we append to the
|
2007-10-11 04:03:53 +02:00
|
|
|
* original file. Otherwise, we open a new temporary file in the same
|
|
|
|
* directory, and either replace the original or remove the temporary file
|
2007-10-04 18:21:58 +02:00
|
|
|
* when we're done.
|
|
|
|
*
|
|
|
|
* Return the fd for the newly opened file, and store working data in
|
|
|
|
* *<b>data_out</b>. The caller should not close the fd manually:
|
|
|
|
* instead, call finish_writing_to_file() or abort_writing_to_file().
|
|
|
|
* Returns -1 on failure.
|
|
|
|
*
|
|
|
|
* NOTE: When not appending, the flags O_CREAT and O_TRUNC are treated
|
|
|
|
* as true and the flag O_EXCL is treated as false.
|
|
|
|
*/
|
2007-08-29 21:02:37 +02:00
|
|
|
int
|
|
|
|
start_writing_to_file(const char *fname, int open_flags, int mode,
|
|
|
|
open_file_t **data_out)
|
|
|
|
{
|
|
|
|
size_t tempname_len = strlen(fname)+16;
|
|
|
|
open_file_t *new_file = tor_malloc_zero(sizeof(open_file_t));
|
|
|
|
const char *open_name;
|
|
|
|
tor_assert(fname);
|
|
|
|
tor_assert(data_out);
|
2007-08-29 21:02:43 +02:00
|
|
|
#if (O_BINARY != 0 && O_TEXT != 0)
|
|
|
|
tor_assert((open_flags & (O_BINARY|O_TEXT)) != 0);
|
|
|
|
#endif
|
2007-08-29 21:02:37 +02:00
|
|
|
new_file->fd = -1;
|
2005-02-22 07:38:39 +01:00
|
|
|
tempname_len = strlen(fname)+16;
|
|
|
|
tor_assert(tempname_len > strlen(fname)); /*check for overflow*/
|
2007-08-29 21:02:37 +02:00
|
|
|
new_file->filename = tor_strdup(fname);
|
2005-09-13 08:19:31 +02:00
|
|
|
if (open_flags & O_APPEND) {
|
2007-08-29 21:02:37 +02:00
|
|
|
open_name = fname;
|
|
|
|
new_file->rename_on_close = 0;
|
2005-09-13 08:19:31 +02:00
|
|
|
} else {
|
2007-08-29 21:02:43 +02:00
|
|
|
open_name = new_file->tempname = tor_malloc(tempname_len);
|
2007-08-29 21:02:37 +02:00
|
|
|
if (tor_snprintf(new_file->tempname, tempname_len, "%s.tmp", fname)<0) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_WARN, LD_GENERAL, "Failed to generate filename");
|
2005-09-13 08:19:31 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2007-10-04 18:21:58 +02:00
|
|
|
/* We always replace an existing temporary file if there is one. */
|
|
|
|
open_flags |= O_CREAT|O_TRUNC;
|
|
|
|
open_flags &= ~O_EXCL;
|
2007-08-29 21:02:37 +02:00
|
|
|
new_file->rename_on_close = 1;
|
2003-09-26 20:27:35 +02:00
|
|
|
}
|
2007-08-29 21:02:37 +02:00
|
|
|
|
2007-08-29 21:02:43 +02:00
|
|
|
if ((new_file->fd = open(open_name, open_flags, mode))
|
2004-09-08 09:16:34 +02:00
|
|
|
< 0) {
|
2007-08-29 21:02:43 +02:00
|
|
|
log(LOG_WARN, LD_FS, "Couldn't open \"%s\" (%s) for writing: %s",
|
|
|
|
open_name, fname, strerror(errno));
|
2005-02-22 07:38:39 +01:00
|
|
|
goto err;
|
2003-09-26 20:27:35 +02:00
|
|
|
}
|
2007-08-29 21:02:37 +02:00
|
|
|
|
|
|
|
*data_out = new_file;
|
|
|
|
|
|
|
|
return new_file->fd;
|
|
|
|
err:
|
|
|
|
*data_out = NULL;
|
|
|
|
tor_free(new_file->filename);
|
|
|
|
tor_free(new_file->tempname);
|
|
|
|
tor_free(new_file);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Given <b>file_data</b> from start_writing_to_file(), return a stdio FILE*
|
|
|
|
* that can be used to write to the same file. The caller should not mix
|
|
|
|
* stdio calls with non-stdio calls. */
|
2007-08-29 21:02:43 +02:00
|
|
|
FILE *
|
|
|
|
fdopen_file(open_file_t *file_data)
|
|
|
|
{
|
|
|
|
tor_assert(file_data);
|
|
|
|
if (file_data->stdio_file)
|
|
|
|
return file_data->stdio_file;
|
|
|
|
tor_assert(file_data->fd >= 0);
|
|
|
|
if (!(file_data->stdio_file = fdopen(file_data->fd, "a"))) {
|
|
|
|
log_warn(LD_FS, "Couldn't fdopen \"%s\": %s", file_data->filename,
|
|
|
|
strerror(errno));
|
|
|
|
}
|
|
|
|
return file_data->stdio_file;
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Combines start_writing_to_file with fdopen_file(): arguments are as
|
|
|
|
* for start_writing_to_file, but */
|
2007-08-29 21:02:43 +02:00
|
|
|
FILE *
|
|
|
|
start_writing_to_stdio_file(const char *fname, int open_flags, int mode,
|
|
|
|
open_file_t **data_out)
|
|
|
|
{
|
|
|
|
FILE *res;
|
|
|
|
if (start_writing_to_file(fname, open_flags, mode, data_out)<0)
|
|
|
|
return NULL;
|
|
|
|
if (!(res = fdopen_file(*data_out)))
|
|
|
|
abort_writing_to_file(*data_out);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Helper function: close and free the underlying file and memory in
|
|
|
|
* <b>file_data</b>. If we were writing into a temporary file, then delete
|
|
|
|
* that file (if abort_write is true) or replaces the target file with
|
|
|
|
* the temporary file (if abort_write is false). */
|
2007-08-29 21:02:37 +02:00
|
|
|
static int
|
|
|
|
finish_writing_to_file_impl(open_file_t *file_data, int abort_write)
|
|
|
|
{
|
|
|
|
int r = 0;
|
|
|
|
tor_assert(file_data && file_data->filename);
|
2007-08-29 21:02:43 +02:00
|
|
|
if (file_data->stdio_file) {
|
|
|
|
if (fclose(file_data->stdio_file)) {
|
|
|
|
log_warn(LD_FS, "Error closing \"%s\": %s", file_data->filename,
|
|
|
|
strerror(errno));
|
|
|
|
abort_write = r = -1;
|
|
|
|
}
|
|
|
|
} else if (file_data->fd >= 0 && close(file_data->fd) < 0) {
|
2007-08-29 21:02:37 +02:00
|
|
|
log_warn(LD_FS, "Error flushing \"%s\": %s", file_data->filename,
|
|
|
|
strerror(errno));
|
2007-08-29 21:02:43 +02:00
|
|
|
abort_write = r = -1;
|
2007-08-29 21:02:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (file_data->rename_on_close) {
|
|
|
|
tor_assert(file_data->tempname && file_data->filename);
|
|
|
|
if (abort_write) {
|
|
|
|
unlink(file_data->tempname);
|
|
|
|
} else {
|
|
|
|
tor_assert(strcmp(file_data->filename, file_data->tempname));
|
|
|
|
if (replace_file(file_data->tempname, file_data->filename)) {
|
|
|
|
log_warn(LD_FS, "Error replacing \"%s\": %s", file_data->filename,
|
|
|
|
strerror(errno));
|
|
|
|
r = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
tor_free(file_data->filename);
|
|
|
|
tor_free(file_data->tempname);
|
|
|
|
tor_free(file_data);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Finish writing to <b>file_data</b>: close the file handle, free memory as
|
|
|
|
* needed, and if using a temporary file, replace the original file with
|
|
|
|
* the temporary file. */
|
2007-08-29 21:02:37 +02:00
|
|
|
int
|
|
|
|
finish_writing_to_file(open_file_t *file_data)
|
|
|
|
{
|
|
|
|
return finish_writing_to_file_impl(file_data, 0);
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Finish writing to <b>file_data</b>: close the file handle, free memory as
|
|
|
|
* needed, and if using a temporary file, delete it. */
|
2007-08-29 21:02:37 +02:00
|
|
|
int
|
|
|
|
abort_writing_to_file(open_file_t *file_data)
|
|
|
|
{
|
|
|
|
return finish_writing_to_file_impl(file_data, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Helper: given a set of flags as passed to open(2), open the file
|
|
|
|
* <b>fname</b> and write all the sized_chunk_t structs in <b>chunks</b> to
|
|
|
|
* the file. Do so as atomically as possible e.g. by opening temp files and
|
|
|
|
* renaming. */
|
|
|
|
static int
|
|
|
|
write_chunks_to_file_impl(const char *fname, const smartlist_t *chunks,
|
|
|
|
int open_flags)
|
|
|
|
{
|
|
|
|
open_file_t *file = NULL;
|
|
|
|
int fd, result;
|
|
|
|
fd = start_writing_to_file(fname, open_flags, 0600, &file);
|
|
|
|
if (fd<0)
|
|
|
|
return -1;
|
2005-09-13 08:19:31 +02:00
|
|
|
SMARTLIST_FOREACH(chunks, sized_chunk_t *, chunk,
|
|
|
|
{
|
|
|
|
result = write_all(fd, chunk->bytes, chunk->len, 0);
|
|
|
|
if (result < 0 || (size_t)result != chunk->len) {
|
2007-08-29 21:02:37 +02:00
|
|
|
log(LOG_WARN, LD_FS, "Error writing to \"%s\": %s", fname,
|
2005-12-14 21:40:40 +01:00
|
|
|
strerror(errno));
|
2005-09-13 08:19:31 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
});
|
2007-08-29 21:02:37 +02:00
|
|
|
|
|
|
|
return finish_writing_to_file(file);
|
2005-02-22 07:38:39 +01:00
|
|
|
err:
|
2007-08-29 21:02:37 +02:00
|
|
|
abort_writing_to_file(file);
|
2005-02-22 07:38:39 +01:00
|
|
|
return -1;
|
2003-09-26 20:27:35 +02:00
|
|
|
}
|
2003-09-28 08:47:29 +02:00
|
|
|
|
2007-02-02 21:06:43 +01:00
|
|
|
/** Given a smartlist of sized_chunk_t, write them atomically to a file
|
2006-10-07 08:28:50 +02:00
|
|
|
* <b>fname</b>, overwriting or creating the file as necessary. */
|
2005-09-13 08:19:31 +02:00
|
|
|
int
|
|
|
|
write_chunks_to_file(const char *fname, const smartlist_t *chunks, int bin)
|
|
|
|
{
|
2007-08-29 21:02:43 +02:00
|
|
|
int flags = OPEN_FLAGS_REPLACE|(bin?O_BINARY:O_TEXT);
|
2005-09-13 08:19:31 +02:00
|
|
|
return write_chunks_to_file_impl(fname, chunks, flags);
|
|
|
|
}
|
|
|
|
|
2006-10-07 08:28:50 +02:00
|
|
|
/** As write_str_to_file, but does not assume a NUL-terminated
|
2005-09-13 08:19:31 +02:00
|
|
|
* string. Instead, we write <b>len</b> bytes, starting at <b>str</b>. */
|
|
|
|
int
|
|
|
|
write_bytes_to_file(const char *fname, const char *str, size_t len,
|
|
|
|
int bin)
|
|
|
|
{
|
2007-08-29 21:02:43 +02:00
|
|
|
int flags = OPEN_FLAGS_REPLACE|(bin?O_BINARY:O_TEXT);
|
2005-09-13 08:19:31 +02:00
|
|
|
int r;
|
|
|
|
sized_chunk_t c = { str, len };
|
|
|
|
smartlist_t *chunks = smartlist_create();
|
|
|
|
smartlist_add(chunks, &c);
|
|
|
|
r = write_chunks_to_file_impl(fname, chunks, flags);
|
|
|
|
smartlist_free(chunks);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** As write_bytes_to_file, but if the file already exists, append the bytes
|
|
|
|
* to the end of the file instead of overwriting it. */
|
2005-09-13 08:19:31 +02:00
|
|
|
int
|
|
|
|
append_bytes_to_file(const char *fname, const char *str, size_t len,
|
|
|
|
int bin)
|
|
|
|
{
|
2007-08-29 21:02:43 +02:00
|
|
|
int flags = OPEN_FLAGS_APPEND|(bin?O_BINARY:O_TEXT);
|
2005-09-13 08:19:31 +02:00
|
|
|
int r;
|
|
|
|
sized_chunk_t c = { str, len };
|
|
|
|
smartlist_t *chunks = smartlist_create();
|
|
|
|
smartlist_add(chunks, &c);
|
|
|
|
r = write_chunks_to_file_impl(fname, chunks, flags);
|
|
|
|
smartlist_free(chunks);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2005-02-22 08:18:46 +01:00
|
|
|
/** Read the contents of <b>filename</b> into a newly allocated
|
|
|
|
* string; return the string on success or NULL on failure.
|
2006-10-20 01:05:02 +02:00
|
|
|
*
|
2007-05-22 19:58:25 +02:00
|
|
|
* If <b>stat_out</b> is provided, store the result of stat()ing the
|
|
|
|
* file into <b>stat_out</b>.
|
2007-02-12 22:39:44 +01:00
|
|
|
*
|
|
|
|
* If <b>flags</b> & RFTS_BIN, open the file in binary mode.
|
|
|
|
* If <b>flags</b> & RFTS_IGNORE_MISSING, don't warn if the file
|
|
|
|
* doesn't exist.
|
2005-02-22 08:18:46 +01:00
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* This function <em>may</em> return an erroneous result if the file
|
|
|
|
* is modified while it is running, but must not crash or overflow.
|
|
|
|
* Right now, the error case occurs when the file length grows between
|
|
|
|
* the call to stat and the call to read_all: the resulting string will
|
|
|
|
* be truncated.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
char *
|
2007-02-12 22:39:44 +01:00
|
|
|
read_file_to_str(const char *filename, int flags, struct stat *stat_out)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2003-09-28 08:47:29 +02:00
|
|
|
int fd; /* router file */
|
|
|
|
struct stat statbuf;
|
2007-02-01 19:09:27 +01:00
|
|
|
char *string;
|
2004-09-26 18:51:31 +02:00
|
|
|
int r;
|
2007-02-12 22:39:44 +01:00
|
|
|
int bin = flags & RFTS_BIN;
|
2003-09-28 08:47:29 +02:00
|
|
|
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(filename);
|
2003-09-28 08:47:29 +02:00
|
|
|
|
2004-11-09 20:30:50 +01:00
|
|
|
fd = open(filename,O_RDONLY|(bin?O_BINARY:O_TEXT),0);
|
2003-09-28 08:47:29 +02:00
|
|
|
if (fd<0) {
|
2007-02-12 22:39:44 +01:00
|
|
|
int severity = LOG_WARN;
|
2007-10-24 17:45:42 +02:00
|
|
|
int save_errno = errno;
|
2007-02-12 22:39:44 +01:00
|
|
|
if (errno == ENOENT && (flags & RFTS_IGNORE_MISSING))
|
|
|
|
severity = LOG_INFO;
|
|
|
|
log_fn(severity, LD_FS,"Could not open \"%s\": %s ",filename,
|
|
|
|
strerror(errno));
|
2007-10-24 17:45:42 +02:00
|
|
|
errno = save_errno;
|
2003-09-28 08:47:29 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-02-01 19:09:27 +01:00
|
|
|
if (fstat(fd, &statbuf)<0) {
|
2007-10-24 17:45:42 +02:00
|
|
|
int save_errno = errno;
|
2007-02-01 19:09:27 +01:00
|
|
|
close(fd);
|
2007-02-12 22:39:44 +01:00
|
|
|
log_warn(LD_FS,"Could not fstat \"%s\".",filename);
|
2007-10-24 17:45:42 +02:00
|
|
|
errno = save_errno;
|
2007-02-01 19:09:27 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-11-14 04:41:05 +01:00
|
|
|
if ((uint64_t)(statbuf.st_size)+1 > SIZE_T_MAX)
|
2006-11-14 02:07:52 +01:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
string = tor_malloc((size_t)(statbuf.st_size+1));
|
2003-09-28 08:47:29 +02:00
|
|
|
|
2006-11-14 02:07:52 +01:00
|
|
|
r = read_all(fd,string,(size_t)statbuf.st_size,0);
|
2004-09-26 18:51:31 +02:00
|
|
|
if (r<0) {
|
2007-10-24 17:45:42 +02:00
|
|
|
int save_errno = errno;
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_FS,"Error reading from file \"%s\": %s", filename,
|
|
|
|
strerror(errno));
|
2004-09-26 18:51:31 +02:00
|
|
|
tor_free(string);
|
|
|
|
close(fd);
|
2007-10-24 17:45:42 +02:00
|
|
|
errno = save_errno;
|
2004-09-26 18:51:31 +02:00
|
|
|
return NULL;
|
2004-11-09 20:13:08 +01:00
|
|
|
}
|
|
|
|
string[r] = '\0'; /* NUL-terminate the result. */
|
2004-11-09 21:04:00 +01:00
|
|
|
|
2004-11-09 20:13:08 +01:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
if (!bin && strchr(string, '\r')) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_debug(LD_FS, "We didn't convert CRLF to LF as well as we hoped "
|
|
|
|
"when reading %s. Coping.",
|
|
|
|
filename);
|
2004-11-09 20:30:50 +01:00
|
|
|
tor_strstrip(string, "\r");
|
2007-02-01 19:09:27 +01:00
|
|
|
r = strlen(string);
|
2004-11-09 20:13:08 +01:00
|
|
|
}
|
2007-02-01 19:09:27 +01:00
|
|
|
if (!bin) {
|
|
|
|
statbuf.st_size = (size_t) r;
|
|
|
|
} else
|
2004-11-09 20:13:08 +01:00
|
|
|
#endif
|
2007-02-01 19:09:27 +01:00
|
|
|
if (r != statbuf.st_size) {
|
|
|
|
/* Unless we're using text mode on win32, we'd better have an exact
|
|
|
|
* match for size. */
|
2007-10-24 17:45:42 +02:00
|
|
|
int save_errno = errno;
|
2007-02-01 19:09:27 +01:00
|
|
|
log_warn(LD_FS,"Could read only %d of %ld bytes of file \"%s\".",
|
|
|
|
r, (long)statbuf.st_size,filename);
|
|
|
|
tor_free(string);
|
|
|
|
close(fd);
|
2007-10-24 17:45:42 +02:00
|
|
|
errno = save_errno;
|
2007-02-01 19:09:27 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
2003-09-28 08:47:29 +02:00
|
|
|
close(fd);
|
2007-02-01 19:09:27 +01:00
|
|
|
if (stat_out) {
|
|
|
|
memcpy(stat_out, &statbuf, sizeof(struct stat));
|
|
|
|
}
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2003-09-28 08:47:29 +02:00
|
|
|
return string;
|
|
|
|
}
|
|
|
|
|
2004-11-09 19:22:17 +01:00
|
|
|
/** Given a string containing part of a configuration file or similar format,
|
|
|
|
* advance past comments and whitespace and try to parse a single line. If we
|
|
|
|
* parse a line successfully, set *<b>key_out</b> to the key portion and
|
|
|
|
* *<b>value_out</b> to the value portion of the line, and return a pointer to
|
|
|
|
* the start of the next line. If we run out of data, return a pointer to the
|
|
|
|
* end of the string. If we encounter an error, return NULL.
|
2004-11-04 23:29:45 +01:00
|
|
|
*
|
2007-11-30 18:23:46 +01:00
|
|
|
* NOTE: We modify *<b>line</b> as we parse it, by inserting NULs
|
|
|
|
* to terminate the key and value.
|
2004-11-04 23:29:45 +01:00
|
|
|
*/
|
|
|
|
char *
|
|
|
|
parse_line_from_str(char *line, char **key_out, char **value_out)
|
|
|
|
{
|
|
|
|
char *key, *val, *cp;
|
|
|
|
|
|
|
|
tor_assert(key_out);
|
|
|
|
tor_assert(value_out);
|
|
|
|
|
|
|
|
*key_out = *value_out = key = val = NULL;
|
|
|
|
/* Skip until the first keyword. */
|
|
|
|
while (1) {
|
2004-12-08 01:42:50 +01:00
|
|
|
while (TOR_ISSPACE(*line))
|
2004-11-04 23:29:45 +01:00
|
|
|
++line;
|
|
|
|
if (*line == '#') {
|
|
|
|
while (*line && *line != '\n')
|
|
|
|
++line;
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!*line) { /* End of string? */
|
|
|
|
*key_out = *value_out = NULL;
|
|
|
|
return line;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip until the next space. */
|
|
|
|
key = line;
|
2004-12-08 01:42:50 +01:00
|
|
|
while (*line && !TOR_ISSPACE(*line) && *line != '#')
|
2004-11-04 23:29:45 +01:00
|
|
|
++line;
|
|
|
|
|
2007-11-30 18:23:46 +01:00
|
|
|
/* Skip until the value, writing nuls so key will be nul-terminated */
|
2004-11-04 23:29:45 +01:00
|
|
|
while (*line == ' ' || *line == '\t')
|
|
|
|
*line++ = '\0';
|
2007-11-30 18:23:46 +01:00
|
|
|
|
2004-11-04 23:29:45 +01:00
|
|
|
val = line;
|
|
|
|
|
|
|
|
/* Find the end of the line. */
|
|
|
|
while (*line && *line != '\n' && *line != '#')
|
|
|
|
++line;
|
|
|
|
if (*line == '\n')
|
|
|
|
cp = line++;
|
|
|
|
else {
|
|
|
|
cp = line-1;
|
|
|
|
}
|
2004-12-08 01:42:50 +01:00
|
|
|
while (cp>=val && TOR_ISSPACE(*cp))
|
2004-11-04 23:29:45 +01:00
|
|
|
*cp-- = '\0';
|
|
|
|
|
|
|
|
if (*line == '#') {
|
|
|
|
do {
|
|
|
|
*line++ = '\0';
|
|
|
|
} while (*line && *line != '\n');
|
|
|
|
if (*line == '\n')
|
|
|
|
++line;
|
|
|
|
}
|
|
|
|
|
|
|
|
*key_out = key;
|
|
|
|
*value_out = val;
|
|
|
|
|
|
|
|
return line;
|
2003-09-29 09:50:08 +02:00
|
|
|
}
|
|
|
|
|
2007-06-01 01:57:46 +02:00
|
|
|
/** Expand any homedir prefix on <b>filename</b>; return a newly allocated
|
2004-07-15 04:00:43 +02:00
|
|
|
* string. */
|
2005-09-30 03:09:52 +02:00
|
|
|
char *
|
|
|
|
expand_filename(const char *filename)
|
2004-07-15 04:00:43 +02:00
|
|
|
{
|
|
|
|
tor_assert(filename);
|
2004-11-10 15:23:31 +01:00
|
|
|
if (*filename == '~') {
|
2004-10-27 07:53:07 +02:00
|
|
|
size_t len;
|
2004-11-10 15:23:31 +01:00
|
|
|
char *home, *result;
|
|
|
|
const char *rest;
|
|
|
|
|
|
|
|
if (filename[1] == '/' || filename[1] == '\0') {
|
|
|
|
home = getenv("HOME");
|
|
|
|
if (!home) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CONFIG, "Couldn't find $HOME environment variable while "
|
2006-03-05 10:50:26 +01:00
|
|
|
"expanding \"%s\"", filename);
|
2004-11-10 15:23:31 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
home = tor_strdup(home);
|
2007-08-31 14:51:52 +02:00
|
|
|
rest = strlen(filename)>=2?(filename+2):"";
|
2004-11-10 15:23:31 +01:00
|
|
|
} else {
|
|
|
|
#ifdef HAVE_PWD_H
|
|
|
|
char *username, *slash;
|
|
|
|
slash = strchr(filename, '/');
|
|
|
|
if (slash)
|
|
|
|
username = tor_strndup(filename+1,slash-filename-1);
|
|
|
|
else
|
|
|
|
username = tor_strdup(filename+1);
|
|
|
|
if (!(home = get_user_homedir(username))) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CONFIG,"Couldn't get homedir for \"%s\"",username);
|
2004-11-10 15:23:31 +01:00
|
|
|
tor_free(username);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
tor_free(username);
|
2007-08-31 14:51:52 +02:00
|
|
|
rest = slash ? (slash+1) : "";
|
2004-11-10 15:23:31 +01:00
|
|
|
#else
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CONFIG, "Couldn't expend homedir on system without pwd.h");
|
2004-11-10 15:23:31 +01:00
|
|
|
return tor_strdup(filename);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
tor_assert(home);
|
|
|
|
/* Remove trailing slash. */
|
2007-03-09 22:39:30 +01:00
|
|
|
if (strlen(home)>1 && !strcmpend(home,PATH_SEPARATOR)) {
|
2004-11-10 15:23:31 +01:00
|
|
|
home[strlen(home)-1] = '\0';
|
2004-07-15 04:00:43 +02:00
|
|
|
}
|
2004-11-10 15:23:31 +01:00
|
|
|
/* Plus one for /, plus one for NUL.
|
2004-10-27 08:03:28 +02:00
|
|
|
* Round up to 16 in case we can't do math. */
|
2004-11-10 15:23:31 +01:00
|
|
|
len = strlen(home)+strlen(rest)+16;
|
2004-10-27 07:53:07 +02:00
|
|
|
result = tor_malloc(len);
|
2007-08-31 14:51:52 +02:00
|
|
|
tor_snprintf(result,len,"%s"PATH_SEPARATOR"%s",home,rest);
|
2004-11-10 15:23:31 +01:00
|
|
|
tor_free(home);
|
2004-07-15 04:00:43 +02:00
|
|
|
return result;
|
|
|
|
} else {
|
|
|
|
return tor_strdup(filename);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-09-03 06:40:05 +02:00
|
|
|
/** Return a new list containing the filenames in the directory <b>dirname</b>.
|
|
|
|
* Return NULL on error or if <b>dirname</b> is not a directory.
|
|
|
|
*/
|
|
|
|
smartlist_t *
|
|
|
|
tor_listdir(const char *dirname)
|
|
|
|
{
|
|
|
|
smartlist_t *result;
|
2005-09-09 23:29:23 +02:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
char *pattern;
|
|
|
|
HANDLE handle;
|
|
|
|
WIN32_FIND_DATA findData;
|
|
|
|
size_t pattern_len = strlen(dirname)+16;
|
|
|
|
pattern = tor_malloc(pattern_len);
|
|
|
|
tor_snprintf(pattern, pattern_len, "%s\\*", dirname);
|
|
|
|
if (!(handle = FindFirstFile(pattern, &findData))) {
|
|
|
|
tor_free(pattern);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
result = smartlist_create();
|
|
|
|
while (1) {
|
2005-11-15 04:16:32 +01:00
|
|
|
if (strcmp(findData.cFileName, ".") &&
|
|
|
|
strcmp(findData.cFileName, "..")) {
|
|
|
|
smartlist_add(result, tor_strdup(findData.cFileName));
|
|
|
|
}
|
2005-09-09 23:29:23 +02:00
|
|
|
if (!FindNextFile(handle, &findData)) {
|
|
|
|
if (GetLastError() != ERROR_NO_MORE_FILES) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_FS, "Error reading directory.");
|
2005-09-09 23:29:23 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FindClose(handle);
|
|
|
|
tor_free(pattern);
|
|
|
|
#else
|
|
|
|
DIR *d;
|
2005-09-03 06:40:05 +02:00
|
|
|
struct dirent *de;
|
|
|
|
if (!(d = opendir(dirname)))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
result = smartlist_create();
|
|
|
|
while ((de = readdir(d))) {
|
|
|
|
if (!strcmp(de->d_name, ".") ||
|
|
|
|
!strcmp(de->d_name, ".."))
|
|
|
|
continue;
|
|
|
|
smartlist_add(result, tor_strdup(de->d_name));
|
|
|
|
}
|
|
|
|
closedir(d);
|
2005-09-09 23:29:23 +02:00
|
|
|
#endif
|
2005-09-03 06:40:05 +02:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2006-10-02 23:00:24 +02:00
|
|
|
/** Return true iff <b>filename</b> is a relative path. */
|
2006-01-10 21:00:20 +01:00
|
|
|
int
|
|
|
|
path_is_relative(const char *filename)
|
|
|
|
{
|
|
|
|
if (filename && filename[0] == '/')
|
|
|
|
return 0;
|
2006-10-02 23:00:24 +02:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
else if (filename && filename[0] == '\\')
|
|
|
|
return 0;
|
|
|
|
else if (filename && strlen(filename)>3 && TOR_ISALPHA(filename[0]) &&
|
|
|
|
filename[1] == ':' && filename[2] == '\\')
|
2006-10-08 20:24:31 +02:00
|
|
|
return 0;
|
2006-10-02 23:00:24 +02:00
|
|
|
#endif
|
2006-01-10 21:00:20 +01:00
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/* =====
|
|
|
|
* Net helpers
|
|
|
|
* ===== */
|
2004-08-09 06:28:25 +02:00
|
|
|
|
2004-05-07 19:04:12 +02:00
|
|
|
/** Return true iff <b>ip</b> (in host order) is an IP reserved to localhost,
|
2004-05-01 22:46:28 +02:00
|
|
|
* or reserved for local networks by RFC 1918.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
2005-12-09 03:45:33 +01:00
|
|
|
is_internal_IP(uint32_t ip, int for_listening)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2007-07-19 20:46:09 +02:00
|
|
|
tor_addr_t myaddr;
|
2007-12-04 06:19:56 +01:00
|
|
|
myaddr.family = AF_INET;
|
|
|
|
myaddr.addr.in_addr.s_addr = htonl(ip);
|
2007-07-19 20:46:09 +02:00
|
|
|
|
|
|
|
return tor_addr_is_internal(&myaddr, for_listening);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return true iff <b>ip</b> is an IP reserved to localhost or local networks
|
|
|
|
* in RFC1918 or RFC4193 or RFC4291. (fec0::/10, deprecated by RFC3879, is
|
|
|
|
* also treated as internal for now.)
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
tor_addr_is_internal(const tor_addr_t *addr, int for_listening)
|
|
|
|
{
|
2007-07-19 21:43:08 +02:00
|
|
|
uint32_t iph4 = 0;
|
2007-07-19 20:46:09 +02:00
|
|
|
uint32_t iph6[4];
|
|
|
|
sa_family_t v_family;
|
|
|
|
v_family = IN_FAMILY(addr);
|
|
|
|
|
|
|
|
if (v_family == AF_INET) {
|
|
|
|
iph4 = IPV4IPh(addr);
|
|
|
|
} else if (v_family == AF_INET6) {
|
|
|
|
if (tor_addr_is_v4(addr)) { /* v4-mapped */
|
|
|
|
v_family = AF_INET;
|
2007-08-17 22:44:54 +02:00
|
|
|
iph4 = ntohl(IN6_ADDRESS32(addr)[3]);
|
2007-07-19 20:46:09 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (v_family == AF_INET6) {
|
2007-08-17 22:44:54 +02:00
|
|
|
iph6[0] = ntohl(IN6_ADDRESS32(addr)[0]);
|
|
|
|
iph6[1] = ntohl(IN6_ADDRESS32(addr)[1]);
|
|
|
|
iph6[2] = ntohl(IN6_ADDRESS32(addr)[2]);
|
|
|
|
iph6[3] = ntohl(IN6_ADDRESS32(addr)[3]);
|
2007-07-19 20:46:09 +02:00
|
|
|
if (for_listening && !iph6[0] && !iph6[1] && !iph6[2] && !iph6[3]) /* :: */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (((iph6[0] & 0xfe000000) == 0xfc000000) || /* fc00/7 - RFC4193 */
|
|
|
|
((iph6[0] & 0xffc00000) == 0xfe800000) || /* fe80/10 - RFC4291 */
|
|
|
|
((iph6[0] & 0xffc00000) == 0xfec00000)) /* fec0/10 D- RFC3879 */
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (!iph6[0] && !iph6[1] && !iph6[2] &&
|
|
|
|
((iph6[3] & 0xfffffffe) == 0x00000000)) /* ::/127 */
|
|
|
|
return 1;
|
|
|
|
|
2005-12-09 03:45:33 +01:00
|
|
|
return 0;
|
2007-07-19 20:46:09 +02:00
|
|
|
} else if (v_family == AF_INET) {
|
|
|
|
if (for_listening && !iph4) /* special case for binding to 0.0.0.0 */
|
|
|
|
return 0;
|
|
|
|
if (((iph4 & 0xff000000) == 0x0a000000) || /* 10/8 */
|
|
|
|
((iph4 & 0xff000000) == 0x00000000) || /* 0/8 */
|
|
|
|
((iph4 & 0xff000000) == 0x7f000000) || /* 127/8 */
|
|
|
|
((iph4 & 0xffff0000) == 0xa9fe0000) || /* 169.254/16 */
|
|
|
|
((iph4 & 0xfff00000) == 0xac100000) || /* 172.16/12 */
|
|
|
|
((iph4 & 0xffff0000) == 0xc0a80000)) /* 192.168/16 */
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* unknown address family... assume it's not safe for external use */
|
|
|
|
/* rather than tor_assert(0) */
|
|
|
|
log_warn(LD_BUG, "tor_addr_is_internal() called with a non-IP address.");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/** Convert a tor_addr_t <b>addr</b> into a string, and store it in
|
|
|
|
* <b>dest</b> of size <b>len</b>. Returns a pointer to dest on success,
|
|
|
|
* or NULL on failure.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
tor_addr_to_str(char *dest, const tor_addr_t *addr, int len)
|
|
|
|
{
|
|
|
|
const char *ptr;
|
|
|
|
tor_assert(addr && dest);
|
|
|
|
|
|
|
|
switch (IN_FAMILY(addr)) {
|
|
|
|
case AF_INET:
|
|
|
|
ptr = tor_inet_ntop(AF_INET, &addr->sa.sin_addr, dest, len);
|
|
|
|
break;
|
|
|
|
case AF_INET6:
|
|
|
|
ptr = tor_inet_ntop(AF_INET6, &addr->sa6.sin6_addr, dest, len);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return ptr;
|
2004-03-14 19:07:46 +01:00
|
|
|
}
|
2007-07-19 20:46:09 +02:00
|
|
|
#endif
|
2004-03-14 19:07:46 +01:00
|
|
|
|
2004-10-12 17:48:30 +02:00
|
|
|
/** Parse a string of the form "host[:port]" from <b>addrport</b>. If
|
|
|
|
* <b>address</b> is provided, set *<b>address</b> to a copy of the
|
|
|
|
* host portion of the string. If <b>addr</b> is provided, try to
|
|
|
|
* resolve the host portion of the string and store it into
|
2005-08-05 03:51:19 +02:00
|
|
|
* *<b>addr</b> (in host byte order). If <b>port_out</b> is provided,
|
|
|
|
* store the port number into *<b>port_out</b>, or 0 if no port is given.
|
|
|
|
* If <b>port_out</b> is NULL, then there must be no port number in
|
|
|
|
* <b>addrport</b>.
|
2004-10-12 18:02:15 +02:00
|
|
|
* Return 0 on success, -1 on failure.
|
2004-10-12 17:48:30 +02:00
|
|
|
*/
|
|
|
|
int
|
2006-07-06 04:44:07 +02:00
|
|
|
parse_addr_port(int severity, const char *addrport, char **address,
|
|
|
|
uint32_t *addr, uint16_t *port_out)
|
2004-10-12 17:48:30 +02:00
|
|
|
{
|
|
|
|
const char *colon;
|
|
|
|
char *_address = NULL;
|
|
|
|
int _port;
|
|
|
|
int ok = 1;
|
|
|
|
|
|
|
|
tor_assert(addrport);
|
|
|
|
|
|
|
|
colon = strchr(addrport, ':');
|
|
|
|
if (colon) {
|
|
|
|
_address = tor_strndup(addrport, colon-addrport);
|
2004-10-12 21:32:41 +02:00
|
|
|
_port = (int) tor_parse_long(colon+1,10,1,65535,NULL,NULL);
|
|
|
|
if (!_port) {
|
2006-07-06 04:44:07 +02:00
|
|
|
log_fn(severity, LD_GENERAL, "Port %s out of range", escaped(colon+1));
|
2004-10-12 17:48:30 +02:00
|
|
|
ok = 0;
|
|
|
|
}
|
2005-08-05 03:51:19 +02:00
|
|
|
if (!port_out) {
|
2006-03-05 10:50:26 +01:00
|
|
|
char *esc_addrport = esc_for_log(addrport);
|
2006-07-06 04:44:07 +02:00
|
|
|
log_fn(severity, LD_GENERAL,
|
|
|
|
"Port %s given on %s when not required",
|
|
|
|
escaped(colon+1), esc_addrport);
|
2006-03-05 10:50:26 +01:00
|
|
|
tor_free(esc_addrport);
|
2005-08-05 03:51:19 +02:00
|
|
|
ok = 0;
|
|
|
|
}
|
2004-10-12 17:48:30 +02:00
|
|
|
} else {
|
|
|
|
_address = tor_strdup(addrport);
|
|
|
|
_port = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (addr) {
|
|
|
|
/* There's an addr pointer, so we need to resolve the hostname. */
|
|
|
|
if (tor_lookup_hostname(_address,addr)) {
|
2006-07-06 04:44:07 +02:00
|
|
|
log_fn(severity, LD_NET, "Couldn't look up %s", escaped(_address));
|
2004-10-12 17:48:30 +02:00
|
|
|
ok = 0;
|
|
|
|
*addr = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (address && ok) {
|
|
|
|
*address = _address;
|
|
|
|
} else {
|
|
|
|
if (address)
|
|
|
|
*address = NULL;
|
|
|
|
tor_free(_address);
|
|
|
|
}
|
2005-08-05 03:51:19 +02:00
|
|
|
if (port_out)
|
|
|
|
*port_out = ok ? ((uint16_t) _port) : 0;
|
2004-10-12 17:48:30 +02:00
|
|
|
|
|
|
|
return ok ? 0 : -1;
|
|
|
|
}
|
|
|
|
|
2006-02-13 00:58:22 +01:00
|
|
|
/** If <b>mask</b> is an address mask for a bit-prefix, return the number of
|
|
|
|
* bits. Otherwise, return -1. */
|
|
|
|
int
|
|
|
|
addr_mask_get_bits(uint32_t mask)
|
|
|
|
{
|
|
|
|
int i;
|
2006-02-13 01:26:43 +01:00
|
|
|
if (mask == 0)
|
|
|
|
return 0;
|
|
|
|
if (mask == 0xFFFFFFFFu)
|
|
|
|
return 32;
|
2006-02-13 00:58:22 +01:00
|
|
|
for (i=0; i<=32; ++i) {
|
2006-02-13 01:26:43 +01:00
|
|
|
if (mask == (uint32_t) ~((1u<<(32-i))-1)) {
|
2006-02-13 00:58:22 +01:00
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-07-19 21:40:45 +02:00
|
|
|
/** Compare two addresses <b>a1</b> and <b>a2</b> for equality under a
|
|
|
|
* etmask of <b>mbits</b> bits. Return -1, 0, or 1.
|
|
|
|
*
|
|
|
|
* XXXX020Temporary function to allow masks as bitcounts everywhere. This
|
|
|
|
* will be replaced with an IPv6-aware version as soon as 32-bit addresses are
|
|
|
|
* no longer passed around.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
addr_mask_cmp_bits(uint32_t a1, uint32_t a2, maskbits_t bits)
|
|
|
|
{
|
|
|
|
if (bits > 32)
|
|
|
|
bits = 32;
|
|
|
|
else if (bits == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
a1 >>= (32-bits);
|
|
|
|
a2 >>= (32-bits);
|
|
|
|
|
|
|
|
if (a1 < a2)
|
|
|
|
return -1;
|
|
|
|
else if (a1 > a2)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-05 06:27:59 +01:00
|
|
|
/** Parse a string <b>s</b> in the format of (*|port(-maxport)?)?, setting the
|
|
|
|
* various *out pointers as appropriate. Return 0 on success, -1 on failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
parse_port_range(const char *port, uint16_t *port_min_out,
|
|
|
|
uint16_t *port_max_out)
|
|
|
|
{
|
2006-12-21 18:38:15 +01:00
|
|
|
int port_min, port_max, ok;
|
2006-03-05 06:27:59 +01:00
|
|
|
tor_assert(port_min_out);
|
|
|
|
tor_assert(port_max_out);
|
|
|
|
|
|
|
|
if (!port || *port == '\0' || strcmp(port, "*") == 0) {
|
2006-12-21 18:38:15 +01:00
|
|
|
port_min = 1;
|
|
|
|
port_max = 65535;
|
2006-03-05 06:27:59 +01:00
|
|
|
} else {
|
|
|
|
char *endptr = NULL;
|
2006-12-21 18:38:15 +01:00
|
|
|
port_min = tor_parse_long(port, 10, 0, 65535, &ok, &endptr);
|
|
|
|
if (!ok) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Malformed port %s on address range; rejecting.",
|
|
|
|
escaped(port));
|
|
|
|
return -1;
|
|
|
|
} else if (endptr && *endptr == '-') {
|
2006-03-05 06:27:59 +01:00
|
|
|
port = endptr+1;
|
|
|
|
endptr = NULL;
|
2006-12-21 18:38:15 +01:00
|
|
|
port_max = tor_parse_long(port, 10, 1, 65536, &ok, &endptr);
|
|
|
|
if (!ok) {
|
2006-03-05 06:27:59 +01:00
|
|
|
log_warn(LD_GENERAL,
|
2006-12-21 04:22:59 +01:00
|
|
|
"Malformed port %s on address range; rejecting.",
|
2006-03-05 10:50:26 +01:00
|
|
|
escaped(port));
|
2006-12-21 04:22:59 +01:00
|
|
|
return -1;
|
2006-03-05 06:27:59 +01:00
|
|
|
}
|
|
|
|
} else {
|
2006-12-21 18:38:15 +01:00
|
|
|
port_max = port_min;
|
2006-03-05 06:27:59 +01:00
|
|
|
}
|
2006-12-21 18:38:15 +01:00
|
|
|
if (port_min > port_max) {
|
2006-03-05 06:27:59 +01:00
|
|
|
log_warn(LD_GENERAL, "Insane port range on address policy; rejecting.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-21 18:38:15 +01:00
|
|
|
if (port_min < 1)
|
|
|
|
port_min = 1;
|
|
|
|
if (port_max > 65535)
|
|
|
|
port_max = 65535;
|
|
|
|
|
|
|
|
*port_min_out = (uint16_t) port_min;
|
|
|
|
*port_max_out = (uint16_t) port_max;
|
|
|
|
|
2006-03-05 06:27:59 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-10-16 23:41:12 +02:00
|
|
|
/** Parse a string <b>s</b> in the format of
|
2006-03-05 06:27:59 +01:00
|
|
|
* (IP(/mask|/mask-bits)?|*)(:*|port(-maxport)?)?, setting the various
|
2004-10-16 23:41:12 +02:00
|
|
|
* *out pointers as appropriate. Return 0 on success, -1 on failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
parse_addr_and_port_range(const char *s, uint32_t *addr_out,
|
2007-07-19 21:40:45 +02:00
|
|
|
maskbits_t *maskbits_out, uint16_t *port_min_out,
|
2004-10-16 23:41:12 +02:00
|
|
|
uint16_t *port_max_out)
|
|
|
|
{
|
|
|
|
char *address;
|
|
|
|
char *mask, *port, *endptr;
|
|
|
|
struct in_addr in;
|
|
|
|
int bits;
|
|
|
|
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(s);
|
|
|
|
tor_assert(addr_out);
|
2007-07-19 21:40:45 +02:00
|
|
|
tor_assert(maskbits_out);
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(port_min_out);
|
|
|
|
tor_assert(port_max_out);
|
|
|
|
|
2004-10-16 23:41:12 +02:00
|
|
|
address = tor_strdup(s);
|
|
|
|
/* Break 'address' into separate strings.
|
|
|
|
*/
|
|
|
|
mask = strchr(address,'/');
|
|
|
|
port = strchr(mask?mask:address,':');
|
|
|
|
if (mask)
|
|
|
|
*mask++ = '\0';
|
|
|
|
if (port)
|
|
|
|
*port++ = '\0';
|
|
|
|
/* Now "address" is the IP|'*' part...
|
|
|
|
* "mask" is the Mask|Maskbits part...
|
|
|
|
* and "port" is the *|port|min-max part.
|
|
|
|
*/
|
2004-10-27 08:26:23 +02:00
|
|
|
|
2004-10-16 23:41:12 +02:00
|
|
|
if (strcmp(address,"*")==0) {
|
|
|
|
*addr_out = 0;
|
|
|
|
} else if (tor_inet_aton(address, &in) != 0) {
|
|
|
|
*addr_out = ntohl(in.s_addr);
|
|
|
|
} else {
|
2006-03-05 10:50:26 +01:00
|
|
|
log_warn(LD_GENERAL, "Malformed IP %s in address pattern; rejecting.",
|
|
|
|
escaped(address));
|
2004-10-16 23:41:12 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mask) {
|
|
|
|
if (strcmp(address,"*")==0)
|
2007-07-19 21:40:45 +02:00
|
|
|
*maskbits_out = 0;
|
2004-10-16 23:41:12 +02:00
|
|
|
else
|
2007-07-19 21:40:45 +02:00
|
|
|
*maskbits_out = 32;
|
2004-10-16 23:41:12 +02:00
|
|
|
} else {
|
|
|
|
endptr = NULL;
|
|
|
|
bits = (int) strtol(mask, &endptr, 10);
|
|
|
|
if (!*endptr) {
|
|
|
|
/* strtol handled the whole mask. */
|
|
|
|
if (bits < 0 || bits > 32) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Bad number of mask bits on address range; rejecting.");
|
2004-10-16 23:41:12 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2007-07-19 21:40:45 +02:00
|
|
|
*maskbits_out = bits;
|
2004-10-16 23:41:12 +02:00
|
|
|
} else if (tor_inet_aton(mask, &in) != 0) {
|
2007-07-19 21:40:45 +02:00
|
|
|
bits = addr_mask_get_bits(ntohl(in.s_addr));
|
|
|
|
if (bits < 0) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Mask %s on address range isn't a prefix; dropping",
|
|
|
|
escaped(mask));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
*maskbits_out = bits;
|
2004-10-16 23:41:12 +02:00
|
|
|
} else {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_GENERAL,
|
2006-03-05 10:50:26 +01:00
|
|
|
"Malformed mask %s on address range; rejecting.",
|
|
|
|
escaped(mask));
|
2004-10-16 23:41:12 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-05 06:27:59 +01:00
|
|
|
if (parse_port_range(port, port_min_out, port_max_out)<0)
|
|
|
|
goto err;
|
2004-10-16 23:41:12 +02:00
|
|
|
|
|
|
|
tor_free(address);
|
|
|
|
return 0;
|
|
|
|
err:
|
|
|
|
tor_free(address);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-07-19 20:46:09 +02:00
|
|
|
/** Parse a string <b>s</b> containing an IPv4/IPv6 address, and possibly
|
|
|
|
* a mask and port or port range. Store the parsed address in
|
|
|
|
* <b>addr_out</b>, a mask (if any) in <b>mask_out</b>, and port(s) (if any)
|
|
|
|
* in <b>port_min_out</b> and <b>port_max_out</b>.
|
|
|
|
*
|
2007-07-30 19:46:12 +02:00
|
|
|
* The syntax is:
|
|
|
|
* Address OptMask OptPortRange
|
|
|
|
* Address ::= IPv4Address / "[" IPv6Address "]" / "*"
|
|
|
|
* OptMask ::= "/" Integer /
|
|
|
|
* OptPortRange ::= ":*" / ":" Integer / ":" Integer "-" Integer /
|
2007-07-19 20:46:09 +02:00
|
|
|
*
|
2007-07-30 19:46:12 +02:00
|
|
|
* - If mask, minport, or maxport are NULL, we do not want these
|
|
|
|
* options to be set; treat them as an error if present.
|
2007-07-19 20:46:09 +02:00
|
|
|
* - If the string has no mask, the mask is set to /32 (IPv4) or /128 (IPv6).
|
|
|
|
* - If the string has one port, it is placed in both min and max port
|
|
|
|
* variables.
|
|
|
|
* - If the string has no port(s), port_(min|max)_out are set to 1 and 65535.
|
|
|
|
*
|
|
|
|
* Return an address family on success, or -1 if an invalid address string is
|
|
|
|
* provided.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
tor_addr_parse_mask_ports(const char *s, tor_addr_t *addr_out,
|
|
|
|
maskbits_t *maskbits_out,
|
|
|
|
uint16_t *port_min_out, uint16_t *port_max_out)
|
|
|
|
{
|
|
|
|
char *base = NULL, *address, *mask = NULL, *port = NULL, *rbracket = NULL;
|
|
|
|
char *endptr;
|
|
|
|
int any_flag=0, v4map=0;
|
|
|
|
|
|
|
|
tor_assert(s);
|
|
|
|
tor_assert(addr_out);
|
|
|
|
|
|
|
|
/* IP, [], /mask, ports */
|
|
|
|
#define MAX_ADDRESS_LENGTH (TOR_ADDR_BUF_LEN+2+(1+INET_NTOA_BUF_LEN)+12+1)
|
|
|
|
|
|
|
|
if (strlen(s) > MAX_ADDRESS_LENGTH) {
|
|
|
|
log_warn(LD_GENERAL, "Impossibly long IP %s; rejecting", escaped(s));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
base = tor_strdup(s);
|
|
|
|
|
|
|
|
/* Break 'base' into separate strings. */
|
|
|
|
address = base;
|
|
|
|
if (*address == '[') { /* Probably IPv6 */
|
|
|
|
address++;
|
|
|
|
rbracket = strchr(address, ']');
|
|
|
|
if (!rbracket) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"No closing IPv6 bracket in address pattern; rejecting.");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mask = strchr((rbracket?rbracket:address),'/');
|
|
|
|
port = strchr((mask?mask:(rbracket?rbracket:address)), ':');
|
|
|
|
if (port)
|
|
|
|
*port++ = '\0';
|
|
|
|
if (mask)
|
|
|
|
*mask++ = '\0';
|
|
|
|
if (rbracket)
|
|
|
|
*rbracket = '\0';
|
|
|
|
if (port && mask)
|
|
|
|
tor_assert(port > mask);
|
|
|
|
if (mask && rbracket)
|
|
|
|
tor_assert(mask > rbracket);
|
|
|
|
|
|
|
|
/* Now "address" is the a.b.c.d|'*'|abcd::1 part...
|
|
|
|
* "mask" is the Mask|Maskbits part...
|
|
|
|
* and "port" is the *|port|min-max part.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Process the address portion */
|
|
|
|
memset(addr_out, 0, sizeof(tor_addr_t));
|
|
|
|
|
|
|
|
if (!strcmp(address, "*")) {
|
2007-12-04 06:19:56 +01:00
|
|
|
addr_out->family = AF_INET; /* AF_UNSPEC ???? XXXXX020 */
|
2007-07-19 20:46:09 +02:00
|
|
|
any_flag = 1;
|
2007-12-04 06:19:56 +01:00
|
|
|
} else if (tor_inet_pton(AF_INET6, address, &addr_out->addr.in6_addr) > 0) {
|
|
|
|
addr_out->family = AF_INET6;
|
|
|
|
} else if (tor_inet_pton(AF_INET, address, &addr_out->addr.in_addr) > 0) {
|
|
|
|
addr_out->family = AF_INET;
|
2007-07-19 20:46:09 +02:00
|
|
|
} else {
|
|
|
|
log_warn(LD_GENERAL, "Malformed IP %s in address pattern; rejecting.",
|
|
|
|
escaped(address));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
v4map = tor_addr_is_v4(addr_out);
|
|
|
|
|
|
|
|
/*
|
|
|
|
#ifdef ALWAYS_V6_MAP
|
|
|
|
if (v_family == AF_INET) {
|
|
|
|
v_family = AF_INET6;
|
2007-08-01 17:57:34 +02:00
|
|
|
IN_ADDR6(addr_out).s6_addr32[3] = IN6_ADDRESS(addr_out).s_addr;
|
|
|
|
memset(&IN6_ADDRESS(addr_out), 0, 10);
|
2007-07-19 20:46:09 +02:00
|
|
|
IN_ADDR6(addr_out).s6_addr16[5] = 0xffff;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
if (v_family == AF_INET6 && v4map) {
|
|
|
|
v_family = AF_INET;
|
2007-08-01 17:57:34 +02:00
|
|
|
IN4_ADDRESS((addr_out).s_addr = IN6_ADDRESS(addr_out).s6_addr32[3];
|
2007-07-19 20:46:09 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Parse mask */
|
|
|
|
if (maskbits_out) {
|
|
|
|
int bits = 0;
|
|
|
|
struct in_addr v4mask;
|
|
|
|
|
|
|
|
if (mask) { /* the caller (tried to) specify a mask */
|
|
|
|
bits = (int) strtol(mask, &endptr, 10);
|
|
|
|
if (!*endptr) { /* strtol converted everything, so it was an integer */
|
|
|
|
if ((bits<0 || bits>128) ||
|
|
|
|
((IN_FAMILY(addr_out) == AF_INET) && bits > 32)) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Bad number of mask bits (%d) on address range; rejecting.",
|
|
|
|
bits);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
} else { /* mask might still be an address-style mask */
|
|
|
|
if (tor_inet_pton(AF_INET, mask, &v4mask) > 0) {
|
|
|
|
bits = addr_mask_get_bits(ntohl(v4mask.s_addr));
|
|
|
|
if (bits < 0) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"IPv4-style mask %s is not a prefix address; rejecting.",
|
|
|
|
escaped(mask));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
} else { /* Not IPv4; we don't do address-style IPv6 masks. */
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Malformed mask on address range %s; rejecting.",
|
|
|
|
escaped(s));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (IN_FAMILY(addr_out) == AF_INET6 && v4map) {
|
|
|
|
if (bits > 32 && bits < 96) { /* Crazy */
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Bad mask bits %i for V4-mapped V6 address; rejecting.",
|
|
|
|
bits);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* XXXX020 is this really what we want? */
|
|
|
|
bits = 96 + bits%32; /* map v4-mapped masks onto 96-128 bits */
|
|
|
|
}
|
|
|
|
} else { /* pick an appropriate mask, as none was given */
|
|
|
|
if (any_flag)
|
|
|
|
bits = 0; /* This is okay whether it's V6 or V4 (FIX V4-mapped V6!) */
|
|
|
|
else if (IN_FAMILY(addr_out) == AF_INET)
|
|
|
|
bits = 32;
|
|
|
|
else if (IN_FAMILY(addr_out) == AF_INET6)
|
|
|
|
bits = 128;
|
|
|
|
}
|
|
|
|
*maskbits_out = (maskbits_t) bits;
|
|
|
|
} else {
|
|
|
|
if (mask) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Unexpected mask in addrss %s; rejecting", escaped(s));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Parse port(s) */
|
|
|
|
if (port_min_out) {
|
|
|
|
uint16_t port2;
|
|
|
|
if (!port_max_out) /* caller specified one port; fake the second one */
|
|
|
|
port_max_out = &port2;
|
|
|
|
|
|
|
|
if (parse_port_range(port, port_min_out, port_max_out) < 0) {
|
|
|
|
goto err;
|
|
|
|
} else if ((*port_min_out != *port_max_out) && port_max_out == &port2) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Wanted one port from address range, but there are two.");
|
|
|
|
|
|
|
|
port_max_out = NULL; /* caller specified one port, so set this back */
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (port) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Unexpected ports in addrss %s; rejecting", escaped(s));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
tor_free(base);
|
|
|
|
return IN_FAMILY(addr_out);
|
|
|
|
err:
|
|
|
|
tor_free(base);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Determine whether an address is IPv4, either native or ipv4-mapped ipv6.
|
|
|
|
* Note that this is about representation only, as any decent stack will
|
|
|
|
* reject ipv4-mapped addresses received on the wire (and won't use them
|
|
|
|
* on the wire either).
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
tor_addr_is_v4(const tor_addr_t *addr)
|
|
|
|
{
|
|
|
|
tor_assert(addr);
|
|
|
|
|
|
|
|
if (IN_FAMILY(addr) == AF_INET)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (IN_FAMILY(addr) == AF_INET6) { /* First two don't need to be ordered */
|
2007-08-17 22:44:54 +02:00
|
|
|
if ((IN6_ADDRESS32(addr)[0] == 0) &&
|
|
|
|
(IN6_ADDRESS32(addr)[1] == 0) &&
|
|
|
|
(ntohl(IN6_ADDRESS32(addr)[2]) == 0x0000ffffu))
|
2007-07-19 20:46:09 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0; /* Not IPv4 - unknown family or a full-blood IPv6 address */
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Determine whether an address <b>addr</b> is null, either all zeroes or
|
|
|
|
* belonging to family AF_UNSPEC.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
tor_addr_is_null(const tor_addr_t *addr)
|
|
|
|
{
|
|
|
|
tor_assert(addr);
|
|
|
|
|
2007-07-19 21:40:45 +02:00
|
|
|
switch (IN_FAMILY(addr)) {
|
2007-07-19 20:46:09 +02:00
|
|
|
case AF_INET6:
|
2007-08-17 22:44:54 +02:00
|
|
|
return (!IN6_ADDRESS32(addr)[0] &&
|
|
|
|
!IN6_ADDRESS32(addr)[1] &&
|
|
|
|
!IN6_ADDRESS32(addr)[2] &&
|
|
|
|
!IN6_ADDRESS32(addr)[3]);
|
2007-07-19 20:46:09 +02:00
|
|
|
case AF_INET:
|
2007-08-01 17:57:34 +02:00
|
|
|
return (!IN4_ADDRESS(addr)->s_addr);
|
2007-07-19 20:46:09 +02:00
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
//return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Given an IPv4 in_addr struct *<b>in</b> (in network order, as usual),
|
|
|
|
* write it as a string into the <b>buf_len</b>-byte buffer in
|
|
|
|
* <b>buf</b>.
|
2005-03-17 13:38:37 +01:00
|
|
|
*/
|
2005-02-22 09:18:36 +01:00
|
|
|
int
|
2007-05-25 20:22:37 +02:00
|
|
|
tor_inet_ntoa(const struct in_addr *in, char *buf, size_t buf_len)
|
2005-02-22 09:18:36 +01:00
|
|
|
{
|
|
|
|
uint32_t a = ntohl(in->s_addr);
|
|
|
|
return tor_snprintf(buf, buf_len, "%d.%d.%d.%d",
|
|
|
|
(int)(uint8_t)((a>>24)&0xff),
|
|
|
|
(int)(uint8_t)((a>>16)&0xff),
|
|
|
|
(int)(uint8_t)((a>>8 )&0xff),
|
|
|
|
(int)(uint8_t)((a )&0xff));
|
|
|
|
}
|
|
|
|
|
2007-07-19 20:46:09 +02:00
|
|
|
/** Take a 32-bit host-order ipv4 address <b>v4addr</b> and store it in the
|
|
|
|
* tor_addr *<b>dest</b>.
|
|
|
|
*
|
|
|
|
* XXXX020 Temporary, for use while 32-bit int addresses are still being
|
|
|
|
* passed around.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
tor_addr_from_ipv4(tor_addr_t *dest, uint32_t v4addr)
|
|
|
|
{
|
|
|
|
tor_assert(dest);
|
|
|
|
memset(dest, 0, sizeof(dest));
|
2007-12-04 06:19:56 +01:00
|
|
|
dest->family = AF_INET;
|
|
|
|
dest->addr.in_addr.s_addr = htonl(v4addr);
|
2007-07-19 20:46:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Copy a tor_addr_t from <b>src</b> to <b>dest</b>.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
tor_addr_copy(tor_addr_t *dest, const tor_addr_t *src)
|
|
|
|
{
|
|
|
|
tor_assert(src && dest);
|
|
|
|
memcpy(dest, src, sizeof(tor_addr_t));
|
|
|
|
}
|
|
|
|
|
2007-07-30 19:46:12 +02:00
|
|
|
/** Given two addresses <b>addr1</b> and <b>addr2</b>, return 0 if the two
|
|
|
|
* addresses are equivalent under the mask mbits, less than 0 if addr1
|
|
|
|
* preceeds addr2, and greater than 0 otherwise.
|
|
|
|
*
|
|
|
|
* Different address families (IPv4 vs IPv6) are always considered unequal.
|
|
|
|
*/
|
2007-07-19 20:46:09 +02:00
|
|
|
int
|
|
|
|
tor_addr_compare(const tor_addr_t *addr1, const tor_addr_t *addr2)
|
|
|
|
{
|
|
|
|
return tor_addr_compare_masked(addr1, addr2, 128);
|
|
|
|
}
|
|
|
|
|
2007-07-30 19:46:12 +02:00
|
|
|
/** As tor_addr_compare(), but only looks at the first <b>mask</b> bits of
|
|
|
|
* the address.
|
2007-07-19 20:46:09 +02:00
|
|
|
*
|
|
|
|
* Reduce over-specific masks (>128 for ipv6, >32 for ipv4) to 128 or 32.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2,
|
|
|
|
maskbits_t mbits)
|
|
|
|
{
|
|
|
|
uint32_t ip4a=0, ip4b=0;
|
|
|
|
sa_family_t v_family[2];
|
|
|
|
int idx;
|
|
|
|
uint32_t masked_a, masked_b;
|
|
|
|
|
|
|
|
tor_assert(addr1 && addr2);
|
|
|
|
|
2007-07-30 19:46:12 +02:00
|
|
|
/* XXXX020 this code doesn't handle mask bits right it's using v4-mapped v6
|
|
|
|
* addresses. If I ask whether ::ffff:1.2.3.4 and ::ffff:1.2.7.8 are the
|
|
|
|
* same in the first 16 bits, it will say "yes." That's not so intuitive.
|
|
|
|
*/
|
|
|
|
|
2007-07-19 20:46:09 +02:00
|
|
|
v_family[0] = IN_FAMILY(addr1);
|
|
|
|
v_family[1] = IN_FAMILY(addr2);
|
|
|
|
|
|
|
|
if (v_family[0] == AF_INET) { /* If this is native IPv4, note the address */
|
|
|
|
ip4a = IPV4IPh(addr1); /* Later we risk overwriting a v4-mapped address */
|
|
|
|
} else if ((v_family[0] == AF_INET6) && tor_addr_is_v4(addr1)) {
|
|
|
|
v_family[0] = AF_INET;
|
|
|
|
ip4a = IPV4MAPh(addr1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (v_family[1] == AF_INET) { /* If this is native IPv4, note the address */
|
|
|
|
ip4b = IPV4IPh(addr2); /* Later we risk overwriting a v4-mapped address */
|
|
|
|
} else if ((v_family[1] == AF_INET6) && tor_addr_is_v4(addr2)) {
|
|
|
|
v_family[1] = AF_INET;
|
|
|
|
ip4b = IPV4MAPh(addr2);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (v_family[0] > v_family[1]) /* Comparison of virtual families */
|
|
|
|
return 1;
|
|
|
|
else if (v_family[0] < v_family[1])
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (mbits == 0) /* Under a complete wildcard mask, consider them equal */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (v_family[0] == AF_INET) { /* Real or mapped IPv4 */
|
|
|
|
if (mbits >= 32) {
|
|
|
|
masked_a = ip4a;
|
|
|
|
masked_b = ip4b;
|
2007-07-19 21:40:45 +02:00
|
|
|
} else if (mbits == 0) {
|
|
|
|
return 0;
|
2007-07-19 20:46:09 +02:00
|
|
|
} else {
|
2007-07-19 21:40:45 +02:00
|
|
|
masked_a = ip4a >> (32-mbits);
|
|
|
|
masked_b = ip4b >> (32-mbits);
|
2007-07-19 20:46:09 +02:00
|
|
|
}
|
|
|
|
if (masked_a < masked_b)
|
|
|
|
return -1;
|
|
|
|
else if (masked_a > masked_b)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
} else if (v_family[0] == AF_INET6) { /* Real IPv6 */
|
2007-08-17 22:44:54 +02:00
|
|
|
const uint32_t *a1 = IN6_ADDRESS32(addr1);
|
|
|
|
const uint32_t *a2 = IN6_ADDRESS32(addr2);
|
2007-07-19 20:46:09 +02:00
|
|
|
for (idx = 0; idx < 4; ++idx) {
|
2007-07-19 21:40:45 +02:00
|
|
|
uint32_t masked_a = ntohl(a1[idx]);
|
|
|
|
uint32_t masked_b = ntohl(a2[idx]);
|
|
|
|
if (!mbits) {
|
2007-07-19 20:46:09 +02:00
|
|
|
return 0; /* Mask covers both addresses from here on */
|
2007-07-19 21:40:45 +02:00
|
|
|
} else if (mbits < 32) {
|
|
|
|
masked_a >>= (32-mbits);
|
|
|
|
masked_b >>= (32-mbits);
|
|
|
|
}
|
2007-07-19 20:46:09 +02:00
|
|
|
|
|
|
|
if (masked_a > masked_b)
|
|
|
|
return 1;
|
|
|
|
else if (masked_a < masked_b)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (mbits < 32)
|
|
|
|
return 0;
|
|
|
|
mbits -= 32;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
tor_assert(0); /* Unknown address family */
|
|
|
|
return -1; /* unknown address family, return unequal? */
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Given a host-order <b>addr</b>, call tor_inet_ntop() on it
|
|
|
|
* and return a strdup of the resulting address.
|
2005-08-26 09:37:07 +02:00
|
|
|
*/
|
|
|
|
char *
|
|
|
|
tor_dup_addr(uint32_t addr)
|
|
|
|
{
|
2007-07-19 20:46:09 +02:00
|
|
|
char buf[TOR_ADDR_BUF_LEN];
|
2005-08-26 09:37:07 +02:00
|
|
|
struct in_addr in;
|
|
|
|
|
|
|
|
in.s_addr = htonl(addr);
|
2007-07-19 20:46:09 +02:00
|
|
|
tor_inet_ntop(AF_INET, &in, buf, sizeof(buf));
|
2005-08-26 09:37:07 +02:00
|
|
|
return tor_strdup(buf);
|
|
|
|
}
|
|
|
|
|
2007-07-19 20:46:09 +02:00
|
|
|
/** Convert the tor_addr_t *<b>addr</b> into string form and store it in
|
2007-07-30 19:46:12 +02:00
|
|
|
* <b>dest</b>, which can hold at least <b>len</b> bytes. Returns <b>dest</b>
|
|
|
|
* on success, NULL on failure.
|
2007-07-19 20:46:09 +02:00
|
|
|
*/
|
|
|
|
const char *
|
|
|
|
tor_addr_to_str(char *dest, const tor_addr_t *addr, int len)
|
|
|
|
{
|
|
|
|
tor_assert(addr && dest);
|
|
|
|
|
|
|
|
if (IN_FAMILY(addr) == AF_INET) {
|
2007-08-01 17:57:34 +02:00
|
|
|
return tor_inet_ntop(AF_INET, IN4_ADDRESS(addr), dest, len);
|
2007-07-19 20:46:09 +02:00
|
|
|
} else if (IN_FAMILY(addr) == AF_INET6) {
|
2007-08-01 17:57:34 +02:00
|
|
|
return tor_inet_ntop(AF_INET6, IN6_ADDRESS(addr), dest, len);
|
2007-07-19 20:46:09 +02:00
|
|
|
} else {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Convert the string in <b>src</b> to a tor_addr_t <b>addr</b>.
|
2007-08-27 17:33:58 +02:00
|
|
|
*
|
|
|
|
* Return an address family on success, or -1 if an invalid address string is
|
|
|
|
* provided. */
|
2005-08-03 22:42:17 +02:00
|
|
|
int
|
2007-07-19 20:46:09 +02:00
|
|
|
tor_addr_from_str(tor_addr_t *addr, const char *src)
|
|
|
|
{
|
|
|
|
tor_assert(addr && src);
|
|
|
|
return tor_addr_parse_mask_ports(src, addr, NULL, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Set *<b>addr</b> to the IP address (if any) of whatever interface
|
|
|
|
* connects to the internet. This address should only be used in checking
|
|
|
|
* whether our address has changed. Return 0 on success, -1 on failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr)
|
2005-08-03 22:42:17 +02:00
|
|
|
{
|
|
|
|
int sock=-1, r=-1;
|
2007-07-19 20:46:09 +02:00
|
|
|
struct sockaddr_storage my_addr, target_addr;
|
|
|
|
socklen_t my_addr_len;
|
2005-08-03 22:42:17 +02:00
|
|
|
|
|
|
|
tor_assert(addr);
|
|
|
|
|
2007-07-19 20:46:09 +02:00
|
|
|
memset(addr, 0, sizeof(tor_addr_t));
|
|
|
|
memset(&target_addr, 0, sizeof(target_addr));
|
|
|
|
my_addr_len = sizeof(my_addr);
|
|
|
|
((struct sockaddr_in*)&target_addr)->sin_port = 9; /* DISGARD port */
|
|
|
|
/* Don't worry: no packets are sent. We just need to use a real address
|
|
|
|
* on the actual internet. */
|
|
|
|
if (family == AF_INET6) {
|
|
|
|
struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&target_addr;
|
|
|
|
sock = tor_open_socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP);
|
|
|
|
my_addr_len = sizeof(struct sockaddr_in6);
|
|
|
|
sin6->sin6_family = AF_INET6;
|
2007-08-17 22:44:54 +02:00
|
|
|
S6_ADDR16(sin6->sin6_addr)[0] = htons(0x2002); /* 2002:: */
|
2007-07-19 20:46:09 +02:00
|
|
|
} else if (family == AF_INET) {
|
|
|
|
struct sockaddr_in *sin = (struct sockaddr_in*)&target_addr;
|
|
|
|
sock = tor_open_socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP);
|
|
|
|
my_addr_len = sizeof(struct sockaddr_in);
|
|
|
|
sin->sin_family = AF_INET;
|
|
|
|
sin->sin_addr.s_addr = htonl(0x12000001); /* 18.0.0.1 */
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
2005-08-03 22:42:17 +02:00
|
|
|
if (sock < 0) {
|
|
|
|
int e = tor_socket_errno(-1);
|
2006-09-09 21:20:27 +02:00
|
|
|
log_fn(severity, LD_NET, "unable to create socket: %s",
|
|
|
|
tor_socket_strerror(e));
|
2005-08-03 22:42:17 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (connect(sock,(struct sockaddr *)&target_addr,sizeof(target_addr))<0) {
|
|
|
|
int e = tor_socket_errno(sock);
|
2006-09-09 21:20:27 +02:00
|
|
|
log_fn(severity, LD_NET, "connect() failed: %s", tor_socket_strerror(e));
|
2005-08-03 22:42:17 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2007-07-19 20:46:09 +02:00
|
|
|
if (getsockname(sock,(struct sockaddr*)&my_addr, &my_addr_len)) {
|
2005-08-03 22:42:17 +02:00
|
|
|
int e = tor_socket_errno(sock);
|
2006-09-30 00:33:40 +02:00
|
|
|
log_fn(severity, LD_NET, "getsockname() to determine interface failed: %s",
|
2006-09-09 21:20:27 +02:00
|
|
|
tor_socket_strerror(e));
|
2005-08-03 22:42:17 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2007-07-19 20:46:09 +02:00
|
|
|
memcpy(addr, &my_addr, sizeof(tor_addr_t));
|
2005-08-03 22:42:17 +02:00
|
|
|
r=0;
|
|
|
|
err:
|
|
|
|
if (sock >= 0)
|
|
|
|
tor_close_socket(sock);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2007-07-19 20:46:09 +02:00
|
|
|
/**
|
|
|
|
* Set *<b>addr</b> to the host-order IPv4 address (if any) of whatever
|
|
|
|
* interface connects to the internet. This address should only be used in
|
|
|
|
* checking whether our address has changed. Return 0 on success, -1 on
|
|
|
|
* failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
get_interface_address(int severity, uint32_t *addr)
|
|
|
|
{
|
|
|
|
tor_addr_t local_addr;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
r = get_interface_address6(severity, AF_INET, &local_addr);
|
|
|
|
if (r>=0)
|
|
|
|
*addr = IPV4IPh(&local_addr);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/* =====
|
|
|
|
* Process helpers
|
|
|
|
* ===== */
|
|
|
|
|
|
|
|
#ifndef MS_WINDOWS
|
|
|
|
/* Based on code contributed by christian grothoff */
|
2007-02-24 08:50:38 +01:00
|
|
|
/** True iff we've called start_daemon(). */
|
2004-11-01 21:41:47 +01:00
|
|
|
static int start_daemon_called = 0;
|
2007-02-24 08:50:38 +01:00
|
|
|
/** True iff we've called finish_daemon(). */
|
2004-11-01 21:41:47 +01:00
|
|
|
static int finish_daemon_called = 0;
|
2007-02-16 21:39:37 +01:00
|
|
|
/** Socketpair used to communicate between parent and child process while
|
|
|
|
* daemonizing. */
|
2004-11-01 21:41:47 +01:00
|
|
|
static int daemon_filedes[2];
|
|
|
|
/** Start putting the process into daemon mode: fork and drop all resources
|
|
|
|
* except standard fds. The parent process never returns, but stays around
|
|
|
|
* until finish_daemon is called. (Note: it's safe to call this more
|
|
|
|
* than once: calls after the first are ignored.)
|
2004-10-12 21:32:41 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
start_daemon(void)
|
2004-10-12 21:32:41 +02:00
|
|
|
{
|
2004-11-01 21:41:47 +01:00
|
|
|
pid_t pid;
|
2004-10-12 21:32:41 +02:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
if (start_daemon_called)
|
|
|
|
return;
|
|
|
|
start_daemon_called = 1;
|
2004-10-12 21:32:41 +02:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
pipe(daemon_filedes);
|
|
|
|
pid = fork();
|
|
|
|
if (pid < 0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_err(LD_GENERAL,"fork failed. Exiting.");
|
2004-11-01 21:41:47 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (pid) { /* Parent */
|
|
|
|
int ok;
|
|
|
|
char c;
|
2004-10-12 21:32:41 +02:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
close(daemon_filedes[1]); /* we only read */
|
|
|
|
ok = -1;
|
|
|
|
while (0 < read(daemon_filedes[0], &c, sizeof(char))) {
|
|
|
|
if (c == '.')
|
|
|
|
ok = 1;
|
|
|
|
}
|
|
|
|
fflush(stdout);
|
|
|
|
if (ok == 1)
|
|
|
|
exit(0);
|
|
|
|
else
|
|
|
|
exit(1); /* child reported error */
|
|
|
|
} else { /* Child */
|
|
|
|
close(daemon_filedes[0]); /* we only write */
|
2004-10-12 21:32:41 +02:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
pid = setsid(); /* Detach from controlling terminal */
|
|
|
|
/*
|
|
|
|
* Fork one more time, so the parent (the session group leader) can exit.
|
|
|
|
* This means that we, as a non-session group leader, can never regain a
|
|
|
|
* controlling terminal. This part is recommended by Stevens's
|
|
|
|
* _Advanced Programming in the Unix Environment_.
|
|
|
|
*/
|
|
|
|
if (fork() != 0) {
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2004-10-27 08:26:23 +02:00
|
|
|
}
|
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/** Finish putting the process into daemon mode: drop standard fds, and tell
|
|
|
|
* the parent process to exit. (Note: it's safe to call this more than once:
|
|
|
|
* calls after the first are ignored. Calls start_daemon first if it hasn't
|
|
|
|
* been called already.)
|
2004-10-27 08:26:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
finish_daemon(const char *desired_cwd)
|
2004-10-27 08:26:23 +02:00
|
|
|
{
|
2004-11-01 21:41:47 +01:00
|
|
|
int nullfd;
|
|
|
|
char c = '.';
|
|
|
|
if (finish_daemon_called)
|
|
|
|
return;
|
|
|
|
if (!start_daemon_called)
|
2005-04-06 21:07:38 +02:00
|
|
|
start_daemon();
|
2004-11-01 21:41:47 +01:00
|
|
|
finish_daemon_called = 1;
|
2004-10-27 08:26:23 +02:00
|
|
|
|
2005-04-06 21:07:38 +02:00
|
|
|
if (!desired_cwd)
|
|
|
|
desired_cwd = "/";
|
|
|
|
/* Don't hold the wrong FS mounted */
|
|
|
|
if (chdir(desired_cwd) < 0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_err(LD_GENERAL,"chdir to \"%s\" failed. Exiting.",desired_cwd);
|
2005-04-06 21:07:38 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
nullfd = open("/dev/null",
|
|
|
|
O_CREAT | O_RDWR | O_APPEND);
|
|
|
|
if (nullfd < 0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_err(LD_GENERAL,"/dev/null can't be opened. Exiting.");
|
2004-11-01 21:41:47 +01:00
|
|
|
exit(1);
|
2004-06-05 03:50:35 +02:00
|
|
|
}
|
2004-11-01 21:41:47 +01:00
|
|
|
/* close fds linking to invoking terminal, but
|
|
|
|
* close usual incoming fds, but redirect them somewhere
|
|
|
|
* useful so the fds don't get reallocated elsewhere.
|
|
|
|
*/
|
|
|
|
if (dup2(nullfd,0) < 0 ||
|
|
|
|
dup2(nullfd,1) < 0 ||
|
|
|
|
dup2(nullfd,2) < 0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_err(LD_GENERAL,"dup2 failed. Exiting.");
|
2004-11-01 21:41:47 +01:00
|
|
|
exit(1);
|
2004-06-05 03:50:35 +02:00
|
|
|
}
|
2005-06-30 08:56:00 +02:00
|
|
|
if (nullfd > 2)
|
|
|
|
close(nullfd);
|
2004-11-01 21:41:47 +01:00
|
|
|
write(daemon_filedes[1], &c, sizeof(char)); /* signal success */
|
|
|
|
close(daemon_filedes[1]);
|
2004-06-05 03:50:35 +02:00
|
|
|
}
|
2004-11-01 21:41:47 +01:00
|
|
|
#else
|
|
|
|
/* defined(MS_WINDOWS) */
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
start_daemon(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
void
|
|
|
|
finish_daemon(const char *cp)
|
|
|
|
{
|
2007-02-28 21:24:27 +01:00
|
|
|
(void)cp;
|
2005-09-30 03:09:52 +02:00
|
|
|
}
|
2004-06-05 03:50:35 +02:00
|
|
|
#endif
|
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
/** Write the current process ID, followed by NL, into <b>filename</b>.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
write_pidfile(char *filename)
|
|
|
|
{
|
2004-11-01 21:41:47 +01:00
|
|
|
FILE *pidfile;
|
2004-10-30 21:26:31 +02:00
|
|
|
|
2004-11-01 21:41:47 +01:00
|
|
|
if ((pidfile = fopen(filename, "w")) == NULL) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_FS, "Unable to open \"%s\" for writing: %s", filename,
|
|
|
|
strerror(errno));
|
2004-11-01 21:41:47 +01:00
|
|
|
} else {
|
2006-12-15 06:12:52 +01:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
fprintf(pidfile, "%d\n", (int)_getpid());
|
|
|
|
#else
|
2004-11-01 21:41:47 +01:00
|
|
|
fprintf(pidfile, "%d\n", (int)getpid());
|
2006-12-15 06:12:52 +01:00
|
|
|
#endif
|
2004-11-01 21:41:47 +01:00
|
|
|
fclose(pidfile);
|
2004-10-30 21:26:31 +02:00
|
|
|
}
|
|
|
|
}
|
2005-06-09 21:03:31 +02:00
|
|
|
|