Commit 42b3caa6 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Move network code to libtor-net. 

There are some additional changes to come: those points are marked
by XXXX.
parent 80730c45

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ uptime-*.json 
/src/lib/libtor-log-testing.a

/src/lib/libtor-malloc.a

/src/lib/libtor-malloc-testing.a

/src/lib/libtor-net.a

/src/lib/libtor-net-testing.a

/src/lib/libtor-string.a

/src/lib/libtor-string-testing.a

/src/lib/libtor-tls.a

Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ endif 
# "Common" libraries used to link tor's utility code.

TOR_UTIL_LIBS = \

	src/common/libor.a \

	src/lib/libtor-net.a \

        src/lib/libtor-log.a \

        src/lib/libtor-lock.a \

        src/lib/libtor-fdio.a \
@@ -55,6 +56,7 @@ TOR_UTIL_LIBS = \ 
# and tests)

TOR_UTIL_TESTING_LIBS = \

	src/common/libor-testing.a \

	src/lib/libtor-net-testing.a \

        src/lib/libtor-log-testing.a \

        src/lib/libtor-lock-testing.a \

        src/lib/libtor-fdio-testing.a \

src/common/compat.c

+5 −864

File changed.

Preview size limit exceeded, changes collapsed.

src/common/compat.h

+4 −182
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 
#include "lib/string/compat_ctype.h"

#include "lib/string/compat_string.h"

#include "lib/string/printf.h"

#include "lib/net/socket.h"

#include "lib/net/ipv4.h"

#include "lib/net/ipv6.h"

#include "lib/net/resolve.h"



#include <stdio.h>

#include <errno.h>
@@ -162,180 +166,7 @@ int64_t tor_get_avail_disk_space(const char *path); 


/* ===== Net compatibility */



#if (SIZEOF_SOCKLEN_T == 0)

typedef int socklen_t;

#endif



#ifdef _WIN32

/* XXX Actually, this should arguably be SOCKET; we use intptr_t here so that

 * any inadvertent checks for the socket being <= 0 or > 0 will probably

 * still work. */

#define tor_socket_t intptr_t

#define TOR_SOCKET_T_FORMAT INTPTR_T_FORMAT

#define SOCKET_OK(s) ((SOCKET)(s) != INVALID_SOCKET)

#define TOR_INVALID_SOCKET INVALID_SOCKET

#else /* !(defined(_WIN32)) */

/** Type used for a network socket. */

#define tor_socket_t int

#define TOR_SOCKET_T_FORMAT "%d"

/** Macro: true iff 's' is a possible value for a valid initialized socket. */

#define SOCKET_OK(s) ((s) >= 0)

/** Error/uninitialized value for a tor_socket_t. */

#define TOR_INVALID_SOCKET (-1)

#endif /* defined(_WIN32) */



int tor_close_socket_simple(tor_socket_t s);

MOCK_DECL(int, tor_close_socket, (tor_socket_t s));

void tor_take_socket_ownership(tor_socket_t s);

tor_socket_t tor_open_socket_with_extensions(

                                           int domain, int type, int protocol,

                                           int cloexec, int nonblock);

MOCK_DECL(tor_socket_t,

tor_open_socket,(int domain, int type, int protocol));

tor_socket_t tor_open_socket_nonblocking(int domain, int type, int protocol);

tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr,

                                  socklen_t *len);

tor_socket_t tor_accept_socket_nonblocking(tor_socket_t sockfd,

                                           struct sockaddr *addr,

                                           socklen_t *len);

tor_socket_t tor_accept_socket_with_extensions(tor_socket_t sockfd,

                                               struct sockaddr *addr,

                                               socklen_t *len,

                                               int cloexec, int nonblock);

MOCK_DECL(tor_socket_t,

tor_connect_socket,(tor_socket_t socket,const struct sockaddr *address,

                    socklen_t address_len));

int get_n_open_sockets(void);



MOCK_DECL(int,

tor_getsockname,(tor_socket_t socket, struct sockaddr *address,

                 socklen_t *address_len));

struct tor_addr_t;

int tor_addr_from_getsockname(struct tor_addr_t *addr_out, tor_socket_t sock);



#define tor_socket_send(s, buf, len, flags) send(s, buf, len, flags)

#define tor_socket_recv(s, buf, len, flags) recv(s, buf, len, flags)



/** Implementation of struct in6_addr for platforms that do not have it.

 * Generally, these platforms are ones without IPv6 support, but we want to

 * have a working in6_addr there anyway, so we can use it to parse IPv6

 * addresses. */

#if !defined(HAVE_STRUCT_IN6_ADDR)

struct in6_addr

{

  union {

    uint8_t u6_addr8[16];

    uint16_t u6_addr16[8];

    uint32_t u6_addr32[4];

  } in6_u;

#define s6_addr   in6_u.u6_addr8

#define s6_addr16 in6_u.u6_addr16

#define s6_addr32 in6_u.u6_addr32

};

#endif /* !defined(HAVE_STRUCT_IN6_ADDR) */



/** @{ */

/** Many BSD variants seem not to define these. */

#if defined(__APPLE__) || defined(__darwin__) || \

  defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)

#ifndef s6_addr16

#define s6_addr16 __u6_addr.__u6_addr16

#endif

#ifndef s6_addr32

#define s6_addr32 __u6_addr.__u6_addr32

#endif

#endif /* defined(__APPLE__) || defined(__darwin__) || ... */

/** @} */



#ifndef HAVE_SA_FAMILY_T

typedef uint16_t sa_family_t;

#endif



/** @{ */

/** Apparently, MS and Solaris don't define s6_addr16 or s6_addr32; these

 * macros get you a pointer to s6_addr32 or local equivalent. */

#ifdef HAVE_STRUCT_IN6_ADDR_S6_ADDR32

#define S6_ADDR32(x) ((uint32_t*)(x).s6_addr32)

#else

#define S6_ADDR32(x) ((uint32_t*)((char*)&(x).s6_addr))

#endif

#ifdef HAVE_STRUCT_IN6_ADDR_S6_ADDR16

#define S6_ADDR16(x) ((uint16_t*)(x).s6_addr16)

#else

#define S6_ADDR16(x) ((uint16_t*)((char*)&(x).s6_addr))

#endif

/** @} */



/** Implementation of struct sockaddr_in6 on platforms that do not have

 * it. See notes on struct in6_addr. */

#if !defined(HAVE_STRUCT_SOCKADDR_IN6)

struct sockaddr_in6 {

  sa_family_t sin6_family;

  uint16_t sin6_port;

  // uint32_t sin6_flowinfo;

  struct in6_addr sin6_addr;

  // uint32_t sin6_scope_id;

};

#endif /* !defined(HAVE_STRUCT_SOCKADDR_IN6) */



MOCK_DECL(int,tor_gethostname,(char *name, size_t namelen));

int tor_inet_aton(const char *cp, struct in_addr *addr) ATTR_NONNULL((1,2));

const char *tor_inet_ntop(int af, const void *src, char *dst, size_t len);

int tor_inet_pton(int af, const char *src, void *dst);

MOCK_DECL(int,tor_lookup_hostname,(const char *name, uint32_t *addr));

int set_socket_nonblocking(tor_socket_t socket);

int tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]);

int network_init(void);



/* For stupid historical reasons, windows sockets have an independent

 * set of errnos, and an independent way to get them.  Also, you can't

 * always believe WSAEWOULDBLOCK.  Use the macros below to compare

 * errnos against expected values, and use tor_socket_errno to find

 * the actual errno after a socket operation fails.

 */

#if defined(_WIN32)

/** Expands to WSA<b>e</b> on Windows, and to <b>e</b> elsewhere. */

#define SOCK_ERRNO(e) WSA##e

/** Return true if e is EAGAIN or the local equivalent. */

#define ERRNO_IS_EAGAIN(e)           ((e) == EAGAIN || (e) == WSAEWOULDBLOCK)

/** Return true if e is EINPROGRESS or the local equivalent. */

#define ERRNO_IS_EINPROGRESS(e)      ((e) == WSAEINPROGRESS)

/** Return true if e is EINPROGRESS or the local equivalent as returned by

 * a call to connect(). */

#define ERRNO_IS_CONN_EINPROGRESS(e) \

  ((e) == WSAEINPROGRESS || (e)== WSAEINVAL || (e) == WSAEWOULDBLOCK)

/** Return true if e is EAGAIN or another error indicating that a call to

 * accept() has no pending connections to return. */

#define ERRNO_IS_ACCEPT_EAGAIN(e)    ERRNO_IS_EAGAIN(e)

/** Return true if e is EMFILE or another error indicating that a call to

 * accept() has failed because we're out of fds or something. */

#define ERRNO_IS_RESOURCE_LIMIT(e) \

  ((e) == WSAEMFILE || (e) == WSAENOBUFS)

/** Return true if e is EADDRINUSE or the local equivalent. */

#define ERRNO_IS_EADDRINUSE(e)      ((e) == WSAEADDRINUSE)

/** Return true if e is EINTR  or the local equivalent */

#define ERRNO_IS_EINTR(e)            ((e) == WSAEINTR || 0)

int tor_socket_errno(tor_socket_t sock);

const char *tor_socket_strerror(int e);

#else /* !(defined(_WIN32)) */

#define SOCK_ERRNO(e) e

#if EAGAIN == EWOULDBLOCK

/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */

#define ERRNO_IS_EAGAIN(e)           ((e) == EAGAIN || 0)

#else

#define ERRNO_IS_EAGAIN(e)           ((e) == EAGAIN || (e) == EWOULDBLOCK)

#endif /* EAGAIN == EWOULDBLOCK */

#define ERRNO_IS_EINTR(e)            ((e) == EINTR || 0)

#define ERRNO_IS_EINPROGRESS(e)      ((e) == EINPROGRESS || 0)

#define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS || 0)

#define ERRNO_IS_ACCEPT_EAGAIN(e) \

  (ERRNO_IS_EAGAIN(e) || (e) == ECONNABORTED)

#define ERRNO_IS_RESOURCE_LIMIT(e) \

  ((e) == EMFILE || (e) == ENFILE || (e) == ENOBUFS || (e) == ENOMEM)

#define ERRNO_IS_EADDRINUSE(e)       (((e) == EADDRINUSE) || 0)

#define tor_socket_errno(sock)       (errno)

#define tor_socket_strerror(e)       strerror(e)

#endif /* defined(_WIN32) */



/** Specified SOCKS5 status codes. */

typedef enum {
@@ -372,7 +203,6 @@ set_uint8(void *cp, uint8_t v) 
#if !defined(HAVE_RLIM_T)

typedef unsigned long rlim_t;

#endif

int get_max_sockets(void);

int set_max_file_descriptors(rlim_t limit, int *max);

int tor_disable_debugger_attach(void);
@@ -440,14 +270,6 @@ char *format_win32_error(DWORD err); 


#endif /* defined(_WIN32) */



#ifdef COMPAT_PRIVATE

#if !defined(HAVE_SOCKETPAIR) || defined(_WIN32) || defined(TOR_UNIT_TESTS)

#define NEED_ERSATZ_SOCKETPAIR

STATIC int tor_ersatz_socketpair(int family, int type, int protocol,

                                   tor_socket_t fd[2]);

#endif

#endif /* defined(COMPAT_PRIVATE) */



ssize_t tor_getpass(const char *prompt, char *output, size_t buflen);



/* This needs some of the declarations above so we include it here. */

src/common/include.am

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ readpassphrase_source= 
endif



LIBOR_A_SRC = \

  src/common/address.c					\

  src/common/address_set.c				\

  src/common/buffers.c					\

  src/common/compat.c					\
@@ -76,7 +75,6 @@ src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) 
src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)



COMMONHEADERS = \

  src/common/address.h				\

  src/common/address_set.h			\

  src/common/buffers.h				\

  src/common/compat.h				\