nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make "common" no longer depend on or.h

Browse Source 
svn:r1466
This commit is contained in:
Nick Mathewson 2004-04-03 04:05:12 +00:00
parent cb07e2ad27
commit b3c2b62a14
8 changed files with 73 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/crypto.c
View File

@ -2,7 +2,7 @@
/* See LICENSE for licensing information */
/* $Id$ */
#include "../or/or.h"
#include "orconfig.h"
#include <string.h>
@ -22,9 +22,14 @@
#include <stdio.h>
#include <limits.h>
#ifdef HAVE_CTYPE_H
#include <ctype.h>
#endif
#include "crypto.h"
#include "log.h"
#include "aes.h"
#include "util.h"
#ifdef MS_WINDOWS
#include <wincrypt.h>

3
src/common/fakepoll.c
View File

@ -15,6 +15,9 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#if _MSC_VER > 1300
#include <winsock2.h>
#include <ws2tcpip.h>

7
src/common/log.c
View File

@ -2,8 +2,13 @@
/* See LICENSE for licensing information */
/* $Id$ */
#include "../or/or.h"
#include <stdarg.h>
#include <assert.h>
#include <stdlib.h>
#include "orconfig.h"
#include "./util.h"
#include "./log.h"
#ifdef MS_WINDOWS
#define vsnprintf _vsnprintf

1
src/common/tortls.c
View File

@ -11,6 +11,7 @@
#include "./tortls.h"
#include "./util.h"
#include "./log.h"
#include <string.h>
/* Copied from or.h */
#define LEGAL_NICKNAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"

42
src/common/util.c
View File

@ -2,12 +2,52 @@
/* See LICENSE for licensing information */
/* $Id$ */
#include "../or/or.h"
#include "orconfig.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include "util.h"
#include "log.h"
#include "crypto.h"
#include "../or/tree.h"
#ifdef HAVE_UNAME
#include <sys/utsname.h>
#endif
#ifdef HAVE_CTYPE_H
#include <ctype.h>
#endif
#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_TYPES_H
#include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#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
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
#ifdef HAVE_GRP_H
#include <grp.h>
#endif
/* used by inet_addr, not defined on solaris anywhere!? */
#ifndef INADDR_NONE

10
src/common/util.h
View File

@ -5,7 +5,12 @@
#ifndef __UTIL_H
#define __UTIL_H
#include "../or/or.h"
#include "orconfig.h"
#include "torint.h"
#include <stdio.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#if _MSC_VER > 1300
#include <winsock2.h>
@ -32,6 +37,9 @@
#define INLINE inline
#endif
/* legal characters in a filename */
#define CONFIG_LEGAL_FILENAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_/"
size_t strlcat(char *dst, const char *src, size_t siz);
size_t strlcpy(char *dst, const char *src, size_t siz);

7
src/or/dirserv.c
View File

@ -494,3 +494,10 @@ size_t dirserv_get_directory(const char **directory)
return the_directory_len;
}
/*
Local Variables:
mode:c
indent-tabs-mode:nil
c-basic-offset:2
End:
*/

8
src/or/or.h
View File

@ -73,12 +73,6 @@
#ifdef HAVE_TIME_H
#include <time.h>
#endif
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
#ifdef HAVE_GRP_H
#include <grp.h>
#endif
#ifdef HAVE_WINSOCK_H
#include <winsock.h>
#endif
@ -276,8 +270,6 @@
#define CELL_RELAY 3
#define CELL_DESTROY 4
/* legal characters in a filename */
#define CONFIG_LEGAL_FILENAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_/"
/* legal characters in a nickname */
#define LEGAL_NICKNAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"